From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 27 Apr 2012 21:50:53 +0000 (+0000)
Subject: Fix handling of id attributes on callouts.
X-Git-Tag: release/1.79.1~6^2~467
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=647b5f8dc8072871eb0552df9361e4b5d7cee365;p=docbook-dsssl

Fix handling of id attributes on callouts.
---

diff --git a/xsl/html/callout.xsl b/xsl/html/callout.xsl
index 2eb290415..610a5d244 100644
--- a/xsl/html/callout.xsl
+++ b/xsl/html/callout.xsl
@@ -102,6 +102,7 @@
         <xsl:apply-templates select="." mode="common.html.attributes"/>
         <xsl:choose>
           <xsl:when test="$generate.id.attributes = 0">
+            <!-- force an id attribute here -->
             <xsl:if test="@id or @xml:id">
               <xsl:attribute name="name">
                 <xsl:value-of select="(@id|@xml:id)[1]"/>
@@ -121,7 +122,15 @@
       </a>
     </xsl:when>
     <xsl:otherwise>
-      <xsl:call-template name="id.attribute"/>
+      <xsl:if test="$generate.id.attributes != 0">
+        <xsl:if test="@id or @xml:id">
+          <span>
+             <xsl:attribute name="id">
+                <xsl:value-of select="(@id|@xml:id)[1]"/>
+              </xsl:attribute>
+          </span>
+        </xsl:if>
+      </xsl:if>
       <xsl:call-template name="anchor"/>
       <xsl:apply-templates select="." mode="callout-bug"/>
     </xsl:otherwise>