From: Bob Stayton <bobs@sagehill.net>
Date: Wed, 16 Jan 2013 18:56:16 +0000 (+0000)
Subject: Make sure bridgeheads are not numbered in all contexts, including html title attributes.
X-Git-Tag: release/1.79.1~6^2~249
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71b9447c2ade829ec18b96408afe52e13ee59b05;p=docbook-dsssl

Make sure bridgeheads are not numbered in all contexts, including html title attributes.
---

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index bfb5e3003..197815fd6 100644
--- a/xsl/common/gentext.xsl
+++ b/xsl/common/gentext.xsl
@@ -196,7 +196,8 @@
 </xsl:template>
 
 <xsl:template match="bridgehead" mode="is.autonumber">
-  <xsl:value-of select="$section.autolabel"/>
+  <!-- bridgeheads are not numbered -->
+  <xsl:text>0</xsl:text>
 </xsl:template>
 
 <xsl:template match="procedure" mode="is.autonumber">
diff --git a/xsl/common/labels.xsl b/xsl/common/labels.xsl
index 6c81d4513..ec49eb85d 100644
--- a/xsl/common/labels.xsl
+++ b/xsl/common/labels.xsl
@@ -378,24 +378,7 @@ element label.</para>
 </xsl:template>
 
 <xsl:template match="bridgehead" mode="label.markup">
-  <!-- FIXME: could we do a better job here? -->
-  <xsl:variable name="contsec"
-                select="(ancestor::section
-                         |ancestor::simplesect
-                         |ancestor::topic
-                         |ancestor::sect1
-                         |ancestor::sect2
-                         |ancestor::sect3
-                         |ancestor::sect4
-                         |ancestor::sect5
-                         |ancestor::refsect1
-                         |ancestor::refsect2
-                         |ancestor::refsect3
-                         |ancestor::chapter
-                         |ancestor::appendix
-                         |ancestor::preface)[last()]"/>
-
-  <xsl:apply-templates select="$contsec" mode="label.markup"/>
+  <!-- bridgeheads are not normally numbered -->
 </xsl:template>
 
 <xsl:template match="refsect1" mode="label.markup">
@@ -821,6 +804,8 @@ element label.</para>
   </xsl:variable>
 
   <xsl:choose>
+    <!-- bridgeheads are not numbered -->
+    <xsl:when test="$section/self::bridgehead">0</xsl:when>
     <xsl:when test="$level &lt;= $section.autolabel.max.depth">      
       <xsl:value-of select="$section.autolabel"/>
     </xsl:when>