Merge pull request #736 from rvdb/jTEI_optimizeWhitespaceInEg

optimizations for whitespace handling in eg elements
TEIC · Feb 26, 2025 · ef5fa03 · ef5fa03
2 parents f42a7cd + 7c9ee21
commit ef5fa03
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/profiles/jtei/openedition/to.xsl b/profiles/jtei/openedition/to.xsl
@@ -472,10 +472,12 @@
   </xsl:template>
 
   <xsl:template match="tei:eg">
-    <xsl:variable name="stripIndent" select="min((for $line in tokenize(., '\n')[.] return string-length(replace($line, '^(\s+).*', '$1'))))"/>
+    <!-- strip leading blank lines, normalize tabs -->
+    <xsl:variable name="eg" select="replace(., '^(\s*\n+)', '') ! replace(., '\t', '    ')"/>
+    <xsl:variable name="stripIndent" select="min((for $line in tokenize($eg, '\n')[.] return string-length(replace($line, '^(\s*).+', '$1'))))"/>
     <p rend="noindent">
       <code lang="xml">
-        <xsl:analyze-string select="." regex="\n">
+        <xsl:analyze-string select="replace($eg, '^\n+', '')" regex="\n">
           <xsl:matching-substring>
             <xsl:text>&#10;</xsl:text>
           </xsl:matching-substring>

diff --git a/profiles/jtei/pdf/to.xsl b/profiles/jtei/pdf/to.xsl
@@ -460,12 +460,14 @@
   </xsl:template>
 
   <xsl:template match="tei:eg">
+    <!-- strip leading blank lines, normalize tabs -->
+    <xsl:variable name="eg" select="replace(., '^(\s*\n+)', '') ! replace(., '\t', '    ')"/>
     <!-- determine maximal amount of preceding whitespace that can be stripped out -->
-    <xsl:variable name="stripIndent" select="min((for $line in tokenize(., '\n')[.] return string-length(replace($line, '^(\s+).*', '$1'))))"/>
-    <fo:block xsl:use-attribute-sets="egXML.properties monospace.properties">
-      <xsl:analyze-string select="." regex="\n">
+    <xsl:variable name="stripIndent" select="min((for $line in tokenize($eg, '\n')[.] return string-length(replace($line, '^(\s*).+', '$1'))))"/>
+    <fo:block xsl:use-attribute-sets="egXML.properties monospace.properties" linefeed-treatment="preserve">
+      <xsl:analyze-string select="$eg" regex="\n">
         <xsl:matching-substring>
-          <fo:block/>
+          <xsl:text>&#10;</xsl:text>
         </xsl:matching-substring>
         <xsl:non-matching-substring>
           <xsl:analyze-string select="if ($stripIndent > 0) then replace(., concat('^\s{', $stripIndent, '}'), '') else ." regex="\s">