Move calculation of linenumber.* parameters into the number.rtf.lines template

diff --git a/xsl/fo/callout.xsl b/xsl/fo/callout.xsl
index e00f98d74f9fad0b0fc0e3ebefef1936bfa72231..05678bb8dd372d2aff00a05262b44f7cf3cf3f7b 100644 (file)
--- a/xsl/fo/callout.xsl
+++ b/xsl/fo/callout.xsl
@@ -55,12 +55,8 @@
                         and $linenumbering.extension != '0'">
           <xsl:call-template name="number.rtf.lines">
             <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-            <xsl:with-param name="linenumbering.everyNth"
-                            select="$linenumbering.everyNth"/>
-            <xsl:with-param name="linenumbering.width"
-                            select="$linenumbering.width"/>
-            <xsl:with-param name="linenumbering.separator"
-                            select="$linenumbering.separator"/>
+            <xsl:with-param name="pi.context"
+                            select="programlisting|screen"/>
           </xsl:call-template>
           <xsl:apply-templates select="calloutlist"/>
         </xsl:when>

diff --git a/xsl/fo/verbatim.xsl b/xsl/fo/verbatim.xsl
index d8e97b174832e1e117e9c3416475cf4717935009..ce8d4f6a0c2ee64374d476a20505f6ed2fbf0fc8 100644 (file)
--- a/xsl/fo/verbatim.xsl
+++ b/xsl/fo/verbatim.xsl
@@ -25,42 +25,6 @@
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
 
-  <!-- Obey the <?dbfo linenumbering.everyNth="x"?> PI -->
-  <xsl:variable name="pi.linenumbering.everyNth">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="attribute" select="'everyNth'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="everyNth">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.everyNth != ''">
-        <xsl:value-of select="$pi.linenumbering.everyNth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$linenumbering.everyNth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Obey the <?dbfo linenumbering.separator="x"?> PI -->
-  <xsl:variable name="pi.linenumbering.separator">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="separator">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.separator != ''">
-        <xsl:value-of select="$pi.linenumbering.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$linenumbering.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
   <xsl:choose>
     <xsl:when test="$suppress-numbers = '0'
                     and @linenumbering = 'numbered'
@@ -76,12 +40,6 @@
                 xsl:use-attribute-sets="monospace.verbatim.properties">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf" select="$rtf"/>
-          <xsl:with-param name="linenumbering.everyNth"
-                          select="$everyNth"/>
-          <xsl:with-param name="linenumbering.width"
-                          select="$linenumbering.width"/>
-          <xsl:with-param name="linenumbering.separator"
-                          select="$separator"/>
         </xsl:call-template>
       </fo:block>
     </xsl:when>
@@ -119,12 +77,6 @@
                     xsl:use-attribute-sets="monospace.verbatim.properties">
             <xsl:call-template name="number.rtf.lines">
               <xsl:with-param name="rtf" select="$rtf"/>
-              <xsl:with-param name="linenumbering.everyNth"
-                              select="$linenumbering.everyNth"/>
-              <xsl:with-param name="linenumbering.width"
-                              select="$linenumbering.width"/>
-              <xsl:with-param name="linenumbering.separator"
-                              select="$linenumbering.separator"/>
             </xsl:call-template>
           </fo:block>
         </xsl:when>
@@ -136,12 +88,6 @@
                     xsl:use-attribute-sets="verbatim.properties">
             <xsl:call-template name="number.rtf.lines">
               <xsl:with-param name="rtf" select="$rtf"/>
-              <xsl:with-param name="linenumbering.everyNth"
-                              select="$linenumbering.everyNth"/>
-              <xsl:with-param name="linenumbering.width"
-                              select="$linenumbering.width"/>
-              <xsl:with-param name="linenumbering.separator"
-                              select="$linenumbering.separator"/>
             </xsl:call-template>
           </fo:block>
         </xsl:otherwise>
@@ -191,12 +137,6 @@
                 xsl:use-attribute-sets="verbatim.properties">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf" select="$rtf"/>
-          <xsl:with-param name="linenumbering.everyNth"
-                          select="$linenumbering.everyNth"/>
-          <xsl:with-param name="linenumbering.width"
-                          select="$linenumbering.width"/>
-          <xsl:with-param name="linenumbering.separator"
-                          select="$linenumbering.separator"/>
         </xsl:call-template>
       </fo:block>
     </xsl:when>
@@ -214,10 +154,76 @@
 
 <xsl:template name="number.rtf.lines">
   <xsl:param name="rtf" select="''"/>
-  <!-- the following parameters must have these names ... -->
-  <xsl:param name="linenumbering.everyNth" select="1"/>
-  <xsl:param name="linenumbering.width" select="3"/>
-  <xsl:param name="linenumbering.separator" select="' |'"/>
+  <xsl:param name="pi.context" select="."/>
+
+  <!-- Save the global values -->
+  <xsl:variable name="global.linenumbering.everyNth"
+                select="$linenumbering.everyNth"/>
+
+  <xsl:variable name="global.linenumbering.separator"
+                select="$linenumbering.separator"/>
+
+  <xsl:variable name="global.linenumbering.width"
+                select="$linenumbering.width"/>
+
+  <!-- Extract the <?dbfo linenumbering.*?> PI values -->
+  <xsl:variable name="pi.linenumbering.everyNth">
+    <xsl:call-template name="dbfo-attribute">
+      <xsl:with-param name="pis"
+                      select="$pi.context/processing-instruction('dbfo')"/>
+      <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="pi.linenumbering.separator">
+    <xsl:call-template name="dbfo-attribute">
+      <xsl:with-param name="pis"
+                      select="$pi.context/processing-instruction('dbfo')"/>
+      <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="pi.linenumbering.width">
+    <xsl:call-template name="dbfo-attribute">
+      <xsl:with-param name="pis"
+                      select="$pi.context/processing-instruction('dbfo')"/>
+      <xsl:with-param name="attribute" select="'linenumbering.width'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <!-- Construct the 'in-context' values -->
+  <xsl:variable name="linenumbering.everyNth">
+    <xsl:choose>
+      <xsl:when test="$pi.linenumbering.everyNth != ''">
+        <xsl:value-of select="$pi.linenumbering.everyNth"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$global.linenumbering.everyNth"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="linenumbering.separator">
+    <xsl:choose>
+      <xsl:when test="$pi.linenumbering.separator != ''">
+        <xsl:value-of select="$pi.linenumbering.separator"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$global.linenumbering.separator"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="linenumbering.width">
+    <xsl:choose>
+      <xsl:when test="$pi.linenumbering.width != ''">
+        <xsl:value-of select="$pi.linenumbering.width"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$global.linenumbering.width"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
 
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
 

diff --git a/xsl/html/callout.xsl b/xsl/html/callout.xsl
index cb289adbfe2cf324901acdec14533d889eeb01d5..9af572252dc23529ee12ae0a3bc90332e38aa3db 100644 (file)
--- a/xsl/html/callout.xsl
+++ b/xsl/html/callout.xsl
@@ -55,12 +55,8 @@
           <div class="{name(.)}">
             <xsl:call-template name="number.rtf.lines">
               <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-              <xsl:with-param name="linenumbering.everyNth"
-                              select="$linenumbering.everyNth"/>
-              <xsl:with-param name="linenumbering.width"
-                              select="$linenumbering.width"/>
-              <xsl:with-param name="linenumbering.separator"
-                              select="$linenumbering.separator"/>
+              <xsl:with-param name="pi.context"
+                              select="programlisting|screen"/>
             </xsl:call-template>
             <xsl:apply-templates select="calloutlist"/>
           </div>

diff --git a/xsl/html/verbatim.xsl b/xsl/html/verbatim.xsl
index d958d91c39d292a6391544120c72cf6a924fc1e3..bfaa1578e80773aeb0f83495f534a90916f4b44b 100644 (file)
--- a/xsl/html/verbatim.xsl
+++ b/xsl/html/verbatim.xsl
@@ -24,42 +24,6 @@
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
   <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
 
-  <!-- Obey the <?dbhtml linenumbering.everyNth="x"?> PI -->
-  <xsl:variable name="pi.linenumbering.everyNth">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="attribute" select="'everyNth'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="everyNth">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.everyNth != ''">
-        <xsl:value-of select="$pi.linenumbering.everyNth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$linenumbering.everyNth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Obey the <?dbhtml linenumbering.separator="x"?> PI -->
-  <xsl:variable name="pi.linenumbering.separator">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="separator">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.separator != ''">
-        <xsl:value-of select="$pi.linenumbering.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$linenumbering.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
   <xsl:if test="@id">
     <a href="{$id}"/>
   </xsl:if>
@@ -75,16 +39,9 @@
       <pre class="{name(.)}">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf" select="$rtf"/>
-          <xsl:with-param name="linenumbering.everyNth"
-                          select="$everyNth"/>
-          <xsl:with-param name="linenumbering.width"
-                          select="$linenumbering.width"/>
-          <xsl:with-param name="linenumbering.separator"
-                          select="$separator"/>
         </xsl:call-template>
       </pre>
     </xsl:when>
-
     <xsl:otherwise>
       <pre class="{name(.)}">
         <xsl:apply-templates/>
@@ -111,12 +68,6 @@
           <pre class="{name(.)}">
             <xsl:call-template name="number.rtf.lines">
               <xsl:with-param name="rtf" select="$rtf"/>
-              <xsl:with-param name="linenumbering.everyNth"
-                              select="$linenumbering.everyNth"/>
-              <xsl:with-param name="linenumbering.width"
-                              select="$linenumbering.width"/>
-              <xsl:with-param name="linenumbering.separator"
-                              select="$linenumbering.separator"/>
             </xsl:call-template>
           </pre>
         </xsl:when>
@@ -124,12 +75,6 @@
           <div class="{name(.)}">
             <xsl:call-template name="number.rtf.lines">
               <xsl:with-param name="rtf" select="$rtf"/>
-              <xsl:with-param name="linenumbering.everyNth"
-                              select="$linenumbering.everyNth"/>
-              <xsl:with-param name="linenumbering.width"
-                              select="$linenumbering.width"/>
-              <xsl:with-param name="linenumbering.separator"
-                              select="$linenumbering.separator"/>
             </xsl:call-template>
           </div>
         </xsl:otherwise>
@@ -176,12 +121,6 @@
       <div class="{name(.)}">
         <xsl:call-template name="number.rtf.lines">
           <xsl:with-param name="rtf" select="$rtf"/>
-          <xsl:with-param name="linenumbering.everyNth"
-                          select="$linenumbering.everyNth"/>
-          <xsl:with-param name="linenumbering.width"
-                          select="$linenumbering.width"/>
-          <xsl:with-param name="linenumbering.separator"
-                          select="$linenumbering.separator"/>
         </xsl:call-template>
       </div>
     </xsl:when>
@@ -196,10 +135,76 @@
 
 <xsl:template name="number.rtf.lines">
   <xsl:param name="rtf" select="''"/>
-  <!-- the following parameters must have these names ... -->
-  <xsl:param name="linenumbering.everyNth" select="1"/>
-  <xsl:param name="linenumbering.width" select="3"/>
-  <xsl:param name="linenumbering.separator" select="' |'"/>
+  <xsl:param name="pi.context" select="."/>
+
+  <!-- Save the global values -->
+  <xsl:variable name="global.linenumbering.everyNth"
+                select="$linenumbering.everyNth"/>
+
+  <xsl:variable name="global.linenumbering.separator"
+                select="$linenumbering.separator"/>
+
+  <xsl:variable name="global.linenumbering.width"
+                select="$linenumbering.width"/>
+
+  <!-- Extract the <?dbhtml linenumbering.*?> PI values -->
+  <xsl:variable name="pi.linenumbering.everyNth">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+                      select="$pi.context/processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="pi.linenumbering.separator">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+                      select="$pi.context/processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:variable name="pi.linenumbering.width">
+    <xsl:call-template name="dbhtml-attribute">
+      <xsl:with-param name="pis"
+                      select="$pi.context/processing-instruction('dbhtml')"/>
+      <xsl:with-param name="attribute" select="'linenumbering.width'"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <!-- Construct the 'in-context' values -->
+  <xsl:variable name="linenumbering.everyNth">
+    <xsl:choose>
+      <xsl:when test="$pi.linenumbering.everyNth != ''">
+        <xsl:value-of select="$pi.linenumbering.everyNth"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$global.linenumbering.everyNth"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="linenumbering.separator">
+    <xsl:choose>
+      <xsl:when test="$pi.linenumbering.separator != ''">
+        <xsl:value-of select="$pi.linenumbering.separator"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$global.linenumbering.separator"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
+  <xsl:variable name="linenumbering.width">
+    <xsl:choose>
+      <xsl:when test="$pi.linenumbering.width != ''">
+        <xsl:value-of select="$pi.linenumbering.width"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$global.linenumbering.width"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
 
   <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>