diff --git a/evolve-hub/driver-docx.xpl b/evolve-hub/driver-docx.xpl
index e76727d..8df0be9 100644
--- a/evolve-hub/driver-docx.xpl
+++ b/evolve-hub/driver-docx.xpl
@@ -11,6 +11,35 @@
   <p:input port="stylesheet" primary="false"/>
   <p:input port="parameters" kind="parameter" primary="true"/>
   <p:output port="result" primary="true"/>
+
+  <p:output port="report" sequence="true">
+    <p:pipe port="report" step="split-at-tab"/>
+    <p:pipe port="report" step="dissolve-sidebars-without-purpose"/>
+    <p:pipe port="report" step="meta-infos-to-sidebar"/>
+    <p:pipe port="report" step="preprocess-hierarchy"/>
+    <p:pipe port="report" step="hierarchy"/>
+    <p:pipe port="report" step="postprocess-hierarchy"/>
+    <p:pipe port="report" step="figure-captions"/>
+    <p:pipe port="report" step="table-captions"/>
+    <p:pipe port="report" step="repair-hierarchy"/>
+    <p:pipe port="report" step="process-meta"/>
+    <p:pipe port="report" step="join-phrases"/>
+    <p:pipe port="report" step="twipsify-lengths"/>
+    <p:pipe port="report" step="identifiers"/>
+    <p:pipe port="report" step="tabs-to-indent"/>
+    <p:pipe port="report" step="handle-indent"/>
+    <p:pipe port="report" step="strip-space"/>
+    <p:pipe port="report" step="prepare-lists"/>
+    <p:pipe port="report" step="lists"/>
+    <p:pipe port="report" step="postprocess-lists"/>
+    <p:pipe port="report" step="ids"/>
+    <p:pipe port="report" step="blockquotes"/>
+    <p:pipe port="report" step="clean-hub"/>
+    <p:pipe port="report" step="repair-language-markup"/>
+    <p:pipe port="report" step="preprocess-hyphens"/>
+    <p:pipe port="report" step="custom-1"/>
+    <p:pipe port="report" step="custom-2"/>
+  </p:output>
   
   <p:option name="debug" required="false" select="'no'"/>
   <p:option name="debug-dir-uri" select="'debug'"/>
@@ -22,7 +51,7 @@
   <p:import href="http://transpect.io/evolve-hub/xpl/evolve-hub_lists-by-indent.xpl"/>
   <p:import href="http://transpect.io/cascade/xpl/load-cascaded.xpl"/>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/00" mode="hub:split-at-tab">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/00" mode="hub:split-at-tab" name="split-at-tab">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -32,7 +61,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/01" mode="hub:dissolve-sidebars-without-purpose">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/01" mode="hub:dissolve-sidebars-without-purpose" name="dissolve-sidebars-without-purpose">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -42,7 +71,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/02" mode="hub:meta-infos-to-sidebar">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/02" mode="hub:meta-infos-to-sidebar" name="meta-infos-to-sidebar">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="models"><p:empty/></p:input>
     <p:with-option name="debug" select="$debug"/>
@@ -51,7 +80,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/03" mode="hub:preprocess-hierarchy">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/03" mode="hub:preprocess-hierarchy" name="preprocess-hierarchy">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -61,7 +90,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/04" mode="hub:hierarchy">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/04" mode="hub:hierarchy" name="hierarchy">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -71,7 +100,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/05" mode="hub:postprocess-hierarchy">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/05" mode="hub:postprocess-hierarchy" name="postprocess-hierarchy">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -81,7 +110,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/12" mode="hub:figure-captions">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/12" mode="hub:figure-captions" name="figure-captions">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -91,7 +120,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/13" mode="hub:table-captions">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/13" mode="hub:table-captions" name="table-captions">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -101,7 +130,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/40" mode="hub:repair-hierarchy">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/40" mode="hub:repair-hierarchy" name="repair-hierarchy">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -120,7 +149,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/42" mode="hub:join-phrases">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/42" mode="hub:join-phrases" name="join-phrases">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -130,7 +159,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/43" mode="hub:twipsify-lengths">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/43" mode="hub:twipsify-lengths" name="twipsify-lengths">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -140,7 +169,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/44" mode="hub:identifiers">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/44" mode="hub:identifiers" name="identifiers">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -150,7 +179,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.2" prefix="evolve-hub/51" mode="hub:tabs-to-indent" name="tabs-to-indent">
+  <tr:xslt-mode msg="yes" hub-version="1.2" prefix="evolve-hub/51" mode="hub:tabs-to-indent"  name="tabs-to-indent">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -209,7 +238,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/60" mode="hub:ids">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/60" mode="hub:ids" name="ids">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -219,7 +248,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/65" mode="hub:blockquotes">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/65" mode="hub:blockquotes" name="blockquotes">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -229,7 +258,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/90" mode="hub:clean-hub">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/90" mode="hub:clean-hub" name="clean-hub">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -239,7 +268,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/91" mode="hub:repair-language-markup">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/91" mode="hub:repair-language-markup" name="repair-language-markup">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -249,7 +278,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
 
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/93" mode="preprocess-hyphens">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/93" mode="preprocess-hyphens"  name="preprocess-hyphens">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -259,7 +288,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/95" mode="custom-1">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/95" mode="custom-1" name="custom-1">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
@@ -269,7 +298,7 @@
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
   </tr:xslt-mode>
   
-  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/96" mode="custom-2">
+  <tr:xslt-mode msg="yes" hub-version="1.1" prefix="evolve-hub/96" mode="custom-2" name="custom-2">
     <p:input port="stylesheet"><p:pipe step="driver-docx" port="stylesheet"/></p:input>
     <p:input port="parameters"><p:pipe step="driver-docx" port="parameters"/></p:input>
     <p:input port="models"><p:empty/></p:input>
diff --git a/evolve-hub/driver-docx.xsl b/evolve-hub/driver-docx.xsl
index 22de78d..cd20f0e 100644
--- a/evolve-hub/driver-docx.xsl
+++ b/evolve-hub/driver-docx.xsl
@@ -8,6 +8,7 @@
   xmlns:functx="http://www.functx.com"
   xmlns:xml2tex="http://transpect.io/xml2tex"
   xmlns:tr="http://transpect.io"
+  xmlns:mml="http://www.w3.org/1998/Math/MathML"
   xmlns="http://docbook.org/ns/docbook" 
   xpath-default-namespace="http://docbook.org/ns/docbook"
   exclude-result-prefixes="xs hub dbk xlink functx xml2tex" 
@@ -164,19 +165,18 @@
     </xsl:copy>
   </xsl:template>
   
-  <xsl:template match="*[not(self::blockquote)][para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex))]]" 
+  <xsl:template match="*[not(self::blockquote)][para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex), 'i')]]" 
                 name="build-blockquotes" 
                 mode="hub:blockquotes" xmlns="http://docbook.org/ns/docbook">
     <xsl:param name="wrapper-element-name" select="name()" as="xs:string" tunnel="no"/>
     <xsl:element name="{$wrapper-element-name}">
       <xsl:apply-templates select="@*" mode="#current"/>
-      <xsl:for-each-group select="*|processing-instruction()" group-adjacent="self::para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex))] 
-                                                                              or
-                                                                              self::processing-instruction()[preceding-sibling::*[1][self::para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex))]] 
-                                                                                                             and
-                                                                                                             following-sibling::*[1][self::para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex))]]]">
-
-
+      <xsl:for-each-group select="*|processing-instruction()" 
+                          group-adjacent="self::para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex), 'i')] 
+                                          or
+                                          self::processing-instruction()[preceding-sibling::*[1][self::para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex), 'i')]] 
+                                                                         and
+                                                                         following-sibling::*[1][self::para[matches(@role, concat($hub:blockquote-role-regex,'|',$hub:blockquote-source-role-regex), 'i')]]]">
         <!-- all blockquote paras -->
           <xsl:choose>
             <xsl:when test="current-grouping-key()">
@@ -185,14 +185,14 @@
                                                                   = substring(preceding-sibling::*[1][self::para]/@role, 1, 6))]
                                                                  [normalize-space()] 
                                                          or
-                                                         self::para[matches(@role,$hub:blockquote-role-regex)]
-                                                                   [preceding-sibling::*[1][self::para[matches(@role,$hub:blockquote-source-role-regex)]]]
+                                                         self::para[matches(@role,$hub:blockquote-role-regex, 'i')]
+                                                                   [preceding-sibling::*[1][self::para[matches(@role, $hub:blockquote-source-role-regex, 'i')]]]
                                                          ]">
-               <xsl:variable name="blockquote-source" as="element(dbk:para)*" select="current-group()[matches(@role, $hub:blockquote-source-role-regex)]"/>
+                <xsl:variable name="blockquote-source" as="element(dbk:para)*" select="current-group()[matches(@role, $hub:blockquote-source-role-regex, 'i')]"/>
                 <!-- splitted in different blockquote-types: '^([a-z]{1,3}motto|[a-z]{1,3}dialogue|[a-z]{1,3}quotation)$' -->
                 <xsl:element name="blockquote">
-                  <xsl:apply-templates select="current-group()[matches(@role, $hub:blockquote-role-regex)][1]/@role" mode="#current"/>
-                  <xsl:if test="current-group()[1]/preceding-sibling::*[1]/self::para[matches(@role, $hub:blockquote-heading-role-regex)]">
+                  <xsl:apply-templates select="current-group()[matches(@role, $hub:blockquote-role-regex, 'i')][1]/@role" mode="#current"/>
+                  <xsl:if test="current-group()[1]/preceding-sibling::*[1]/self::para[matches(@role, $hub:blockquote-heading-role-regex, 'i')]">
                     <title>
                       <xsl:apply-templates select="current-group()[1]/preceding-sibling::node()[1]/node()" mode="#current"/>
                     </title>
@@ -202,7 +202,7 @@
                       <xsl:apply-templates select="$blockquote-source/@*, $blockquote-source/node()" mode="#current"/>
                     </attribution>
                   </xsl:if>
-                  <xsl:apply-templates select="current-group()[not(matches(@role, $hub:blockquote-source-role-regex))]
+                  <xsl:apply-templates select="current-group()[not(matches(@role, $hub:blockquote-source-role-regex, 'i'))]
                                                               [normalize-space() or processing-instruction()]" mode="#current"/>
                 </xsl:element>
               </xsl:for-each-group>
@@ -273,13 +273,14 @@
   </xsl:template>
   
   <!-- expand xml:lang attributes from styles -->
-
+  <xsl:variable name="expand-lang-from-style" select="true()"/>
+  
   <xsl:template match="*[not(@xml:lang)]
                         [node()]/@srcpath" mode="hub:dissolve-sidebars-without-purpose" priority="10">
     <xsl:variable name="first-child-lang" as="attribute(xml:lang)?" select="../*[@xml:lang][1]/@xml:lang"/>
     <xsl:next-match/>
     <!-- expand lang from styles or pull up lang from children -->
-    <xsl:apply-templates select="key('hub:style-by-role', ../@role)/@xml:lang, 
+    <xsl:apply-templates select="key('hub:style-by-role', ../@role)/@xml:lang[$expand-lang-from-style], 
                                   if (every $child in ../node()[not(self::anchor|self::indexterm|self::tab)] satisfies 
                                       $child[@xml:lang[. = $first-child-lang]
                                              or matches(.,'^[\p{Zs}\.,;!\?]+$')
@@ -406,7 +407,9 @@
        https://redmine.le-tex.de/issues/13193 -->
   
   <xsl:template match="blockquote[not(   para[matches(@role, $info-blockquote-roles)]
-                                      or para[matches(@role, $info-blockquote-source-roles)])]
+                                      or para[matches(@role, $info-blockquote-source-roles)]
+                                      or para[matches(@role, $dialogue-role-regex)]
+                                  )]
                                  [not(count(*) eq 1)]" mode="hub:clean-hub">
     <xsl:variable name="role" select="@role" as="attribute(role)?"/>
     <xsl:for-each-group select="*" group-adjacent="if(matches(@role, $hub:blockquote-source-role-regex) or not(@role))
@@ -437,11 +440,14 @@
   </xsl:template>
     
   <xsl:template match="para[matches(@role, $info-blockquote-source-roles)]
+                           [preceding-sibling::*[1][self::para[matches(@role, $info-blockquote-roles)]
+                                                              [not(parent::blockquote)]]]
                       |*[self::bibliomixed|self::para]/node()[1][self::br]
                       |*[self::bibliomixed|self::para]/br[every $p in preceding-sibling::node() 
                                                           satisfies $p[   not(matches(., '\P{Zs}')) 
                                                                        or empty(.)]]" 
-                mode="hub:clean-hub"/>
+                mode="hub:clean-hub">
+  </xsl:template>
 
   <xsl:template match="*[part]" mode="hub:clean-hub">
     <xsl:copy>
@@ -565,6 +571,7 @@
                 select="concat('(',
                                string-join(
                                            ($figure-image-role-regex, 
+                                            $figure-alt-role-regex, 
                                             $figure-caption-role-regex, 
                                             $figure-source-role-regex,
                                             $figure-link-role-regex
@@ -573,8 +580,7 @@
                                ')')" />
   
   <xsl:template match="*[   para[.//mediaobject]
-                         or para[matches(@role, $figure-image-role-regex, 'i')]]
-                                [normalize-space(replace(., concat($pi-mark, '[a-z]+'), '', 'i'))]" mode="hub:split-at-tab">
+                         or para[matches(@role, $figure-image-role-regex, 'i')]]" mode="hub:split-at-tab">
     <xsl:copy>
       <xsl:apply-templates select="@*" mode="#current"/>
       <xsl:for-each-group select="*" 
@@ -670,12 +676,44 @@
                            [normalize-space(replace(., concat($pi-mark, '[a-z]+'), '', 'i'))]
                            [not(exists(.//mediaobject))]" mode="figures">
     <mediaobject>
+      <xsl:if test="following-sibling::*[1][self::para[matches(@role, $figure-alt-role-regex, 'i')]]">
+        <alt>
+          <xsl:apply-templates select="following-sibling::*[1][self::para[matches(@role, $figure-alt-role-regex, 'i')]]/node()" mode="#current"/>
+        </alt>
+      </xsl:if>
+      <xsl:variable name="figure-name" select="replace(normalize-space(string-join(descendant::text(),'')),concat($pi-mark, '[a-z]+'), '', 'i')"/>
       <imageobject>
-        <imagedata role="archive" fileref="{encode-for-uri(normalize-space(replace(., concat($pi-mark, '[a-z]+'), '', 'i')))}"/>
+        <imagedata role="archive" fileref="{encode-for-uri(normalize-space($figure-name))}"/>
       </imageobject>
     </mediaobject>
   </xsl:template>
   
+  <xsl:template match="inlineequation[following-sibling::*[1][self::phrase[matches(@role, $formula_alt_role_regex)]]]/@role |
+                       equation[../following-sibling::*[1][self::para][empty(inlineequation)][phrase[matches(@role, $formula_alt_role_regex)]]]/@role" mode="hub:split-at-tab">
+    <!-- https://redmine.le-tex.de/issues/13166 -->
+    <xsl:next-match/>
+
+    <alt>
+      <xsl:apply-templates select="if (..[self::inlineequation]) 
+        then ../following-sibling::*[1][self::phrase[matches(@role, $formula_alt_role_regex)]] 
+        else ../../following-sibling::*[1]/phrase[matches(@role, $formula_alt_role_regex)]" mode="text-only"/>
+    </alt>
+  </xsl:template>
+  
+  <xsl:template match="*" mode="text-only" priority="1.5">
+    <xsl:apply-templates select="node()" mode="text-only"/>
+  </xsl:template>
+  
+  <xsl:template match="text()" mode="text-only"  priority="2">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+  
+  <xsl:template match="@*|indexterm|anchor|footnote" mode="text-only" priority="2"/>
+  
+  <xsl:template match="phrase[matches(@role, $formula_alt_role_regex)][preceding-sibling::*[1][self::inlineequation]] | 
+                       phrase[matches(@role, $formula_alt_role_regex)][..[self::para][empty(inlineequation)]
+                                                                      [preceding-sibling::*[1][self::para[equation]]]]" mode="hub:split-at-tab"/>
+  
   <xsl:template match="para[matches(@role, $figure-image-role-regex, 'i')][.//mediaobject]" mode="figures">
     <xsl:apply-templates select=".//mediaobject" mode="#current"/>
   </xsl:template>
@@ -702,13 +740,20 @@
     <xsl:param name="one-caption-for-multiple-images" as="xs:boolean" select="false()"/>
     <xsl:copy>
       <xsl:if test="$one-caption-for-multiple-images">
-        <xsl:attribute name="role" select="parent::para/@role"/>
+        <xsl:attribute name="role" select="ancestor::para[1]/@role"/>
       </xsl:if>
-      <xsl:apply-templates select="@* except @role, node()" mode="hub:split-at-tab"/>
+      <xsl:apply-templates select="@* except @role" mode="hub:split-at-tab"/>
+      <xsl:call-template name="alt-texts"/>
+      <xsl:apply-templates select="node() except alt" mode="hub:split-at-tab"/>
     </xsl:copy>
   </xsl:template>
   
-  <!-- explicitely markup inline images so that they don't get accidentally 
+  <xsl:template name="alt-texts">
+    <xsl:apply-templates select="alt" mode="hub:split-at-tab"/>
+    <!-- you could also use paras as alt here -->
+  </xsl:template>
+    
+  <!-- explicitly markup inline images so that they don't get accidentally 
        removed or rendered as display image later -->
   
   <xsl:template match="mediaobject[not(parent::figure)]
@@ -716,7 +761,9 @@
                                   [not(ancestor::para[.//processing-instruction()[name() eq $pi-xml-name]])]
                                   [ancestor::para[normalize-space(.)]]" mode="hub:split-at-tab">
     <inlinemediaobject>
-      <xsl:apply-templates select="@*, node()" mode="#current"/>
+      <xsl:apply-templates select="@*" mode="#current"/>
+      <xsl:call-template name="alt-texts"/>
+      <xsl:apply-templates select="node() except alt" mode="#current"/>
     </inlinemediaobject>
   </xsl:template>
   
@@ -785,7 +832,7 @@
   <!-- remove paras and phrases that interfere with caption evaluation -->
   
   <xsl:template match="para[preceding-sibling::*[1][self::para][mediaobject]][not(normalize-space())]
-                      |para[matches(@role, '[a-z]{2,3}figurecaption')][matches(., '^[\p{Zs}]+$')]" mode="hub:split-at-tab" priority="100000">
+                      |para[matches(@role, '[a-z]{2,3}(figurecaption|figurealt)')][matches(., '^[\p{Zs}]+$')]" mode="hub:split-at-tab" priority="100000">
   </xsl:template>
   
   <xsl:template match="phrase[@css:color eq '#000000'][@srcpath][count(@*) eq 2]" mode="hub:split-at-tab">
@@ -1084,34 +1131,50 @@
         * dialogue
         * -->
   
-  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex)]]" mode="custom-1">
+  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex, 'i')]]/para/phrase[matches(., $dialogue-speaker-delimiter-regex, 'i')][1]" mode="hub:clean-hub">
     <xsl:copy>
-      <xsl:attribute name="role" select="'dialogue'"/>
-      <xsl:apply-templates select="@*, node()" mode="#current"/>
+      <xsl:apply-templates select="@*" mode="#current"/>
+      <xsl:sequence select="tr:insert-delimiter(., $dialogue-speaker-delimiter-regex)"/>
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex, 'i')]]/para/text()[matches(., $dialogue-speaker-delimiter-regex, 'i')][1]
+                                                                                              [not(preceding-sibling::phrase[matches(., $dialogue-speaker-delimiter-regex)])]" mode="hub:clean-hub">
+    <xsl:sequence select="tr:insert-delimiter(., $dialogue-speaker-delimiter-regex)"/>
+  </xsl:template>
+  
+  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex, 'i')]]/para[delimiter[following-sibling::node()]]" mode="custom-1">
+    <xsl:copy>
+      <xsl:apply-templates select="@*" mode="#current"/>
+      <xsl:for-each-group select="node()" group-ending-with="delimiter">
+        <xsl:choose>
+          <xsl:when test="position() eq 1">
+            <personname role="speaker">
+              <xsl:apply-templates select="current-group()" mode="#current"/>
+            </personname>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:apply-templates select="current-group()" mode="#current"/>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each-group>
     </xsl:copy>
   </xsl:template>
   
-  <xsl:template match="para[matches(@role, $dialogue-role-regex)][not(phrase[@role eq 'hub:identifier'])]/text()[following-sibling::tab]
-                      |para[matches(@role, $dialogue-role-regex)]/phrase[@role eq 'hub:identifier']" mode="custom-1">
+  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex, 'i')]]/para/node()[1][self::phrase[delimiter]]" mode="custom-1">
     <personname role="speaker">
-      <xsl:value-of select="."/>
+      <xsl:apply-templates mode="#current"/>
     </personname>
   </xsl:template>
   
-  <xsl:template match="para[matches(@role, $dialogue-role-regex)]
-                           [not(tab or phrase[@role eq 'hub:identifier'])]" mode="custom-1">
+  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex, 'i')]]/para/delimiter" mode="custom-1">
+    <xsl:value-of select="@char"/>
+  </xsl:template>
+  
+  <xsl:template match="blockquote[para[matches(@role, $dialogue-role-regex, 'i')]]" mode="custom-1">
     <xsl:copy>
-      <xsl:apply-templates select="@*" mode="#current"/>
-      <xsl:analyze-string select="." regex="^(\p{{L}}+)(\s\p{{L}}+)*:">
-        <xsl:matching-substring>        
-          <personname role="speaker">
-            <xsl:value-of select="."/>
-          </personname>
-        </xsl:matching-substring>
-        <xsl:non-matching-substring>
-          <xsl:value-of select="."/>
-        </xsl:non-matching-substring>
-      </xsl:analyze-string>
+      <xsl:attribute name="role" select="'dialogue'"/>
+      <xsl:apply-templates select="@*, node()" mode="#current"/>
     </xsl:copy>
   </xsl:template>
   
@@ -1254,8 +1317,9 @@
 
   <xsl:template match="para[not(node())][not(matches(@role, $empty-line-style))]
                       |part/title[not(node())]
-                      |blockquote[every $i in * 
-                                  satisfies $i[not(node())]]" mode="hub:clean-hub" priority="5"/>
+                      |blockquote[    not(node()) 
+                                  and (every $i in * 
+                                       satisfies $i[not(node())])]" mode="hub:clean-hub" priority="5"/>
   
   <!-- remove width attributes from table cells for htmltabs -->
   
@@ -1290,7 +1354,7 @@
   
   <!-- drop phrases without any text -->
   
-  <xsl:template match="phrase[*][not(normalize-space())]" mode="custom-2">
+  <xsl:template match="phrase[*[not(self::xref)]][not(normalize-space())]" mode="custom-2">
     <xsl:apply-templates/>
   </xsl:template>
   
@@ -1457,19 +1521,24 @@
     </xsl:copy>
   </xsl:template>
   
+  <xsl:variable name="pi-allowed-in-index" select="'IndexLetters'"/>  
+  
   <xsl:template match="*[self::part
                         |self::chapter
                         |self::section
                         |self::appendix]
                         [info/title[matches(@role, $index-heading-regex)]
-                          |title[matches(@role, $index-heading-regex)]]
-                     | *[self::index]     
-                     | *[self::part
+                        |title[matches(@role, $index-heading-regex)]]
+                      |*[self::index]     
+                      |*[self::part
                         |self::chapter
                         |self::section
                         |self::appendix]
-                        [title[matches(@role, $hub:general-heading-main-name-regex)]]
-                        [para][every $p in * satisfies $p[self::para[matches(@role,$index-static-regex)] or self::para[matches(@role,$index-text-regex)] or self::title]]
+                        [title[matches(@role, string-join($hub:hierarchy-role-regexes-x, '|'))]]
+                        [para[matches(@role,concat($index-static-regex,$index-static-level-regex,'$'))]]
+                                      [every $p in * satisfies $p[self::para[matches(@role,$index-static-regex)]
+                                                                or self::para[matches(@role,$index-text-regex)] or self::para[processing-instruction()[matches(.,$pi-allowed-in-index)]] 
+                                                                or self::title]]
                         [$create-index-at-general-headings]" mode="custom-1" priority="3">
     <xsl:variable name="index-type" as="xs:string" 
                   select="(@type[..[self::index]], 
@@ -1477,10 +1546,11 @@
                            $index-type-default-name
                            )[. ne ''][1]"/>
     <index>
+      <xsl:sequence select="(hub:renderas-from-xml-pi(@renderas, *[self::info/title or self::title]//processing-instruction()[name() = $pi-xml-name]), hub:renderas-from-role-suffix(@renderas, title[1]/@role))[1]"/>
       <!-- check if there are static index entries present (static index) or if the type 
            matches any real indexterm elements (dynamic index with index headline). sometimes
            users assign a index type to a headline but not to the index terms -->
-      <xsl:if test="para or ($index-type = $index-types)">
+      <xsl:if test="para[matches(@role,concat($index-static-regex,$index-static-level-regex,'$'))] or ($index-type = $index-types)">
         <xsl:attribute name="type" select="$index-type"/>
       </xsl:if>
       <xsl:apply-templates select="@xml:id|@role" mode="#current"/>
@@ -1491,7 +1561,6 @@
       </xsl:if>
       <!-- if existing, group static index entries -->
       <xsl:for-each-group select="* except (info, title)" group-adjacent="matches(@role, concat($index-static-regex,$index-static-level-regex,'$'))">
-        
         <xsl:choose>
           <xsl:when test="current-grouping-key()">
             <xsl:for-each-group select="current-group()" 
@@ -1600,6 +1669,7 @@
   </xsl:template>
   
   <!-- (4) static index -->
+  
   <!-- but first: cleaning of indexparas and see/seealso phrases -->
   
   <!--    move see indicator from phrase, like
@@ -1608,9 +1678,9 @@
                            /phrase[matches(.,
                                      concat(
                                        $index-see-also-regex, 
-                                       '?'
+                                       '?$'
                                      )
-                                   )]" mode="hub:clean-hub">
+                                   )]" mode="hub:clean-hub" priority="3">
     <xsl:copy>
       <xsl:apply-templates select="@*" mode="#current"/>
       <xsl:sequence select="replace(., concat($index-see-also-regex, '?'), '')"/>
@@ -1621,6 +1691,18 @@
                           )"/>
   </xsl:template>
   
+  <!-- dissolve textstylings around see also entrys (done by tex later)  -->
+  <xsl:template match="para[matches(@role, concat($index-static-regex, $index-static-level-regex))]
+                           /phrase[matches(@role,'italic|kursiv')]
+                                  [matches(.,
+                                     concat('^',
+                                       $index-see-also-regex, 
+                                       '?.+$'
+                                     )
+                                   )]" mode="hub:clean-hub">
+    <xsl:apply-templates select="node()" mode="#current"/>
+  </xsl:template>
+  
   <xsl:template match="para[matches(@role, concat($index-static-regex, $index-static-level-regex))]
                            /phrase[matches(.,
                                      concat('^\p{Zs}*', $index-see-also-regex, '?\p{Zs}*$')
@@ -1664,8 +1746,12 @@
             </seeie>
           </xsl:when>
           <xsl:otherwise>
+            <xsl:variable name="index-term" select="current-group()[following-sibling::*[self::tab]]"/>
             <xsl:for-each select="current-group()" >
               <xsl:choose>
+                <xsl:when test="current() intersect $index-term">
+                  <xsl:apply-templates select="current()"/>
+                </xsl:when>
                 <xsl:when test="matches(string-join(current(),''),'(^|,?\s)(([\d]+)(–([\d]+))?)+') and current()[self::*]">
                   <xsl:copy>
                     <xsl:apply-templates select="@*"/>
@@ -1700,7 +1786,15 @@
             <xsl:value-of select="replace(.,$index-see-regex,'')"/>
           </xsl:matching-substring>
           <xsl:non-matching-substring>
-            <xsl:value-of select="."/>
+            <xsl:analyze-string select="." regex="(^|,?\s)(([\d]+)(–([\d]+))?)+">
+              <xsl:matching-substring>
+                <xsl:processing-instruction name="pages"/>
+                <xsl:value-of select="."/>
+              </xsl:matching-substring>
+              <xsl:non-matching-substring>
+                <xsl:value-of select="."/>
+              </xsl:non-matching-substring>
+            </xsl:analyze-string>
           </xsl:non-matching-substring>
         </xsl:analyze-string>
       </xsl:non-matching-substring>
@@ -1715,7 +1809,9 @@
           <!-- range-->
           <xsl:when test="regex-group(4)">
             <xsl:value-of select="regex-group(1)"/>
-            <xref xlink:href="page-{regex-group(3)}" annotations="start-of-range"/>-<xref xlink:href="page-{regex-group(5)}" annotations="end-of-range"/>
+            <xref xlink:href="page-{regex-group(3)}" annotations="start-of-range"/>
+            <xsl:value-of select="$index-static-page-range-separator"/>
+            <xref xlink:href="page-{regex-group(5)}" annotations="end-of-range"/>
           </xsl:when>
           <xsl:otherwise>
               <xsl:value-of select="regex-group(1)"/>
@@ -1729,6 +1825,8 @@
     </xsl:analyze-string>
   </xsl:function>
   
+  <xsl:template match="processing-instruction()[matches(name(), 'pages')]" mode="custom-2"/>
+  
   <xsl:template match="*[self::*[local-name() = $primary-secondary-etc]]
                         [*:seealsoie or *:seeie]"  
                 mode="custom-2" priority="4">
@@ -1836,7 +1934,6 @@
   
   <xsl:function name="hub:index-entry-element-name" as="xs:string">
     <xsl:param name="level" />
-
     <xsl:sequence select="if(exists($level) and $level castable as xs:integer) 
                           then $primary-secondary-etc[xs:integer($level)]
                           else $primary-secondary-etc[1]"/>
@@ -1867,6 +1964,7 @@
     </index>
   </xsl:template>
   
+  
   <xsl:template match="para[not(parent::div[@role eq 'hub:index'])][matches(@role, $index-heading-regex, 'i')]" mode="custom-2"/>
   
   <xsl:template match="indexentry//@xml:lang
@@ -2307,7 +2405,7 @@
   <!-- https://redmine.le-tex.de/issues/14883
        resolve biblioset that is interfering with xml2tex matching patterns
   -->
-  <xsl:template match="info/biblioset[every $child in * satisfies $child[self::abstract]]" mode="custom-2">
+  <xsl:template match="info/biblioset[every $child in * satisfies $child[self::abstract or self::person or self::orgname]]" mode="custom-2">
     <!-- preserve biblioset with DOIs, license info etc. if only an abstract is contained, dissolve it-->
     <xsl:apply-templates mode="#current"/>
   </xsl:template>
@@ -2321,7 +2419,7 @@
 
   <xsl:template match="para[matches(@role, $hub:transcription-role-regex-x)]" mode="hub:repair-hierarchy">
     <!-- move line number to para to allow def-list creation from speakers-->
-   <xsl:variable name="line-num-separator" select="tab[preceding-sibling::node()[1][matches(., '\d')]]" as="element(tab)?"/>
+   <xsl:variable name="line-num-separator" select="tab[preceding-sibling::node()[1][matches(., '\d')]][1]" as="element(tab)?"/>
    <xsl:copy>
      <xsl:apply-templates select="@*" mode="#current"/>
      <xsl:if test="exists($line-num-separator)"><xsl:attribute name="annotations" select="node()[. &lt;&lt; $line-num-separator]">
@@ -2344,7 +2442,7 @@
   <xsl:template match="para[matches(@role, $hub:transcription-role-regex-x)]/tab " mode="hub:clean-hub"/>
   
   
-  <xsl:template match="para[matches(@role, $hub:transcription-role-regex-x)]/node()[1][contains(., ':')][following-sibling::node()[1][self::tab]]" mode="hub:clean-hub">
+  <xsl:template match="para[matches(@role, $hub:transcription-role-regex-x)]/(node()[not(self::anchor)])[1][contains(., ':')][following-sibling::node()[1][self::tab]]" mode="hub:clean-hub">
     <phrase role="speaker"><xsl:sequence select="."/></phrase>
   </xsl:template>
   
@@ -2359,6 +2457,10 @@
   
   <xsl:template match="annotation" mode="hub:clean-hub"/>
   
+  <xsl:template match="link[matches(., '^\p{Zs}+$')]" mode="hub:clean-hub">
+    <xsl:apply-templates select="node()" mode="#current"/>
+  </xsl:template>
+  
   <xsl:template match="text()[parent::phrase]
                              [(matches(., '^(\s+).+') and ../node()[1][not(self::anchor | self::index-term)][self::text()]) or (matches(., '.+(\s+)$') and ../node()[not(self::anchor | self::index-term)][last()][self::text()])] (: leading or trailing whitespace :)
                              [string-length(normalize-space(.)) gt 0]
@@ -2483,7 +2585,7 @@
     
   <xsl:template match="text()[normalize-space()]
                              [matches(., '-')]
-                             [not(ancestor::*[self::*:link|self::keywordset|self::biblioset[@role = 'chunk-metadata']])]
+                             [not(ancestor::*[self::*:link|self::keywordset|self::mml:math|self::biblioset[@role = 'chunk-metadata']])]
                              [not(exists(ancestor::*[matches(@role, $hub:prevent-normalization-style-regex)]))]" mode="preprocess-hyphens">
     <xsl:value-of select="hub:replace-hyphens(.)"/>
   </xsl:template>
@@ -2511,6 +2613,29 @@
     <xsl:apply-templates select="dbk:listitem/dbk:variablelist/dbk:varlistentry" mode="#current"/>
   </xsl:template>
   
+<!--  <cases>
+   <case id="1" char="‑">(inhaltlich-)thematischen</case> 
+   <case id="2" char="‑">Privatisierungsbefürwortern und -befürworterinnen </case> 
+   <case id="3" char="‑">Kranken-, Kinder- und …</case> 
+   <case id="4" char="‑">ÖPP-Beschleunigungsgesetz</case> 
+   <case id="5" char="‑">α-Strahlung</case> 
+   <case id="6" char="‐">bitter-süß</case> 
+   <case id="7" char="‐">SPD-Führung</case>
+   <case id="8" char="‐">EU-Bürger- und Bürgerinnen</case>
+   <case id="9" char="‐"><phrase role="citalic">Apax</phrase>-Vorstand</case>
+   <case id="10" char="‑">Covid-19-Infizierte ICE-3</case>
+   <case id="10b" char="">450-Euro-Jobs</case>
+   <case id="11" char="‐"><phrase role="citalic" srcpath="tei_d334e496">Zeit-</phrase>Verlagsgruppe</case>
+   <case id="12" char="‐">»Schoolwork«-Gefüge ›Code your Life‹-Initiative</case>
+   <case id="13" char="‐">Foto-Sharing-<link>…</link></case>
+   <case id="14" char="‑">DFB-&amp;-McDonald’s</case>
+   <case id="15" char="‐">Bertelsmann-»Studien«</case>
+   <case id="16" char="">CDU-/CSU-Bundestagsfraktion</case>
+   <case id="17" char="‐">401(k)-Fondsmodell</case>
+   <case id="18" char="–">S. 1-7 (200-203)</case>
+   <case id="19" char="–">Die Bahn baut die Rheintalstrecke aus - und ist wohl 2041 fertig</case>
+  </cases>-->
+  
   <xsl:function name="hub:replace-hyphens" as="xs:string">
     <xsl:param name="text" as="xs:string"/>
     <xsl:variable name="regex" as="xs:string" select="'([\p{L}](-)[\),/\]\d])|((-).(-))|(\s(-)\p{L})|((^|\s)[\p{L}&#120576;-&#120777;]{1,2}(-)\p{L})|((^|[\p{L}‹«\d\)])(-)([\p{L}\s»›]|$))|((\p{Zs}|^)[\(\[]?\d+(-)\d+([^-]|$))|((\s-)\s)'"/>
@@ -2572,4 +2697,17 @@
     </xsl:if>
   </xsl:function>
   
+  <xsl:function name="tr:insert-delimiter" as="node()*">
+    <xsl:param name="string" as="xs:string"/>
+    <xsl:param name="delimiter-regex" as="xs:string"/>
+    <xsl:analyze-string select="$string" regex="{$delimiter-regex}">
+      <xsl:matching-substring>
+        <delimiter char="{.}"/>
+      </xsl:matching-substring>
+      <xsl:non-matching-substring>
+        <xsl:value-of select="."/>
+      </xsl:non-matching-substring>
+    </xsl:analyze-string>
+  </xsl:function>
+  
 </xsl:stylesheet>
diff --git a/evolve-hub/parse-bibrefs.xsl b/evolve-hub/parse-bibrefs.xsl
index 2827315..7af53f1 100755
--- a/evolve-hub/parse-bibrefs.xsl
+++ b/evolve-hub/parse-bibrefs.xsl
@@ -150,6 +150,12 @@
     </publishername>
   </xsl:template>
   
+  <xsl:template match="url">
+    <bibliosource>
+      <xsl:apply-templates/>
+    </bibliosource>
+  </xsl:template>
+  
   <xsl:template match="@* | * | processing-instruction()">
     <xsl:copy>
       <xsl:apply-templates select="@*, node()"/>
diff --git a/generate-xmp/generate-xmp.xsl b/generate-xmp/generate-xmp.xsl
index 8671092..37adcbd 100755
--- a/generate-xmp/generate-xmp.xsl
+++ b/generate-xmp/generate-xmp.xsl
@@ -22,15 +22,27 @@
   <xsl:output indent="yes"/>
   
   <xsl:template match="/cx:documents">
-    <x:xmpmeta>
-      <rdf:RDF>
-        <rdf:Description rdf:about="">
-          <!-- necessary metadata -->
-          <pdfaid:part>3</pdfaid:part>
-          <pdfaid:conformance>U</pdfaid:conformance>
+    <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.4-c005 78.147326, 2012/08/23-13:03:03        ">
+      <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+        <rdf:Description rdf:about=""
+          xmlns:dc="http://purl.org/dc/elements/1.1/"
+          xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+          xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+          xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+          xmlns:pdfuaid="http://www.aiim.org/pdfua/ns/id/"
+          xmlns:pdfaid="http://www.aiim.org/pdfa/ns/id/"
+          xmlns:pdfaExtension="http://www.aiim.org/pdfa/ns/extension/"
+          xmlns:pdfaSchema="http://www.aiim.org/pdfa/ns/schema#"
+          xmlns:pdfaProperty="http://www.aiim.org/pdfa/ns/property#"
+          xmlns:pdfaType="http://www.aiim.org/pdfa/ns/type#"
+          xmlns:pdfaField="http://www.aiim.org/pdfa/ns/field#"
+          >
           <pdfuaid:part>1</pdfuaid:part>
-          <dc:format>application/pdf</dc:format>
-          <!-- author -->
+          <pdf:Producer>le-tex xerif with CoCoTeX</pdf:Producer>
+          <xmp:CreatorTool>MS Word</xmp:CreatorTool>
+          <xmp:ModifyDate>PLACEHOLDER</xmp:ModifyDate>
+          <xmp:CreateDate>PLACEHOLDER</xmp:CreateDate>
+          <!-- INSERT METADATA HERE AND REMOVE COMMENT -->
           <dc:creator>
             <rdf:Seq>
               <xsl:for-each select="ONIXmessage/product/contributor[b035 eq 'A32']">
@@ -59,39 +71,34 @@
               </xsl:for-each>
             </rdf:Alt>
           </dc:title>
+          <dc:publisher>
+            <rdf:Bag>
+              <rdf:li><xsl:value-of select="ONIXmessage/product/publisher/b081"/></rdf:li>
+            </rdf:Bag>
+          </dc:publisher>
           <dc:rights>
             <rdf:Alt>
               <rdf:li xml:lang="x-default"><xsl:value-of select="ONIXmessage/product/publisher/b081"/></rdf:li>
             </rdf:Alt>
           </dc:rights>
-          <!--<dc:rights>
-            <rdf:Alt>
-              <rdf:li xml:lang="x-default">TBD</rdf:li>
-            </rdf:Alt>
-          </dc:rights>
           <dc:subject>
             <rdf:Bag>
-              <rdf:li>TBD</rdf:li>
-              <rdf:li>...</rdf:li>
+              <xsl:for-each select="ONIXmessage/product/subject[b067 eq '20']/b070">
+                <rdf:li>
+                  <xsl:value-of select="."/>
+                </rdf:li>  
+              </xsl:for-each>
             </rdf:Bag>
-          </dc:subject>-->
-          <xmp:CreateDate><xsl:value-of select="current-dateTime()"/></xmp:CreateDate>
-          <xmp:CreatorTool>LaTeX with hyperref</xmp:CreatorTool>
-          <xmp:ModifyDate><xsl:value-of select="current-dateTime()"/></xmp:ModifyDate>
-          <xmp:MetadataDate><xsl:value-of select="current-dateTime()"/></xmp:MetadataDate>
-          <pdf:Producer>le-tex xerif</pdf:Producer>
-          <pdf:Keywords>
+          </dc:subject>
+          <!--        <pdf:Producer>le-tex xerif</pdf:Producer>
+            <pdf:Keywords>
             <xsl:value-of select="string-join(ONIXmessage/product/subject[b067 eq '20']/b070, ', ')"/>
-          </pdf:Keywords>
-          <pdf:Copyright>
+            </pdf:Keywords>
+            <pdf:Copyright>
             <xsl:value-of select="format-date(current-date(), '[Y]')"/>
             <xsl:text> Copyright by </xsl:text>
             <xsl:value-of select="ONIXmessage/product/publisher/b081"/>
-          </pdf:Copyright>
-          <xmpMM:DocumentID>uuid:0a260816-6fd8-456e-bdcc-1f7db1176b0e</xmpMM:DocumentID>
-          <xmpMM:InstanceID>uuid:d689337d-78a1-4a0d-a88f-39319e1396c6</xmpMM:InstanceID>
-          <xmpRights:Marked>True</xmpRights:Marked>
-          <xmpRights:WebStatement>https://creativecommons.org/licenses/by/4.0</xmpRights:WebStatement>
+            </pdf:Copyright>-->
           <pdfaExtension:schemas>
             <rdf:Bag>
               <rdf:li rdf:parseType="Resource">
@@ -177,6 +184,7 @@
         </rdf:Description>
       </rdf:RDF>
     </x:xmpmeta>
+  
   </xsl:template>
   
 </xsl:stylesheet>
diff --git a/schematron/bits/bits.sch.xml b/schematron/bits/bits.sch.xml
index e9d8a28..68d5578 100755
--- a/schematron/bits/bits.sch.xml
+++ b/schematron/bits/bits.sch.xml
@@ -19,8 +19,8 @@
   
   <pattern id="contrib">
     <rule context="book-meta/contrib-group">
-      <assert test="contrib[@contrib-type = 'author']" role="error" id="no-author">
-        There is no author in <code xmlns="http://www.w3.org/1999/xhtml">&lt;contrib-group/></code>.
+      <assert test="contrib[@contrib-type = ('editor','author')]" role="error" id="no-author">
+        There is no author or editor in <code xmlns="http://www.w3.org/1999/xhtml">&lt;contrib-group/></code>.
       </assert>
     </rule>
   </pattern>
diff --git a/schematron/check-formatting/check-formatting.sch.xml b/schematron/check-formatting/check-formatting.sch.xml
index 871e3ed..7084190 100755
--- a/schematron/check-formatting/check-formatting.sch.xml
+++ b/schematron/check-formatting/check-formatting.sch.xml
@@ -53,7 +53,8 @@
         This paragraph has been formatted with the figure caption style but includes an image. Please verify whether the image belongs to the caption or to the figure. 
         For the latter, please ensure that the image is placed in a paragraph above the caption and formatted with the figure style (regex: <value-of select="$figure-image-role-regex"/>).
       </assert>
-      <assert test="preceding-sibling::*[1][self::dbk:para][matches(@role, $figure-image-role-regex, 'i')]" role="error" id="isolated-figure-caption" diagnostics="isolated-figure-caption_de">
+      <assert test="preceding-sibling::*[1][self::dbk:para][matches(@role, $figure-image-role-regex, 'i')]
+        or (preceding-sibling::*[1][self::dbk:para][matches(@role, $figure-alt-role-regex, 'i')] and preceding-sibling::*[2][self::dbk:para][matches(@role, $figure-image-role-regex, 'i')])" role="error" id="isolated-figure-caption" diagnostics="isolated-figure-caption_de">
         This paragraph has been formatted with the figure caption style but the paragraph above has the style: '<value-of select="preceding-sibling::*[1]/@role"/>'.
       </assert>
     </rule>
@@ -71,7 +72,7 @@
       </assert>
     </rule>
     <rule context="dbk:para[matches(@role, $table-caption-role-regex)]">
-      <assert test="not(following-sibling::*[1][self::dbk:informaltable])" role="error" id="isolated-table-caption" diagnostics="isolated-table-caption_de">
+      <assert test="following-sibling::*[1][self::dbk:informaltable]" role="error" id="isolated-table-caption" diagnostics="isolated-table-caption_de">
         This paragraph has been formatted with the table caption style but it is not placed above the table.
       </assert>
     </rule>
@@ -158,7 +159,7 @@
       Dieser Absatz ist mit dem Absatzformat für eine gedrehte Tabelle ausgezeichnet, ist aber nicht über einer Tabelle platziert. 
     </diagnostic>
     <diagnostic id="isolated-table-caption_de" xml:lang="de">
-      Dieser Absatz ist als Tabellen-Legende ausgezeichnet, aber der Absatz darüber ist nicht über einer Tabelle platziert.
+      Dieser Absatz ist als Tabellen-Legende ausgezeichnet, ist aber nicht über einer Tabelle platziert.
       Bitte beachten Sie die korrekte Reihenfolge der Absatzformate für Tabelle, Legende und Quelle.
     </diagnostic>
     <diagnostic id="isolated-table-source_de" xml:lang="de">
diff --git a/schematron/flat-hub/flat-hub.sch.xml b/schematron/flat-hub/flat-hub.sch.xml
index 5020421..acdc4a4 100644
--- a/schematron/flat-hub/flat-hub.sch.xml
+++ b/schematron/flat-hub/flat-hub.sch.xml
@@ -19,6 +19,8 @@
   <let name="base-dir" value="/*/dbk:info/dbk:keywordset[@role eq 'hub']/dbk:keyword[@role eq 'source-dir-uri']"/>
   <let name="fake-table-invisible-footnote" value="'Tabellenfussnote_ZifferUnsichbar'"/>
   <let name="fake-table-manual-footnote-in-table" value="'Tabellenfussnote_unecht'"/>
+  <let name="heading-roles" value="string-join($hub:hierarchy-role-regexes-x, '|')"/>
+  
   <ns prefix="schematron" uri="http://purl.oclc.org/dsdl/schematron" />
 
   <pattern id="flat-hub_multi_para_captions">
@@ -48,7 +50,7 @@
   </pattern>
   
   <pattern id="flat-hub_multi_para_heading">  
-    <rule context="dbk:para[matches(@role, $hub:general-heading-main-name-regex)][not(matches(., '^\s*$'))]">
+    <rule context="dbk:para[matches(@role, $heading-roles)][not(matches(., '^\s*$'))]">
       <let name="role" value="replace(@role, '^(.+?)(_-_.+)?$', '$1')"/>
       <report test="replace(following-sibling::*[1]/self::dbk:para/@role, '^(.+?)(_-_.+)?$', '$1') = $role" id="multi_para_heading" role="error"
         diagnostics="multi_para_heading_de">
diff --git a/styles/cssa.xml b/styles/cssa.xml
index eac50cf..2a20062 100644
--- a/styles/cssa.xml
+++ b/styles/cssa.xml
@@ -48,6 +48,7 @@
   <css:rule layout-type="para" native-name="tslistof_endnotes" name="tsliterature" regex="^[a-z]{1,3}tslistof(endnotes|figures|tables)$"/>
   <css:rule layout-type="para" native-name="ts_quotation" name="tsquotation" regex="^[a-z]{1,3}quotation$"/>
   <css:rule layout-type="para" native-name="ts_dialogue" name="tsdialogue" regex="^[a-z]{1,3}dialogue$"/>
+  <css:rule layout-type="para" native-name="ts_dialogue-action" name="tsdialogue-action" regex="^[a-z]{1,3}dialogue-action$"/>
   <css:rule layout-type="para" native-name="ts_footnote" name="tsfootnote" regex="^[a-z]{1,3}footnote$"/>
   <css:rule layout-type="para" native-name="ts_ded" name="tsded" regex="^[a-z]{1,3}ded$"/>
   <css:rule layout-type="para" native-name="ts_dedication" name="tsdedication" regex="^[a-z]{1,3}dedication$"/>
diff --git a/xml2tex/helpers.xsl b/xml2tex/helpers.xsl
index 90fea22..f97f392 100755
--- a/xml2tex/helpers.xsl
+++ b/xml2tex/helpers.xsl
@@ -7,6 +7,7 @@
   xmlns:css="http://www.w3.org/1996/css"
   xmlns:functx="http://www.functx.com"
   xmlns:xml2tex="http://transpect.io/xml2tex"
+  xmlns:tr="http://transpect.io"
   xmlns="http://docbook.org/ns/docbook"
   exclude-result-prefixes="xs xhtml"
   version="2.0">
@@ -45,6 +46,11 @@
     </xsl:if>
   </xsl:template>
   
+  <xsl:function name="tr:create-newpage" as="xs:boolean">
+    <xsl:param name="table" as="element()"/>
+    <xsl:sequence select="if ($table/@role eq 'tablerotated') then false() else true()"/>
+  </xsl:function>
+  
   <xsl:template name="xml2tex:split-table">
     <xsl:param name="table" as="element()"/>
     <xsl:variable name="table-split" as="node()+">
@@ -53,7 +59,7 @@
                                   )/dbk:row" 
                           group-starting-with="dbk:row[dbk:entry//processing-instruction()[name() eq 'latex']
                                                       [matches(., functx:escape-for-regex($xml2tex:split-table-pi))]]">
-        <xsl:if test="not(position() eq 1)">
+        <xsl:if test="not(position() eq 1) and tr:create-newpage($table)">
           <xsl:processing-instruction name="latex" select="'{\newpage}%&#xa;'"/>
         </xsl:if>
         <xsl:element name="{$table/name()}">
diff --git a/xml2tex/latex.conf.xml b/xml2tex/latex.conf.xml
index 48dfbc9..47b4650 100644
--- a/xml2tex/latex.conf.xml
+++ b/xml2tex/latex.conf.xml
@@ -52,7 +52,6 @@
   <!-- other params -->
   
   <xsl:param name="run-local" as="xs:string"/>
-  <xsl:param name="cocotex" as="xs:boolean" select="false()"/>
   
   <xsl:param name="a11y" as="xs:boolean" select="false()"/>
 
@@ -128,7 +127,7 @@
   <xsl:variable name="publisher-location" as="element(dbk:keyword)?"
                 select="$metadata/dbk:keyword[@role eq 'Verlagsort']"/>
   <xsl:variable name="publisher-website" as="element(dbk:keyword)?"
-                select="$metadata/dbk:keyword[@role eq 'transcript-Website']"/>
+                select="$metadata/dbk:keyword[@role eq 'Website']"/>
   <!-- publication meta -->
   <xsl:variable name="doi" as="element(dbk:keyword)?"
                 select="$metadata/dbk:keyword[@role eq 'DOI']"/>
@@ -232,7 +231,7 @@
                 select="concat('\documentclass[',
                                string-join(($babel-langs[position() ne 1],
                                             $greek[normalize-space()],
-                                            $babel-langs[1]), (: 1st lang is main lang and comes last :)
+                                            concat('main=',$babel-langs[1])), (: 1st lang is main lang and comes last :)
                                             ','),
                                $pubtype-value, 
                                xml2tex:determine-footnote-options($pubtype, $notes-type, $notes-per-chapter, $endnotes-with-chapter),
@@ -240,11 +239,11 @@
                                ',withcoltitles'[$running-header eq 'yes'],
                                ',a11y'[$a11y],
                                ']{', 
-                               if ($cocotex) then 'cocotex' else 'transpect',
+                               'cocotex',
                                '}&#xa;')"/>
   <xsl:variable name="doc-pkg"       as="xs:string*">
     <xsl:text>\usepackage{htmltabs}&#xa;</xsl:text>
-    <xsl:if test="//*[@css:letter-spacing or exists(key('style', @role)[@css:letter-spacing])] and $letter-spacing-def[normalize-space()]">
+    <xsl:if test="//*[@css:letter-spacing or exists(key('style', @role, $root)[@css:letter-spacing])] and $letter-spacing-def[normalize-space()]">
       <xsl:value-of select="concat('\usepackage{', $letter-spacing-def,'}&#xa;')"/>
     </xsl:if>
     <xsl:for-each select="xml2tex:rgb-to-tex-color( $colors)">
@@ -323,16 +322,16 @@
       <xsl:text>&#xa;\end{tpSeriesEditor}&#xa;</xsl:text>
     </xsl:for-each>
     <xsl:if test="normalize-space($title) or normalize-space($title-for-running-head)">
-      <xsl:value-of select="concat('&#xa;\tpTitle{', ($title, $title-for-running-head)[1], '}&#xa;')"/>
+      <xsl:value-of select="concat('&#xa;\tpTitle{', xml2tex:meta-remove-links-etc(($title, $title-for-running-head)[1]), '}&#xa;')"/>
     </xsl:if>
     <xsl:if test="$title-for-running-head">
       <xsl:value-of select="concat('&#xa;\tpRunTitle{', $title-for-running-head, '}&#xa;')"/>
     </xsl:if>
     <xsl:if test="normalize-space($subtitle)">
-      <xsl:value-of select="concat('&#xa;\tpSubtitle{', $subtitle, '}&#xa;')"/>
+      <xsl:value-of select="concat('&#xa;\tpSubtitle{', xml2tex:meta-remove-links-etc($subtitle), '}&#xa;')"/>
     </xsl:if>
     <xsl:if test="normalize-space($shorttitle)">
-      <xsl:value-of select="concat('&#xa;\tpShortTitle{', $shorttitle, '}&#xa;')"/>
+      <xsl:value-of select="concat('&#xa;\tpShortTitle{', xml2tex:meta-remove-links-etc($shorttitle), '}&#xa;')"/>
     </xsl:if>
     <!-- cover image -->
     <xsl:if test="normalize-space($cover-href)">
@@ -468,7 +467,7 @@
     <xsl:if test="normalize-space($license-text)">
       <xsl:value-of select="concat('&#xA;\tpLicenceText{', 
                                    string-join(for $line in tokenize($license-text, '\n')[normalize-space()]
-                                               return normalize-space($line), '\\&#xa;'),
+                                               return normalize-space($line), '\tpBreak&#xa;'),
                                    '}&#xA;')"/>
     </xsl:if>
     <xsl:if test="normalize-space($license-link)">
@@ -529,26 +528,39 @@
     </xsl:if>
   </xsl:variable>
   
+  <xsl:variable name="name-divider" select="' '"/>
+  
   <xsl:template name="contributor-name" as="xs:string">
     <xsl:variable name="content">
-    <xsl:choose>
+      <xsl:choose>
         <xsl:when test="dbk:personname/dbk:firstname and dbk:personname/dbk:surname">
           <xsl:value-of select="string-join(('&#xa;\tpFirstName{', xml2tex:meta-remove-links-etc(dbk:personname/dbk:firstname), '}',
                                              '&#xa;\tpLastName{',  xml2tex:meta-remove-links-etc(dbk:personname/dbk:surname), '}',
                                              if(dbk:personname/dbk:lineage) then ('&#xa;\tpLineage{', xml2tex:meta-remove-links-etc(dbk:personname/dbk:lineage), '}') else ()
-                                            ))"/>
+                                             ))"/>
         </xsl:when>
         <xsl:when test="dbk:personname/dbk:othername">
-          <xsl:value-of select="concat('&#xa;\tpFullName{', xml2tex:meta-remove-links-etc(dbk:personname/dbk:othername), '}')"/>
+          <xsl:value-of select="concat('&#xa;\tpFullName{', replace(xml2tex:meta-remove-links-etc(dbk:personname/dbk:othername) ,' ', $name-divider), '}')"/>
+        </xsl:when>
+        <xsl:when test="self::dbk:keyword and matches(.,',')">
+          <xsl:variable name="given-name" select="replace(normalize-space(replace(tokenize(., ',')[2],'(†|&#x271d;|\((.*)\)?)','')), ' ',$name-divider)" as="xs:string"/>
+          <xsl:variable name="surname" select="replace(normalize-space(tokenize(replace(., '(†|&#x271d;|\((.*)\)?)', ''), ',')[1]), ' ',$name-divider)" as="xs:string"/>
+          <xsl:variable name="additions" select="if (matches(., '(\(†|&#x271d;\|.+)')) 
+                                                 then concat( $name-divider, replace(normalize-space(tokenize(replace(., '.*(\(†|&#x271d;\|.+)', '$1'), ',')[1]), ' ',$name-divider))
+                                                 else ''"/>
+          <xsl:value-of select="concat('&#xa;\tpFullName{', $given-name, $name-divider, $surname, $additions, '}')"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="concat('&#xa;\tpFullName{', xml2tex:meta-remove-links-etc(.), '}')"/>
+          <xsl:value-of select="concat('&#xa;\tpFullName{', replace(xml2tex:meta-remove-links-etc(.), ' ' , $name-divider), '}')"/>
         </xsl:otherwise>  
       </xsl:choose>
       <xsl:value-of select="concat('&#xa;\tpPDFInfoName{', if (dbk:personname/dbk:firstname and dbk:personname/dbk:surname) 
                                                            then concat(xml2tex:meta-remove-links-etc(dbk:personname/dbk:firstname), ' ', xml2tex:meta-remove-links-etc(dbk:personname/dbk:surname))
-                                                           else xml2tex:meta-remove-links-etc(.), '}')">
-      <!-- https://redmine.le-tex.de/issues/16215-->
+                                                           else 
+                                                              if (self::dbk:keyword and matches(.,',')) 
+                                                              then concat(normalize-space(replace(tokenize(., ',')[2],'(†|&#x271d;|\((.*)\)?)','')), ' ' , normalize-space(tokenize(replace(., '(†|&#x271d;|\((.*)\)?)', ''), ',')[1]) )
+                                                              else xml2tex:meta-remove-links-etc(.), '}')">
+        <!-- https://redmine.le-tex.de/issues/16215-->
       </xsl:value-of>
     </xsl:variable>
     <xsl:value-of select="string-join($content, '')"/>
@@ -589,7 +601,7 @@
   
   <back>
     <xsl:if test="    $notes-type eq 'endnotes' 
-                  and not($notes-per-chapter eq 'yes')
+                  and (not($notes-per-chapter eq 'yes') or $endnotes-with-chapter eq 'yes')
                   and not(//*[self::dbk:para|self::dbk:title]
                              [matches(@role, $endnotes-heading-style)])
                   and not(//processing-instruction()[name() = ($name-for-Tex-PI, 'latex')][. = '\printnotes'])">
@@ -629,7 +641,7 @@
     <script name="hebrew"   unicode-range="&#x590;-&#x5ff;&#xfb1d;-&#xfb4f;"/>
     <script name="japanese" unicode-range="&#x3040;-&#x309f;&#x30a0;-&#x30ff;&#12352;-&#12543;"/>
     <script name="korean"   unicode-range="&#xac00;-&#xd7ae;&#x1100;-&#x11ff;&#x3130;-&#x318f;&#xa960;-&#xa97f;&#xd7b0;-&#xd7ff;"/>
-    <script name="greek"    unicode-range="&#x370;-&#x3ff;&#7936;-&#8191;"/>
+    <script name="greek"    unicode-range="&#x370;-&#x3ff;&#7936;-&#8190;"/>
     <script name="georgian" unicode-range="&#x10a0;-&#x10ff;"/>
   </xsl:variable>
   
@@ -707,26 +719,34 @@
     <!-- allow matching of regexes for example creating \foreignlanguage makros in \tpMeta items-->
   </xsl:template>
 
-  <xsl:template match="dbk:phrase[@css:font-style = 'italic' or @role = ('citalic', 'italic', 'kursiv')]" mode="strip-meta" priority="6">
+  <xsl:template match="dbk:phrase[@css:font-style = 'italic' or matches(@role, concat('c?italic|kursiv|',$italic-style))]" mode="strip-meta" priority="6">
     <xsl:text>\textit{</xsl:text>
     <xsl:next-match/>
     <xsl:text>}</xsl:text>
   </xsl:template>
   
-  <xsl:template match="dbk:br" mode="strip-meta" priority="6">
+  <xsl:template match="*:br" mode="strip-meta" priority="6">
     <xsl:text>\tpBreak </xsl:text>
   </xsl:template>
 
   <xsl:template match="dbk:link | dbk:ulink" mode="strip-meta" priority="6">
+    
     <xsl:apply-templates select="." mode="xml2tex"/>
+    
   </xsl:template>
   
-  <xsl:template match="dbk:phrase[@css:font-weight = 'bold' or @role = ('cbold', 'fett', 'bold')]" mode="strip-meta" priority="6">
+  <xsl:template match="dbk:phrase[@css:font-weight = 'bold' or matches(@role, concat('c?bold|fett|',$bold-style))]" mode="strip-meta" priority="5">
     <xsl:text>\textbf{</xsl:text>
     <xsl:next-match/>
     <xsl:text>}</xsl:text>
   </xsl:template>
 
+  <xsl:template match="dbk:phrase[@css:text-decoration = 'underline']" mode="strip-meta" priority="4.5">
+    <xsl:text>\uline{</xsl:text>
+    <xsl:next-match/>
+    <xsl:text>}</xsl:text>
+  </xsl:template>
+  
   <xsl:template match="dbk:superscript | dbk:subscript" mode="strip-meta" priority="6">
     <xsl:value-of select="if(self::dbk:superscript) 
                           then '\textsuperscript{' 
@@ -774,6 +794,10 @@
   <xsl:variable name="xerif" as="xs:boolean" select="true()">
   <!-- overrides some next-matches in docx2tex  -->
   </xsl:variable>
+  
+  <xsl:variable name="create-mainmatter" as="xs:boolean" select="true()">
+  <!-- overrides some next-matches for mainmatter creation  -->
+  </xsl:variable>
 
   <xsl:template match="/" priority="1000" mode="xml2tex">
     <xsl:next-match>
@@ -784,8 +808,11 @@
 
   <template context="/*/*[self::dbk:part|self::dbk:chapter|self::dbk:section]
                          [empty(preceding-sibling::dbk:para)][1]
-                         [not(preceding-sibling::dbk:toc)]
-                    |/*/dbk:para[1][following-sibling::*[self::dbk:part|self::dbk:chapter|self::dbk:section]]" priority="3001">
+                         [empty(preceding-sibling::dbk:figure)][1]
+                         [not(//dbk:toc)]
+                         [$create-mainmatter]
+                    |/*/dbk:para[1][following-sibling::*[self::dbk:part|self::dbk:chapter|self::dbk:section]][$create-mainmatter]
+                    |/*/dbk:figure[1][following-sibling::*[self::dbk:part|self::dbk:chapter|self::dbk:section]][$create-mainmatter]" priority="3001">
     <xsl:text>&#xa;\mainmatter&#xa;</xsl:text>
     <xsl:next-match/>
   </template>
@@ -797,8 +824,10 @@
         <!-- if a select language was made: avoid breaks before (esp. with cca tagging) -->
       </xsl:param>
     <rule break-before="0" break-after="0">
-        <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)], node(), tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
-      </rule>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
+    </rule>
   </template>
   
   <template context="/*/*[self::dbk:appendix
@@ -818,8 +847,8 @@
 
   <template context="*[not(self::dbk:book|self::dbk:hub|self::dbk:figure)]
                       [not(@role = ('alternative-title', 'keywords'))]
-                      [dbk:info]
-                      [@xml:lang]
+                      [dbk:info or self::dbk:phrase[ancestor::*[self::dbk:div[@role = 'transcription']]]]
+                      [xml2tex:lang-to-babel-lang(@xml:lang)[normalize-space()]]
                       [@xml:lang ne /*/@xml:lang]
                       [not(../@xml:lang = current()/@xml:lang)]" priority="800">
     <xsl:param name="suppress-select-lang" as="xs:boolean" select="false()"/>
@@ -868,7 +897,7 @@
                                   [not(ancestor::*[self::dbk:chapter])]
                       )
                       and 
-                      ($context[$notes-type eq 'endnotes' and $notes-per-chapter eq 'yes']
+                      ($context[$notes-type eq 'endnotes' and $notes-per-chapter eq 'yes' and not($endnotes-with-chapter eq 'yes')]
                                [.//dbk:footnote]
                                [not(.//dbk:para[matches(@role, $endnotes-heading-style)])]
                                [not(.//processing-instruction()[name() = ($name-for-Tex-PI, 'latex')][. = '\printnotes'])]
@@ -881,8 +910,12 @@
       </xsl:when>
       <!-- Endnoten am Buchende -->
       <xsl:when test="$context[. is /*]
-                              [$notes-type eq 'endnotes' and $notes-per-chapter ne 'yes']
-                              [.//dbk:footnote]">
+                              [$notes-type eq 'endnotes']
+                              [not($notes-per-chapter eq 'yes') or $endnotes-with-chapter eq 'yes']
+                              [.//dbk:footnote]
+                              [not(.//dbk:para[matches(@role, $endnotes-heading-style)])]
+                              [not(.//dbk:title[matches(@role, $endnotes-heading-style)])]
+                              [not(.//processing-instruction()[name() = ($name-for-Tex-PI, 'latex')][. = '\printnotes'])]">
         <rule name="heading" type="env" break-after="2" break-before="2">
           <param select="'chapter'"/>
           <text select="concat('\tpTitle{', ('Anmerkungen', 'Notes', 'Notes')[index-of(('de', 'en', 'fr'), $main-lang)], '}')"/>
@@ -890,8 +923,7 @@
         <rule name="printnotes" type="cmd" break-before="1"/>
       </xsl:when>
       <!-- Endnoten an der Position des Absatzes mit Endnotenüberschrift -->
-      <xsl:when test="$context[self::dbk:chapter
-                              |self::dbk:section]
+      <xsl:when test="$context[self::dbk:chapter|self::dbk:section|self::dbk:appendix]
                               [dbk:info/dbk:title/@role[matches(., $endnotes-heading-style)]]">
         <rule name="printnotes" type="cmd" break-before="1"/>                              
       </xsl:when>
@@ -916,11 +948,12 @@
   </template>
   
   <template name="create-bookmark-content">
-    <xsl:if test="exists(*[not(self::dbk:footnote
+    <xsl:if test="(exists(*[not(self::dbk:footnote
                               |self::dbk:br
                               |self::dbk:phrase[@role = ('identifier', 'hub:identifier')]
                               |self::dbk:tab
                               |self::dbk:anchor)])
+                   or @xml:lang)
                   and 
                   exists(dbk:phrase[@role = ('identifier', 'hub:identifier')])">
       <!-- if title contains markup, create \tpBM-Makros. if \tpBMTitle is created, also a \tpNumber is generated. empty or -->
@@ -935,7 +968,8 @@
                               |self::dbk:phrase[@role = ('identifier', 'hub:identifier')]
                               |self::dbk:tab
                               |self::dbk:anchor)])
-                  or 
+                  or @xml:lang
+                  or
                   matches(., '[&amp;&#x9;&#xa0;&#x2000;-&#x200a;&#xAE;]')">
       <rule name="tpBMTitle" type="cmd" break-before="1">
         <!-- Newlines in title items are discarded by default (remove-newline). 
@@ -960,7 +994,7 @@
                       [descendant::dbk:personname/dbk:othername/*[not(self::dbk:footnote
                                                          |self::dbk:br
                                                          |self::dbk:tab
-                                                         |self::dbk:anchor)]]">
+                                                         |self::dbk:anchor)] or @xml:lang]">
       <rule name="tpBMAuthorNameList" type="cmd" break-before="1">
           <xsl:variable name="content">
             <xsl:apply-templates select="../(dbk:author|dbk:authorgroup/dbk:author)/dbk:personname/dbk:othername" mode="bookmark-contents"/>
@@ -971,7 +1005,7 @@
     <xsl:if test="../*[self::dbk:subtitle][*[not(self::dbk:footnote
                                                 |self::dbk:br
                                                 |self::dbk:tab
-                                                |self::dbk:anchor)]]">
+                                                |self::dbk:anchor)] or @xml:lang]">
       <rule name="tpBMSubtitle" type="cmd" break-before="1">
           <xsl:variable name="content">
             <xsl:apply-templates select="../*[self::dbk:subtitle]" mode="bookmark-contents"/>
@@ -1038,20 +1072,31 @@
     <xsl:if test="not($discard-info)">
 
       <rule name="heading" type="env" break-after="2" break-before="2">
-        <xsl:if test="   .//dbk:anchor[@role eq 'start' or not(@role)][@xml:id = $link-refs]">
-          <xsl:text>[label={</xsl:text>
-          <xsl:for-each select="descendant::dbk:anchor[@role eq 'start' or not(@role)][@xml:id = $link-refs]">
-            <xsl:apply-templates select="." mode="#current">
-              <xsl:with-param name="as-title-param" select="true()" as="xs:boolean" tunnel="yes"/>
-            </xsl:apply-templates>
-            <xsl:if test="position() ne last()">
-              <xsl:text>,</xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-          <xsl:text>}]</xsl:text>
-        </xsl:if>
-        <xsl:if test="tr:create-sect-option-from-renderas(parent::*/@renderas)">
-          <option select="xml2tex:sect-renderas-to-option(parent::*/@renderas)"/>
+        <xsl:if test=".//dbk:anchor[@role eq 'start' or not(@role)][@xml:id = $link-refs] 
+                      or 
+                      tr:create-sect-option-from-renderas(parent::*/@renderas)">
+          <xsl:text>[</xsl:text>
+            <xsl:if test=".//dbk:anchor[@role eq 'start' or not(@role)][@xml:id = $link-refs]">
+              <xsl:text>label={</xsl:text>
+              <xsl:for-each select="descendant::dbk:anchor[@role eq 'start' or not(@role)][@xml:id = $link-refs]">
+                <xsl:apply-templates select="." mode="#current">
+                  <xsl:with-param name="as-title-param" select="true()" as="xs:boolean" tunnel="yes"/>
+                </xsl:apply-templates>
+                <xsl:if test="position() ne last()">
+                  <xsl:text>,</xsl:text>
+                </xsl:if>
+              </xsl:for-each>
+              <xsl:text>}</xsl:text>
+          </xsl:if>
+          <xsl:if test=".//dbk:anchor[@role eq 'start' or not(@role)][@xml:id = $link-refs] 
+            and 
+            tr:create-sect-option-from-renderas(parent::*/@renderas)">
+            <xsl:text>,</xsl:text>
+          </xsl:if>
+          <xsl:if test="tr:create-sect-option-from-renderas(parent::*/@renderas)">
+            <xsl:sequence select="xml2tex:sect-renderas-to-option(parent::*/@renderas)"/>
+          </xsl:if>
+          <xsl:text>]</xsl:text>
         </xsl:if>
         <param select="tr:heading-level(parent::*)"/>
         <xsl:apply-templates select="(dbk:authorgroup | dbk:author), dbk:title" mode="#current"/>
@@ -1252,40 +1297,40 @@
       </xsl:when>
       <xsl:otherwise>
         <rule name="tpTocTitle" type="cmd" break-after="0" break-before="1">
-      <param select="dbk:title/node()[not(self::dbk:phrase[@role = ('identifier', 'hub:identifier')])]">
-        <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
-        <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
-        <with-param name="remove-textcolor" select="$remove-textcolor-for-runningtitles" as="xs:boolean?" tunnel="yes"/>
-      </param>
-    </rule>
-    <xsl:if test="dbk:title[dbk:phrase[@role = ('identifier', 'hub:identifier')]]">
-      <rule name="tpTocNumber" type="cmd" break-after="0" break-before="1">
-        <param select="dbk:title/dbk:phrase[@role = ('identifier', 'hub:identifier')]/node()">
-          <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
-          <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
-          <with-param name="remove-textcolor" select="$remove-textcolor-for-runningtitles" as="xs:boolean?" tunnel="yes"/>
-        </param>
-      </rule>
-    </xsl:if>
-    <xsl:if test="dbk:subtitle">
-      <rule name="tpTocSubtitle" type="cmd" break-after="0" break-before="1">
-        <param select="dbk:subtitle/node()">
-          <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
-          <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
-          <with-param name="remove-textcolor" select="$remove-textcolor-for-runningtitles" as="xs:boolean?" tunnel="yes"/>
-        </param>
-      </rule>
-    </xsl:if>
-    <xsl:if test="(dbk:author or dbk:authorgroup/dbk:author) and not($create-TocAuthorNames-by-style)">
-      <rule name="tpTocAuthorNameList" type="cmd" break-after="0" break-before="1">
-        <param select="if ((dbk:author|dbk:authorgroup/dbk:author)/dbk:personname/dbk:othername[@role[contains(., 'notoc')]]) 
-                       then '' 
-                       else (dbk:author|dbk:authorgroup/dbk:author)/dbk:personname/dbk:othername/node()">
-          <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
-          <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
-        </param>
-      </rule>
-    </xsl:if>
+          <param select="dbk:title/node()[not(self::dbk:phrase[@role = ('identifier', 'hub:identifier')])]">
+            <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
+            <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
+            <with-param name="remove-textcolor" select="$remove-textcolor-for-runningtitles" as="xs:boolean?" tunnel="yes"/>
+          </param>
+        </rule>
+        <xsl:if test="dbk:title[dbk:phrase[@role = ('identifier', 'hub:identifier')]]">
+          <rule name="tpTocNumber" type="cmd" break-after="0" break-before="1">
+            <param select="dbk:title/dbk:phrase[@role = ('identifier', 'hub:identifier')]/node()">
+              <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
+              <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
+              <with-param name="remove-textcolor" select="$remove-textcolor-for-runningtitles" as="xs:boolean?" tunnel="yes"/>
+            </param>
+          </rule>
+        </xsl:if>
+        <xsl:if test="dbk:subtitle">
+          <rule name="tpTocSubtitle" type="cmd" break-after="0" break-before="1">
+            <param select="dbk:subtitle/node()">
+              <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
+              <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
+              <with-param name="remove-textcolor" select="$remove-textcolor-for-runningtitles" as="xs:boolean?" tunnel="yes"/>
+            </param>
+          </rule>
+        </xsl:if>
+        <xsl:if test="(dbk:author or dbk:authorgroup/dbk:author) and not($create-TocAuthorNames-by-style)">
+          <rule name="tpTocAuthorNameList" type="cmd" break-after="0" break-before="1">
+            <param select="if ((dbk:author|dbk:authorgroup/dbk:author)/dbk:personname/dbk:othername[@role[contains(., 'notoc')]]) 
+              then '' 
+              else (dbk:author|dbk:authorgroup/dbk:author)/dbk:personname/dbk:othername/node()">
+              <with-param name="suppress-foreign-lang" select="true()" as="xs:boolean" tunnel="yes"/>
+              <with-param name="toc-override" select="true()" as="xs:boolean" tunnel="yes"/>
+            </param>
+          </rule>
+        </xsl:if>
       </xsl:otherwise>
     </xsl:choose>
   </template>
@@ -1477,8 +1522,6 @@
   <xsl:variable name="col-author-style" select="'^[a-z]{1,3}headlineauthor$'" as="xs:string"/>
   <xsl:variable name="col-head-style" select="'^[a-z]{1,3}(headingshort|headline(left|right|short)?)$'" as="xs:string"/>
 
-  <template context="dbk:info/dbk:titleabbrev[preceding-sibling::*[self::dbk:titleabbrev]]"/>
-  
   <template context="/dbk:hub/dbk:info/dbk:subtitle">
     <rule name="tpSubtitle" type="cmd"  break-after="2" break-before="2">
       <param/>
@@ -1518,14 +1561,10 @@
                                                       |self::dbk:editor
                                                       |self::dbk:othercredit]">
     <xsl:choose>
-      <xsl:when test="$cocotex 
-                      and 
-                      (
-                       (    dbk:personname/dbk:surname 
-                        and dbk:personname/*[self::dbk:givenname|self::dbk:firstname]
+      <xsl:when test="(    dbk:personname/dbk:surname 
+                       and dbk:personname/*[self::dbk:givenname|self::dbk:firstname]
                        ) 
-                       or exists(*[not(self::dbk:personname)])
-                      )">
+                       or exists(*[not(self::dbk:personname)])">
         <!-- if author contains only name → tpAuthorNamelist. If name is structured though 
              or if other metadata is present generate environment -->
         <rule name="tpAuthor" type="env" break-after="0" break-before="1">
@@ -1668,8 +1707,6 @@
     </rule>
   </template>
   
-  <xsl:variable name="motto-style" select="'^[a-z]{1,3}motto$'" as="xs:string"/>
-  <xsl:variable name="motto-source-style" select="'^[a-z]{1,3}mottosource$'" as="xs:string"/>
 <!--
   <template context="dbk:info/dbk:blockquote/dbk:para[matches(@role, $motto-style)] | dbk:info/dbk:epigraph/dbk:para[matches(@role, $motto-style)]">
     <rule name="quote" type="cmd" break-before="1">
@@ -1778,7 +1815,7 @@
   </xsl:function>
 
 
-  <xsl:function name="xml2tex:generate-clear-after-p" as="xs:string?">
+  <xsl:function name="xml2tex:generate-clear-after-p" as="xs:string?">  
     <xsl:param name="context" as="element()"/>
     <xsl:if test="$context[matches(tr:determine-float-pos(.), 'float-pos=t?p') 
                            and not(following-sibling::*[1][xml2tex:is-float-object(.)])
@@ -2007,6 +2044,7 @@
         <xsl:sequence select="if($elt[   dbk:title 
                                       or dbk:info 
                                       or dbk:caption
+                                      or self::dbk:figure[@floatstyle]
                                       or self::dbk:informaltable
                                       or self::*:table
                                       or preceding-sibling::*[1][matches(., ':\p{Zs}*$')]
@@ -2061,7 +2099,7 @@
                                                                       [@xml:id = $link-refs]
                                              or descendant::dbk:link[@linkend]">
         <rule name="tpListofCaption" type="cmd" break-before="0" break-after="1">
-          <param select="$caption-nodes-without-num">
+          <param select="tr:add-cca('Start', 'P'), $caption-nodes-without-num, tr:add-cca('End', 'P')">
             <with-param name="remove-footnote" select="true()" as="xs:boolean" tunnel="yes"/>
             <with-param name="remove-ref-target" select="true()" as="xs:boolean" tunnel="yes"/>
             <with-param name="dissolve-hyperlink" select="true()" as="xs:boolean" tunnel="yes"/>
@@ -2091,8 +2129,8 @@
                      |dbk:informaltable/dbk:caption
                      |*:table/dbk:textobject">
      <rule name="tpLegend" break-before="1" break-after="0" type="cmd">
-       <param/>
-     <text select="tr:add-cca('Start', 'P')[current()[self::dbk:para|dbk:textobject]], node(), tr:add-cca('End', 'P')[current()[self::dbk:para|dbk:textobject]]"/></rule>
+       <param select="tr:add-cca('Start', 'P')[current()[self::dbk:para|dbk:textobject]], node(), tr:add-cca('End', 'P')[current()[self::dbk:para|dbk:textobject]]"/>
+     </rule>
    </template>
   
   <template context="dbk:figure/dbk:caption 
@@ -2100,7 +2138,7 @@
                     |*:table/dbk:info/dbk:legalnotice
                     |dbk:informaltable/dbk:info/dbk:legalnotice">
     <rule name="tpSource" break-before="1" break-after="0" type="cmd" >
-      <param/>
+      <param select="tr:add-cca('Start', 'P')[current()[self::dbk:para|dbk:textobject]], node(), tr:add-cca('End', 'P')[current()[self::dbk:para|dbk:textobject]]"/>
     </rule>
     <xsl:if test="descendant::*[dbk:link[@linkend]|dbk:footnote]">
     <!-- https://redmine.le-tex.de/issues/16801#note-6-->
@@ -2256,14 +2294,16 @@
         * -->
   
   <xsl:template match="*[self::dbk:div]
-                        [@xml:lang[not(. = ../ancestor::*[@xml:lang][1]/@xml:lang)]]" priority="5000" mode="xml2tex">
+                        [@xml:lang[not(. = ../ancestor::*[@xml:lang][1]/@xml:lang)]
+                                  [xml2tex:lang-to-babel-lang(.)[normalize-space()]]
+                        ]" priority="5000" mode="xml2tex">
     <xsl:param name="suppress-select-lang" as="xs:boolean" select="false()"/>
     <!-- add selectlanguage -->
-    <xsl:if test="@xml:lang and not($suppress-select-lang) and not(preceding-sibling::*[1][self::dbk:para|self::dbk:blockquote][@xml:lang = current/@xml:lang])">
-      <xsl:value-of select="concat('\selectlanguage{', xml2tex:lang-to-babel-lang(@xml:lang), '}%')"/>
+    <xsl:if test="@xml:lang[xml2tex:lang-to-babel-lang(.)[normalize-space()]] and not($suppress-select-lang) and not(preceding-sibling::*[1][self::dbk:para|self::dbk:blockquote][@xml:lang = current/@xml:lang])">
+      <xsl:value-of select="concat('\selectlanguage{', xml2tex:lang-to-babel-lang(@xml:lang), '}%&#xa;')"/>
     </xsl:if>
     <xsl:next-match/>
-    <xsl:if test="@xml:lang and not(following-sibling::*[1][@xml:lang]) and not($suppress-select-lang)">
+    <xsl:if test="@xml:lang[xml2tex:lang-to-babel-lang(.)[normalize-space()]] and not(following-sibling::*[1][@xml:lang]) and not($suppress-select-lang)">
       <xsl:value-of select="concat('\selectlanguage{', xml2tex:lang-to-babel-lang($main-lang), '}')"/>
     </xsl:if>
   </xsl:template>
@@ -2273,7 +2313,7 @@
     <xsl:param name="suppress-select-lang" as="xs:boolean" select="false()"/>
     <xsl:param name="keep" as="xs:boolean?" tunnel="yes"/>
     <xsl:if test="(self::dbk:epigraph and $keep) or self::dbk:blockquote">
-     <xsl:if test="@xml:lang and not($suppress-select-lang)">
+     <xsl:if test="@xml:lang[xml2tex:lang-to-babel-lang(.)[normalize-space()]] and not($suppress-select-lang)">
       <xsl:value-of select="concat('\selectlanguage{', xml2tex:lang-to-babel-lang(@xml:lang), '}%')"/>
     </xsl:if>
     <rule name="quote" type="env" break-before="1">
@@ -2284,7 +2324,7 @@
       </xsl:if>
       <text select="* except dbk:attribution"/>
     </rule>
-    <xsl:if test="@xml:lang and not(following-sibling::*[1][not(self::dbk:div)][@xml:lang]) and not($suppress-select-lang)">
+    <xsl:if test="@xml:lang[xml2tex:lang-to-babel-lang(.)[normalize-space()]] and not(following-sibling::*[1][not(self::dbk:div)][@xml:lang]) and not($suppress-select-lang)">
       <xsl:value-of select="concat('\selectlanguage{', xml2tex:lang-to-babel-lang($main-lang), '}')"/>
     </xsl:if>
    </xsl:if>
@@ -2292,13 +2332,15 @@
   
   <template context="dbk:info/dbk:epigraph/dbk:attribution">
     <rule name="tpQuoteSource" type="cmd" break-before="1">
-        <param/>
-      </rule>
+      <param/>
+    </rule>
   </template>
   
   <template context="dbk:info/dbk:epigraph">
     <xsl:param name="suppress-select-lang" as="xs:boolean" select="false()"/>
     <xsl:param name="keep" as="xs:boolean?" tunnel="yes"/>
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <!--  https://redmine.le-tex.de/projects/transpect-typesetter/wiki/%C3%9Cberschriften#%C3%9Cberschriften-im-transpect-tex-Common-Framework-transpect-headingsdtx-->
     <!--   alle Zitat-Absätze in ein \quote-Makro, ggf. mit \tpBreak abgegrenzt, wenn mehrere Zitat-Absätze, analog Zitat-Quelle → \quotesource-->
     <xsl:variable name="context" select="."/>
@@ -2316,6 +2358,7 @@
                 <rule name="tpQuoteText" type="cmd" break-before="1">
                   <xsl:text>{</xsl:text>
                     <xsl:for-each select="current-group()">
+                      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
                       <xsl:if test="current()/@xml:lang and not($suppress-select-lang)">
                         <xsl:value-of select="concat('\foreignlanguage{', xml2tex:lang-to-babel-lang(@xml:lang), '}{')"/>
                       </xsl:if>
@@ -2323,6 +2366,7 @@
                       <xsl:if test="current()/@xml:lang and not($suppress-select-lang)">
                         <xsl:value-of select="'}'"/>
                       </xsl:if>
+                      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
                       <xsl:if test="not(. is $cg[position() = last()])"><xsl:value-of select="$motto-linebreak-content"/></xsl:if>
                     </xsl:for-each>
                   <xsl:text>}</xsl:text>
@@ -2332,7 +2376,9 @@
                 <rule name="tpQuoteSource" type="cmd" break-before="1">
                    <xsl:text>{</xsl:text>
                     <xsl:for-each select="current-group()">
+                      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
                       <xsl:apply-templates select="./node()" mode="#current"/>
+                      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
                       <xsl:if test="not(. is $cg[position() = last()])"><xsl:value-of select="$mottosource-linebreak-content"/></xsl:if>
                     </xsl:for-each>
                  <xsl:text>}</xsl:text>
@@ -2381,7 +2427,7 @@
   
   <template context="dbk:blockquote[matches(@role, $verse-centered-style)]">
     <rule name="versecentered" type="env" break-after="1" break-before="1">
-      <text select="*"/>
+      <text/>
     </rule>
   </template>
 
@@ -2398,6 +2444,8 @@
   </template>
   
   <template context="dbk:div[@role = 'transcription'][dbk:para[dbk:phrase[@role = 'speaker']]]/dbk:para" priority="400">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <!-- https://redmine.le-tex.de/issues/16281 -->
     <xsl:variable name="previous-line-number" select="preceding-sibling::*[self::dbk:para][1]/@annotations"/>
     <xsl:variable name="line-number" select="@annotations"/>
@@ -2410,7 +2458,9 @@
     </xsl:if>
     <rule name="item" type="cmd" break-before="1">
       <option select="dbk:phrase[@role = 'speaker']"/>
-      <text select="tr:add-cca('Start', 'P'), node() except dbk:phrase[@role = 'speaker'], tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text select="node() except dbk:phrase[@role = 'speaker']"/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
     </rule>
   </template>
   
@@ -2423,9 +2473,13 @@
   </template>
 
   <template context="dbk:para[matches(@role, $letter-spacing-para-style)]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule name="item" type="cmd" break-after="0">
       <text> </text>
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
       <xsl:if test="following-sibling::*[1][self::dbk:para]"><text>\\</text>
         <text>&#xa;</text>
       </xsl:if>
@@ -2436,9 +2490,13 @@
                              [following-sibling::*[1]
                                                   [self::dbk:para[matches(@role, $letter-spacing-para-style)]]
                              ]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule name="item" type="cmd" break-after="0">
       <text> </text>
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
       <text>&#xa;</text>
     </rule>
   </template>
@@ -2471,15 +2529,23 @@
     -->
   
   <template context="dbk:para[matches(@role, $letter-para-style)]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule break-after="1">
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
       <text>\tpBreak</text>
     </rule>
   </template>
 
-  <template context="dbk:blockquote[matches(@role, $verse-misc-style)]/dbk:para">  
+  <template context="dbk:blockquote[matches(@role, $verse-misc-style)]/dbk:para">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule break-after="1">
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
     </rule>
   </template>
   
@@ -2492,8 +2558,12 @@
   </template>
   
   <template context="dbk:para[matches(@role, $letter-spacing-para-style)][. is ../*[1]]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule break-after="1" break-before="1">
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
       <xsl:if test="following-sibling::*[1][self::dbk:para[matches(@role, $letter-para-style)]]">
         <text>\\</text>
       </xsl:if>
@@ -2503,8 +2573,12 @@
 
   <template context="dbk:para[matches(@role, $letter-para-style)]
                              [following-sibling::*[1][self::dbk:para[matches(@role, $letter-spacing-para-style)]]]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule break-after="1">
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
     </rule>
   </template>
   
@@ -2512,16 +2586,27 @@
         * dialogue
         * -->
   
-  <template context="dbk:blockquote[@role='dialogue' or @role[matches(., $dialogue-style)]]">
+  <template context="dbk:blockquote[@role='dialogue' or @role[matches(., $dialogue-role-regex, 'i')]]">
     <rule name="dialog" type="env">
       <text/>
     </rule>
   </template>
   
+  <template context="dbk:blockquote[@role='dialogue' or @role[matches(., $dialogue-role-regex, 'i')]]/dbk:para[matches(@role, $dialogue-action-role-regex, 'i')]">
+    <rule name="action" type="cmd" break-before="1">
+      <text>&#x20;</text>
+      <text/>
+    </rule>
+  </template>
+  
   <template context="dbk:para[dbk:personname[@role eq 'speaker']]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule name="item" type="cmd" break-before="1">
       <option select="dbk:personname[@role eq 'speaker']/normalize-space(string-join(node(), ''))"/>
-      <text select="tr:add-cca('Start', 'P'), node() except dbk:personname[@role eq 'speaker'], tr:add-cca('End', 'P')"/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text select="node() except dbk:personname[@role eq 'speaker']"/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
     </rule>
   </template>
   
@@ -2548,8 +2633,12 @@
   </template>
   
   <template context="dbk:para[matches(@role, $box-heading-style)]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule break-after="0">
-      <text select="tr:add-cca('Start', 'P'), node(), tr:add-cca('End', 'P') "/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
+      <text/>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
     </rule>
   </template>
   
@@ -2568,11 +2657,15 @@
         * -->
   
   <template context="dbk:para[matches(@role, $empty-line-style)]" priority="900">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <xsl:variable name="line-count-str" as="xs:string?" 
                   select="if (matches(@role, '\d$')) then replace(@role, '^.+(\d)$', '$1') else '1'"/>
     <rule name="tpNewPar" break-after="2" break-before="0" type="cmd">
     <option select="concat($line-count-str, '\baselineskip')"/>
-    <text select="tr:add-cca('Start', 'P')[current()[normalize-space()]], node(), tr:add-cca('End', 'P')[current()[normalize-space()]] "/>
+      <text select="tr:add-cca('Start', 'P')[current()[normalize-space()]][not($suppress-cca) and not($already-structured)]"/>
+      <text/> 
+      <text select="tr:add-cca('End', 'P')[current()[normalize-space()]][not($suppress-cca) and not($already-structured)] "/>
     </rule>
   </template>
   
@@ -2661,12 +2754,16 @@
   
   <template context="dbk:bibliomixed
                     |dbk:bibliography[not(@role = ('Citavi', 'Citavi-formatted', 'CSL', 'CSL-formatted'))]/dbk:biblioentry[dbk:abstract[@role eq 'rendered']]">
+    <xsl:param name="suppress-cca" select="tr:suppress-structure(.)" tunnel="yes" as="xs:boolean?"/>
+    <xsl:param name="already-structured" tunnel="yes" as="xs:boolean?"/>
     <rule break-after="2" type="cmd" name="bibitem">
       <option select="concat('a(', position(), ')')"/>
       <param select="(@xreflabel, concat('bib-', index-of($bibitem-ids, generate-id())))[1]"/>
+      <text select="tr:add-cca('Start', 'P')[not($suppress-cca) and not($already-structured)]"/>
       <xsl:if test="@xml:lang"><xsl:value-of select="concat('\foreignlanguage{', xml2tex:lang-to-babel-lang(@xml:lang), '}{')"/></xsl:if>
       <text select="if(dbk:abstract[@role eq 'rendered']) then dbk:abstract[@role eq 'rendered']/dbk:para/node() else node()"/>
-      <xsl:if test="@xml:lang"><xsl:value-of select="'}'"/></xsl:if>  
+      <xsl:if test="@xml:lang"><xsl:value-of select="'}'"/></xsl:if>
+      <text select="tr:add-cca('End', 'P')[not($suppress-cca) and not($already-structured)]"/>
     </rule>
   </template>
   
@@ -2705,7 +2802,7 @@
        escape ! in indexterms (makeindex has no issues with escaped 
        exclamation mark "! but xindy does ) -->
   
-  <template context="dbk:see|dbk:seealso">
+  <template context="dbk:see">
     <rule>
       <text select="concat(
                       '|',
@@ -2720,6 +2817,21 @@
     </rule>
   </template>
   
+  <template context="dbk:seealso">
+    <rule>
+      <text select="concat(
+                      '|',
+                      replace(
+                        replace(
+                          string-join(
+                            xml2tex:utf2tex(., ., $charmap, (), $texregex), ''
+                          ), '!', '{&quot;!}'
+                        ), '^((see also|voir|véase|vedi|ver|siehe auch|请参阅|ראה|انظر|참조)\s+)?(.+)$', 'seealso{$3}', 'i'
+                      )
+                    )"/>
+    </rule>
+  </template>
+  
   <template context="*[local-name() = ('primary', 
                                        'secondary', 
                                        'tertiary', 
@@ -2853,13 +2965,13 @@
     </rule>
   </regex>
 
-  <regex regex="([&#x370;-&#x3ff;&#7936;-&#8191;&#x263;]+([\p{Zs}\p{P}&#x300;-&#x36F;]+[&#x370;-&#x3ff;&#7936;-&#8191;&#x263;]+)*[…:;,\.]?)" context="not(self::*:phrase[@xml:lang='el'])">
+  <regex regex="([&#x370;-&#x3ff;&#7936;-&#8191;&#x263;]+([\p{Zs}\p{P}&#x300;-&#x36F;]+[&#x370;-&#x3ff;&#7936;-&#8191;&#x263;]+)*[…:;,\.]?)" context="not(ancestor-or-self::*[self::*:phrase[@xml:lang='el'] or self::*:phrase[matches(@role,$mathphrase-role)]])">
     <rule type="cmd" name="foreignlanguage{greek}" protect="true">
       <param regex-group="1"/>
     </rule>
   </regex>
   
-  <regex regex="([\p{Po}\p{Pd}\p{Pc}\p{Pi}\p{Pf}\(\)\[\]]?[&#x590;-&#x5ff;&#xfb1d;-&#xfb4f;]+([\p{Zs}\p{P}]+[&#x590;-&#x5ff;&#xfb1d;-&#xfb4f;]+)*)" normalize-unicode="false" context="not(self::*:phrase[@xml:lang='he'])">
+  <regex regex="([&#x590;-&#x5ff;&#xfb1d;-&#xfb4f;]+([\p{Zs}\p{P}]+[&#x590;-&#x5ff;&#xfb1d;-&#xfb4f;]+)*)" normalize-unicode="false" context="not(ancestor-or-self::*[@xml:lang='he'])">
     <rule type="cmd" name="foreignlanguage{hebrew}" protect="true">
       <param regex-group="1"/>
     </rule>
@@ -2901,9 +3013,16 @@
     </rule>
   </regex>
   
+  <regex regex="([&#x400;-&#x4ff;&#x500;-&#x52f;]+)" context="not(self::*:phrase[@xml:lang='ru'])">
+    <rule type="cmd" name="foreignlanguage{russian}" protect="true">
+      <param regex-group="1"/>
+    </rule>
+  </regex>
+  
   <!-- unichar for font change in sans-serif non-latin text #7115 -->
  
   <xsl:variable name="non-latin-style" select="'^[a-z]{1,3}nonlatin$'" as="xs:string"/>
+  <xsl:variable name="mathphrase-role" select="'^[a-z]{1,3}math$'" as="xs:string"/>
   
   <template context="dbk:phrase[matches(@role, $non-latin-style)]
                                [not(matches(., concat(
@@ -2939,31 +3058,20 @@
   <xsl:variable name="strikethrough-style" select="'^[a-z]{1,3}strikethrough$'" as="xs:string"/>
   
   <template context="dbk:phrase[matches(@role, $strikethrough-style)]
-                               [not(@css:text-decoration-line = 'line-through')] 
-                               [empty(key('style', @role)[@css:text-decoration-line = 'line-through'])]">
+                               [not(matches(@css:text-decoration-line, 'line-through'))] 
+                               [empty(key('style', @role, $root)[matches(@css:text-decoration-line, 'line-through')])]">
     <xsl:text>\sout{</xsl:text>
       <xsl:next-match/>
     <xsl:text>}</xsl:text>
   </template>
-  
-  <!-- hyperref and soul package interfere with each other -->
-  <template context="dbk:title//dbk:phrase[matches(@role, $strikethrough-style)]
-                    |dbk:title//dbk:phrase[@css:text-decoration-line eq 'line-through']">
-    <rule name="texorpdfstring" type="cmd">
-      <text>{\sout{</text>
-      <text/>
-      <text>}}</text>
-      <param/>
-    </rule>
-  </template>
 
   <!-- underline -->
 
   <xsl:variable name="underline-style" select="'^[a-z]{1,3}underline$'" as="xs:string"/>
   
   <template context="dbk:phrase[matches(@role, $underline-style)]
-                               [not(@css:text-decoration-line = 'underline')] 
-                               [empty(key('style', @role)[@css:text-decoration-line eq 'underline'])]">
+                               [not(matches(@css:text-decoration-line, 'underline'))] 
+                               [empty(key('style', @role, $root)[matches(@css:text-decoration-line, 'underline')])]">
         <!-- if thithose other conditions are true the template in docx2tex/conf.xml will match and create the uline. 
           if no restraints were set, nested \ulines would be generated-->
         <xsl:text>\uline{</xsl:text>
@@ -2973,23 +3081,38 @@
   
   
   <xsl:variable name="italic-style" select="'^[a-z]{1,3}italic$'" as="xs:string"/>
+  <xsl:variable name="bold-style" select="'^[a-z]{1,3}bold$'" as="xs:string"/>
   <xsl:variable name="emph-style" select="'^[a-z]{1,3}emph$'" as="xs:string"/>
   <xsl:variable name="strikethrough-style" select="'(^(typografisch_)?|_-_)?durchgestrichen($|_)'" as="xs:string"/>
   <xsl:variable name="underline-style" select="'(^(typografisch_)?|_-_)?unter($|_)'" as="xs:string"/>
 
   <template context="dbk:phrase[matches(@role, $italic-style)]
                                [not(@css:font-style = 'italic')]
-                               [empty(key('style', @role)[@css:font-style eq 'italic'])]">
+                               [empty(key('style', @role, $root)[@css:font-style eq 'italic'])]">
     <xsl:text>\textit{</xsl:text>
       <xsl:next-match/>
     <xsl:text>}</xsl:text>
   </template>
   
-  <xsl:variable name="bold-style" select="'^[a-z]{1,3}bold$'" as="xs:string"/>
+  <xsl:template match="dbk:phrase[matches(@role, $bold-style)]
+                                 [following-sibling::node()[1][self::dbk:indexterm]] |
+                       dbk:phrase[matches(@role, $italic-style)]
+                                 [following-sibling::node()[1][self::dbk:indexterm]]" mode="escape-bad-chars" priority="10">
+        
+    <xsl:copy>
+      <xsl:apply-templates select="@*, node()" mode="#current"/>
+      <xsl:copy-of select="following-sibling::*:indexterm[1]"/>
+    </xsl:copy>
+  </xsl:template>
+  
+  <xsl:template match="dbk:indexterm[preceding-sibling::node()[1]
+                                                              [self::dbk:phrase[matches(@role, concat($italic-style, '|', $bold-style))]]
+                                                              
+                                    ]" mode="escape-bad-chars" priority="10"/>
   
   <template context="dbk:phrase[matches(@role, $bold-style)]
                                [not(@css:font-weight = 'bold')]
-                               [empty(key('style', @role)[@css:font-weight eq 'bold'])]">
+                               [empty(key('style', @role, $root)[@css:font-weight eq 'bold'])]">
     <xsl:text>\textbf{</xsl:text>
     <xsl:next-match/>
     <xsl:text>}</xsl:text>
@@ -3003,10 +3126,10 @@
 
   <!-- override from docx2tex for arabic and chinese -->
   
-  <template context="dbk:phrase[@css:text-decoration-line ne 'none']
-                               [(@css:text-decoration-line[. eq 'underline'] 
-                                or exists(for $i in ./@role 
-                                          return /dbk:hub/dbk:info/css:rules/css:rule[$i eq @name][@css:text-decoration-line eq 'underline']))]
+  <template context="dbk:phrase[not(matches(@css:text-decoration-line, 'none'))]
+                               [(matches(@css:text-decoration-line, 'underline') 
+                                 or exists(for $i in ./@role 
+                                           return $root/dbk:hub/dbk:info/css:rules/css:rule[$i eq @name][matches(@css:text-decoration-line, 'underline')]))]
                                [not(@role eq 'Hyperlink')] 
                                [not(parent::dbk:link)]
                                [not(.//dbk:link)]
@@ -3018,11 +3141,11 @@
   
   <!-- suppress hyphenation -->
   
-  <xsl:variable name="no-hyphen-style" select="'^[a-z]{1,3}nohyphen$'" as="xs:string"/>
-  
   <template context="dbk:phrase[matches(@role, $no-hyphen-style)]">
     <rule name="mbox" type="cmd">
-      <param/>
+      <param>
+        <xsl:next-match/>
+      </param>
     </rule>
   </template>
   
@@ -3138,11 +3261,11 @@
       <xsl:when test="ancestor::*[local-name() = ('title', 'author', 'titleabbrev') or self::dbk:phrase[@role = 'hub:identifier']]
                                  [not(..[self::dbk:figure|self::*:table])]"/>
       <xsl:when test="key('item-by-linkend', @xml:id)[@role = 'page']">
-        <!-- pageref, https://redmine.le-tex.de/issues/14169 -->
-        <xsl:value-of select="concat('\tpPageLabel{', $label, '}')"/>
+        <!-- pageref, https://redmine.le-tex.de/issues/14169, https://redmine.le-tex.de/issues/18621 -->
+        <xsl:value-of select="concat('\protect'[current()/ancestor::*[self::dbk:figure|self::*:table]],'\tpPageLabel{', $label, '}')"/>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="concat('\hypertarget{', $label, '}{}')"/>
+        <xsl:value-of select="concat('\protect'[current()/ancestor::*[self::dbk:figure|self::*:table]],'\hypertarget{', $label, '}{}')"/>
       </xsl:otherwise>
     </xsl:choose>
   </template>
@@ -3194,14 +3317,14 @@
   <template context="dbk:superscript[not(dbk:footnote)]
                     |dbk:subscript
                     |dbk:phrase[not(dbk:footnote)][exists(for $i in ./@role 
-                                                          return /dbk:hub/dbk:info/css:rules/css:rule[$i eq @name]
+                                                          return $root/dbk:hub/dbk:info/css:rules/css:rule[$i eq @name]
                                                                                                      [@remap = ('superscript', 
                                                                                                                 'subscript')]
                                                           )
                                                   ]">
     <xsl:value-of select="if(   self::dbk:superscript 
                              or self::dbk:phrase[exists(for $i in ./@role 
-                                                          return /dbk:hub/dbk:info/css:rules/css:rule[$i eq @name]
+                                                          return $root/dbk:hub/dbk:info/css:rules/css:rule[$i eq @name]
                                                                                                      [@remap = 'superscript']
                                                         )
                                                 ]
@@ -3347,9 +3470,9 @@
     <xsl:param name="bm-override" as="xs:boolean?" tunnel="yes"/>
     <xsl:param name="run-override" as="xs:boolean?" tunnel="yes"/>
     <!-- in \tpTocTitle etc. some characters cannot be displayed properly and therefore have to be escaped. 
-          Example: A no-break Space has to be mapped to a tilde (https://redmine.le-tex.de/issues/13715) otherwise no space is displayed-->
-    <xsl:choose>
-      <xsl:when test="$toc-override eq true() or $bm-override eq true() or $run-override eq true()">
+          Example: A no-break Space has to be mapped to a tilde (https://redmine.le-tex.de/issues/13715, https://redmine.le-tex.de/issues/18364) otherwise no space is displayed-->
+  <!--  <xsl:choose>
+      <xsl:when test="$toc-override eq true() or $bm-override eq true() or $run-override eq true()">-->
         <xsl:variable name="regex" select="'([&amp;&#x9;&#xa0;&#x2000;-&#x200a;]+)'" as="xs:string"/>
         <xsl:analyze-string select="." regex="{$regex}">
           <xsl:matching-substring>
@@ -3369,14 +3492,24 @@
            <xsl:apply-templates select="$text/node()" mode="#current"/>
           </xsl:non-matching-substring>
         </xsl:analyze-string>
-      </xsl:when>
+<!--      </xsl:when>
       <xsl:otherwise>
         <xsl:next-match/>
       </xsl:otherwise>
-    </xsl:choose>
+    </xsl:choose>-->
     
   </xsl:template>
   
+  <template context="dbk:inlineequation[not(ancestor::dbk:superscript or ancestor::dbk:subscript )]
+                    |dbk:equation[ancestor::dbk:table or ancestor::dbk:informaltable]
+                    |dbk:informalequation[ancestor::dbk:table or ancestor::dbk:informaltable]">
+    <rule>
+      <text select="'\('"/>
+      <text select="node() except dbk:alt, dbk:alt"/>
+      <text select="'\)'"/>
+    </rule>
+  </template>
+  
   <xsl:template match="text()" mode="clean" priority="5">
     <xsl:variable name="remove-whitespace-before-pagebreaks" select="replace(., '([^\p{Zs}])\p{Zs}*\n?\p{Zs}*(\\(pagebreak|break|newline|\\|tpBreak))', '$1$2', 'm')" as="xs:string"/>
     <xsl:value-of select="$remove-whitespace-before-pagebreaks"/>
@@ -3399,16 +3532,16 @@
     <!--  https://redmine.le-tex.de/issues/14615-->
     <char character="&#xAE;" string="\textregistered{}"/>
     <char character="&#x7e;" string="{\string~}"/>
-    <char character="&#x7e;" string="${\sim}$" context="*[not(self::dbk:link|self::dbk:ulink|self::dbk:phrase[@role = 'pseudolink'])]"/>
+    <char character="&#x7e;" string="\({\sim}\)" context="*[not(self::dbk:link|self::dbk:ulink|self::dbk:phrase[@role = 'pseudolink'])]"/>
     <char character="&#x5e;" string="\textasciicircum{}"/>
-    <char character="&#x2c6f;" string="$\forall$"/>
-    <char character="&#x2200;" string="$\forall$"/>
-
-    <char character="&#x2229;" string="$\cap$"/>
-    <char character="&#x21d2;" string="$\Rightarrow$"/>
-    <char character="&#x2208;" string="$\in$"/>
-    <char character="&#x220a;" string="$\in$"/>
-    <char character="&#x2115;" string="$\mathbb{N}$"/>
+    <char character="&#x2c6f;" string="\(\forall\)" />
+    <char character="&#x2200;" string="\(\forall\)" />
+
+    <char character="&#x2229;" string="\(\cap\)" />
+    <char character="&#x21d2;" string="\(\Rightarrow\)" />
+    <char character="&#x2208;" string="\(\in\)" />
+    <char character="&#x220a;" string="\(\in\)" />
+    <char character="&#x2115;" string="\(\mathbb{N}\)" />
 
     <char character="&#xe4;" string="ä"/>
     <char character="&#xf6;" string="ö"/>
diff --git a/xpl/generate-xmp.xpl b/xpl/generate-xmp.xpl
index b18eb78..dde1bbf 100755
--- a/xpl/generate-xmp.xpl
+++ b/xpl/generate-xmp.xpl
@@ -21,7 +21,7 @@
     </p:documentation>
   </p:input>
   
-  <p:input port="meta" primary="false">
+  <p:input port="meta" primary="false" sequence="true">
     <p:documentation>
       Expects the metadata
     </p:documentation>
@@ -34,8 +34,9 @@
   </p:input>
   <p:output port="result" primary="true">
     <p:documentation>
-      Hub document with updated filerefs
+      XMP document
     </p:documentation>
+    <p:pipe port="result" step="generate-xmp"/>
   </p:output>
   
   <p:option name="debug" required="false" select="'no'"/>
@@ -63,4 +64,5 @@
     </p:input>
   </tr:dynamic-transformation-pipeline>
   
+  <p:sink/>
 </p:declare-step>
\ No newline at end of file
diff --git a/xpl/main-ts.xpl b/xpl/main-ts.xpl
index 8f3c4e8..a774cd5 100644
--- a/xpl/main-ts.xpl
+++ b/xpl/main-ts.xpl
@@ -377,7 +377,7 @@
       <p:pipe port="result" step="get-paths"/>
     </p:input>
     <p:input port="meta">
-      <p:pipe port="result" step="load-meta-wrapper"/>
+      <p:pipe port="result" step="insert-meta"/>
     </p:input>
     <p:with-option name="out-dir-uri" select="$out-dir-uri"/>
     <p:with-option name="debug" select="$debug"/>
diff --git a/xpl/xml2tex.xpl b/xpl/xml2tex.xpl
index f1eee44..ffb5cb9 100644
--- a/xpl/xml2tex.xpl
+++ b/xpl/xml2tex.xpl
@@ -104,6 +104,9 @@
     <p:with-option name="debug" select="$debug"/>
     <p:with-option name="debug-dir-uri" select="$debug-dir-uri"/>
     <p:with-option name="status-dir-uri" select="$status-dir-uri"/>
+    <p:with-option name="texmap-uri" select="(/c:param-set/c:param[@name eq 'texmap-uri']/@value[normalize-space()], '../texmap/katexmap.xml')[1]">
+       <p:pipe port="params" step="tx-xml2tex"/>
+    </p:with-option>
     <p:with-option name="collect-all-xsl" select="(/c:param-set/c:param[@name eq 'collect-all-xsl']/@value, 'yes')[1]">
       <p:pipe port="params" step="tx-xml2tex"/>
       <p:documentation>collect all xsl templates from config. important if you work with several modes for the same elements. 
diff --git a/xsl/shared-variables.xsl b/xsl/shared-variables.xsl
index dbb2300..27f9d82 100644
--- a/xsl/shared-variables.xsl
+++ b/xsl/shared-variables.xsl
@@ -35,13 +35,13 @@
                 select="'^toctitle$'"/>
 
   <xsl:variable name="hub:blockquote-role-regex" as="xs:string" 
-    select="'^[a-z]{1,3}_?(motto|dedication|epigraph|dialogue|quotation|verse|transcription|codeblock[a-z0-9]+)(_-_.+)?$'"/>
+                select="'^[a-z]{1,3}_?(motto|dedication|epigraph|dialogue[a-z]?(-action)?|quotation|verse|transcription|codeblock[a-z0-9]+)(_-_.+)?$'"/>
   
   <xsl:variable name="hub:blockquote-source-role-regex" as="xs:string" 
-                select="'^[a-z]{1,3}_?(motto|dedication|epigraph|dialogue|quotation|verse)-?source$'"/>
+                select="'^[a-z]{1,3}_?(motto|dedication|epigraph|dialogue[a-z]?|quotation|verse)-?source$'"/>
   
   <xsl:variable name="hub:list-by-indent-exception-role-regex" as="xs:string" 
-                select="'^[a-z]{1,3}_?(literature|body|dedication|motto|dialogue|quotation|figurecaption|figuresource|tablecaption|tablesource|formula|indexstatic|indexlist|codeblock[a-z0-9]+)'"/>  
+                select="'^[a-z]{1,3}_?(literature|body|dedication|motto|dialogue[a-z]?(-action)?|quotation|figurecaption|figuresource|tablecaption|tablesource|formula|indexstatic|indexlist|codeblock[a-z0-9]+)'"/>  
 
   <xsl:variable name="tei:floatingTexts-role" as="xs:string" select="'^[a-z]{1,3}_?box(grey|border)$|^transcription$'"/>
   
@@ -126,7 +126,13 @@
                 select="'^[a-z]{1,3}codeblock[a-z0-9]+$'"/>
   
   <xsl:variable name="dialogue-role-regex" as="xs:string"
-                select="'^[a-z]{1,3}dialogue$'"/>
+                select="'^[a-z]{1,3}dialogue(-action)?[a-z]?$'"/>
+  
+  <xsl:variable name="dialogue-action-role-regex" as="xs:string"
+                select="'^[a-z]+dialogue-action$'"/>
+  
+  <xsl:variable name="dialogue-speaker-delimiter-regex" as="xs:string" 
+                select="':'"/>
   
   <xsl:variable name="poem-role-regex" as="xs:string"
                 select="'^[a-z]{1,3}(verse|poem).*$'"/>
@@ -144,10 +150,13 @@
                 select="'^[a-z]+_?verse.*$'" />
   
   <xsl:variable name="letter-para-style" as="xs:string" 
-                select="'ts_letter$'"/>
+                select="'[a-z]{1,3}_letter$'"/>
+  
+  <xsl:variable name="no-hyphen-style" as="xs:string"
+                select="'^[a-z]{1,3}nohyphen$'"/>
   
   <xsl:variable name="letter-spacing-para-style" as="xs:string" 
-                select="'ts_letter_spacing$'"/>
+                select="'[a-z]{1,3}_letter_spacing$'"/>
   
   <!-- role for para that contains image or file reference, first 
        regex group identifies class, second group represents position -->
@@ -157,6 +166,12 @@
   <xsl:variable name="fig-legend-para-style-regex" as="xs:string" 
                 select="'^[a-z]{1,3}figurelegend$'"/>
   
+  <xsl:variable name="figure-alt-role-regex" as="xs:string"
+                select="'^[a-z]{1,3}figurealt$'" />
+  
+  <xsl:variable name="formula_alt_role_regex" as="xs:string" 
+                select="'^[a-z]{1,3}formulaalt$'"/>
+  
   <xsl:variable name="figure-caption-role-regex" as="xs:string"
                 select="'^[a-z]{1,3}figurecaption$'" />
   
@@ -257,6 +272,17 @@
   <xsl:variable name="info-subtitle-role" as="xs:string"
                 select="'^[a-z]{1,3}(subheading\d|journalreviewsubheading)$'"/>
   
+  <!-- motto-style and info-blockquote-roles as well 
+       as motto-source-style and info-blockquote-source-roles 
+       share the same semantic. Perhaps we should stick to 
+       'info-blockquote' or 'epigraph' as 'motto' is German. 
+       Perhaps we need two different environemnts for headings? -->
+  <xsl:variable name="motto-style" as="xs:string" 
+                select="'^[a-z]{1,3}motto$'"/>
+  
+  <xsl:variable name="motto-source-style" as="xs:string"
+                select="'^[a-z]{1,3}mottosource$'"/>
+  
   <xsl:variable name="info-blockquote-roles" as="xs:string"
                 select="'^[a-z]{1,3}(motto-zitat|motto|epigraph)$'"/>
   
@@ -267,7 +293,7 @@
                 select="'^[a-z]{1,3}abbreviations$'"/>
   
   <xsl:variable name="create-index-at-general-headings" 
-                select="false()"/>
+                select="true()"/>
   
   <xsl:variable name="index-text-regex" as="xs:string" 
                 select="'^[a-z]{1,3}index\s?text'"/>
@@ -293,21 +319,22 @@
   <xsl:variable name="index-static-level-regex" as="xs:string" 
                 select="concat('(', string-join($index-static-level, '|'), ')?')"/>
   
+  <xsl:variable name="index-static-page-range-separator" as="xs:string" 
+                select="'&#x2013;'" />
+  
   <!-- please do not remove the tailing and leading regex group -->
   <xsl:variable name="index-see-regex" as="xs:string" 
                 select="'(see|siehe)'"/>
   <xsl:variable name="index-see-also-regex" as="xs:string" 
                 select="concat($index-see-regex, '(\p{Zs}(also|auch))')"/>
-  <xsl:variable name="index-see-pi-name" as="xs:string" 
-                select="'see'"/>
-  <xsl:variable name="index-see-also-pi-name" as="xs:string" 
-                select="'seealso'"/>
   
   <xsl:variable name="index-see-pi-name" as="xs:string" 
                 select="'see'"/>
   <xsl:variable name="index-see-also-pi-name" as="xs:string" 
                 select="'seealso'"/>
   
+  <xsl:variable name="hub:seealso-indexentry-text-regex" select="'\s*[sS]iehe\p{Zs}+auch|\s*[Ss]ee\p{Zs}+also'"/>
+  
   <xsl:variable name="bibliography-role-regex" as="xs:string" 
                 select="'^[a-z]{1,3}literature$'"/>
   
@@ -326,8 +353,6 @@
 
   <xsl:variable name="empty-line-style" select="'^[a-z]{1,3}(lineskip(\d)?|codeblock[a-z0-9]+)$'" as="xs:string"/>
 
-  <xsl:variable name="dialogue-style" select="'^[a-z]+dialogue'" as="xs:string"/>
-
   <!-- the following variables are mainly for the idml conversion and checking pipelines -->
 
   <xsl:key name="tr:rule-definition-in-document" match="css:rule" use="@name"/>
@@ -371,8 +396,6 @@
   
 
   <xsl:variable name="hub:subtitle-role-regex" as="xs:string" select="'tssubheading[1-5]'" /> 
-
-  <xsl:variable name="hub:general-heading-main-name-regex" select="'tsheading(numerated)?([1-5]|part)'" as="xs:string"/>
   <xsl:variable name="hub:tabs-are-allowed-in-this-para" select="'tslist|tsheading|tsfigurecaption|tstablecaption|tsfootnote'" as="xs:string"/>
   <xsl:variable name="hub:list-role-regex" as="xs:string" select="'tslist$'" >
     <!-- for schematron purposes mainly, but also to determine that ohub:tabs-are-allowed-in-this-paranly these paras are handled by list handler via function  -->