From: Alexey Neyman <stilor@att.net>
Date: Tue, 24 Sep 2013 03:35:07 +0000 (+0000)
Subject: Pass the object referenced as a parameter to mode="intralabel.punctuation"
X-Git-Tag: release/1.79.1~6^2~153
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88c4404191fef5ce45d7261d3d8de32ba7fbe1a9;p=docbook-dsssl

Pass the object referenced as a parameter to mode="intralabel.punctuation"
template.
---

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index 8b087049a..df81d12f4 100644
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -29,7 +29,13 @@ element label.</para>
 </refdescription>
 </doc:mode>
 
+<!--
+     Note that this template is applied to parent of the object being
+     referenced, and that object is passed via parameter.
+-->
 <xsl:template match="*" mode="intralabel.punctuation">
+  <xsl:param name="object" select="."/>
+
   <xsl:text>.</xsl:text>
 </xsl:template>
 
@@ -84,7 +90,9 @@ element label.</para>
         <xsl:if test="$part.label != ''">
           <xsl:value-of select="$part.label"/>
           <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
+                               mode="intralabel.punctuation">
+            <xsl:with-param name="object" select="."/>
+          </xsl:apply-templates>
         </xsl:if>
       </xsl:if>
       <xsl:variable name="format">
@@ -119,7 +127,9 @@ element label.</para>
         <xsl:if test="$part.label != ''">
           <xsl:value-of select="$part.label"/>
           <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
+                               mode="intralabel.punctuation">
+            <xsl:with-param name="object" select="."/>
+          </xsl:apply-templates>
         </xsl:if>
       </xsl:if>
       <xsl:variable name="format">
@@ -154,7 +164,9 @@ element label.</para>
         <xsl:if test="$part.label != ''">
           <xsl:value-of select="$part.label"/>
           <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
+                               mode="intralabel.punctuation">
+            <xsl:with-param name="object" select="."/>
+          </xsl:apply-templates>
         </xsl:if>
       </xsl:if>
       <xsl:variable name="format">
@@ -202,7 +214,9 @@ element label.</para>
         <xsl:if test="$part.label != ''">
           <xsl:value-of select="$part.label"/>
           <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
+                               mode="intralabel.punctuation">
+            <xsl:with-param name="object" select="."/>
+          </xsl:apply-templates>
         </xsl:if>
       </xsl:if>
       <xsl:variable name="format">
@@ -238,7 +252,9 @@ element label.</para>
     </xsl:variable>
     <xsl:if test="$parent.section.label != '0'">
       <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      <xsl:apply-templates select=".." mode="intralabel.punctuation">
+        <xsl:with-param name="object" select="."/>
+      </xsl:apply-templates>
     </xsl:if>
   </xsl:if>
 
@@ -263,7 +279,9 @@ element label.</para>
     </xsl:variable>
     <xsl:if test="$parent.label != ''">
       <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      <xsl:apply-templates select=".." mode="intralabel.punctuation">
+        <xsl:with-param name="object" select="."/>
+      </xsl:apply-templates>
     </xsl:if>
   </xsl:if>
 
@@ -304,7 +322,9 @@ element label.</para>
       </xsl:variable>
       <xsl:if test="$parent.label != ''">
         <xsl:apply-templates select=".." mode="label.markup"/>
-        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+        <xsl:apply-templates select=".." mode="intralabel.punctuation">
+          <xsl:with-param name="object" select="."/>
+        </xsl:apply-templates>
       </xsl:if>
     </xsl:if>
   </xsl:variable>
@@ -339,7 +359,9 @@ element label.</para>
   </xsl:variable>
   <xsl:if test="$parent.section.label != '0'">
     <xsl:apply-templates select=".." mode="label.markup"/>
-    <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+    <xsl:apply-templates select=".." mode="intralabel.punctuation">
+      <xsl:with-param name="object" select="."/>
+    </xsl:apply-templates>
   </xsl:if>
 
   <xsl:variable name="is.numbered">
@@ -404,7 +426,9 @@ element label.</para>
   </xsl:variable>
   <xsl:if test="$parent.label != ''">
     <xsl:apply-templates select=".." mode="label.markup"/>
-    <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+    <xsl:apply-templates select=".." mode="intralabel.punctuation">
+      <xsl:with-param name="object" select="."/>
+    </xsl:apply-templates>
   </xsl:if>
 
   <xsl:choose>
@@ -442,7 +466,9 @@ element label.</para>
     </xsl:variable>
     <xsl:if test="$parent.section.label != ''">
       <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      <xsl:apply-templates select=".." mode="intralabel.punctuation">
+        <xsl:with-param name="object" select="."/>
+      </xsl:apply-templates>
     </xsl:if>
   </xsl:if>
 
@@ -467,7 +493,9 @@ element label.</para>
     </xsl:variable>
     <xsl:if test="$parent.label != ''">
       <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      <xsl:apply-templates select=".." mode="intralabel.punctuation">
+        <xsl:with-param name="object" select="."/>
+      </xsl:apply-templates>
     </xsl:if>
   </xsl:if>
 
@@ -515,7 +543,9 @@ element label.</para>
     <xsl:if test="$qanda.inherit.numeration != 0">
       <xsl:if test="$lparent.prefix != ''">
         <xsl:apply-templates select="$lparent" mode="label.markup"/>
-        <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
+        <xsl:apply-templates select="$lparent" mode="intralabel.punctuation">
+          <xsl:with-param name="object" select="."/>
+        </xsl:apply-templates>
       </xsl:if>
     </xsl:if>
   </xsl:variable>
@@ -564,12 +594,16 @@ element label.</para>
           <xsl:if test="string-length($div.label) != 0">
             <xsl:copy-of select="$div.label"/>
             <xsl:apply-templates select="ancestor::qandadiv[1]"
-                                 mode="intralabel.punctuation"/>
+                                 mode="intralabel.punctuation">
+              <xsl:with-param name="object" select="."/>
+            </xsl:apply-templates>
           </xsl:if>
         </xsl:when>
         <xsl:when test="$lparent.prefix != ''">
           <xsl:apply-templates select="$lparent" mode="label.markup"/>
-          <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
+          <xsl:apply-templates select="$lparent" mode="intralabel.punctuation">
+            <xsl:with-param name="object" select="."/>
+          </xsl:apply-templates>
         </xsl:when>
       </xsl:choose>
     </xsl:if>
@@ -658,7 +692,9 @@ element label.</para>
       <xsl:choose>
         <xsl:when test="$prefix != ''">
             <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
+            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation">
+              <xsl:with-param name="object" select="."/>
+            </xsl:apply-templates>
           <xsl:number format="1" from="chapter|appendix" level="any"/>
         </xsl:when>
         <xsl:otherwise>
@@ -693,7 +729,9 @@ element label.</para>
         <xsl:when test="count($pchap)>0">
           <xsl:if test="$prefix != ''">
             <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
+            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation">
+              <xsl:with-param name="object" select="."/>
+            </xsl:apply-templates>
           </xsl:if>
           <xsl:number count="procedure[title|blockinfo/title|info/title]" format="1" 
                       from="chapter|appendix" level="any"/>
@@ -728,7 +766,9 @@ element label.</para>
         <xsl:when test="count($pchap)>0">
           <xsl:if test="$prefix != ''">
             <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
+            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation">
+              <xsl:with-param name="object" select="."/>
+            </xsl:apply-templates>
           </xsl:if>
           <xsl:number format="1" count="equation" 
                       from="chapter|appendix" level="any"/>