Improve FAQ labeling

diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index 9ac37fe783a2e60feff761e4b6831ca682eb77a7..d5ab761670577d3a708f8ed01ae558369213bce4 100644 (file)
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -411,6 +411,11 @@ element label.</para>
         <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:if>
   </xsl:variable>
 

diff --git a/xsl/html/qandaset.xsl b/xsl/html/qandaset.xsl
index 53e351a794e0ba0b352b1cdb15ef2bbd89102d48..e46d1ef847caef1b5f915c9dcba1065c758cb375 100644 (file)
--- a/xsl/html/qandaset.xsl
+++ b/xsl/html/qandaset.xsl
@@ -163,6 +163,7 @@
       <xsl:with-param name="conditional" select="0"/>
     </xsl:call-template>
     <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
+    <xsl:value-of select="$autotoc.label.separator"/>
     <xsl:text> </xsl:text>
     <xsl:apply-templates/>
   </xsl:element>
@@ -255,6 +256,7 @@
   </xsl:variable>
 
   <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
+  <xsl:value-of select="$autotoc.label.separator"/>
   <xsl:text> </xsl:text>
   <a>
     <xsl:attribute name="href">