From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 17 Jul 2002 11:04:16 +0000 (+0000)
Subject: Fixed thinko
X-Git-Tag: release/1.79.1~6^2~5396
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94cf0390f4093b4d6cf3bfcf419dcd223aa1058c;p=docbook-dsssl

Fixed thinko
---

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index 87ace73e7..a3385a1ea 100644
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -488,8 +488,40 @@ element label.</para>
   </xsl:if>
 </xsl:template>
 
-<xsl:template match="figure|table|example|equation|procedure"
-              mode="label.markup">
+<xsl:template match="figure|table|example|procedure" mode="label.markup">
+  <xsl:variable name="pchap"
+                select="ancestor::chapter
+                        |ancestor::appendix
+                        |ancestor::article[ancestor::book]"/>
+
+  <xsl:variable name="prefix">
+    <xsl:if test="count($pchap) &gt; 0">
+      <xsl:apply-templates select="$pchap" mode="label.markup"/>
+    </xsl:if>
+  </xsl:variable>
+
+  <xsl:choose>
+    <xsl:when test="@label">
+      <xsl:value-of select="@label"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:choose>
+        <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:if>
+          <xsl:number format="1" from="chapter|appendix" level="any"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:number format="1" from="book|article" level="any"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="equation" mode="label.markup">
   <xsl:variable name="pchap"
                 select="ancestor::chapter
                         |ancestor::appendix