From 7d7b1974b50438388787cc03d5a29531b80be280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Tue, 8 Oct 2024 23:56:02 +0200
Subject: [PATCH 1/7] remove redundant mode

The correct name is app:reading-text
---
 xsl/common/libapp2.xsl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/xsl/common/libapp2.xsl b/xsl/common/libapp2.xsl
index 62e5b33..828ee10 100644
--- a/xsl/common/libapp2.xsl
+++ b/xsl/common/libapp2.xsl
@@ -390,11 +390,6 @@ see xsl/projects/alea/preview.xsl
         apply the rules from 'lemma-text-nodes' on them. -->
     <xsl:mode name="app:lemma-text-nodes-dspt" on-no-match="shallow-skip" visibility="public"/>
 
-    <!-- The mode apparatus-reading-dspt is for the entries after the lemma (readings, etc.).
-        It serves as a dispatcher for different types of entries.
-        All templates should leave it again to get the text of the reading etc. -->
-    <xsl:mode name="app:reading" on-no-match="shallow-skip" visibility="public"/>
-
 
     <!-- app -->
 

From 7bc23954687ed8c89558f3366960a47c03919bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Wed, 9 Oct 2024 01:12:59 +0200
Subject: [PATCH 2/7] librend for rendering shared over text, apparatus and
 editorial notes

---
 build.xml               |   7 ++
 saxon.xml               |   3 +
 xsl/latex/librend.xsl   | 184 ++++++++++++++++++++++++++++++++++++++++
 xsl/latex/librend.xspec |  90 ++++++++++++++++++++
 4 files changed, 284 insertions(+)
 create mode 100644 xsl/latex/librend.xsl
 create mode 100644 xsl/latex/librend.xspec

diff --git a/build.xml b/build.xml
index 9f66cb4..5b5c1ab 100644
--- a/build.xml
+++ b/build.xml
@@ -34,6 +34,7 @@
         <antcall target="test-xsl-html-libapp2c.xsl"/>
         <antcall target="test-xsl-html-libapp2c-html-librend.xsl"/>
         <antcall target="test-xsl-latex-libreledmac.xsl"/>
+        <antcall target="test-xsl-latex-librend.xsl"/>
         <antcall target="test-xsl-latex-libapp2c.xsl"/>
         <antcall target="test-xsl-latex-libtext.xsl"/>
         <antcall target="test-xsl-latex-libcouplet.xsl"/>
@@ -96,6 +97,12 @@
         </antcall>
     </target>
 
+    <target name="test-xsl-latex-librend.xsl">
+        <antcall target="xspec.xspec" inheritall="false">
+            <param name="xspec.xml" location="${basedir}/xsl/latex/librend.xspec"/>
+        </antcall>
+    </target>
+
     <target name="test-xsl-html-prose.xsl">
         <antcall target="xspec.xspec" inheritall="false">
             <param name="xspec.xml" location="${basedir}/xsl/html/prose.xspec"/>
diff --git a/saxon.xml b/saxon.xml
index 1bfb8d2..d73883d 100644
--- a/saxon.xml
+++ b/saxon.xml
@@ -16,6 +16,9 @@ http://www.saxonica.com/documentation/index/configuration-file.html
           <package
                name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/common/librend.xsl"
                version="1.0.0" sourceLocation="xsl/common/librend.xsl" priority="10"/>
+          <package
+               name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/librend.xsl"
+               version="1.0.0" sourceLocation="xsl/latex/librend.xsl"/>
 
           <package
                name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/common/libref.xsl"
diff --git a/xsl/latex/librend.xsl b/xsl/latex/librend.xsl
new file mode 100644
index 0000000..c36c29a
--- /dev/null
+++ b/xsl/latex/librend.xsl
@@ -0,0 +1,184 @@
+<!-- components for latex output shared in modes text:text, app:reading-text and note:editorial -->
+<!DOCTYPE package [
+    <!ENTITY lb "&#xa;" >
+    <!ENTITY lre "&#x202a;" >
+    <!ENTITY rle "&#x202b;" >
+    <!ENTITY pdf "&#x202c;" >]>
+<xsl:package
+  name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/librend.xsl"
+  package-version="1.0.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:map="http://www.w3.org/2005/xpath-functions/map"
+  xmlns:i18n="http://scdh.wwu.de/transform/i18n#" xmlns:text="http://scdh.wwu.de/transform/text#"
+  xmlns:app="http://scdh.wwu.de/transform/app#" xmlns:note="http://scdh.wwu.de/transform/note#"
+  xmlns:edmac="http://scdh.wwu.de/transform/edmac#" exclude-result-prefixes="#all"
+  xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="3.0">
+
+  <!-- names of indices (used by imakeidx) -->
+  <xsl:param name="text:indices" as="xs:string*" required="false"
+    select="'person', 'place', 'org', 'event'"/>
+
+  <xsl:use-package
+    name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/libreledmac.xsl"
+    package-version="1.0.0"/>
+
+  <xsl:use-package
+    name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/common/librend.xsl"
+    package-version="1.0.0">
+    <xsl:accept component="mode" names="*" visibility="public"/>
+
+    <xsl:override>
+
+      <!-- write PIs from latex target to the output -->
+      <xsl:template mode="text:text app:reading-text note:editorial"
+        match="processing-instruction('latex')">
+        <xsl:value-of select="."/>
+      </xsl:template>
+
+      <!-- you may want to override the rule content, e.g., by \txarb{.} -->
+      <xsl:template mode="text:text app:reading-text note:editorial" match="text()">
+        <!-- some characters need to be escaped -->
+        <!--xsl:value-of select=". => replace('\[', '\\lbrack{}') => replace('\]', '\\rbrack{}')"/-->
+        <!--xsl:value-of select=". => replace('([\[])', '{$1}')"/-->
+        <xsl:value-of select="."/>
+      </xsl:template>
+
+      <!-- shrink multiple whitespace space characters to a single space  -->
+      <xsl:template mode="text:text app:reading-text note:editorial"
+        match="text()[ancestor::p or ancestor::l or ancestor::head]">
+        <xsl:value-of select=". => replace('\s+', ' ')"/>
+      </xsl:template>
+
+      <!-- add hooks everywhere -->
+      <xsl:template mode="text:text app:reading-text note:editorial" match="*">
+        <xsl:call-template name="text:hooks"/>
+      </xsl:template>
+
+
+      <!-- named entities make up indices. Its up to downstream packages to use them or to let the go. -->
+
+      <xsl:template mode="text:text app:reading-text note:editorial" match="rs">
+        <xsl:call-template name="text:index-entity">
+          <xsl:with-param name="index" select="@type"/>
+        </xsl:call-template>
+      </xsl:template>
+
+      <xsl:template mode="text:text app:reading-text note:editorial" match="persName">
+        <xsl:call-template name="text:index-entity">
+          <xsl:with-param name="index">person</xsl:with-param>
+        </xsl:call-template>
+      </xsl:template>
+
+      <xsl:template mode="text:text app:reading-text note:editorial" match="placeName">
+        <xsl:call-template name="text:index-entity">
+          <xsl:with-param name="index">place</xsl:with-param>
+        </xsl:call-template>
+      </xsl:template>
+
+      <xsl:template mode="text:text app:reading-text note:editorial" match="orgName">
+        <xsl:call-template name="text:index-entity">
+          <xsl:with-param name="index">org</xsl:with-param>
+        </xsl:call-template>
+      </xsl:template>
+
+      <xsl:template mode="text:text app:reading-text note:editorial" match="eventName">
+        <xsl:call-template name="text:index-entity">
+          <xsl:with-param name="index">event</xsl:with-param>
+        </xsl:call-template>
+      </xsl:template>
+
+    </xsl:override>
+  </xsl:use-package>
+
+  <!-- hooks -->
+  <xsl:mode name="text:hook-ahead" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="text:hook-before" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="text:hook-after" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="text:hook-behind" on-no-match="deep-skip" visibility="public"/>
+
+  <xsl:template name="text:hooks" visibility="public">
+    <xsl:context-item as="element()" use="required"/>
+    <xsl:apply-templates mode="text:hook-ahead" select="."/>
+    <xsl:call-template name="edmac:edlabel">
+      <xsl:with-param name="suffix" select="'-start'"/>
+    </xsl:call-template>
+    <xsl:apply-templates mode="text:hook-before" select="."/>
+    <!-- #current mode on children.
+      This works albeit we are in a named template!
+      Its guaranteed by the specs.
+      Quote From the XSLT 3.0 TR:
+      "Definition: At any point in the processing of a stylesheet,
+      there is a current mode." -->
+    <xsl:apply-templates mode="#current"/>
+    <xsl:apply-templates mode="text:hook-after" select="."/>
+    <xsl:call-template name="edmac:edlabel">
+      <xsl:with-param name="suffix" select="'-end'"/>
+    </xsl:call-template>
+    <xsl:apply-templates mode="text:hook-behind" select="."/>
+  </xsl:template>
+
+
+  <!-- named template that generates entries to the indices.
+    This also calls the hooks.
+    The index parameter should be of the values of rs/@type, i.e., 'person', 'place', 'org', 'event', etc. -->
+  <xsl:template name="text:index-entity" visibility="public">
+    <xsl:context-item as="element()" use="required"/>
+    <xsl:param name="index" as="xs:string" required="true"/>
+    <!-- early hooks and start label -->
+    <xsl:apply-templates mode="text:hook-ahead" select="."/>
+    <xsl:call-template name="edmac:edlabel">
+      <xsl:with-param name="suffix" select="'-start'"/>
+    </xsl:call-template>
+    <xsl:apply-templates mode="text:hook-before" select="."/>
+    <!-- output index macro -->
+    <xsl:for-each select="text:index-keys(., $index)">
+      <xsl:text>\index[</xsl:text>
+      <xsl:value-of select="$index"/>
+      <xsl:text>]{</xsl:text>
+      <xsl:value-of select="."/>
+      <xsl:text>}</xsl:text>
+    </xsl:for-each>
+    <!-- current mode on children -->
+    <xsl:apply-templates mode="#current"/>
+    <!-- late hooks and ending label -->
+    <xsl:apply-templates mode="text:hook-after" select="."/>
+    <xsl:call-template name="edmac:edlabel">
+      <xsl:with-param name="suffix" select="'-end'"/>
+    </xsl:call-template>
+    <xsl:apply-templates mode="text:hook-behind" select="."/>
+  </xsl:template>
+
+  <!-- likely to be replaced with a more sophisticated function that gets names for keys -->
+  <xsl:function name="text:index-keys" as="xs:string*" visibility="public">
+    <xsl:param name="context" as="element()"/>
+    <xsl:param name="index" as="xs:string"/>
+    <xsl:variable name="keys" as="xs:string*">
+      <xsl:choose>
+        <xsl:when test="$context/@key">
+          <xsl:value-of select="$context/@key"/>
+        </xsl:when>
+        <xsl:when test="$context/@ref">
+          <xsl:value-of select="$context/@ref => replace('#', '')"/>
+        </xsl:when>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:sequence select="tokenize($keys)"/>
+  </xsl:function>
+
+
+  <!-- contributions to the latex prologue -->
+  <xsl:template name="text:latex-header-index" visibility="public">
+    <xsl:context-item as="item()" use="required"/>
+    <xsl:text>&lb;\makeatletter%</xsl:text>
+    <xsl:text>&lb;\@ifpackageloaded{imakeidx}{}{\usepackage{imakeidx}}%</xsl:text>
+    <xsl:text>&lb;\makeatother%</xsl:text>
+    <xsl:for-each select="(root(.)//rs/@type ! string(), $text:indices) => distinct-values()">
+      <xsl:text>&lb;\makeindex[name=</xsl:text>
+      <xsl:value-of select="."/>
+      <xsl:text>,title={</xsl:text>
+      <xsl:value-of select="."/>
+      <xsl:text>}]</xsl:text>
+    </xsl:for-each>
+    <xsl:text>&lb;&lb;</xsl:text>
+  </xsl:template>
+
+</xsl:package>
diff --git a/xsl/latex/librend.xspec b/xsl/latex/librend.xspec
new file mode 100644
index 0000000..3995e32
--- /dev/null
+++ b/xsl/latex/librend.xspec
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:map="http://www.w3.org/2005/xpath-functions/map"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ht="http://www.w3.org/1999/xhtml"
+    xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:app="http://scdh.wwu.de/transform/app#"
+    xmlns:text="http://scdh.wwu.de/transform/text#" xmlns:t="http://www.tei-c.org/ns/1.0"
+    xmlns:edmac="http://scdh.wwu.de/transform/edmac#" stylesheet="librend.xsl"
+    run-as="external">
+
+    <x:variable name="x:saxon-config" href="../../saxon.he.xml"/>
+
+
+    <x:scenario label="index from persName">
+        <x:context mode="text:text">
+            <tei:persName ref="#oma">Oma</tei:persName>
+        </x:context>
+        <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
+        <x:expect label="has end label" test="matches(., '\\edlabel\{[a-zA-Z0-9]+-end\}$')"/>
+        <x:expect label="has index entry" test="matches(., '\\index\[person\]\{oma\}')"/>
+        <x:expect label="has text" test="matches(., 'Oma')"/>
+        <x:expect label="result"
+            test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}\\index\[person\]\{oma\}Oma\\edlabel\{[a-zA-Z0-9]+-end\}$')"
+        />
+    </x:scenario>
+
+    <x:scenario label="index from placeName">
+        <x:context mode="text:text">
+            <tei:placeName ref="#rome">Roma</tei:placeName>
+        </x:context>
+        <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
+        <x:expect label="has end label" test="matches(., '\\edlabel\{[a-zA-Z0-9]+-end\}$')"/>
+        <x:expect label="has index entry" test="matches(., '\\index\[place\]\{rome\}')"/>
+        <x:expect label="has text" test="matches(., 'Roma')"/>
+        <x:expect label="result"
+            test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}\\index\[place\]\{rome\}Roma\\edlabel\{[a-zA-Z0-9]+-end\}$')"
+        />
+    </x:scenario>
+
+    <x:scenario label="index from orgName">
+        <x:context mode="text:text">
+            <tei:orgName key="teic">TEI-C</tei:orgName>
+        </x:context>
+        <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
+        <x:expect label="has end label" test="matches(., '\\edlabel\{[a-zA-Z0-9]+-end\}$')"/>
+        <x:expect label="has index entry" test="matches(., '\\index\[org\]\{teic\}')"/>
+        <x:expect label="has text" test="matches(., 'TEI-C')"/>
+        <x:expect label="result"
+            test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}\\index\[org\]\{teic\}TEI-C\\edlabel\{[a-zA-Z0-9]+-end\}$')"
+        />
+    </x:scenario>
+
+    <x:scenario label="index from eventName">
+        <x:context mode="text:text">
+            <tei:eventName ref="#pragueDefenestration">Prager Fenstersturz</tei:eventName>
+        </x:context>
+        <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
+        <x:expect label="has end label" test="matches(., '\\edlabel\{[a-zA-Z0-9]+-end\}$')"/>
+        <x:expect label="has index entry"
+            test="matches(., '\\index\[event\]\{pragueDefenestration\}')"/>
+        <x:expect label="has text" test="matches(., 'Prager\s*Fenstersturz')"/>
+        <x:expect label="result"
+            test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}\\index\[event\]\{pragueDefenestration\}Prager Fenstersturz\\edlabel\{[a-zA-Z0-9]+-end\}$')"
+        />
+    </x:scenario>
+
+    <x:scenario label="index from rs of type place">
+        <x:context mode="text:text">
+            <tei:rs type="place" ref="#rome">Roma</tei:rs>
+        </x:context>
+        <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
+        <x:expect label="has end label" test="matches(., '\\edlabel\{[a-zA-Z0-9]+-end\}$')"/>
+        <x:expect label="has index entry" test="matches(., '\\index\[place\]\{rome\}')"/>
+        <x:expect label="has text" test="matches(., 'Roma')"/>
+        <x:expect label="result"
+            test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}\\index\[place\]\{rome\}Roma\\edlabel\{[a-zA-Z0-9]+-end\}$')"
+        />
+    </x:scenario>
+
+    <x:scenario label="multiple index entries from rs of type place">
+        <x:context mode="text:text">
+            <tei:rs type="place" ref="#cologne #hamburg #munich #berlin" xml:space="preserve">in deutschen Städte mit mehr als einer Million Einwohnern</tei:rs>
+        </x:context>
+        <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
+        <x:expect label="has end label" test="matches(., '\\edlabel\{[a-zA-Z0-9]+-end\}$')"/>
+        <x:expect label="has index entries"
+            test="matches(., '\\index\[place\]\{cologne\}\\index\[place\]\{hamburg\}\\index\[place\]\{munich\}\\index\[place\]\{berlin\}')"
+        />
+    </x:scenario>
+
+</x:description>

From a25c4ca66cde38fc2b1bc81c892932ed6a1b85ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Wed, 9 Oct 2024 16:57:23 +0200
Subject: [PATCH 3/7] inherit from librend.xsl

---
 xsl/latex/libtext.xsl | 740 ++++++++++++++++++------------------------
 1 file changed, 314 insertions(+), 426 deletions(-)

diff --git a/xsl/latex/libtext.xsl b/xsl/latex/libtext.xsl
index 13a7c6a..6781bb7 100644
--- a/xsl/latex/libtext.xsl
+++ b/xsl/latex/libtext.xsl
@@ -18,126 +18,329 @@
   <!-- whether to use a workaround for issues related to sectioning in reledmac, e.g., #976 and #976 -->
   <xsl:param name="edmac:section-workaround" as="xs:boolean" select="false()" required="false"/>
 
-  <!-- names of indices (used by imakeidx) -->
-  <xsl:param name="text:indices" as="xs:string*" required="false"
-    select="'person', 'place', 'org', 'event'"/>
+  <xsl:variable name="text:section-levels" as="xs:string*"
+    select="'chapter', 'section', 'subsection', 'subsubsection'" visibility="public"/>
+
 
   <xsl:use-package
     name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/libreledmac.xsl"
     package-version="1.0.0"/>
 
-  <xsl:mode name="text:text" on-no-match="shallow-skip" visibility="public"/>
-
-  <xsl:mode name="text:hook-ahead" on-no-match="deep-skip" visibility="public"/>
-  <xsl:mode name="text:hook-before" on-no-match="deep-skip" visibility="public"/>
-  <xsl:mode name="text:hook-after" on-no-match="deep-skip" visibility="public"/>
-  <xsl:mode name="text:hook-behind" on-no-match="deep-skip" visibility="public"/>
-
-
-  <!-- write PIs from latex target to the output -->
-  <xsl:template match="processing-instruction('latex')">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <!-- you may want to override the rule content, e.g., by \txarb{.} -->
-  <xsl:template match="text()">
-    <!-- some characters need to be escaped -->
-    <!--xsl:value-of select=". => replace('\[', '\\lbrack{}') => replace('\]', '\\rbrack{}')"/-->
-    <!--xsl:value-of select=". => replace('([\[])', '{$1}')"/-->
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <!-- shrink multiple whitespace space characters to a singel space  -->
-  <xsl:template match="text()[ancestor::p or ancestor::l or ancestor::head]">
-    <xsl:value-of select=". => replace('\s+', ' ')"/>
-  </xsl:template>
-
-  <!-- drop whitespace nodes that from outside pLike -->
-  <!--xsl:template match="text()[normalize-space() eq '' and not(ancestor::p | ancestor::l | ancestor::head)]"/-->
-
-  <xsl:template match="teiHeader"/>
-
-  <!-- TODO -->
-  <xsl:template match="front | back"/>
-
-  <xsl:template match="body">
-    <xsl:text>&lb;&lb;%% begin of text body&lb;\beginnumbering&lb;&lb;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&lb;&lb;%% end of text body&lb;\endnumbering&lb;&lb;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="element()">
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:apply-templates/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
-  </xsl:template>
-
-
-  <!-- document structure -->
-
-  <xsl:variable name="text:section-levels" as="xs:string*"
-    select="'chapter', 'section', 'subsection', 'subsubsection'" visibility="public"/>
+  <xsl:use-package
+    name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/librend.xsl"
+    package-version="1.0.0">
+    <xsl:accept component="mode" names="*" visibility="public"/>
+    <xsl:accept component="function" names="*" visibility="public"/>
+    <xsl:accept component="template" names="*" visibility="public"/>
+
+    <xsl:override>
+
+      <!-- drop whitespace nodes that from outside pLike -->
+      <!--xsl:template match="text()[normalize-space() eq '' and not(ancestor::p | ancestor::l | ancestor::head)]"/-->
+
+      <!-- elements outside of line numbering -->
+      <xsl:template match="TEI | text">
+        <xsl:apply-templates/>
+      </xsl:template>
+
+      <!-- parts not to print -->
+      <xsl:template match="teiHeader | facsimile"/>
+
+      <!-- TODO -->
+      <xsl:template match="front | back"/>
+
+      <xsl:template match="body">
+        <xsl:text>&lb;&lb;%% begin of text body&lb;\beginnumbering&lb;&lb;</xsl:text>
+        <xsl:apply-templates/>
+        <xsl:text>&lb;&lb;%% end of text body&lb;\endnumbering&lb;&lb;</xsl:text>
+      </xsl:template>
+
+
+      <!-- document structure -->
+
+      <xsl:template match="head">
+        <xsl:variable name="level" as="xs:integer" select="text:section-level(.)"/>
+        <xsl:apply-templates mode="text:hook-ahead" select=".">
+          <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
+        </xsl:apply-templates>
+        <xsl:text>&lb;</xsl:text>
+        <xsl:call-template name="edmac:par-start"/>
+        <xsl:apply-templates mode="text:hook-before" select=".">
+          <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
+        </xsl:apply-templates>
+        <xsl:text>&lb;\eled</xsl:text>
+        <xsl:value-of select="$text:section-levels[$level]"/>
+        <xsl:text>[</xsl:text>
+        <xsl:apply-templates mode="text:text-only"/>
+        <xsl:text>]{</xsl:text>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-end'"/>
+        </xsl:call-template>
+        <xsl:text>}</xsl:text>
+        <xsl:apply-templates mode="text:hook-after" select=".">
+          <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
+        </xsl:apply-templates>
+        <xsl:call-template name="edmac:par-end"/>
+        <xsl:text>&lb;&lb;</xsl:text>
+        <xsl:apply-templates mode="text:hook-behind" select=".">
+          <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
+        </xsl:apply-templates>
+      </xsl:template>
+
+      <xsl:template mode="text:hook-ahead" match="head">
+        <xsl:param name="level" as="xs:integer" select="0" tunnel="true"/>
+        <xsl:choose>
+          <xsl:when test="not($edmac:section-workaround)"/>
+          <xsl:when test="parent::*/preceding-sibling::*">
+            <xsl:text>&lb;&lb;\seed</xsl:text>
+            <xsl:value-of select="$text:section-levels[$level]"/>
+            <xsl:text>beforeskip&lb;&lb;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise/>
+        </xsl:choose>
+      </xsl:template>
+
+      <xsl:template mode="text:hook-after" match="head">
+        <xsl:param name="level" as="xs:integer" select="0" tunnel="true"/>
+        <xsl:choose>
+          <xsl:when test="not($edmac:section-workaround)"/>
+          <xsl:when test="following-sibling::*[1][self::*[child::*[1][self::head]]]">
+            <xsl:text>&lb;&lb;\seed</xsl:text>
+            <xsl:value-of select="$text:section-levels[$level]"/>
+            <xsl:text>afterskip&lb;&lb;</xsl:text>
+          </xsl:when>
+          <xsl:otherwise/>
+        </xsl:choose>
+      </xsl:template>
+
+      <xsl:template match="div | div1 | div2 | div3 | div4 | div5 | div6 | div7">
+        <xsl:apply-templates mode="text:hook-ahead" select="."/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-end'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-behind" select="."/>
+      </xsl:template>
+
+      <xsl:template match="p">
+        <xsl:call-template name="edmac:par-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-end'"/>
+        </xsl:call-template>
+        <xsl:call-template name="edmac:par-end"/>
+        <xsl:text>&lb;&lb;&lb;</xsl:text>
+      </xsl:template>
+
+      <xsl:template match="lg[not(lg)]">
+        <xsl:apply-templates mode="text:hook-ahead" select="."/>
+        <xsl:call-template name="edmac:stanza-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates/>
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-end'"/>
+        </xsl:call-template>
+        <xsl:call-template name="edmac:stanza-end"/>
+        <xsl:apply-templates mode="text:hook-behind" select="."/>
+      </xsl:template>
+
+      <!-- a single verse not in lg is output as a stanza -->
+      <xsl:template match="l[not(ancestor::lg)]">
+        <xsl:apply-templates mode="text:hook-ahead" select="."/>
+        <xsl:call-template name="edmac:stanza-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:variable name="latex" as="text()*">
+          <xsl:call-template name="text:verse"/>
+        </xsl:variable>
+        <xsl:value-of select="edmac:normalize($latex)"/>
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-end'"/>
+        </xsl:call-template>
+        <xsl:call-template name="edmac:stanza-end"/>
+        <xsl:apply-templates mode="text:hook-behind" select="."/>
+      </xsl:template>
+
+      <xsl:template match="l[ancestor::lg]">
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:call-template name="text:verse"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-end'"/>
+        </xsl:call-template>
+        <xsl:call-template name="edmac:verse-end"/>
+      </xsl:template>
+
+      <!-- delete whitespace nodes between verses -->
+      <xsl:template match="text()[normalize-space(.) eq '' and ancestor::lg and not(ancestor::l)]"/>
+
+      <xsl:template match="caesura">
+        <xsl:text>\caesura{}</xsl:text>
+      </xsl:template>
+
+      <xsl:template match="pb">
+        <xsl:call-template name="edmac:edlabel"/>
+        <xsl:text>\pb{</xsl:text>
+        <xsl:value-of select="@n"/>
+        <xsl:text>}</xsl:text>
+      </xsl:template>
+
+      <xsl:template match="milestone">
+        <xsl:call-template name="edmac:edlabel"/>
+        <xsl:text>\milestone{</xsl:text>
+        <xsl:value-of select="@n"/>
+        <xsl:text>}{</xsl:text>
+        <xsl:value-of select="@unit"/>
+        <!--
+    <xsl:text>}{</xsl:text>
+    <xsl:value-of select="ancestor-or-self::*[@xml:lang]/@xml:lang"/>
+    -->
+        <xsl:text>}</xsl:text>
+      </xsl:template>
+
+
+      <!-- related to critical apparatus and notes -->
+
+      <xsl:template match="app">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:apply-templates select="lem"/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="anchor">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="context" select="."/>
+          <xsl:with-param name="suffix" select="''"/>
+        </xsl:call-template>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="rdg"/>
+
+      <xsl:template match="lem[//variantEncoding/@method eq 'parallel-segmentation']">
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="context" select="parent::app"/>
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates/>
+      </xsl:template>
+
+      <xsl:template match="lem[//variantEncoding/@method ne 'parallel-segmentation']"/>
+
+      <xsl:template match="witDetail"/>
+
+      <xsl:template match="note">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="gap">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:text>[...]</xsl:text>
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="supplied">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <!--xsl:text>[</xsl:text-->
+        <xsl:apply-templates/>
+        <!--xsl:text>]</xsl:text-->
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="unclear">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <!--xsl:text>[? </xsl:text-->
+        <xsl:apply-templates/>
+        <!--xsl:text> ?]</xsl:text-->
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="choice[child::sic and child::corr]">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates select="corr"/>
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="sic[not(parent::choice)]">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates/>
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="corr[not(parent::choice)]">
+        <xsl:call-template name="edmac:app-start"/>
+        <xsl:call-template name="edmac:edlabel">
+          <xsl:with-param name="suffix" select="'-start'"/>
+        </xsl:call-template>
+        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates/>
+        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:call-template name="text:inline-footnotes"/>
+        <xsl:call-template name="edmac:app-end"/>
+      </xsl:template>
+
+      <xsl:template match="span/text() | interp/text()"/>
+
+    </xsl:override>
+  </xsl:use-package>
 
-  <xsl:template match="head">
-    <xsl:variable name="level" as="xs:integer" select="text:section-level(.)"/>
-    <xsl:apply-templates mode="text:hook-ahead" select=".">
-      <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
-    </xsl:apply-templates>
-    <xsl:text>&lb;</xsl:text>
-    <xsl:call-template name="edmac:par-start"/>
-    <xsl:apply-templates mode="text:hook-before" select=".">
-      <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
-    </xsl:apply-templates>
-    <xsl:text>&lb;\eled</xsl:text>
-    <xsl:value-of select="$text:section-levels[$level]"/>
-    <xsl:text>[</xsl:text>
-    <xsl:apply-templates mode="text:text-only"/>
-    <xsl:text>]{</xsl:text>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
+  <!-- a hook for handling verse. The default just applies the templates in mode text:text -->
+  <xsl:template name="text:verse" visibility="public">
     <xsl:apply-templates/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:text>}</xsl:text>
-    <xsl:apply-templates mode="text:hook-after" select=".">
-      <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
-    </xsl:apply-templates>
-    <xsl:call-template name="edmac:par-end"/>
-    <xsl:text>&lb;&lb;</xsl:text>
-    <xsl:apply-templates mode="text:hook-behind" select=".">
-      <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-  <xsl:template mode="text:hook-ahead" match="head">
-    <xsl:param name="level" as="xs:integer" select="0" tunnel="true"/>
-    <xsl:choose>
-      <xsl:when test="not($edmac:section-workaround)"/>
-      <xsl:when test="parent::*/preceding-sibling::*">
-        <xsl:text>&lb;&lb;\seed</xsl:text>
-        <xsl:value-of select="$text:section-levels[$level]"/>
-        <xsl:text>beforeskip&lb;&lb;</xsl:text>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
   </xsl:template>
 
-  <xsl:template mode="text:hook-after" match="head">
-    <xsl:param name="level" as="xs:integer" select="0" tunnel="true"/>
-    <xsl:choose>
-      <xsl:when test="not($edmac:section-workaround)"/>
-      <xsl:when test="following-sibling::*[1][self::*[child::*[1][self::head]]]">
-        <xsl:text>&lb;&lb;\seed</xsl:text>
-        <xsl:value-of select="$text:section-levels[$level]"/>
-        <xsl:text>afterskip&lb;&lb;</xsl:text>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:template>
 
   <xsl:function name="text:section-level" as="xs:integer" visibility="public">
     <xsl:param name="context" as="element(head)"/>
@@ -167,307 +370,7 @@
     <xsl:sequence select="$level + $text:section-level-delta"/>
   </xsl:function>
 
-  <xsl:template match="div | div1 | div2 | div3 | div4 | div5 | div6 | div7">
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
-  </xsl:template>
-
-  <xsl:template match="p">
-    <xsl:call-template name="edmac:par-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:call-template name="edmac:par-end"/>
-    <xsl:text>&lb;&lb;&lb;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="lg[not(lg)]">
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
-    <xsl:call-template name="edmac:stanza-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:apply-templates/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:call-template name="edmac:stanza-end"/>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
-  </xsl:template>
-
-  <!-- a single verse not in lg is output as a stanza -->
-  <xsl:template match="l[not(ancestor::lg)]">
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
-    <xsl:call-template name="edmac:stanza-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:variable name="latex" as="text()*">
-      <xsl:call-template name="text:verse"/>
-    </xsl:variable>
-    <xsl:value-of select="edmac:normalize($latex)"/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:call-template name="edmac:stanza-end"/>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
-  </xsl:template>
-
-  <xsl:template match="l[ancestor::lg]">
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:call-template name="text:verse"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:call-template name="edmac:verse-end"/>
-  </xsl:template>
-
-  <!-- a hook for handling verse. The default just applies the templates in mode text:text -->
-  <xsl:template name="text:verse" visibility="public">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <!-- delete whitespace nodes between verses -->
-  <xsl:template match="text()[normalize-space(.) eq '' and ancestor::lg and not(ancestor::l)]"/>
-
-  <xsl:template match="caesura">
-    <xsl:text>\caesura{}</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="pb">
-    <xsl:call-template name="edmac:edlabel"/>
-    <xsl:text>\pb{</xsl:text>
-    <xsl:value-of select="@n"/>
-    <xsl:text>}</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="milestone">
-    <xsl:call-template name="edmac:edlabel"/>
-    <xsl:text>\milestone{</xsl:text>
-    <xsl:value-of select="@n"/>
-    <xsl:text>}{</xsl:text>
-    <xsl:value-of select="@unit"/>
-    <!--
-    <xsl:text>}{</xsl:text>
-    <xsl:value-of select="ancestor-or-self::*[@xml:lang]/@xml:lang"/>
-    -->
-    <xsl:text>}</xsl:text>
-  </xsl:template>
-
-
-  <!-- related to critical apparatus and notes -->
-
-  <xsl:template match="app">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:apply-templates select="lem"/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="anchor">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="context" select="."/>
-      <xsl:with-param name="suffix" select="''"/>
-    </xsl:call-template>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="rdg"/>
 
-  <xsl:template match="lem[//variantEncoding/@method eq 'parallel-segmentation']">
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="context" select="parent::app"/>
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </xsl:template>
-
-  <xsl:template match="lem[//variantEncoding/@method ne 'parallel-segmentation']"/>
-
-  <xsl:template match="witDetail"/>
-
-  <xsl:template match="note">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="gap">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:text>[...]</xsl:text>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="supplied">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <!--xsl:text>[</xsl:text-->
-    <xsl:apply-templates/>
-    <!--xsl:text>]</xsl:text-->
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="unclear">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <!--xsl:text>[? </xsl:text-->
-    <xsl:apply-templates/>
-    <!--xsl:text> ?]</xsl:text-->
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="choice[child::sic and child::corr]">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:apply-templates select="corr"/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="sic[not(parent::choice)]">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:apply-templates/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="corr[not(parent::choice)]">
-    <xsl:call-template name="edmac:app-start"/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <xsl:apply-templates/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="text:inline-footnotes"/>
-    <xsl:call-template name="edmac:app-end"/>
-  </xsl:template>
-
-  <xsl:template match="span/text() | interp/text()"/>
-
-
-  <!-- named entities make up indices. Its up to downstream packages to use them or to let the go. -->
-
-  <xsl:template match="rs">
-    <xsl:call-template name="text:index-entity">
-      <xsl:with-param name="index" select="@type"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="persName">
-    <xsl:call-template name="text:index-entity">
-      <xsl:with-param name="index">person</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="placeName">
-    <xsl:call-template name="text:index-entity">
-      <xsl:with-param name="index">place</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="orgName">
-    <xsl:call-template name="text:index-entity">
-      <xsl:with-param name="index">org</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="eventName">
-    <xsl:call-template name="text:index-entity">
-      <xsl:with-param name="index">event</xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-
-  <!-- named template that generates entries to the indices.
-    This also calls the hooks.
-    The index parameter should be of the values of rs/@type, i.e., 'person', 'place', 'org', 'event', etc. -->
-  <xsl:template name="text:index-entity" visibility="public">
-    <xsl:context-item as="element()" use="required"/>
-    <xsl:param name="index" as="xs:string" required="true"/>
-    <!-- early hooks and start label -->
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-start'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
-    <!-- output index macro -->
-    <xsl:for-each select="text:index-keys(., $index)">
-      <xsl:text>\index[</xsl:text>
-      <xsl:value-of select="$index"/>
-      <xsl:text>]{</xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>}</xsl:text>
-    </xsl:for-each>
-    <!-- current mode on children -->
-    <xsl:apply-templates mode="#current"/>
-    <!-- late hooks and ending label -->
-    <xsl:apply-templates mode="text:hook-after" select="."/>
-    <xsl:call-template name="edmac:edlabel">
-      <xsl:with-param name="suffix" select="'-end'"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
-  </xsl:template>
-
-  <!-- likely to be replaced with a more sophisticated function that gets names for keys -->
-  <xsl:function name="text:index-keys" as="xs:string*" visibility="public">
-    <xsl:param name="context" as="element()"/>
-    <xsl:param name="index" as="xs:string"/>
-    <xsl:variable name="keys" as="xs:string*">
-      <xsl:choose>
-        <xsl:when test="$context/@key">
-          <xsl:value-of select="$context/@key"/>
-        </xsl:when>
-        <xsl:when test="$context/@ref">
-          <xsl:value-of select="$context/@ref => replace('#', '')"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:sequence select="tokenize($keys)"/>
-  </xsl:function>
 
 
   <!-- a mode if text text only (without macros that can cause run away arguments) is needed,
@@ -516,21 +419,6 @@
     <xsl:text>&lb;\newcommand*{\caesura}{||}</xsl:text>
   </xsl:template>
 
-  <xsl:template name="text:latex-header-index" visibility="public">
-    <xsl:context-item as="item()" use="required"/>
-    <xsl:text>&lb;\makeatletter%</xsl:text>
-    <xsl:text>&lb;\@ifpackageloaded{imakeidx}{}{\usepackage{imakeidx}}%</xsl:text>
-    <xsl:text>&lb;\makeatother%</xsl:text>
-    <xsl:for-each select="(root(.)//rs/@type ! string(), $text:indices) => distinct-values()">
-      <xsl:text>&lb;\makeindex[name=</xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>,title={</xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>}]</xsl:text>
-    </xsl:for-each>
-    <xsl:text>&lb;&lb;</xsl:text>
-  </xsl:template>
-
   <!-- contribution to the header for workaround towards issue #36 -->
   <xsl:template name="text:latex-header-workaround36" visibility="public">
     <xsl:text>&lb;\makeatletter%</xsl:text>

From 0c52ed952390c64c219db5f175947f3c2870b73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Wed, 9 Oct 2024 16:58:22 +0200
Subject: [PATCH 4/7] reflect changes in libtext

---
 xsl/latex/libtext.xspec | 78 ++++++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/xsl/latex/libtext.xspec b/xsl/latex/libtext.xspec
index c8620d9..c696192 100644
--- a/xsl/latex/libtext.xspec
+++ b/xsl/latex/libtext.xspec
@@ -61,9 +61,10 @@
             <tei:l>Du siehst, wohin du <tei:hi>siehst, <tei:caesura/> nur</tei:hi> eitelkeit auf
                 erden.</tei:l>
         </x:context>
-        <x:expect label="is treated as a stanza"
-            test="matches(., '\\stanza\\relax %&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}Du siehst, wohin du siehst, \\caesura\{\} nur eitelkeit auf erden.\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%\s+')"
-        />
+        <x:expect label="is treated as a stanza (start)"
+            test="matches(., '^\s*\\stanza\\relax\s*%&#xa;\\edlabel\{[^}]+\}Du')"/>
+        <x:expect label="is treated as a stanza (end)"
+            test="matches(., 'erden\.\\edlabel\{[^}]+\}\\&amp;%\s+')"/>
     </x:scenario>
 
     <x:scenario label="multiple verses">
@@ -74,14 +75,19 @@
                 <tei:l>Was dieser heute baut, <tei:caesura/> reißt jener morgen ein,</tei:l>
             </tei:lg>
         </x:context>
+        <x:expect label="has verse and stanza starts"
+            test="matches(., '^\s*\\stanza\\relax\s*%&#xa;\\edlabel\{[^}]+\}\\edlabel\{[^}]+\}Du')"/>
         <x:expect label="has verse ending and stanza ending"
-            test="matches(., '\\stanza\\relax %&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du siehst, wohin du siehst, \\caesura\{\} nur eitelkeit auf\s+erden.\\edlabel\{[a-zA-Z0-9_-]+\}&amp;%\s+\\edlabel\{[a-zA-Z0-9_-]+\}Was dieser heute baut, \\caesura\{\} reißt jener morgen ein,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%\s+')"
-        />
+            test="matches(., 'ein,\\edlabel\{[^}]+\}\\edlabel\{[^}]+\}\\&amp;%\s+$')"/>
+        <x:expect label="has verse endings and starts"
+            test="matches(., 'erden.\\edlabel\{[^}]+\}&amp;%\s+\\edlabel\{[^}]+\}Was')"/>
     </x:scenario>
 
     <x:scenario label="multiple verses in internal double end point app">
         <x:context mode="text:text">
-            <tei:variantEncoding method="double-end-point" location="internal"/>
+            <tei:teiHeader>
+                <tei:variantEncoding method="double-end-point" location="internal"/>
+            </tei:teiHeader>
             <tei:anchor xml:id="a1"/>
             <tei:lg>
                 <tei:l>Du siehst, wohin du <tei:hi>siehst, <tei:caesura/> nur</tei:hi> eitelkeit auf
@@ -93,7 +99,7 @@
             </tei:app>
         </x:context>
         <x:expect label="has verse ending and stanza ending"
-            test="matches(., 'Du siehst, wohin du siehst, \\caesura\{\} nur eitelkeit auf\s+erden.\\edlabel\{[a-zA-Z0-9_-]+\}&amp;%\s+\\edlabel\{[a-zA-Z0-9_-]+\}Was dieser heute baut, \\caesura\{\} reißt jener morgen ein,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;')"/>
+            test="matches(., 'ein,\\edlabel\{[^}]+\}\\edlabel\{[^}]+\}\\&amp;')"/>
         <x:expect label="has preferred start macro from anchor"
             test="matches(., '^\s*\\stanza\\relax %preferred from tei:anchor&#xa;')"/>
         <x:expect label="has edlabel from anchor"
@@ -117,8 +123,10 @@
                 </tei:app>
             </tei:lg>
         </x:context>
-        <x:expect label="has verse ending and stanza ending and label from anchor"
-            test="matches(., '\\stanza\\relax %&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du siehst, wohin du siehst, \\caesura\{\} nur eitelkeit auf\s+erden.\\edlabel\{[a-zA-Z0-9_-]+\}&amp;%\s+\\edlabel\{a2\}\\edlabel\{[a-zA-Z0-9_-]+\}Was dieser heute baut, \\caesura\{\} reißt jener morgen ein,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;')"/>
+        <x:expect label="has verse ending and stanza ending"
+            test="matches(., 'ein,\\edlabel\{[^}]+\}\\edlabel\{[^}]+\}\\&amp;')"/>
+        <x:expect label="has label from anchor"
+            test="matches(., 'erden.\\edlabel\{[^}]+\}&amp;%\s+\\edlabel\{a2\}\\edlabel\{[^}]+\}Was')"/>
         <x:expect label="no delayed end macro from app"
             test="matches(., 'ein,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%\s+$')"
         />
@@ -126,7 +134,9 @@
 
     <x:scenario label="parallel segmentation apparatus, single missing verse in stanza">
         <x:context mode="text:text">
-            <tei:variantEncoding method="parallel-segmentation" location="internal"/>
+            <tei:teiHeader>
+                <tei:variantEncoding method="parallel-segmentation" location="internal"/>
+            </tei:teiHeader>
             <tei:lg>
                 <tei:l>Du siehst, wohin du <tei:hi>siehst, <tei:caesura/> nur</tei:hi> eitelkeit auf
                     erden.</tei:l>
@@ -138,8 +148,10 @@
                 </tei:app>
             </tei:lg>
         </x:context>
-        <x:expect label="has verse ending and stanza ending and label from anchor"
-            test="matches(., '\\stanza\\relax %&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du siehst, wohin du siehst, \\caesura\{\} nur eitelkeit auf\s+erden.\\edlabel\{[a-zA-Z0-9_-]+\}&amp;%\s+\\edlabel\{a3-start\}\\edlabel\{[a-zA-Z0-9_-]+\}Was dieser heute baut, \\caesura\{\} reißt jener morgen ein,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;')"/>
+        <x:expect label="has verse ending and stanza ending"
+            test="matches(., 'ein,\\edlabel\{[^}]+\}\\edlabel\{[^}]+\}\\&amp;')"/>
+        <x:expect label="has label from anchor"
+            test="matches(., 'erden.\\edlabel\{[^}]+\}&amp;%\s+\\edlabel\{a3-start\}\\edlabel\{[^}]+\}Was')"/>
         <x:expect label="no delayed end macro from app"
             test="matches(., 'ein,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%\s+$')"
         />
@@ -147,7 +159,9 @@
 
     <x:scenario label="double end-point apparatus around several block elements">
         <x:context mode="text:text">
-            <tei:variantEncoding method="double-end-point" location="internal"/>
+            <tei:teiHeader>
+                <tei:variantEncoding method="double-end-point" location="internal"/>
+            </tei:teiHeader>
             <tei:anchor xml:id="a3"/>
             <tei:p>Ein Barock-Gedicht weiß:</tei:p>
             <tei:lg>
@@ -158,16 +172,22 @@
                 <tei:rdg wit="B"/>
             </tei:app>
         </x:context>
-        <x:expect label="paragraph with preferred \pstart and regular \pend"
-            test="matches(., '^\s*\\pstart\{\}%preferred from tei:anchor&#xa;\\edlabel\{a3\}\\edlabel\{[a-zA-Z0-9_-]+\}Ein\s+Barock-Gedicht\s+weiß:\\edlabel\{[a-zA-Z0-9_-]+\}&#xa;\\pend %&#xa;')"/>
-        <x:expect label="verse with regular \stanza and delayed \&amp;"
-            test="matches(., '\\stanza\\relax %&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du\s+siehst,\s+wohin\s+du\s+siehst,\s+\\caesura\{\}\s+nur\s+eitelkeit\s+auf\s+erden.\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%delayed from tei:app&#xa;\s*$')"
+        <x:expect label="paragraph with preferred \pstart"
+            test="matches(., '^\s*\\pstart\{\}%preferred from tei:anchor&#xa;\\edlabel\{a3\}\\edlabel\{[a-zA-Z0-9_-]+\}Ein')"/>
+        <x:expect label="paragraph with regular \pend"
+            test="matches(., 'weiß:\\edlabel\{[a-zA-Z0-9_-]+\}&#xa;\\pend %&#xa;')"/>
+        <x:expect label="verse with regular \stanza"
+            test="matches(., '\\stanza\\relax %&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du')"/>
+        <x:expect label="verse with delayed \&amp;"
+            test="matches(., 'erden.\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%delayed from tei:app&#xa;\s*$')"
         />
     </x:scenario>
 
     <x:scenario label="double end-point apparatus around several block elements in other order">
         <x:context mode="text:text">
-            <tei:variantEncoding method="double-end-point" location="internal"/>
+            <tei:teiHeader>
+                <tei:variantEncoding method="double-end-point" location="internal"/>
+            </tei:teiHeader>
             <tei:anchor xml:id="a3"/>
             <tei:lg>
                 <tei:l>Du siehst, wohin du <tei:hi>siehst, <tei:caesura/> nur</tei:hi> eitelkeit auf
@@ -178,8 +198,10 @@
                 <tei:rdg wit="B"/>
             </tei:app>
         </x:context>
-        <x:expect label="verse with preferred \stanza and regular \&amp;"
-            test="matches(., '^\s*\\stanza\\relax %preferred from tei:anchor&#xa;\\edlabel\{a3\}\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du\s+siehst,\s+wohin\s+du\s+siehst,\s+\\caesura\{\}\s+nur\s+eitelkeit\s+auf\s+erden,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%&#xa;')"/>
+        <x:expect label="verse with preferred \stanza"
+            test="matches(., '^\s*\\stanza\\relax %preferred from tei:anchor&#xa;\\edlabel\{a3\}\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}Du')"/>
+        <x:expect label="verse with regular \&amp;"
+            test="matches(., 'erden,\\edlabel\{[a-zA-Z0-9_-]+\}\\edlabel\{[a-zA-Z0-9_-]+\}\\&amp;%&#xa;')"/>
         <x:expect label="paragraph with regular \pstart and delayed \pend"
             test="matches(., '\\pstart\{\}%&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}weiß\s+ein\s+Barock-Gedicht.\\edlabel\{[a-zA-Z0-9_-]+\}&#xa;\s*\\pend %delayed from tei:app&#xa;\s*$')"
         />
@@ -190,8 +212,8 @@
         <x:context mode="text:text">
             <tei:p>The quick <tei:sic>braun</tei:sic> fox</tei:p>
         </x:context>
-        <x:expect label="has start label"
-            test="matches(., '\\pstart\{\}%&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}The quick \\edlabel\{[a-zA-Z0-9]+-start\}braun fox\\edlabel\{[a-zA-Z0-9_-]+\}\s+\\pend\s*%&#xa;\s*$')"
+        <x:expect label="has start and end labels"
+            test="matches(., '\\edlabel\{[a-zA-Z0-9]+-start\}braun fox\\edlabel\{[a-zA-Z0-9]+-end\}')"
         />
     </x:scenario>
 
@@ -199,8 +221,8 @@
         <x:context mode="text:text">
             <tei:p>The quick <tei:corr>brown</tei:corr> fox</tei:p>
         </x:context>
-        <x:expect label="has start label"
-            test="matches(., '\\pstart\{\}%&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}The quick \\edlabel\{[a-zA-Z0-9]+-start\}brown fox\\edlabel\{[a-zA-Z0-9_-]+\}\s+\\pend\s*%&#xa;\s*$')"
+        <x:expect label="has start and end labels"
+            test="matches(., '\\edlabel\{[a-zA-Z0-9]+-start\}brown fox\\edlabel\{[a-zA-Z0-9]+-end\}')"
         />
     </x:scenario>
 
@@ -211,7 +233,7 @@
                 fox</tei:p>
         </x:context>
         <x:expect label="has start label and text from corr"
-            test="matches(., '\\pstart\{\}%&#xa;\\edlabel\{[a-zA-Z0-9_-]+\}The\s+quick\s+\\edlabel\{[a-zA-Z0-9]+-start\}brown\s+fox\\edlabel\{[a-zA-Z0-9_-]+\}\s+\\pend\s*%&#xa;\s*$')"
+            test="matches(., '\\edlabel\{[a-zA-Z0-9]+-start\}brown\\edlabel\{[a-zA-Z0-9]+-end\}')"
         />
     </x:scenario>
 
@@ -240,7 +262,7 @@
                 </tei:span>len mit den herden.</tei:l>
         </x:context>
         <x:expect label="text from span not in output"
-            test="normalize-space() => matches('spielen')"/>
+            test="normalize-space() => matches('spie(\\edlabel\{[^}]+\})*len')"/>
     </x:scenario>
 
 
@@ -372,7 +394,7 @@
     </x:scenario>
 
     <x:scenario label="index from persName">
-        <x:context>
+        <x:context mode="text:text">
             <tei:persName ref="#oma">Oma</tei:persName>
         </x:context>
         <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>
@@ -385,7 +407,7 @@
     </x:scenario>
 
     <x:scenario label="index from placeName">
-        <x:context>
+        <x:context mode="text:text">
             <tei:placeName ref="#rome">Roma</tei:placeName>
         </x:context>
         <x:expect label="has start label" test="matches(., '^\\edlabel\{[a-zA-Z0-9]+-start\}')"/>

From 6fded3e45f954a211b3ccef206c8ee846047b6b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Wed, 9 Oct 2024 17:07:08 +0200
Subject: [PATCH 5/7] libtext does not expose modes app:reading-text and
 note:editorial

---
 xsl/latex/libtext.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xsl/latex/libtext.xsl b/xsl/latex/libtext.xsl
index 6781bb7..dfb3d6c 100644
--- a/xsl/latex/libtext.xsl
+++ b/xsl/latex/libtext.xsl
@@ -29,7 +29,7 @@
   <xsl:use-package
     name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/librend.xsl"
     package-version="1.0.0">
-    <xsl:accept component="mode" names="*" visibility="public"/>
+    <xsl:accept component="mode" names="text:*" visibility="public"/>
     <xsl:accept component="function" names="*" visibility="public"/>
     <xsl:accept component="template" names="*" visibility="public"/>
 

From 0bc83bd1d07b5f3ca2abc993ff0de6907643e6aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Wed, 9 Oct 2024 17:07:49 +0200
Subject: [PATCH 6/7] use before and after hooks, not asymmetrically ahead and
 after

---
 xsl/projects/alea/latex/prose.xsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xsl/projects/alea/latex/prose.xsl b/xsl/projects/alea/latex/prose.xsl
index 67762d7..d38cecc 100644
--- a/xsl/projects/alea/latex/prose.xsl
+++ b/xsl/projects/alea/latex/prose.xsl
@@ -250,7 +250,7 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
         </xsl:if>
       </xsl:template>
 
-      <xsl:template mode="text:hook-ahead" match="quote[@type eq 'verbatim-holy']">
+      <xsl:template mode="text:hook-before" match="quote[@type eq 'verbatim-holy']">
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>opening parenthesis for verbatim citation of holy text</xsl:text>
         </xsl:message>
@@ -264,7 +264,7 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
         <xsl:text>\arabicornatecparen{}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-ahead" match="quote[@type eq 'verbatim']">
+      <xsl:template mode="text:hook-before" match="quote[@type eq 'verbatim']">
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>opening parenthesis for verbatim citation of holy text</xsl:text>
         </xsl:message>

From 2c42df73fc667b5c8ade8ef7e1f5043bff1f7ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian.lueck@uni-muenster.de>
Date: Wed, 9 Oct 2024 17:48:16 +0200
Subject: [PATCH 7/7] follow the contribution rule regarding namespaces

---
 xsl/latex/librend.xsl             | 55 +++++++++++++-------------
 xsl/latex/libtext.xsl             | 64 ++++++++++++++++---------------
 xsl/projects/alea/latex/prose.xsl | 22 +++++------
 3 files changed, 71 insertions(+), 70 deletions(-)

diff --git a/xsl/latex/librend.xsl b/xsl/latex/librend.xsl
index c36c29a..e04e982 100644
--- a/xsl/latex/librend.xsl
+++ b/xsl/latex/librend.xsl
@@ -8,13 +8,13 @@
   name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/librend.xsl"
   package-version="1.0.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:map="http://www.w3.org/2005/xpath-functions/map"
-  xmlns:i18n="http://scdh.wwu.de/transform/i18n#" xmlns:text="http://scdh.wwu.de/transform/text#"
+  xmlns:rend="http://scdh.wwu.de/transform/rend#" xmlns:text="http://scdh.wwu.de/transform/text#"
   xmlns:app="http://scdh.wwu.de/transform/app#" xmlns:note="http://scdh.wwu.de/transform/note#"
   xmlns:edmac="http://scdh.wwu.de/transform/edmac#" exclude-result-prefixes="#all"
   xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="3.0">
 
   <!-- names of indices (used by imakeidx) -->
-  <xsl:param name="text:indices" as="xs:string*" required="false"
+  <xsl:param name="rend:indices" as="xs:string*" required="false"
     select="'person', 'place', 'org', 'event'"/>
 
   <xsl:use-package
@@ -50,38 +50,38 @@
 
       <!-- add hooks everywhere -->
       <xsl:template mode="text:text app:reading-text note:editorial" match="*">
-        <xsl:call-template name="text:hooks"/>
+        <xsl:call-template name="rend:hooks"/>
       </xsl:template>
 
 
       <!-- named entities make up indices. Its up to downstream packages to use them or to let the go. -->
 
       <xsl:template mode="text:text app:reading-text note:editorial" match="rs">
-        <xsl:call-template name="text:index-entity">
+        <xsl:call-template name="rend:index-entity">
           <xsl:with-param name="index" select="@type"/>
         </xsl:call-template>
       </xsl:template>
 
       <xsl:template mode="text:text app:reading-text note:editorial" match="persName">
-        <xsl:call-template name="text:index-entity">
+        <xsl:call-template name="rend:index-entity">
           <xsl:with-param name="index">person</xsl:with-param>
         </xsl:call-template>
       </xsl:template>
 
       <xsl:template mode="text:text app:reading-text note:editorial" match="placeName">
-        <xsl:call-template name="text:index-entity">
+        <xsl:call-template name="rend:index-entity">
           <xsl:with-param name="index">place</xsl:with-param>
         </xsl:call-template>
       </xsl:template>
 
       <xsl:template mode="text:text app:reading-text note:editorial" match="orgName">
-        <xsl:call-template name="text:index-entity">
+        <xsl:call-template name="rend:index-entity">
           <xsl:with-param name="index">org</xsl:with-param>
         </xsl:call-template>
       </xsl:template>
 
       <xsl:template mode="text:text app:reading-text note:editorial" match="eventName">
-        <xsl:call-template name="text:index-entity">
+        <xsl:call-template name="rend:index-entity">
           <xsl:with-param name="index">event</xsl:with-param>
         </xsl:call-template>
       </xsl:template>
@@ -90,47 +90,46 @@
   </xsl:use-package>
 
   <!-- hooks -->
-  <xsl:mode name="text:hook-ahead" on-no-match="deep-skip" visibility="public"/>
-  <xsl:mode name="text:hook-before" on-no-match="deep-skip" visibility="public"/>
-  <xsl:mode name="text:hook-after" on-no-match="deep-skip" visibility="public"/>
-  <xsl:mode name="text:hook-behind" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="rend:hook-ahead" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="rend:hook-before" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="rend:hook-after" on-no-match="deep-skip" visibility="public"/>
+  <xsl:mode name="rend:hook-behind" on-no-match="deep-skip" visibility="public"/>
 
-  <xsl:template name="text:hooks" visibility="public">
+  <xsl:template name="rend:hooks" visibility="public">
     <xsl:context-item as="element()" use="required"/>
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
+    <xsl:apply-templates mode="rend:hook-ahead" select="."/>
     <xsl:call-template name="edmac:edlabel">
       <xsl:with-param name="suffix" select="'-start'"/>
     </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
+    <xsl:apply-templates mode="rend:hook-before" select="."/>
     <!-- #current mode on children.
       This works albeit we are in a named template!
-      Its guaranteed by the specs.
-      Quote From the XSLT 3.0 TR:
+      Its guaranteed by the specs. Quote From the XSLT 3.0 TR:
       "Definition: At any point in the processing of a stylesheet,
       there is a current mode." -->
     <xsl:apply-templates mode="#current"/>
-    <xsl:apply-templates mode="text:hook-after" select="."/>
+    <xsl:apply-templates mode="rend:hook-after" select="."/>
     <xsl:call-template name="edmac:edlabel">
       <xsl:with-param name="suffix" select="'-end'"/>
     </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
+    <xsl:apply-templates mode="rend:hook-behind" select="."/>
   </xsl:template>
 
 
   <!-- named template that generates entries to the indices.
     This also calls the hooks.
     The index parameter should be of the values of rs/@type, i.e., 'person', 'place', 'org', 'event', etc. -->
-  <xsl:template name="text:index-entity" visibility="public">
+  <xsl:template name="rend:index-entity" visibility="public">
     <xsl:context-item as="element()" use="required"/>
     <xsl:param name="index" as="xs:string" required="true"/>
     <!-- early hooks and start label -->
-    <xsl:apply-templates mode="text:hook-ahead" select="."/>
+    <xsl:apply-templates mode="rend:hook-ahead" select="."/>
     <xsl:call-template name="edmac:edlabel">
       <xsl:with-param name="suffix" select="'-start'"/>
     </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-before" select="."/>
+    <xsl:apply-templates mode="rend:hook-before" select="."/>
     <!-- output index macro -->
-    <xsl:for-each select="text:index-keys(., $index)">
+    <xsl:for-each select="rend:index-keys(., $index)">
       <xsl:text>\index[</xsl:text>
       <xsl:value-of select="$index"/>
       <xsl:text>]{</xsl:text>
@@ -140,15 +139,15 @@
     <!-- current mode on children -->
     <xsl:apply-templates mode="#current"/>
     <!-- late hooks and ending label -->
-    <xsl:apply-templates mode="text:hook-after" select="."/>
+    <xsl:apply-templates mode="rend:hook-after" select="."/>
     <xsl:call-template name="edmac:edlabel">
       <xsl:with-param name="suffix" select="'-end'"/>
     </xsl:call-template>
-    <xsl:apply-templates mode="text:hook-behind" select="."/>
+    <xsl:apply-templates mode="rend:hook-behind" select="."/>
   </xsl:template>
 
   <!-- likely to be replaced with a more sophisticated function that gets names for keys -->
-  <xsl:function name="text:index-keys" as="xs:string*" visibility="public">
+  <xsl:function name="rend:index-keys" as="xs:string*" visibility="public">
     <xsl:param name="context" as="element()"/>
     <xsl:param name="index" as="xs:string"/>
     <xsl:variable name="keys" as="xs:string*">
@@ -166,12 +165,12 @@
 
 
   <!-- contributions to the latex prologue -->
-  <xsl:template name="text:latex-header-index" visibility="public">
+  <xsl:template name="rend:latex-header-index" visibility="public">
     <xsl:context-item as="item()" use="required"/>
     <xsl:text>&lb;\makeatletter%</xsl:text>
     <xsl:text>&lb;\@ifpackageloaded{imakeidx}{}{\usepackage{imakeidx}}%</xsl:text>
     <xsl:text>&lb;\makeatother%</xsl:text>
-    <xsl:for-each select="(root(.)//rs/@type ! string(), $text:indices) => distinct-values()">
+    <xsl:for-each select="(root(.)//rs/@type ! string(), $rend:indices) => distinct-values()">
       <xsl:text>&lb;\makeindex[name=</xsl:text>
       <xsl:value-of select="."/>
       <xsl:text>,title={</xsl:text>
diff --git a/xsl/latex/libtext.xsl b/xsl/latex/libtext.xsl
index dfb3d6c..990d67f 100644
--- a/xsl/latex/libtext.xsl
+++ b/xsl/latex/libtext.xsl
@@ -8,8 +8,9 @@
   package-version="1.0.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:map="http://www.w3.org/2005/xpath-functions/map"
   xmlns:i18n="http://scdh.wwu.de/transform/i18n#" xmlns:text="http://scdh.wwu.de/transform/text#"
-  xmlns:edmac="http://scdh.wwu.de/transform/edmac#" exclude-result-prefixes="#all"
-  xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="3.0" default-mode="text:text">
+  xmlns:edmac="http://scdh.wwu.de/transform/edmac#" xmlns:rend="http://scdh.wwu.de/transform/rend#"
+  exclude-result-prefixes="#all" xpath-default-namespace="http://www.tei-c.org/ns/1.0" version="3.0"
+  default-mode="text:text">
 
 
   <!-- corrects how the section level is set from the level of divs a head coccurs in -->
@@ -29,7 +30,8 @@
   <xsl:use-package
     name="https://scdh.zivgitlabpages.uni-muenster.de/tei-processing/transform/xsl/latex/librend.xsl"
     package-version="1.0.0">
-    <xsl:accept component="mode" names="text:*" visibility="public"/>
+    <xsl:accept component="mode" names="text:text" visibility="public"/>
+    <xsl:accept component="mode" names="rend:*" visibility="public"/>
     <xsl:accept component="function" names="*" visibility="public"/>
     <xsl:accept component="template" names="*" visibility="public"/>
 
@@ -60,12 +62,12 @@
 
       <xsl:template match="head">
         <xsl:variable name="level" as="xs:integer" select="text:section-level(.)"/>
-        <xsl:apply-templates mode="text:hook-ahead" select=".">
+        <xsl:apply-templates mode="rend:hook-ahead" select=".">
           <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
         </xsl:apply-templates>
         <xsl:text>&lb;</xsl:text>
         <xsl:call-template name="edmac:par-start"/>
-        <xsl:apply-templates mode="text:hook-before" select=".">
+        <xsl:apply-templates mode="rend:hook-before" select=".">
           <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
         </xsl:apply-templates>
         <xsl:text>&lb;\eled</xsl:text>
@@ -81,17 +83,17 @@
           <xsl:with-param name="suffix" select="'-end'"/>
         </xsl:call-template>
         <xsl:text>}</xsl:text>
-        <xsl:apply-templates mode="text:hook-after" select=".">
+        <xsl:apply-templates mode="rend:hook-after" select=".">
           <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
         </xsl:apply-templates>
         <xsl:call-template name="edmac:par-end"/>
         <xsl:text>&lb;&lb;</xsl:text>
-        <xsl:apply-templates mode="text:hook-behind" select=".">
+        <xsl:apply-templates mode="rend:hook-behind" select=".">
           <xsl:with-param name="level" as="xs:integer" select="$level" tunnel="true"/>
         </xsl:apply-templates>
       </xsl:template>
 
-      <xsl:template mode="text:hook-ahead" match="head">
+      <xsl:template mode="rend:hook-ahead" match="head">
         <xsl:param name="level" as="xs:integer" select="0" tunnel="true"/>
         <xsl:choose>
           <xsl:when test="not($edmac:section-workaround)"/>
@@ -104,7 +106,7 @@
         </xsl:choose>
       </xsl:template>
 
-      <xsl:template mode="text:hook-after" match="head">
+      <xsl:template mode="rend:hook-after" match="head">
         <xsl:param name="level" as="xs:integer" select="0" tunnel="true"/>
         <xsl:choose>
           <xsl:when test="not($edmac:section-workaround)"/>
@@ -118,7 +120,7 @@
       </xsl:template>
 
       <xsl:template match="div | div1 | div2 | div3 | div4 | div5 | div6 | div7">
-        <xsl:apply-templates mode="text:hook-ahead" select="."/>
+        <xsl:apply-templates mode="rend:hook-ahead" select="."/>
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
@@ -126,7 +128,7 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-end'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-behind" select="."/>
+        <xsl:apply-templates mode="rend:hook-behind" select="."/>
       </xsl:template>
 
       <xsl:template match="p">
@@ -143,39 +145,39 @@
       </xsl:template>
 
       <xsl:template match="lg[not(lg)]">
-        <xsl:apply-templates mode="text:hook-ahead" select="."/>
+        <xsl:apply-templates mode="rend:hook-ahead" select="."/>
         <xsl:call-template name="edmac:stanza-start"/>
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <xsl:apply-templates/>
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-end'"/>
         </xsl:call-template>
         <xsl:call-template name="edmac:stanza-end"/>
-        <xsl:apply-templates mode="text:hook-behind" select="."/>
+        <xsl:apply-templates mode="rend:hook-behind" select="."/>
       </xsl:template>
 
       <!-- a single verse not in lg is output as a stanza -->
       <xsl:template match="l[not(ancestor::lg)]">
-        <xsl:apply-templates mode="text:hook-ahead" select="."/>
+        <xsl:apply-templates mode="rend:hook-ahead" select="."/>
         <xsl:call-template name="edmac:stanza-start"/>
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <xsl:variable name="latex" as="text()*">
           <xsl:call-template name="text:verse"/>
         </xsl:variable>
         <xsl:value-of select="edmac:normalize($latex)"/>
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-end'"/>
         </xsl:call-template>
         <xsl:call-template name="edmac:stanza-end"/>
-        <xsl:apply-templates mode="text:hook-behind" select="."/>
+        <xsl:apply-templates mode="rend:hook-behind" select="."/>
       </xsl:template>
 
       <xsl:template match="l[ancestor::lg]">
@@ -260,9 +262,9 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <xsl:text>[...]</xsl:text>
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="text:inline-footnotes"/>
         <xsl:call-template name="edmac:app-end"/>
       </xsl:template>
@@ -272,11 +274,11 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <!--xsl:text>[</xsl:text-->
         <xsl:apply-templates/>
         <!--xsl:text>]</xsl:text-->
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="text:inline-footnotes"/>
         <xsl:call-template name="edmac:app-end"/>
       </xsl:template>
@@ -286,11 +288,11 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <!--xsl:text>[? </xsl:text-->
         <xsl:apply-templates/>
         <!--xsl:text> ?]</xsl:text-->
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="text:inline-footnotes"/>
         <xsl:call-template name="edmac:app-end"/>
       </xsl:template>
@@ -300,9 +302,9 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <xsl:apply-templates select="corr"/>
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="text:inline-footnotes"/>
         <xsl:call-template name="edmac:app-end"/>
       </xsl:template>
@@ -312,9 +314,9 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <xsl:apply-templates/>
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="text:inline-footnotes"/>
         <xsl:call-template name="edmac:app-end"/>
       </xsl:template>
@@ -324,9 +326,9 @@
         <xsl:call-template name="edmac:edlabel">
           <xsl:with-param name="suffix" select="'-start'"/>
         </xsl:call-template>
-        <xsl:apply-templates mode="text:hook-before" select="."/>
+        <xsl:apply-templates mode="rend:hook-before" select="."/>
         <xsl:apply-templates/>
-        <xsl:apply-templates mode="text:hook-after" select="."/>
+        <xsl:apply-templates mode="rend:hook-after" select="."/>
         <xsl:call-template name="text:inline-footnotes"/>
         <xsl:call-template name="edmac:app-end"/>
       </xsl:template>
diff --git a/xsl/projects/alea/latex/prose.xsl b/xsl/projects/alea/latex/prose.xsl
index d38cecc..814a604 100644
--- a/xsl/projects/alea/latex/prose.xsl
+++ b/xsl/projects/alea/latex/prose.xsl
@@ -20,7 +20,7 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
   xmlns:i18n="http://scdh.wwu.de/transform/i18n#" xmlns:app="http://scdh.wwu.de/transform/app#"
   xmlns:note="http://scdh.wwu.de/transform/note#" xmlns:seed="http://scdh.wwu.de/transform/seed#"
   xmlns:text="http://scdh.wwu.de/transform/text#" xmlns:verse="http://scdh.wwu.de/transform/verse#"
-  xmlns:edmac="http://scdh.wwu.de/transform/edmac#"
+  xmlns:edmac="http://scdh.wwu.de/transform/edmac#" xmlns:rend="http://scdh.wwu.de/transform/rend#"
   xmlns:common="http://scdh.wwu.de/transform/common#"
   xmlns:meta="http://scdh.wwu.de/transform/meta#" xmlns:wit="http://scdh.wwu.de/transform/wit#"
   xmlns:alea="http://scdh.wwu.de/transform/alea#"
@@ -228,7 +228,7 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
         <xsl:call-template name="verse:verse"/>
       </xsl:template>
 
-      <xsl:template mode="text:hook-ahead" match="*[@met]">
+      <xsl:template mode="rend:hook-ahead" match="*[@met]">
         <!-- set the verse meter (metrum) before the verse environment starts -->
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>setting verse meter to </xsl:text>
@@ -242,7 +242,7 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
         <xsl:text>}%&lb;</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-behind" match="*[@met]">
+      <xsl:template mode="rend:hook-behind" match="*[@met]">
         <xsl:variable name="is-embedded" as="xs:boolean"
           select="some $t in tokenize(ancestor::div[1]/@type) satisfies  $embedded-verse-contexts = $t"/>
         <xsl:if test="not($is-embedded)">
@@ -250,43 +250,43 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
         </xsl:if>
       </xsl:template>
 
-      <xsl:template mode="text:hook-before" match="quote[@type eq 'verbatim-holy']">
+      <xsl:template mode="rend:hook-before" match="quote[@type eq 'verbatim-holy']">
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>opening parenthesis for verbatim citation of holy text</xsl:text>
         </xsl:message>
         <xsl:text>\arabicornateoparen{}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-after" match="quote[@type eq 'verbatim-holy']">
+      <xsl:template mode="rend:hook-after" match="quote[@type eq 'verbatim-holy']">
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>closing parenthesis for verbatim citation of holy text</xsl:text>
         </xsl:message>
         <xsl:text>\arabicornatecparen{}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-before" match="quote[@type eq 'verbatim']">
+      <xsl:template mode="rend:hook-before" match="quote[@type eq 'verbatim']">
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>opening parenthesis for verbatim citation of holy text</xsl:text>
         </xsl:message>
         <xsl:text>\arabicoparen{}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-after" match="quote[@type eq 'verbatim']">
+      <xsl:template mode="rend:hook-after" match="quote[@type eq 'verbatim']">
         <xsl:message use-when="system-property('debug') eq 'true'">
           <xsl:text>closing parenthesis for verbatim citation of holy text</xsl:text>
         </xsl:message>
         <xsl:text>\arabiccparen{}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-before" match="supplied">
+      <xsl:template mode="rend:hook-before" match="supplied">
         <xsl:text>{\normalfont\arabicobracket{}}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-after" match="supplied">
+      <xsl:template mode="rend:hook-after" match="supplied">
         <xsl:text>{\normalfont\arabiccbracket{}}</xsl:text>
       </xsl:template>
 
-      <xsl:template mode="text:hook-ahead" match="div[not(head)]">
+      <xsl:template mode="rend:hook-ahead" match="div[not(head)]">
         <xsl:text>&lb;\bigskip</xsl:text>
       </xsl:template>
 
@@ -433,7 +433,7 @@ target/bin/xslt.sh -config:saxon.he.xml -xsl:xsl/projects/alea/latex/prose.xsl -
     <xsl:call-template name="i18n:latex-header"/>
     <xsl:call-template name="app:latex-header"/>
     <xsl:call-template name="arabic-numbering"/>
-    <xsl:call-template name="text:latex-header-index"/>
+    <xsl:call-template name="rend:latex-header-index"/>
 
     <!-- does not give footnotes in para
     <xsl:text>&lb;\let\Footnote\undefined</xsl:text>