Fixed bug in sect1 label.markup mode that could output the

component label without the section label.

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index bc18bf021170b6f0762b80ef7748297a3725b380..ae9910803f95054ce562c12d4f86f74bd1c61ddd 100644 (file)
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -247,16 +247,19 @@ element label.</para>
     </xsl:call-template>
   </xsl:variable>
 
-  <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
-    <xsl:variable name="parent.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+  <xsl:variable name="component.label">
+    <xsl:if test="$section.label.includes.component.label != 0
+                  and $parent.is.component != 0">
+      <xsl:variable name="parent.label">
+        <xsl:apply-templates select=".." mode="label.markup"/>
+      </xsl:variable>
+      <xsl:if test="$parent.label != ''">
+        <xsl:apply-templates select=".." mode="label.markup"/>
+        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
+      </xsl:if>
     </xsl:if>
-  </xsl:if>
+  </xsl:variable>
+
 
   <xsl:variable name="is.numbered">
     <xsl:call-template name="label.this.section"/>
@@ -267,6 +270,7 @@ element label.</para>
       <xsl:value-of select="@label"/>
     </xsl:when>
     <xsl:when test="$is.numbered != 0">
+      <xsl:copy-of select="$component.label"/>
       <xsl:number count="sect1"/>
     </xsl:when>
   </xsl:choose>