From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Tue, 16 Nov 2004 19:36:23 +0000 (+0000)
Subject: issue #924251 Wrong numbering of Qandaset entries
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2654b39a63596bed6e76e4774633e62c7c59ce2c;p=docbook-dsssl

issue #924251 Wrong numbering of Qandaset entries
applied patch from Harald Joerg.
---

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index 38c0c4a49..bc18bf021 100644
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -485,15 +485,17 @@ element label.</para>
 
   <xsl:variable name="prefix">
     <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:if>
-      <xsl:if test="ancestor::qandadiv">
-        <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/>
-        <xsl:apply-templates select="ancestor::qandadiv[1]"
-                             mode="intralabel.punctuation"/>
-      </xsl:if>
+      <xsl:choose>
+	<xsl:when test="ancestor::qandadiv">
+	  <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/>
+	  <xsl:apply-templates select="ancestor::qandadiv[1]"
+			       mode="intralabel.punctuation"/>
+	</xsl:when>
+	<xsl:when test="$lparent.prefix != ''">
+	  <xsl:apply-templates select="$lparent" mode="label.markup"/>
+	  <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
+	</xsl:when>
+      </xsl:choose>
     </xsl:if>
   </xsl:variable>