From ecee9a96f94f04e68b3e9e3edbdda179f58d0cdb Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Wed, 6 Nov 2019 12:49:41 +0100
Subject: [PATCH 1/7] renamed some templates and files

---
 tei2html/tei2html.xsl                                       | 6 +++---
 tei2html/tei2html_chapter.xsl                               | 2 +-
 tei2html/tei2html_chapter_utils.xsl                         | 2 +-
 .../{tei2html_index.xsl => tei2html_publ_frontpage.xsl}     | 4 ++--
 ...ml_index_utils.xsl => tei2html_publ_frontpage_utils.xsl} | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename tei2html/{tei2html_index.xsl => tei2html_publ_frontpage.xsl} (93%)
 rename tei2html/{tei2html_index_utils.xsl => tei2html_publ_frontpage_utils.xsl} (99%)

diff --git a/tei2html/tei2html.xsl b/tei2html/tei2html.xsl
index 3e33e4c..6a0945c 100644
--- a/tei2html/tei2html.xsl
+++ b/tei2html/tei2html.xsl
@@ -13,7 +13,7 @@
 		indent="yes"
 	/>
 
-	<xsl:include href="tei2html_index_utils.xsl"/>
+	<xsl:include href="tei2html_publ_frontpage_utils.xsl"/>
 	<xsl:include href="tei2html_chapter_utils.xsl"/>
 	<xsl:include href="utils/html_rules.xsl"/>
 	<xsl:include href="utils/common.xsl"/>
@@ -46,7 +46,7 @@
 			indent="yes"
 			href="{concat($output_subdir, '/index.html')}"
 		>
-			<xsl:call-template name="writeindexfile">
+			<xsl:call-template name="render_publication_frontpage">
 				<xsl:with-param name="static_dir" select="concat('../../', $static_dir)"/>
 				<xsl:with-param name="logo_dir" select="concat('../../', $logo_dir)"/>
 				<xsl:with-param name="nav_items" as="element(eoa:entry)*" select="$nav_items"/>
@@ -60,7 +60,7 @@
 				indent="yes"
 				href="{concat($output_subdir, '/', position(), '/index.html')}"
 			>
-				<xsl:call-template name="writechapterfile">
+				<xsl:call-template name="render_chapter">
 					<xsl:with-param name="static_dir" select="concat('../../../', $static_dir)"/>
 					<xsl:with-param name="logo_dir" select="concat('../../../', $logo_dir)"/>
 				<xsl:with-param name="nav_items" as="element(eoa:entry)*" select="$nav_items"/>
diff --git a/tei2html/tei2html_chapter.xsl b/tei2html/tei2html_chapter.xsl
index 5754395..9915c45 100644
--- a/tei2html/tei2html_chapter.xsl
+++ b/tei2html/tei2html_chapter.xsl
@@ -31,7 +31,7 @@
 		-->
 		<xsl:for-each select="(//tei:div[@type='chapter'])[position() = $chapter_nr]">
 			<xsl:message>printing chapter <xsl:value-of select="$chapter_nr"/>. head: <xsl:value-of select="tei:head"/></xsl:message>
-			<xsl:call-template name="writechapterfile">
+			<xsl:call-template name="render_chapter">
 				<xsl:with-param name="static_dir" select="$static_dir"/>
 				<xsl:with-param name="logo_dir" select="$logo_dir"/>
 				<xsl:with-param name="nav_items" as="element(eoa:entry)*" select="$nav_items"/>
diff --git a/tei2html/tei2html_chapter_utils.xsl b/tei2html/tei2html_chapter_utils.xsl
index 888b35f..6e70aef 100644
--- a/tei2html/tei2html_chapter_utils.xsl
+++ b/tei2html/tei2html_chapter_utils.xsl
@@ -22,7 +22,7 @@
   <xsl:key name="kWith1stLetter" match="family" use="substring(.,1,1)"/>
 
 	<!-- context: //tei:div[@type='chapter'] -->
-  <xsl:template name="writechapterfile">
+  <xsl:template name="render_chapter">
 		<xsl:param name="static_dir" as="xs:string"/>
 		<xsl:param name="logo_dir" as="xs:string"/>
 		<xsl:param name="nav_items" as="element(eoa:entry)*"/>
diff --git a/tei2html/tei2html_index.xsl b/tei2html/tei2html_publ_frontpage.xsl
similarity index 93%
rename from tei2html/tei2html_index.xsl
rename to tei2html/tei2html_publ_frontpage.xsl
index e47368a..1b99036 100644
--- a/tei2html/tei2html_index.xsl
+++ b/tei2html/tei2html_publ_frontpage.xsl
@@ -21,7 +21,7 @@
 
 	<xsl:include href="utils/common.xsl"/>
 	<xsl:include href="utils/html_rules.xsl"/>
-	<xsl:include href="tei2html_index_utils.xsl"/>
+	<xsl:include href="tei2html_publ_frontpage_utils.xsl"/>
 
 	<!-- use-character-maps="texreplacements"/>-->
   <xsl:variable name="langid" select="//tei:langUsage/tei:language/@ident"/>
@@ -36,7 +36,7 @@
   <xsl:key name="kWith1stLetter" match="family" use="substring(.,1,1)"/>
 
   <xsl:template match="/">
-		<xsl:call-template name="writeindexfile">
+		<xsl:call-template name="render_publication_frontpage">
 			<xsl:with-param name="static_dir" select="$static_dir"/>
 			<xsl:with-param name="logo_dir" select="$logo_dir"/>
 			<xsl:with-param name="nav_items" as="element(eoa:entry)*" select="$nav_items"/>
diff --git a/tei2html/tei2html_index_utils.xsl b/tei2html/tei2html_publ_frontpage_utils.xsl
similarity index 99%
rename from tei2html/tei2html_index_utils.xsl
rename to tei2html/tei2html_publ_frontpage_utils.xsl
index 7f3bb5c..48d5213 100644
--- a/tei2html/tei2html_index_utils.xsl
+++ b/tei2html/tei2html_publ_frontpage_utils.xsl
@@ -16,7 +16,7 @@
   <!-- index sorting, https://stackoverflow.com/questions/13763271 -->
   <xsl:key name="kWith1stLetter" match="family" use="substring(.,1,1)"/>
 
-  <xsl:template name="writeindexfile">
+  <xsl:template name="render_publication_frontpage">
 		<xsl:param name="static_dir" as="xs:string"/>
 		<xsl:param name="logo_dir" as="xs:string"/>
 		<xsl:param name="nav_items" as="element(eoa:entry)*"/>

From 410f9bbd388560c325bacac8043f4419712464f8 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Wed, 6 Nov 2019 14:57:01 +0100
Subject: [PATCH 2/7] tei2html stylesheet: better debug output

---
 tei2html/tei2html.xsl                      |   3 +-
 tei2html/tei2html_chapter.xsl              |   6 +-
 tei2html/tei2html_chapter_utils.xsl        |   2 +-
 tei2html/tei2html_publ_frontpage_utils.xsl |   9 +-
 tei2html/utils/common.xsl                  |  25 +--
 tei2html/utils/html_rules.xsl              | 102 ++++--------
 tei2html/utils/print.xsl                   | 185 +++++++++++++++++++++
 7 files changed, 235 insertions(+), 97 deletions(-)
 create mode 100644 tei2html/utils/print.xsl

diff --git a/tei2html/tei2html.xsl b/tei2html/tei2html.xsl
index 6a0945c..3fc6219 100644
--- a/tei2html/tei2html.xsl
+++ b/tei2html/tei2html.xsl
@@ -17,6 +17,7 @@
 	<xsl:include href="tei2html_chapter_utils.xsl"/>
 	<xsl:include href="utils/html_rules.xsl"/>
 	<xsl:include href="utils/common.xsl"/>
+	<xsl:include href="utils/print.xsl"/>
 
 	<xsl:param name="output_dir" as="xs:string" select="'.'"/>
   <xsl:param name="static_dir" as="xs:string" select="'static'"/>
@@ -35,7 +36,7 @@
 	-->
 
   <xsl:template match="/">
-		<xsl:message> domain: <xsl:value-of select="$domain"/> </xsl:message>
+		<xsl:sequence select="eoa:info(concat('domain: ', $domain))"/>
 		<xsl:variable name="output_subdir" as="xs:string">
 			<xsl:value-of select="concat($output_dir, '/', $series, '/', $publication_number)"/>
 		</xsl:variable>
diff --git a/tei2html/tei2html_chapter.xsl b/tei2html/tei2html_chapter.xsl
index 9915c45..2c9a339 100644
--- a/tei2html/tei2html_chapter.xsl
+++ b/tei2html/tei2html_chapter.xsl
@@ -26,11 +26,9 @@
 	<xsl:include href="tei2html_chapter_utils.xsl"/>
 
   <xsl:template match="/">
-		<!--
-		<xsl:message> domain: <xsl:value-of select="$domain"/> </xsl:message>
-		-->
+		<xsl:sequence select="eoa:info(concat('domain: ', $domain))"/>
 		<xsl:for-each select="(//tei:div[@type='chapter'])[position() = $chapter_nr]">
-			<xsl:message>printing chapter <xsl:value-of select="$chapter_nr"/>. head: <xsl:value-of select="tei:head"/></xsl:message>
+			<xsl:sequence select="eoa:info(concat('printing chapter ', $chapter_nr, '. head: ', tei:head))"/>
 			<xsl:call-template name="render_chapter">
 				<xsl:with-param name="static_dir" select="$static_dir"/>
 				<xsl:with-param name="logo_dir" select="$logo_dir"/>
diff --git a/tei2html/tei2html_chapter_utils.xsl b/tei2html/tei2html_chapter_utils.xsl
index 6e70aef..9e15b22 100644
--- a/tei2html/tei2html_chapter_utils.xsl
+++ b/tei2html/tei2html_chapter_utils.xsl
@@ -176,7 +176,7 @@
 			</xsl:with-param>
 			<xsl:with-param name="script">
 				<xsl:if test=".//tei:formula">
-					<xsl:message>putting in mathjax</xsl:message>
+					<xsl:sequence select="eoa:info('adding mathjax...')"/>
 					<script type="text/x-mathjax-config">
 MathJax.Hub.Config({
 extensions: ["tex2jax.js"],
diff --git a/tei2html/tei2html_publ_frontpage_utils.xsl b/tei2html/tei2html_publ_frontpage_utils.xsl
index 48d5213..03694f3 100644
--- a/tei2html/tei2html_publ_frontpage_utils.xsl
+++ b/tei2html/tei2html_publ_frontpage_utils.xsl
@@ -499,14 +499,14 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="eoa:debug(3, 'No book author. Exiting.', '')"/>
+        <xsl:sequence select="eoa:error('No book author.')"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
   <xsl:template name="create_index">
     <xsl:param name="indextype"/>
-		<xsl:message>creating index...</xsl:message>
+		<xsl:sequence select="eoa:info('creating index')"/>
 		<!-- all index elements starting with the same letter: -->
 		<xsl:for-each-group select="//tei:index[lower-case(@indexName) = $indextype]" group-by="substring(if (exists(./tei:term/@sortKey)) then ./tei:term/@sortKey else ./tei:term/text(),1,1)">
 			<xsl:sort select="current-grouping-key()"/>
@@ -530,9 +530,7 @@
 								<xsl:variable name="paragraph_nr" select="index-of($chapter//tei:p/tei:index/generate-id(), generate-id(.))"/>
 								<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_nr)"/>
 								<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-								<xsl:message>
-									<xsl:value-of select="concat(current-grouping-key(), ': ', $global_uri)"/>
-								</xsl:message>
+								<xsl:sequence select="eoa:info(concat(current-grouping-key(), ': ', $global_uri))"/>
 								<li>
 									<a href="{$global_uri}"> <xsl:value-of select="position()"/></a>
 								</li>
@@ -550,6 +548,7 @@
         </xsl:message>
     -->
     </xsl:for-each-group>
+		<xsl:sequence select="eoa:info('finished creating index')"/>
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/tei2html/utils/common.xsl b/tei2html/utils/common.xsl
index ce60235..a3fc19b 100644
--- a/tei2html/utils/common.xsl
+++ b/tei2html/utils/common.xsl
@@ -13,7 +13,11 @@
 		indent="yes"
 	/>
 
+	<xsl:variable name="apos" as="xs:string">'</xsl:variable>
+
+	<!--
   <xsl:param name="verbosity" as="xs:integer" required="no" select="0"/>
+	-->
 
   <xsl:template name="website_meta_tags">
     <xsl:param name="citation_title"/>
@@ -209,7 +213,7 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="eoa:debug(3, 'No book author. Exiting.', '')"/>
+        <xsl:value-of select="eoa:error('No book author!')"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
@@ -248,26 +252,9 @@
         </xsl:for-each>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="eoa:debug(1, 'No chapter author: ', node())"/>
+        <xsl:value-of select="eoa:error('No chapter author: ', node())"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
 
-  <xsl:function name="eoa:debug">
-    <xsl:param name="level" as="xs:integer"/>
-    <xsl:param name="message" as="xs:string"/>
-    <xsl:param name="node"/>
-    <xsl:choose>
-      <xsl:when test="$level = 1 and $verbosity &gt; 0">
-        <xsl:message terminate="no">[INFO]: <xsl:value-of select="$message"/> <xsl:value-of select="$node"/></xsl:message>
-      </xsl:when>
-      <xsl:when test="$level = 2 and $verbosity &gt; 1">
-        <xsl:message terminate="no">[WARNING]: <xsl:value-of select="$message"/> <xsl:value-of select="$node"/></xsl:message>
-      </xsl:when>
-      <xsl:when test="$level = 3 and $verbosity &gt; 2">
-        <xsl:message terminate="yes">[ERROR]: <xsl:value-of select="$message"/> <xsl:value-of select="$node"/>. Exiting.</xsl:message>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:function>
-
 </xsl:stylesheet>
diff --git a/tei2html/utils/html_rules.xsl b/tei2html/utils/html_rules.xsl
index 31aa3f6..de5148e 100644
--- a/tei2html/utils/html_rules.xsl
+++ b/tei2html/utils/html_rules.xsl
@@ -24,10 +24,7 @@
 
 	<!-- default rule: warning -->
 	<xsl:template mode="chapter_main" match="tei:*" priority="-100">
-		<xsl:message>WARNING: in mode 'chapter_main': no template for 
-			<xsl:value-of select="concat('', name(), ': ') "/>
-			<xsl:value-of select="./text()"/>
-		</xsl:message>
+		<xsl:sequence select="eoa:warning(concat('in mode ', $apos, 'chapter_main', $apos, ': no template for tei:', name(), '[@type=', $apos, @type, $apos, ']'))"/>
 		<!--
 		<xsl:apply-templates/>
 		-->
@@ -88,30 +85,34 @@
 
 	<!-- default rule: warning -->
 	<xsl:template mode="chapter_main_paragraphs" match="tei:*" priority="-100">
-		<xsl:message>WARNING: in mode 'chapter_main_paragraphs': no template for 
-			<xsl:value-of select="concat('', name(), ': ') "/>
-			<xsl:value-of select="./text()"/>
-		</xsl:message>
+		<xsl:sequence select="eoa:warning(concat('in mode ', $apos, 'chapter_main_paragraphs', $apos, ': no template for tei:', name(), '[@type=', $apos, @type, $apos, ']'))"/>
   </xsl:template>
 
 	<xsl:template mode="chapter_main_paragraphs" match="tei:p" as="element(div)">
+		<xsl:call-template name="render_paragraph">
+			<xsl:with-param name="css_classes" select="'publication-detail__main-paragraph'"/>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template name="render_paragraph" as="element(div)">
+		<xsl:param name="css_classes" as="xs:string" select="''"/>
 		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
 		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
 		<xsl:variable name="paragraph_id" as="xs:string"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
 		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:message>paragraph <xsl:value-of select="$paragraph_id"/></xsl:message>
+		<xsl:sequence select="eoa:info(concat('chapter paragraph', $paragraph_id))"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="link" select="$global_uri"/>
 			<xsl:with-param name="content" as="element()*">
-				<p id="{$paragraph_id}" class="publication-detail__main-paragraph">
+				<p id="{$paragraph_id}" class="{$css_classes}">
 					<xsl:if test="@corresp">
 						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
 						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
 						<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
 						<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
 
-						<xsl:message>( theorem nr <xsl:value-of select="$theorem_nr"/> )</xsl:message>
+						<xsl:sequence select="eoa:info(concat(' (theorem nr', $theorem_nr, ')'))"/>
 						<b>
 							<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
 						</b>
@@ -123,8 +124,8 @@
   </xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:epigraph">
-    <xsl:message>epigraph</xsl:message>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('epigraph', $paragraph_id))"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="content" as="element()*">
 				<xsl:for-each select="tei:p">
@@ -139,8 +140,8 @@
   </xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:ab[@type = 'chapterabstract']">
-    <xsl:message>chapter abstract</xsl:message>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('chapterabstract', $paragraph_id))"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="content" as="element()*">
 				<p id="{$paragraph_id}" class="abstract">
@@ -154,17 +155,14 @@
 
 	<!-- default rule: warning -->
 	<xsl:template mode="text_structure" match="tei:*" priority="-100">
-		<xsl:message>WARNING: in mode 'text_structure': no template for 
-			<xsl:value-of select="concat('', name(), ': ') "/>
-			<xsl:value-of select="./text()"/>
-		</xsl:message>
+		<xsl:sequence select="eoa:warning(concat('in mode ', $apos, 'text_structure', $apos, ': no template for tei:', name(), '[@type=', $apos, @type, $apos, ']'))"/>
 		<!--
 		<xsl:apply-templates/>
 		-->
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='section']">
-    <xsl:message>section</xsl:message>
+		<xsl:sequence select="eoa:info('section')"/>
 		<div class="accordion__item active">
 			<a class="accordion__title" href="#">
 				<xsl:call-template name="accordion_row">
@@ -204,7 +202,7 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsection']">
-    <xsl:message>subsection</xsl:message>
+		<xsl:sequence select="eoa:info('subsection')"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="link" as="xs:string" select="'subsectionlink'"/>
 			<xsl:with-param name="content" as="element()*">
@@ -220,7 +218,7 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsubsection']">
-    <xsl:message>subsubsection</xsl:message>
+		<xsl:sequence select="eoa:info('subsubsection')"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="link" as="xs:string" select="'subsectionlink'"/>
 			<xsl:with-param name="content" as="element()*">
@@ -246,40 +244,16 @@
   </xsl:template>
 
 	<xsl:template mode="text_structure" match="tei:body//tei:p" as="element(div)">
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:message>paragraph <xsl:value-of select="$paragraph_id"/></xsl:message>
-		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" select="$global_uri"/>
-			<xsl:with-param name="content" as="element()*">
-				<p id="{$paragraph_id}">
-					<xsl:if test="@corresp">
-						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
-						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
-						<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
-						<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
-
-						<xsl:message>( theorem nr <xsl:value-of select="$theorem_nr"/> )</xsl:message>
-						<b>
-							<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
-						</b>
-					</xsl:if>
-					<xsl:apply-templates mode="html"/>
-				</p>
-			</xsl:with-param>
-		</xsl:call-template>
+		<xsl:call-template name="render_paragraph"/>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:ab[@type='equation']">
-    <xsl:message>block formula</xsl:message>
+		<xsl:sequence select="eoa:info('block formula')"/>
     <xsl:value-of select="concat('$', ., '$')"/>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:ab[@type='subequations']">
-    <xsl:message>equation array</xsl:message>
+		<xsl:sequence select="eoa:info('equation array')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:element name="table">
 			<xsl:for-each select="tei:formula">
@@ -293,7 +267,7 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:ab[@type='equationarray']">
-    <xsl:message>equation array</xsl:message>
+		<xsl:sequence select="eoa:info('equation array')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:element name="table">
 			<xsl:for-each select="tei:formula">
@@ -311,7 +285,7 @@
 
   <xsl:template mode="text_structure" match="tei:lg[@type='verse']">
 		<!-- TODO: find a way to indent the poem -->
-    <xsl:message>verse</xsl:message>
+		<xsl:sequence select="eoa:info('verse')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<p id="{$paragraph_id}">
 			<xsl:for-each select="tei:l">
@@ -325,7 +299,7 @@
 
   <xsl:template mode="text_structure" match="tei:quote">
 		<!-- TODO: find a way to indent the quote -->
-    <xsl:message>quote</xsl:message>
+		<xsl:sequence select="eoa:info('quote')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<p id="{$paragraph_id}">
 			<xsl:apply-templates mode="html"/>
@@ -333,7 +307,7 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:list[@type='ordered' or @type='unordered' or @type='gloss']">
-    <xsl:message>list</xsl:message>
+		<xsl:sequence select="eoa:info('list')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:variable name="element_name">
 			<xsl:choose>
@@ -341,7 +315,7 @@
 				<xsl:when test="@type = 'unordered'">ul</xsl:when>
 				<xsl:when test="@type = 'gloss'">ul</xsl:when>
 				<xsl:otherwise>
-					<xsl:message>ERROR: unknown list type!!</xsl:message>
+					<xsl:sequence select="eoa:error('unknown list type!')"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
@@ -360,7 +334,7 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:table">
-    <xsl:message>table</xsl:message>
+		<xsl:sequence select="eoa:info('table')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<figure id="{$paragraph_id}">
 			<xsl:element name="table">
@@ -384,7 +358,7 @@
 
   <xsl:template mode="text_structure" match="tei:figure">
 		<!-- TODO: check/fix path -->
-    <xsl:message>figure</xsl:message>
+		<xsl:sequence select="eoa:info('figure')"/>
 		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
 		<xsl:variable name="caption">
 			<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
@@ -403,7 +377,7 @@
 
   <!--
 <xsl:template match="tei:formula">
-  <xsl:message>formula</xsl:message>
+	<xsl:sequence select="eoa:info('formula')"/>
   <xsl:choose>
     <xsl:when test="@rend='inline'">
   <xsl:message>inline</xsl:message>
@@ -431,18 +405,14 @@
 
 	<!-- default rule: warning -->
 	<xsl:template mode="html" match="tei:*" priority="-100">
-		<xsl:message>
-			<xsl:text>WARNING: in mode 'html': no template for </xsl:text>
-			<xsl:value-of select="concat('', name(), ': ') "/>
-			<xsl:value-of select="./text()"/>
-		</xsl:message>
+		<xsl:value-of select="eoa:warning(concat('in mode ', $apos, 'html', $apos, ': no template for tei:', name(), '[@type=', $apos, @type, $apos, ']'))"/>
 		<!--
 		<xsl:apply-templates/>
 		-->
   </xsl:template>
 
   <xsl:template mode="html" match="tei:hi">
-    <xsl:message>markup</xsl:message>
+		<xsl:sequence select="eoa:info('markup')"/>
     <xsl:choose>
       <xsl:when test="@rend='italic'">
         <em>
@@ -488,12 +458,12 @@
   </xsl:template>
 
   <xsl:template mode="html" match="tei:formula[@rend='inline']">
-    <xsl:message>inline formula</xsl:message>
+		<xsl:sequence select="eoa:info('inline formula')"/>
     <xsl:value-of select="concat('$', ., '$')"/>
   </xsl:template>
 
   <xsl:template mode="html" match="tei:graphic">
-    <xsl:message>inline graphic</xsl:message>
+		<xsl:sequence select="eoa:info('inline graphic')"/>
 		<img src="{@url}">(missing pic)</img>
   </xsl:template>
 
@@ -506,20 +476,18 @@
   </xsl:template>
 
   <xsl:template mode="html" match="tei:bibl">
-    <xsl:message>WARNING: bibliographic reference dummy implementation</xsl:message>
+		<xsl:sequence select="eoa:warning('bibliographic reference dummy implementation')"/>
 		(reference to bibl.)
   </xsl:template>
 
   <xsl:template mode="html" match="tei:ref">
-    <xsl:message>WARNING: internal reference dummy implementation</xsl:message>
+		<xsl:sequence select="eoa:warning('internal reference dummy implementation')"/>
 		(internal reference)
   </xsl:template>
 
 	<!-- index elements should not be printed in the text. They are invisible markers from which to generate the index-->
 	<xsl:template mode="html" match="tei:index"/>
 
-	<xsl:variable name="apos" as="xs:string">'</xsl:variable>
-
 	<xsl:template name="accordion_row">
 		<xsl:param name="link" as="xs:string?"/>
 		<xsl:param name="content" as="element()*"/>
diff --git a/tei2html/utils/print.xsl b/tei2html/utils/print.xsl
new file mode 100644
index 0000000..5cf5680
--- /dev/null
+++ b/tei2html/utils/print.xsl
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<stylesheet version="2.0"
+	xmlns="http://www.w3.org/1999/XSL/Transform"
+	xmlns:tei="http://www.tei-c.org/ns/1.0"
+	xmlns:rng="http://relaxng.org/ns/structure/1.0"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:eoa="http://www.edition-open-access.de/ns"
+	xmlns:fcn="fcn"
+	xmlns:f="http://fxsl.sf.net/"
+	xmlns:null="null"
+	exclude-result-prefixes="tei rng f fcn xs null eoa"
+>
+
+	<!--
+	<import href="utils.xsl"/>
+	-->
+	
+	<!-- overwrite this to enable module specific debug output -->
+	<param name="debug_modules" as="xs:string*" select="()"/>
+
+	<!-- verbosity: 0: only errors, 1: warnings, 2: info, 3: debug -->
+  <param name="verbosity" as="xs:integer" required="no" select="2"/>
+
+  <function name="eoa:debug" as="xs:integer"><value-of select="0"/></function>
+  <function name="eoa:info" as="xs:integer"><value-of select="1"/></function>
+  <function name="eoa:warning" as="xs:integer"><value-of select="2"/></function>
+  <function name="eoa:error" as="xs:integer"><value-of select="3"/></function>
+
+  <function name="eoa:debug" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:debug(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:debug" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:debug(), $message)"/>
+  </function>
+
+  <function name="eoa:info" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:info(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:info" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:info(), $message)"/>
+  </function>
+
+  <function name="eoa:warning" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:warning(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:warning" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:warning(), $message)"/>
+  </function>
+
+  <function name="eoa:error" as="element()?">
+		<param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:error(), $module, $message)"/>
+  </function>
+
+  <function name="eoa:error" as="element()?">
+		<!-- default param: <param name="module" as="xs:string"/> -->
+    <param name="message" as="xs:string*"/>
+		<!-- TODO: This probably doesn't work if the message is
+			more than a single string -->
+		<sequence select="eoa:message(eoa:error(), $message)"/>
+  </function>
+
+	<!-- promise: this function never returns anything! -->
+  <function name="eoa:message" as="element()?">
+    <param name="level" as="xs:integer"/>
+		<!-- default param: <param name="module" as="xs:string"/> -->
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="$level"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+  </function>
+
+	<!-- promise: this function never returns anything! -->
+  <function name="eoa:message" as="element()?">
+    <param name="level" as="xs:integer"/>
+    <param name="module" as="xs:string"/>
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="$level"/>
+			<with-param name="module" select="$module"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+  </function>
+
+	<template name="eoa:debug" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="eoa:debug()"/>
+			<with-param name="module" select="$module"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+	</template>
+
+	<template name="eoa:info" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="eoa:info()"/>
+			<with-param name="module" select="$module"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+	</template>
+
+	<template name="eoa:warning" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="eoa:warning()"/>
+			<with-param name="module" select="$module"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+	</template>
+
+	<template name="eoa:error" as="element()?">
+    <param name="module" as="xs:string" select="''"/>
+    <param name="message" as="xs:string*"/>
+		<call-template name="eoa:message">
+			<with-param name="level" select="eoa:error()"/>
+			<with-param name="module" select="$module"/>
+			<with-param name="message" select="$message"/>
+		</call-template>
+	</template>
+
+  <template name="eoa:message" as="element()?">
+    <param name="level" as="xs:integer"/>
+    <param name="module" as="xs:string" select="''"/>
+    <param name="message" as="xs:string*"/>
+    <choose>
+      <when test="$level = 0 and $verbosity >= 3 and ($module = '' or $module = $debug_modules)">
+				<for-each select="$message">
+        	<message terminate="no">[DEBUG]: <value-of select="concat($module, ': ')"/><value-of select="."/></message>
+				</for-each>
+      </when>
+      <when test="$level = 1 and $verbosity >= 2">
+				<for-each select="$message">
+        	<message terminate="no">[INFO]: <value-of select="concat($module, ': ')"/><value-of select="."/></message>
+				</for-each>
+      </when>
+      <when test="$level = 2 and $verbosity >= 1">
+				<for-each select="$message">
+        	<message terminate="no">[WARNING]: <value-of select="concat($module, ': ')"/><value-of select="."/></message>
+				</for-each>
+      </when>
+      <when test="$level = 3">
+				<for-each select="$message">
+					<message terminate="{position() = last()}">[ERROR]: <value-of select="concat($module, ': ')"/><value-of select="."/>. Exiting.</message>
+				</for-each>
+      </when>
+    </choose>
+  </template>
+
+</stylesheet>

From 5bc9cdf23217dd8129d6a41e0168c6d90e2e7ca4 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Thu, 7 Nov 2019 16:05:28 +0100
Subject: [PATCH 3/7] tei->html: fix default path in script

---
 tei2html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tei2html.py b/tei2html.py
index 41a210f..8f53445 100755
--- a/tei2html.py
+++ b/tei2html.py
@@ -72,7 +72,7 @@ def main(
     )
     parser.add_argument(
             "--root-dir",
-            default = Path.cwd(),
+            default = Path.cwd() / "output",
             help="internal html links on the page will use this location as a prefix"
     )
     parser.add_argument(

From 01cfd755b8aa9fa67f64247dc3d09b1d1576e871 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Thu, 7 Nov 2019 16:20:10 +0100
Subject: [PATCH 4/7] tei->html: rewrote index generation

---
 tei2html/tei2html.xsl                      |  27 ++-
 tei2html/tei2html_chapter_utils.xsl        |   5 +-
 tei2html/tei2html_publ_frontpage_utils.xsl | 202 +++++++++++----------
 tei2html/utils/html_rules.xsl              |  75 ++++++--
 4 files changed, 195 insertions(+), 114 deletions(-)

diff --git a/tei2html/tei2html.xsl b/tei2html/tei2html.xsl
index 3fc6219..2e04491 100644
--- a/tei2html/tei2html.xsl
+++ b/tei2html/tei2html.xsl
@@ -19,8 +19,9 @@
 	<xsl:include href="utils/common.xsl"/>
 	<xsl:include href="utils/print.xsl"/>
 
-	<xsl:param name="output_dir" as="xs:string" select="'.'"/>
-  <xsl:param name="static_dir" as="xs:string" select="'static'"/>
+	<xsl:param name="output_dir" as="xs:string" select="'./output'"/>
+	<xsl:param name="static_dir" as="xs:string" select="'../static'"/>
+	<xsl:param name="intermediate_dir" as="xs:string?" select="concat($output_dir, '/intermediate')"/>
 	<xsl:param name="logo_dir" as="xs:string" select="concat($static_dir, '/assets/images')"/>
 	<xsl:param name="nav_items" as="element(eoa:entry)*">
 		<eoa:entry active="1">
@@ -40,6 +41,27 @@
 		<xsl:variable name="output_subdir" as="xs:string">
 			<xsl:value-of select="concat($output_dir, '/', $series, '/', $publication_number)"/>
 		</xsl:variable>
+		<xsl:variable name="indices" as="element(eoa:index)*">
+			<xsl:variable name="ctxt" select="."/>
+			<xsl:for-each select="$index_types">
+				<xsl:variable name="index_type" as="xs:string" select="."/>
+				<xsl:for-each select="$ctxt">
+					<xsl:call-template name="create_index">
+						<xsl:with-param name="indextype" select="$index_type"/>
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:if test="$intermediate_dir">
+			<xsl:result-document
+				method="xml"
+				encoding="UTF-8"
+				indent="yes"
+				href="{concat($intermediate_dir, '/indices.xml')}"
+			>
+				<xsl:copy-of select="$indices"/>
+			</xsl:result-document>
+		</xsl:if>
 		<xsl:result-document
 			method="html"
 			encoding="UTF-8"
@@ -51,6 +73,7 @@
 				<xsl:with-param name="static_dir" select="concat('../../', $static_dir)"/>
 				<xsl:with-param name="logo_dir" select="concat('../../', $logo_dir)"/>
 				<xsl:with-param name="nav_items" as="element(eoa:entry)*" select="$nav_items"/>
+				<xsl:with-param name="indices" as="element(eoa:index)*" select="$indices"/>
 			</xsl:call-template>
 		</xsl:result-document>
 		<xsl:for-each select="//tei:div[@type='chapter']">
diff --git a/tei2html/tei2html_chapter_utils.xsl b/tei2html/tei2html_chapter_utils.xsl
index 9e15b22..525a6ba 100644
--- a/tei2html/tei2html_chapter_utils.xsl
+++ b/tei2html/tei2html_chapter_utils.xsl
@@ -221,8 +221,11 @@ tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
 										<xsl:call-template name="paragraph_id"/>
 									</xsl:for-each>
 								</xsl:variable>
+								<xsl:variable name="footnote_id" as="xs:string">
+									<xsl:call-template name="footnote_id"/>
+								</xsl:variable>
 								<xsl:if test="$paragraph_id">
-									<li id="fn{@n}">
+									<li id="{$footnote_id}">
 										<xsl:for-each select="tei:p">
 											<p><xsl:apply-templates mode="html"/></p>
 										</xsl:for-each>
diff --git a/tei2html/tei2html_publ_frontpage_utils.xsl b/tei2html/tei2html_publ_frontpage_utils.xsl
index 03694f3..81a7228 100644
--- a/tei2html/tei2html_publ_frontpage_utils.xsl
+++ b/tei2html/tei2html_publ_frontpage_utils.xsl
@@ -16,10 +16,13 @@
   <!-- index sorting, https://stackoverflow.com/questions/13763271 -->
   <xsl:key name="kWith1stLetter" match="family" use="substring(.,1,1)"/>
 
+	<xsl:variable name="index_types" as="xs:string*" select="('keyword', 'location', 'person')"/>
+
   <xsl:template name="render_publication_frontpage">
 		<xsl:param name="static_dir" as="xs:string"/>
 		<xsl:param name="logo_dir" as="xs:string"/>
 		<xsl:param name="nav_items" as="element(eoa:entry)*"/>
+		<xsl:param name="indices" as="element(eoa:index)*"/>
 		<xsl:call-template name="website_template">
 			<xsl:with-param name="static_dir" select="$static_dir"/>
 			<xsl:with-param name="title">
@@ -354,55 +357,11 @@
 													</xsl:for-each>
 												</div>
 											</div>
-											<xsl:if test="//tei:body//tei:index[@indexName='keyword']">
-												<div class="tabs__content-item">
-													<div class="publications__index-name">
-														<div class="accordion">
-															<a class="accordion__showall" href="#">Show All</a>
-															<xsl:call-template name="create_index">
-																<xsl:with-param name="indextype" select="'keyword'"/>
-															</xsl:call-template>
-															<div class="accordion__item">
-																<a class="accordion__title" href="#">
-																	<h2>B</h2>
-																</a>
-																<div class="accordion__content">
-																	<h4>Peter Becksbaum</h4>
-																	<ul>
-																		<li>1</li>
-																		<li>2</li>
-																	</ul>
-																	<a class="accordion__pageup" href="#"/>
-																</div>
-															</div>
-														</div>
-													</div>
-												</div>
-											</xsl:if>
-											<xsl:if test="//tei:body//tei:index[@indexName='location']">
-												<div class="tabs__content-item">
-													<div class="publications__index-name">
-														<div class="accordion">
-															<a class="accordion__showall" href="#">Show All</a>
-															<xsl:call-template name="create_index">
-																<xsl:with-param name="indextype" select="'location'"/>
-															</xsl:call-template>
-														</div>
-													</div>
-												</div>
-											</xsl:if>
-											<xsl:if test="//tei:body//tei:index[@indexName='person']">
-												<div class="tabs__content-item">
-													<div class="publications__index-name">
-														<div class="accordion">
-															<a class="accordion__showall" href="#">Show All</a>
-															<xsl:call-template name="create_index">
-																<xsl:with-param name="indextype" select="'person'"/>
-															</xsl:call-template>
-														</div>
-													</div>
-												</div>
-											</xsl:if>
+											<xsl:for-each select="$indices">
+												<xsl:call-template name="render_index">
+													<xsl:with-param name="indextype" select="@type"/>
+												</xsl:call-template>
+											</xsl:for-each>
 										</div>
 									</div>
 								</div>
@@ -504,50 +463,111 @@
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template name="create_index">
+	<xsl:template name="render_index" as="element()*">
     <xsl:param name="indextype"/>
-		<xsl:sequence select="eoa:info('creating index')"/>
-		<!-- all index elements starting with the same letter: -->
-		<xsl:for-each-group select="//tei:index[lower-case(@indexName) = $indextype]" group-by="substring(if (exists(./tei:term/@sortKey)) then ./tei:term/@sortKey else ./tei:term/text(),1,1)">
-			<xsl:sort select="current-grouping-key()"/>
-			<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-			<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-      <div class="accordion__item">
-        <a class="accordion__title" href="#">
-    			<h2 class="border">
-						<xsl:value-of select="current-grouping-key()"/>
-					</h2>
-        </a>
-        <div class="accordion__content">
-					<!-- all index elements with the same "term": -->
-					<xsl:for-each-group select="current-group()" group-by="if (exists(tei:term/@sortKey)) then tei:term/@sortKey else tei:term/text()">
-						<xsl:sort select="current-grouping-key()"/>
-						<h4>
-							<xsl:value-of select="current-grouping-key()"/>
-						</h4>
-						<ul>
-							<xsl:for-each select="current-group()">
-								<xsl:variable name="paragraph_nr" select="index-of($chapter//tei:p/tei:index/generate-id(), generate-id(.))"/>
-								<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_nr)"/>
-								<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-								<xsl:sequence select="eoa:info(concat(current-grouping-key(), ': ', $global_uri))"/>
-								<li>
-									<a href="{$global_uri}"> <xsl:value-of select="position()"/></a>
-								</li>
-							</xsl:for-each>
-						</ul>
-						<!-- below that, ul/li for each jumping point -->
+		<div class="tabs__content-item">
+			<div class="publications__index-name">
+				<div class="accordion">
+					<a class="accordion__showall" href="#">Show All</a>
+					<xsl:for-each-group
+						select="eoa:term"
+						group-by="substring(@key,1,1)"
+					>
+						<div class="accordion__item">
+							<a class="accordion__title" href="#">
+								<h2 class="border">
+									<xsl:value-of select="current-grouping-key()"/>
+								</h2>
+							</a>
+							<div class="accordion__content">
+								<xsl:for-each
+									select="current-group()"
+								>
+									<h4>
+										<xsl:value-of select="@key"/>
+									</h4>
+									<ul>
+										<xsl:for-each select="eoa:entry">
+											<li>
+												<a href="{concat(string-join(($domain, eoa:link/eoa:entry[position() != last()]),'/'), '/index.html#', eoa:link/eoa:entry[last()])}"> <xsl:value-of select="position()"/></a>
+											</li>
+										</xsl:for-each>
+									</ul>
+								</xsl:for-each>
+							</div>
+						</div>
 					</xsl:for-each-group>
-        </div>
-      </div>
-      <!--
-        <xsl:message>
-        <xsl:value-of select="$sortkey"/>
-        <xsl:text>: </xsl:text>
-        <xsl:value-of select="./tei:term//text()"/>
-        </xsl:message>
-    -->
-    </xsl:for-each-group>
+				</div>
+			</div>
+		</div>
+	</xsl:template>
+
+  <xsl:template name="create_index" as="element(eoa:index)">
+    <xsl:param name="indextype"/>
+		<xsl:sequence select="eoa:info(concat('creating index ', $indextype))"/>
+		<!-- all index elements starting with the same letter: -->
+		<eoa:index type="{$indextype}">
+			<xsl:for-each-group
+				select="//tei:body//tei:index[lower-case(@indexName) = $indextype][not(ancestor::tei:index)]"
+				group-by="if (exists(tei:term/@sortKey)) then tei:term/@sortKey else tei:term/text()"
+			>
+				<xsl:sort select="current-grouping-key()"/>
+				<eoa:term key="{current-grouping-key()}">
+					<xsl:for-each select="current-group()">
+						<xsl:sequence select="eoa:info(concat('adding index element ', tei:term, '!'))"/>
+						<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+						<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+						<xsl:variable name="dest_id" as="xs:string?">
+							<xsl:variable name="candidates" as="xs:string*">
+								<xsl:for-each select="ancestor::tei:*">
+									<xsl:variable name="footnote_id" as="xs:string?">
+										<xsl:call-template name="footnote_id"/>
+									</xsl:variable>
+									<xsl:variable name="paragraph_id" as="xs:string?">
+										<xsl:call-template name="paragraph_id"/>
+									</xsl:variable>
+									<xsl:choose>
+										<xsl:when test="$footnote_id">
+											<xsl:value-of select="$footnote_id"/>
+										</xsl:when>
+										<xsl:when test="$paragraph_id">
+											<xsl:value-of select="$paragraph_id"/>
+										</xsl:when>
+									</xsl:choose>
+								</xsl:for-each>
+							</xsl:variable>
+							<xsl:value-of select="if( count($candidates) != 0) then $candidates[1] else ()"/>
+						</xsl:variable>
+						<xsl:choose>
+							<xsl:when test="not($dest_id)">
+								<xsl:sequence select="eoa:warning(concat('paragraph not found for index element ', tei:term, '!'))"/>
+							</xsl:when>
+							<xsl:otherwise>
+								<eoa:entry>
+									<eoa:tei-element>
+										<xsl:copy-of select="."/>
+									</eoa:tei-element>
+									<eoa:link>
+										<eoa:entry>
+											<xsl:value-of select="$series"/>
+										</eoa:entry>
+										<eoa:entry>
+											<xsl:value-of select="$publication_number"/>
+										</eoa:entry>
+										<eoa:entry>
+											<xsl:value-of select="$chapter_nr"/>
+										</eoa:entry>
+										<eoa:entry>
+											<xsl:value-of select="$dest_id"/>
+										</eoa:entry>
+									</eoa:link>
+								</eoa:entry>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:for-each>
+				</eoa:term>
+			</xsl:for-each-group>
+		</eoa:index>
 		<xsl:sequence select="eoa:info('finished creating index')"/>
   </xsl:template>
 
diff --git a/tei2html/utils/html_rules.xsl b/tei2html/utils/html_rules.xsl
index de5148e..dad839c 100644
--- a/tei2html/utils/html_rules.xsl
+++ b/tei2html/utils/html_rules.xsl
@@ -182,23 +182,6 @@
 				<a class="accordion__pageup" href="#"></a>
 			</div>
 		</div>
-		<!--
-		<div id="{@xml:id}" class="accordion__item active">
-			<a class="accordion__title" href="#">
-				<h2>
-					<xsl:if test="../@n != 'nonumber'">
-						<xsl:value-of select="concat(../@n, '.', @n, ' ')"/>
-					</xsl:if>
-					<xsl:apply-templates select="tei:head" mode="text_structure"/>
-				</h2>
-			</a>
-			<div class="accordion__content">
-				<xsl:apply-templates select="*[not(self::tei:head)]" mode="text_structure"/>
-				- the link to close the accordion: -
-				<a class="accordion__pageup" href="#"/>
-			</div>
-		</div>
-			-->
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsection']">
@@ -230,6 +213,36 @@
 		<xsl:apply-templates mode="text_structure" select="*[not(self::tei:head)]"/>
   </xsl:template>
 
+  <xsl:template mode="text_structure" match="tei:div[@type='letter']">
+		<xsl:sequence select="eoa:info('letter')"/>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="paragraph_id" as="xs:string"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<xsl:if test="tei:head">
+					<h4>
+						<xsl:apply-templates mode="text_structure" select="tei:head"/>
+					</h4>
+				</xsl:if>
+				<p class="verse">
+					<xsl:for-each select="tei:p">
+						<xsl:apply-templates mode="html" select="node()"/>
+						<xsl:if test="position() != last()">
+							<br/>
+						</xsl:if>
+					</xsl:for-each>
+				</p>
+				<!--
+				<xsl:apply-templates mode="text_structure" select="*[not(self::tei:head)]"/>
+				-->
+			</xsl:with-param>
+		</xsl:call-template>
+  </xsl:template>
+
 	<!-- paragraph level elements: -->
 
 	<xsl:template mode="text_structure" match="tei:body//tei:head">
@@ -468,7 +481,10 @@
   </xsl:template>
 
   <xsl:template mode="html" match="tei:note[@place = 'bottom']">
-		<a href="#fn{@n}">
+		<xsl:variable name="footnote_id" as="xs:string?">
+			<xsl:call-template name="footnote_id"/>
+		</xsl:variable>
+		<a href="{concat('#', $footnote_id)}">
 			<sup>
 				<xsl:value-of select="@n"/>
 			</sup>
@@ -514,11 +530,30 @@
 	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
 	<xsl:template name="paragraph_id" as="xs:string?">
 		<xsl:choose>
-			<xsl:when test="(self::tei:p | self::tei:epigraph | self::tei:ab | self::tei:lg | self::tei:quote | self::tei:list | self::tei:table | self::tei:figure)[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]]">
+			<xsl:when test="(self::tei:p | self::tei:epigraph | self::tei:ab | self::tei:lg | self::tei:quote | self::tei:list | self::tei:table | self::tei:figure | self::tei:div[@type = 'letter'])[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')] or parent::tei:div/parent::tei:div[@type = 'bilingual'] or parent::tei:div/parent::tei:div[@type = 'sidebyside']]">
 				<value-of>
 					<xsl:text>p</xsl:text>
 					<xsl:number
-						count="(tei:p | tei:epigraph | tei:ab | tei:lg | tei:quote | tei:list | tei:table | tei:figure)[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]]"
+						count="(tei:p | tei:epigraph | tei:ab | tei:lg | tei:quote | tei:list | tei:table | tei:figure | tei:div[@type = 'letter'])[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')] or parent::tei:div/parent::tei:div[@type = 'bilingual'] or parent::tei:div/parent::tei:div[@type = 'sidebyside']]"
+						from="tei:div[@type = 'chapter']"
+						level="any"
+					/>
+				</value-of>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
+	<xsl:template name="footnote_id" as="xs:string?">
+		<xsl:choose>
+			<xsl:when test="self::tei:note">
+				<value-of>
+					<xsl:text>fn</xsl:text>
+					<xsl:number
+						count="tei:note"
 						from="tei:div[@type = 'chapter']"
 						level="any"
 					/>

From f9f67c190066d2a9dce760199f0e9811eaebc961 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Thu, 7 Nov 2019 17:04:33 +0100
Subject: [PATCH 5/7] tei->html: refactor: rename and restructure

---
 tei2html/tei2html_chapter_utils.xsl        |   8 +-
 tei2html/tei2html_publ_frontpage_utils.xsl |   8 +-
 tei2html/utils/html_rules.xsl              | 141 ++++++++++++---------
 3 files changed, 92 insertions(+), 65 deletions(-)

diff --git a/tei2html/tei2html_chapter_utils.xsl b/tei2html/tei2html_chapter_utils.xsl
index 525a6ba..b88eb05 100644
--- a/tei2html/tei2html_chapter_utils.xsl
+++ b/tei2html/tei2html_chapter_utils.xsl
@@ -216,20 +216,20 @@ tex2jax: {inlineMath: [["$","$"],["\\(","\\)"]]}
 					<div class="publication-detail__footnotes">
 						<ol>
 							<xsl:for-each select="$chapter//tei:note[@place = 'bottom']">
-								<xsl:variable name="paragraph_id" as="xs:string?">
+								<xsl:variable name="container_id" as="xs:string?">
 									<xsl:for-each select="parent::tei:*">
-										<xsl:call-template name="paragraph_id"/>
+										<xsl:call-template name="container_id"/>
 									</xsl:for-each>
 								</xsl:variable>
 								<xsl:variable name="footnote_id" as="xs:string">
 									<xsl:call-template name="footnote_id"/>
 								</xsl:variable>
-								<xsl:if test="$paragraph_id">
+								<xsl:if test="$container_id">
 									<li id="{$footnote_id}">
 										<xsl:for-each select="tei:p">
 											<p><xsl:apply-templates mode="html"/></p>
 										</xsl:for-each>
-										<a href="#{$paragraph_id}">to paragraph</a>
+										<a href="#{$container_id}">to paragraph</a>
 									</li>
 								</xsl:if>
 							</xsl:for-each>
diff --git a/tei2html/tei2html_publ_frontpage_utils.xsl b/tei2html/tei2html_publ_frontpage_utils.xsl
index 81a7228..9c62725 100644
--- a/tei2html/tei2html_publ_frontpage_utils.xsl
+++ b/tei2html/tei2html_publ_frontpage_utils.xsl
@@ -523,15 +523,15 @@
 									<xsl:variable name="footnote_id" as="xs:string?">
 										<xsl:call-template name="footnote_id"/>
 									</xsl:variable>
-									<xsl:variable name="paragraph_id" as="xs:string?">
-										<xsl:call-template name="paragraph_id"/>
+									<xsl:variable name="container_id" as="xs:string?">
+										<xsl:call-template name="container_id"/>
 									</xsl:variable>
 									<xsl:choose>
 										<xsl:when test="$footnote_id">
 											<xsl:value-of select="$footnote_id"/>
 										</xsl:when>
-										<xsl:when test="$paragraph_id">
-											<xsl:value-of select="$paragraph_id"/>
+										<xsl:when test="$container_id">
+											<xsl:value-of select="$container_id"/>
 										</xsl:when>
 									</xsl:choose>
 								</xsl:for-each>
diff --git a/tei2html/utils/html_rules.xsl b/tei2html/utils/html_rules.xsl
index dad839c..308becc 100644
--- a/tei2html/utils/html_rules.xsl
+++ b/tei2html/utils/html_rules.xsl
@@ -60,9 +60,6 @@
 					</xsl:with-param>
 				</xsl:call-template>
 				<xsl:apply-templates mode="chapter_main_paragraphs" select="(if (tei:div[@type = 'section']) then (tei:div[@type = 'section'][1]/preceding-sibling::*) else (*))[not(self::tei:head)]"/>
-				<!--
-				<xsl:apply-templates mode="text_structure" select="tei:*[not(self::tei:head) and not(self::tei:div[@type = 'section']) and not(self::tei:div[@type = 'subsection']) and not(self::tei:div[@type = 'subsubsection'])]"/>
-				-->
 			</div>
 			<a class="accordion__showall show" href="#">Close All</a>
 			<!-- render chapter text -->
@@ -94,42 +91,13 @@
 		</xsl:call-template>
 	</xsl:template>
 
-	<xsl:template name="render_paragraph" as="element(div)">
-		<xsl:param name="css_classes" as="xs:string" select="''"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="paragraph_id" as="xs:string"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:sequence select="eoa:info(concat('chapter paragraph', $paragraph_id))"/>
-		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" select="$global_uri"/>
-			<xsl:with-param name="content" as="element()*">
-				<p id="{$paragraph_id}" class="{$css_classes}">
-					<xsl:if test="@corresp">
-						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
-						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
-						<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
-						<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
-
-						<xsl:sequence select="eoa:info(concat(' (theorem nr', $theorem_nr, ')'))"/>
-						<b>
-							<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
-						</b>
-					</xsl:if>
-					<xsl:apply-templates mode="html"/>
-				</p>
-			</xsl:with-param>
-		</xsl:call-template>
-  </xsl:template>
-
   <xsl:template mode="chapter_main_paragraphs" match="tei:epigraph">
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<xsl:sequence select="eoa:info(concat('epigraph', $paragraph_id))"/>
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('epigraph', $container_id))"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="content" as="element()*">
 				<xsl:for-each select="tei:p">
-					<p id="{$paragraph_id}" class="epigraph">
+					<p id="{$container_id}" class="epigraph">
 						<em>
 							<xsl:apply-templates mode="html"/>
 						</em>
@@ -140,11 +108,11 @@
   </xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:ab[@type = 'chapterabstract']">
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<xsl:sequence select="eoa:info(concat('chapterabstract', $paragraph_id))"/>
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('chapterabstract', $container_id))"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="content" as="element()*">
-				<p id="{$paragraph_id}" class="abstract">
+				<p id="{$container_id}" class="abstract">
 						<xsl:apply-templates mode="html"/>
 				</p>
 			</xsl:with-param>
@@ -217,8 +185,8 @@
 		<xsl:sequence select="eoa:info('letter')"/>
 		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
 		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="paragraph_id" as="xs:string"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $paragraph_id)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
 		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
 		<xsl:call-template name="accordion_row">
 			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
@@ -267,10 +235,10 @@
 
   <xsl:template mode="text_structure" match="tei:ab[@type='subequations']">
 		<xsl:sequence select="eoa:info('equation array')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
 		<xsl:element name="table">
 			<xsl:for-each select="tei:formula">
-				<tr id="{$paragraph_id}">
+				<tr id="{$container_id}">
 					<td>
     				<xsl:value-of select="concat('$', ., '$')"/>
 					</td>
@@ -281,10 +249,10 @@
 
   <xsl:template mode="text_structure" match="tei:ab[@type='equationarray']">
 		<xsl:sequence select="eoa:info('equation array')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
 		<xsl:element name="table">
 			<xsl:for-each select="tei:formula">
-				<tr id="{$paragraph_id}">
+				<tr id="{$container_id}">
 					<td>
     				<xsl:value-of select="concat('$', ., '$')"/>
 					</td>
@@ -299,8 +267,8 @@
   <xsl:template mode="text_structure" match="tei:lg[@type='verse']">
 		<!-- TODO: find a way to indent the poem -->
 		<xsl:sequence select="eoa:info('verse')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<p id="{$paragraph_id}">
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<p id="{$container_id}">
 			<xsl:for-each select="tei:l">
 				<xsl:apply-templates mode="html"/>
 				<xsl:if test="position() != last()">
@@ -313,15 +281,15 @@
   <xsl:template mode="text_structure" match="tei:quote">
 		<!-- TODO: find a way to indent the quote -->
 		<xsl:sequence select="eoa:info('quote')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<p id="{$paragraph_id}">
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<p id="{$container_id}">
 			<xsl:apply-templates mode="html"/>
 		</p>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:list[@type='ordered' or @type='unordered' or @type='gloss']">
 		<xsl:sequence select="eoa:info('list')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
 		<xsl:variable name="element_name">
 			<xsl:choose>
 				<xsl:when test="@type = 'ordered'">ol</xsl:when>
@@ -333,7 +301,7 @@
 			</xsl:choose>
 		</xsl:variable>
 		<xsl:element name="{$element_name}">
-			<xsl:attribute name="id" select="$paragraph_id"/>
+			<xsl:attribute name="id" select="$container_id"/>
 			<xsl:for-each select="tei:item">
 				<li>
 					<xsl:if test="preceding-sibling::tei:label[1]">
@@ -348,8 +316,8 @@
 
   <xsl:template mode="text_structure" match="tei:table">
 		<xsl:sequence select="eoa:info('table')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
-		<figure id="{$paragraph_id}">
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<figure id="{$container_id}">
 			<xsl:element name="table">
 				<xsl:for-each select="tei:row">
 					<tr>
@@ -372,11 +340,11 @@
   <xsl:template mode="text_structure" match="tei:figure">
 		<!-- TODO: check/fix path -->
 		<xsl:sequence select="eoa:info('figure')"/>
-		<xsl:variable name="paragraph_id"><xsl:call-template name="paragraph_id"/></xsl:variable>
+		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
 		<xsl:variable name="caption">
 			<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
 		</xsl:variable>
-		<figure class="publication__image" id="{$paragraph_id}">
+		<figure class="publication__image" id="{$container_id}">
 			<a href="{@url}" data-lightbox="" title="$caption">
 				<img src="{@url}">image could not</img>
 			</a>
@@ -528,13 +496,44 @@
 	</xsl:template>
 
 	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
-	<xsl:template name="paragraph_id" as="xs:string?">
+	<xsl:template name="container_id" as="xs:string?">
 		<xsl:choose>
-			<xsl:when test="(self::tei:p | self::tei:epigraph | self::tei:ab | self::tei:lg | self::tei:quote | self::tei:list | self::tei:table | self::tei:figure | self::tei:div[@type = 'letter'])[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')] or parent::tei:div/parent::tei:div[@type = 'bilingual'] or parent::tei:div/parent::tei:div[@type = 'sidebyside']]">
+			<xsl:when test="
+				(
+					self::tei:p
+					| self::tei:epigraph
+					| self::tei:ab
+					| self::tei:lg
+					| self::tei:quote
+					| self::tei:list
+					| self::tei:table
+					| self::tei:figure
+					| self::tei:div[@type = 'letter']
+				)[
+					parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]
+					or parent::tei:div/parent::tei:div[@type = 'bilingual']
+					or parent::tei:div/parent::tei:div[@type = 'sidebyside']
+				]"
+			>
 				<value-of>
 					<xsl:text>p</xsl:text>
 					<xsl:number
-						count="(tei:p | tei:epigraph | tei:ab | tei:lg | tei:quote | tei:list | tei:table | tei:figure | tei:div[@type = 'letter'])[parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')] or parent::tei:div/parent::tei:div[@type = 'bilingual'] or parent::tei:div/parent::tei:div[@type = 'sidebyside']]"
+						count="
+							(
+								tei:p
+								| tei:epigraph
+								| tei:ab
+								| tei:lg
+								| tei:quote
+								| tei:list
+								| tei:table
+								| tei:figure
+								| tei:div[@type = 'letter']
+							)[
+								parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]
+								or parent::tei:div/parent::tei:div[@type = 'bilingual']
+								or parent::tei:div/parent::tei:div[@type = 'sidebyside']
+							]"
 						from="tei:div[@type = 'chapter']"
 						level="any"
 					/>
@@ -546,6 +545,34 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template name="render_paragraph" as="element(div)">
+		<xsl:param name="css_classes" as="xs:string" select="''"/>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:sequence select="eoa:info(concat('chapter paragraph', $container_id))"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<p id="{$container_id}" class="{$css_classes}">
+					<xsl:if test="@corresp">
+						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
+						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
+						<xsl:variable name="theorem_group" select="key('theorems', $id)"/>
+						<xsl:variable name="theorem_nr" select="index-of($theorem_group/generate-id(), generate-id(.))"/>
+						<xsl:sequence select="eoa:info(concat(' (theorem nr', $theorem_nr, ')'))"/>
+						<b>
+							<xsl:value-of select="concat( $theorem/text(), ' ', $theorem_nr, ': ')"/>
+						</b>
+					</xsl:if>
+					<xsl:apply-templates mode="html"/>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
+  </xsl:template>
+
 	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
 	<xsl:template name="footnote_id" as="xs:string?">
 		<xsl:choose>

From 3311f169ef037a92760d939d04fb7087c22adb50 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Thu, 7 Nov 2019 17:46:08 +0100
Subject: [PATCH 6/7] tei->html: numbering similar as in the old platform

---
 tei2html/utils/html_rules.xsl | 318 +++++++++++++++++++++-------------
 1 file changed, 193 insertions(+), 125 deletions(-)

diff --git a/tei2html/utils/html_rules.xsl b/tei2html/utils/html_rules.xsl
index 308becc..77c2ca2 100644
--- a/tei2html/utils/html_rules.xsl
+++ b/tei2html/utils/html_rules.xsl
@@ -22,6 +22,55 @@
 	<xsl:variable name="series" select="lower-case(/tei:TEI/tei:teiHeader/tei:fileDesc/tei:seriesStmt/tei:title)"/>
 	<xsl:variable name="publication_number" select="/tei:TEI/tei:teiHeader/tei:fileDesc/tei:seriesStmt/tei:idno[@type = 'number']"/>
 
+	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
+	<xsl:template name="container_id" as="xs:string?">
+		<xsl:choose>
+			<xsl:when test="
+				(
+					self::tei:div[@type = ('section', 'subsection', 'subsubsection')]
+					| self::tei:p
+					| self::tei:epigraph
+					| self::tei:ab
+					| self::tei:lg
+					| self::tei:quote
+					| self::tei:list
+					| self::tei:table
+					| self::tei:figure
+					| self::tei:div[@type = 'letter']
+				)[
+					parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]
+					or parent::tei:div/parent::tei:div[@type = 'bilingual']
+					or parent::tei:div/parent::tei:div[@type = 'sidebyside']
+				]"
+			>
+				<xsl:number
+					count="
+						(
+							tei:div[@type = ('section', 'subsection', 'subsubsection')]
+							| tei:p
+							| tei:epigraph
+							| tei:ab
+							| tei:lg
+							| tei:quote
+							| tei:list
+							| tei:table
+							| tei:figure
+							| tei:div[@type = 'letter']
+						)[
+							parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]
+							or parent::tei:div/parent::tei:div[@type = 'bilingual']
+							or parent::tei:div/parent::tei:div[@type = 'sidebyside']
+						]"
+					from="tei:div[@type = 'chapter']"
+					level="any"
+				/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
 	<!-- default rule: warning -->
 	<xsl:template mode="chapter_main" match="tei:*" priority="-100">
 		<xsl:sequence select="eoa:warning(concat('in mode ', $apos, 'chapter_main', $apos, ': no template for tei:', name(), '[@type=', $apos, @type, $apos, ']'))"/>
@@ -92,9 +141,14 @@
 	</xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:epigraph">
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
 		<xsl:sequence select="eoa:info(concat('epigraph', $container_id))"/>
 		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" select="$global_uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<xsl:for-each select="tei:p">
 					<p id="{$container_id}" class="epigraph">
@@ -108,9 +162,14 @@
   </xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:ab[@type = 'chapterabstract']">
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
 		<xsl:sequence select="eoa:info(concat('chapterabstract', $container_id))"/>
 		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" select="$global_uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<p id="{$container_id}" class="abstract">
 						<xsl:apply-templates mode="html"/>
@@ -130,11 +189,16 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='section']">
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
 		<xsl:sequence select="eoa:info('section')"/>
 		<div class="accordion__item active">
 			<a class="accordion__title" href="#">
 				<xsl:call-template name="accordion_row">
-					<xsl:with-param name="link" as="xs:string" select="'sectionlink'"/>
+					<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
 					<xsl:with-param name="content" as="element()*">
 						<h2>
 							<xsl:if test="../@n != 'nonumber'">
@@ -153,9 +217,14 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsection']">
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
 		<xsl:sequence select="eoa:info('subsection')"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="'subsectionlink'"/>
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<h4>
 					<xsl:if test="../../@n != 'nonumber'">
@@ -169,9 +238,14 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsubsection']">
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
 		<xsl:sequence select="eoa:info('subsubsection')"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="'subsectionlink'"/>
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<h4>
 					<xsl:apply-templates mode="text_structure" select="./tei:head"/>
@@ -224,7 +298,7 @@
 		</xsl:choose>
   </xsl:template>
 
-	<xsl:template mode="text_structure" match="tei:body//tei:p" as="element(div)">
+	<xsl:template mode="text_structure" match="tei:body//tei:p">
 		<xsl:call-template name="render_paragraph"/>
   </xsl:template>
 
@@ -267,93 +341,138 @@
   <xsl:template mode="text_structure" match="tei:lg[@type='verse']">
 		<!-- TODO: find a way to indent the poem -->
 		<xsl:sequence select="eoa:info('verse')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<p id="{$container_id}">
-			<xsl:for-each select="tei:l">
-				<xsl:apply-templates mode="html"/>
-				<xsl:if test="position() != last()">
-					<br/>
-				</xsl:if>
-			</xsl:for-each>
-		</p>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<p id="{$container_id}">
+					<xsl:for-each select="tei:l">
+						<xsl:apply-templates mode="html"/>
+						<xsl:if test="position() != last()">
+							<br/>
+						</xsl:if>
+					</xsl:for-each>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:quote">
 		<!-- TODO: find a way to indent the quote -->
 		<xsl:sequence select="eoa:info('quote')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<p id="{$container_id}">
-			<xsl:apply-templates mode="html"/>
-		</p>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<p id="{$container_id}">
+					<xsl:apply-templates mode="html"/>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:list[@type='ordered' or @type='unordered' or @type='gloss']">
 		<xsl:sequence select="eoa:info('list')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="element_name">
-			<xsl:choose>
-				<xsl:when test="@type = 'ordered'">ol</xsl:when>
-				<xsl:when test="@type = 'unordered'">ul</xsl:when>
-				<xsl:when test="@type = 'gloss'">ul</xsl:when>
-				<xsl:otherwise>
-					<xsl:sequence select="eoa:error('unknown list type!')"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-		<xsl:element name="{$element_name}">
-			<xsl:attribute name="id" select="$container_id"/>
-			<xsl:for-each select="tei:item">
-				<li>
-					<xsl:if test="preceding-sibling::tei:label[1]">
-						<xsl:apply-templates select="preceding-sibling::tei:label[1]"/>
-						<xsl:text>: </xsl:text>
-					</xsl:if>
-					<xsl:apply-templates mode="html"/>
-				</li>
-			</xsl:for-each>
-		</xsl:element>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<xsl:variable name="element_name">
+					<xsl:choose>
+						<xsl:when test="@type = 'ordered'">ol</xsl:when>
+						<xsl:when test="@type = 'unordered'">ul</xsl:when>
+						<xsl:when test="@type = 'gloss'">ul</xsl:when>
+						<xsl:otherwise>
+							<xsl:sequence select="eoa:error('unknown list type!')"/>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<xsl:element name="{$element_name}">
+					<xsl:attribute name="id" select="$container_id"/>
+					<xsl:for-each select="tei:item">
+						<li>
+							<xsl:if test="preceding-sibling::tei:label[1]">
+								<xsl:apply-templates select="preceding-sibling::tei:label[1]"/>
+								<xsl:text>: </xsl:text>
+							</xsl:if>
+							<xsl:apply-templates mode="html"/>
+						</li>
+					</xsl:for-each>
+				</xsl:element>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:table">
 		<xsl:sequence select="eoa:info('table')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<figure id="{$container_id}">
-			<xsl:element name="table">
-				<xsl:for-each select="tei:row">
-					<tr>
-						<xsl:for-each select="tei:cell">
-							<xsl:element name="{if( @role = 'label') then 'th' else 'td'}">
-								<xsl:apply-templates mode="html"/>
-							</xsl:element>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<figure id="{$container_id}">
+					<xsl:element name="table">
+						<xsl:for-each select="tei:row">
+							<tr>
+								<xsl:for-each select="tei:cell">
+									<xsl:element name="{if( @role = 'label') then 'th' else 'td'}">
+										<xsl:apply-templates mode="html"/>
+									</xsl:element>
+								</xsl:for-each>
+							</tr>
 						</xsl:for-each>
-					</tr>
-				</xsl:for-each>
-			</xsl:element>
-			<xsl:if test="tei:head">
-				<figcaption>
-					<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
-				</figcaption>
-			</xsl:if>
-		</figure>
+					</xsl:element>
+					<xsl:if test="tei:head">
+						<figcaption>
+							<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
+						</figcaption>
+					</xsl:if>
+				</figure>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:figure">
 		<!-- TODO: check/fix path -->
 		<xsl:sequence select="eoa:info('figure')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="caption">
-			<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
-		</xsl:variable>
-		<figure class="publication__image" id="{$container_id}">
-			<a href="{@url}" data-lightbox="" title="$caption">
-				<img src="{@url}">image could not</img>
-			</a>
-			<xsl:if test="tei:head">
-				<figcaption>
-					<xsl:value-of select="$caption"/>
-				</figcaption>
-			</xsl:if>
-		</figure>
+		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<xsl:variable name="caption">
+					<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
+				</xsl:variable>
+				<figure class="publication__image" id="{$container_id}">
+					<a href="{@url}" data-lightbox="" title="$caption">
+						<img src="{@url}">image could not</img>
+					</a>
+					<xsl:if test="tei:head">
+						<figcaption>
+							<xsl:value-of select="$caption"/>
+						</figcaption>
+					</xsl:if>
+				</figure>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <!--
@@ -475,7 +594,6 @@
 	<xsl:template name="accordion_row">
 		<xsl:param name="link" as="xs:string?"/>
 		<xsl:param name="content" as="element()*"/>
-
 		<div class="row">
 			<xsl:variable name="flags" as="element()*">
 				<xsl:variable name="data_content" as="xs:string"
@@ -495,56 +613,6 @@
 		</div>
 	</xsl:template>
 
-	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
-	<xsl:template name="container_id" as="xs:string?">
-		<xsl:choose>
-			<xsl:when test="
-				(
-					self::tei:p
-					| self::tei:epigraph
-					| self::tei:ab
-					| self::tei:lg
-					| self::tei:quote
-					| self::tei:list
-					| self::tei:table
-					| self::tei:figure
-					| self::tei:div[@type = 'letter']
-				)[
-					parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]
-					or parent::tei:div/parent::tei:div[@type = 'bilingual']
-					or parent::tei:div/parent::tei:div[@type = 'sidebyside']
-				]"
-			>
-				<value-of>
-					<xsl:text>p</xsl:text>
-					<xsl:number
-						count="
-							(
-								tei:p
-								| tei:epigraph
-								| tei:ab
-								| tei:lg
-								| tei:quote
-								| tei:list
-								| tei:table
-								| tei:figure
-								| tei:div[@type = 'letter']
-							)[
-								parent::tei:div[@type = ('chapter', 'section', 'subsection', 'subsubsection')]
-								or parent::tei:div/parent::tei:div[@type = 'bilingual']
-								or parent::tei:div/parent::tei:div[@type = 'sidebyside']
-							]"
-						from="tei:div[@type = 'chapter']"
-						level="any"
-					/>
-				</value-of>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:value-of select="()"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
 	<xsl:template name="render_paragraph" as="element(div)">
 		<xsl:param name="css_classes" as="xs:string" select="''"/>
 		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>

From fa97c34ad013296cdb5d8512e28b7d12f67185f2 Mon Sep 17 00:00:00 2001
From: EsGeh <SamuelGfroerer@googlemail.com>
Date: Thu, 7 Nov 2019 18:58:39 +0100
Subject: [PATCH 7/7] tei->html: refactoring. also: almost all paragraph elems
 have links now

---
 tei2html/utils/html_rules.xsl | 206 ++++++++++++++++------------------
 1 file changed, 97 insertions(+), 109 deletions(-)

diff --git a/tei2html/utils/html_rules.xsl b/tei2html/utils/html_rules.xsl
index 77c2ca2..a1971fc 100644
--- a/tei2html/utils/html_rules.xsl
+++ b/tei2html/utils/html_rules.xsl
@@ -80,14 +80,11 @@
   </xsl:template>
 
 	<xsl:template mode="chapter_main" match="tei:div[@type='chapter']">
-		<xsl:variable name="chapter" select="self::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html')"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<div class="accordion">
 			<div class="accordion__main">
 				<xsl:call-template name="accordion_row">
-					<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+					<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 					<xsl:with-param name="content" as="element()*">
 						<!-- print chapter heading -->
 						<h1 class="publication-detail__title">
@@ -141,17 +138,13 @@
 	</xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:epigraph">
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:sequence select="eoa:info(concat('epigraph', $container_id))"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('epigraph', $uri/eoa:id))"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" select="$global_uri"/>
+			<xsl:with-param name="link" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<xsl:for-each select="tei:p">
-					<p id="{$container_id}" class="epigraph">
+					<p id="{$uri/eoa:id}" class="epigraph">
 						<em>
 							<xsl:apply-templates mode="html"/>
 						</em>
@@ -162,16 +155,12 @@
   </xsl:template>
 
   <xsl:template mode="chapter_main_paragraphs" match="tei:ab[@type = 'chapterabstract']">
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:sequence select="eoa:info(concat('chapterabstract', $container_id))"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('chapterabstract', $uri/eoa:id))"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" select="$global_uri"/>
+			<xsl:with-param name="link" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
-				<p id="{$container_id}" class="abstract">
+				<p id="{$uri/eoa:id}" class="abstract">
 						<xsl:apply-templates mode="html"/>
 				</p>
 			</xsl:with-param>
@@ -189,16 +178,12 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='section']">
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:sequence select="eoa:info('section')"/>
 		<div class="accordion__item active">
 			<a class="accordion__title" href="#">
 				<xsl:call-template name="accordion_row">
-					<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+					<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 					<xsl:with-param name="content" as="element()*">
 						<h2>
 							<xsl:if test="../@n != 'nonumber'">
@@ -217,14 +202,10 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsection']">
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:sequence select="eoa:info('subsection')"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<h4>
 					<xsl:if test="../../@n != 'nonumber'">
@@ -238,14 +219,10 @@
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:div[@type='subsubsection']">
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:sequence select="eoa:info('subsubsection')"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<h4>
 					<xsl:apply-templates mode="text_structure" select="./tei:head"/>
@@ -257,13 +234,9 @@
 
   <xsl:template mode="text_structure" match="tei:div[@type='letter']">
 		<xsl:sequence select="eoa:info('letter')"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<xsl:if test="tei:head">
 					<h4>
@@ -304,35 +277,53 @@
 
   <xsl:template mode="text_structure" match="tei:ab[@type='equation']">
 		<xsl:sequence select="eoa:info('block formula')"/>
-    <xsl:value-of select="concat('$', ., '$')"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<p>
+					<xsl:value-of select="concat('$', ., '$')"/>
+				</p>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:ab[@type='subequations']">
 		<xsl:sequence select="eoa:info('equation array')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:element name="table">
-			<xsl:for-each select="tei:formula">
-				<tr id="{$container_id}">
-					<td>
-    				<xsl:value-of select="concat('$', ., '$')"/>
-					</td>
-				</tr>
-			</xsl:for-each>
-		</xsl:element>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<table>
+					<xsl:for-each select="tei:formula">
+						<tr id="{$uri/eoa:id}">
+							<td>
+								<xsl:value-of select="concat('$', ., '$')"/>
+							</td>
+						</tr>
+					</xsl:for-each>
+				</table>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
   <xsl:template mode="text_structure" match="tei:ab[@type='equationarray']">
 		<xsl:sequence select="eoa:info('equation array')"/>
-		<xsl:variable name="container_id"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:element name="table">
-			<xsl:for-each select="tei:formula">
-				<tr id="{$container_id}">
-					<td>
-    				<xsl:value-of select="concat('$', ., '$')"/>
-					</td>
-				</tr>
-			</xsl:for-each>
-		</xsl:element>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
+		<xsl:call-template name="accordion_row">
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
+			<xsl:with-param name="content" as="element()*">
+				<table>
+					<xsl:for-each select="tei:formula">
+						<tr id="{$uri/eoa:id}">
+							<td>
+								<xsl:value-of select="concat('$', ., '$')"/>
+							</td>
+						</tr>
+					</xsl:for-each>
+				</table>
+			</xsl:with-param>
+		</xsl:call-template>
   </xsl:template>
 
 	<!-- the theorem DECLARATION is not supposed to appear in the text: -->
@@ -341,15 +332,11 @@
   <xsl:template mode="text_structure" match="tei:lg[@type='verse']">
 		<!-- TODO: find a way to indent the poem -->
 		<xsl:sequence select="eoa:info('verse')"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
-				<p id="{$container_id}">
+				<p id="{$uri/eoa:id}">
 					<xsl:for-each select="tei:l">
 						<xsl:apply-templates mode="html"/>
 						<xsl:if test="position() != last()">
@@ -364,15 +351,11 @@
   <xsl:template mode="text_structure" match="tei:quote">
 		<!-- TODO: find a way to indent the quote -->
 		<xsl:sequence select="eoa:info('quote')"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
-				<p id="{$container_id}">
+				<p id="{$uri/eoa:id}">
 					<xsl:apply-templates mode="html"/>
 				</p>
 			</xsl:with-param>
@@ -381,13 +364,9 @@
 
   <xsl:template mode="text_structure" match="tei:list[@type='ordered' or @type='unordered' or @type='gloss']">
 		<xsl:sequence select="eoa:info('list')"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<xsl:variable name="element_name">
 					<xsl:choose>
@@ -400,7 +379,7 @@
 					</xsl:choose>
 				</xsl:variable>
 				<xsl:element name="{$element_name}">
-					<xsl:attribute name="id" select="$container_id"/>
+					<xsl:attribute name="id" select="$uri/eoa:id"/>
 					<xsl:for-each select="tei:item">
 						<li>
 							<xsl:if test="preceding-sibling::tei:label[1]">
@@ -417,15 +396,11 @@
 
   <xsl:template mode="text_structure" match="tei:table">
 		<xsl:sequence select="eoa:info('table')"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
-				<figure id="{$container_id}">
+				<figure id="{$uri/eoa:id}">
 					<xsl:element name="table">
 						<xsl:for-each select="tei:row">
 							<tr>
@@ -450,18 +425,14 @@
   <xsl:template mode="text_structure" match="tei:figure">
 		<!-- TODO: check/fix path -->
 		<xsl:sequence select="eoa:info('figure')"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" as="xs:string" select="$global_uri"/>
+			<xsl:with-param name="link" as="xs:string" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
 				<xsl:variable name="caption">
 					<xsl:apply-templates mode="html" select="tei:head/node() | text()"/>
 				</xsl:variable>
-				<figure class="publication__image" id="{$container_id}">
+				<figure class="publication__image" id="{$uri/eoa:id}">
 					<a href="{@url}" data-lightbox="" title="$caption">
 						<img src="{@url}">image could not</img>
 					</a>
@@ -615,16 +586,12 @@
 
 	<xsl:template name="render_paragraph" as="element(div)">
 		<xsl:param name="css_classes" as="xs:string" select="''"/>
-		<xsl:variable name="chapter" select="ancestor::tei:div[@type = 'chapter']"/>
-		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
-		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
-		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html#', $container_id)"/>
-		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
-		<xsl:sequence select="eoa:info(concat('chapter paragraph', $container_id))"/>
+		<xsl:variable name="uri"><xsl:call-template name="calc_uri"/></xsl:variable>
+		<xsl:sequence select="eoa:info(concat('chapter paragraph', $uri/eoa:id))"/>
 		<xsl:call-template name="accordion_row">
-			<xsl:with-param name="link" select="$global_uri"/>
+			<xsl:with-param name="link" select="$uri/eoa:uri"/>
 			<xsl:with-param name="content" as="element()*">
-				<p id="{$container_id}" class="{$css_classes}">
+				<p id="{$uri/eoa:id}" class="{$css_classes}">
 					<xsl:if test="@corresp">
 						<xsl:variable name="id" as="xs:string" select="eoa:normalize_reference(@corresp)"/>
 						<xsl:variable name="theorem" select="key('theoremdecls', $id)"/>
@@ -641,6 +608,27 @@
 		</xsl:call-template>
   </xsl:template>
 
+	<xsl:template name="calc_uri" as="element()*">
+		<xsl:variable name="chapter" select="ancestor-or-self::tei:div[@type = 'chapter']"/>
+		<xsl:variable name="chapter_nr" select="count($chapter/preceding-sibling::*)"/>
+		<xsl:variable name="container_id" as="xs:string"><xsl:call-template name="container_id"/></xsl:variable>
+		<xsl:variable name="local_uri" select="concat($series, '/', $publication_number, '/', $chapter_nr , '/index.html')"/>
+		<xsl:variable name="global_uri" select="concat($domain, '/', $local_uri)"/>
+		<eoa:id>
+			<xsl:value-of select="$container_id"/>
+		</eoa:id>
+		<eoa:uri>
+			<xsl:choose>
+				<xsl:when test="self::tei:div[@type ='chapter']">
+					<xsl:value-of select="$global_uri"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="concat($global_uri, '#', $container_id)"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</eoa:uri>
+	</xsl:template>
+
 	<!-- if the current element is a "paragraph level element", return its id in the document. Otherwise return the empty sequence -->
 	<xsl:template name="footnote_id" as="xs:string?">
 		<xsl:choose>