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 38c0c4a49047de64b05671879154a0e157ed12bf..bc18bf021170b6f0762b80ef7748297a3725b380 100644 (file)
--- 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>