From: Bob Stayton <bobs@sagehill.net>
Date: Sun, 22 Apr 2012 06:23:51 +0000 (+0000)
Subject: Fix minor bugs in generate.id.attributes implementation.
X-Git-Tag: release/1.79.1~6^2~473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=541f36d427f798f89736e2d36efc55e5ea303a25;p=docbook-dsssl

Fix minor bugs in generate.id.attributes implementation.
---

diff --git a/xsl/html/block.xsl b/xsl/html/block.xsl
index 7744eb77e..c5c87d03a 100644
--- a/xsl/html/block.xsl
+++ b/xsl/html/block.xsl
@@ -72,16 +72,6 @@
         </xsl:otherwise>
       </xsl:choose>
 
-      <!-- need to capture the id of the listitem -->
-      <xsl:if test="position() = 1 and 
-                   (parent::listitem/@id or parent::listitem/@xml:id)">
-        <span>
-          <xsl:call-template name="id.attribute">
-            <xsl:with-param name="node" select="parent::listitem"/>
-          </xsl:call-template>
-        </span>
-      </xsl:if>
-
       <xsl:copy-of select="$content"/>
     </p>
   </xsl:variable>
diff --git a/xsl/html/division.xsl b/xsl/html/division.xsl
index 78a167486..4c0fbc7ff 100644
--- a/xsl/html/division.xsl
+++ b/xsl/html/division.xsl
@@ -198,10 +198,6 @@
 
   <h1>
     <xsl:attribute name="class">title</xsl:attribute>
-    <xsl:call-template name="id.attribute">
-      <xsl:with-param name="node" select="$node"/>
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
     <xsl:call-template name="anchor">
       <xsl:with-param name="node" select="$node"/>
       <xsl:with-param name="conditional" select="0"/>
diff --git a/xsl/html/footnote.xsl b/xsl/html/footnote.xsl
index 46243c52d..1a4ee0062 100644
--- a/xsl/html/footnote.xsl
+++ b/xsl/html/footnote.xsl
@@ -272,7 +272,7 @@ linkend/id: <xsl:value-of select="@linkend"/>
 
 <xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode">
   <xsl:variable name="id">
-    <xsl:text>#ftn.</xsl:text>
+    <xsl:text>ftn.</xsl:text>
     <xsl:call-template name="object.id">
       <xsl:with-param name="conditional" select="0"/>
     </xsl:call-template>
diff --git a/xsl/html/sections.xsl b/xsl/html/sections.xsl
index e6b0e789a..cdce2877f 100644
--- a/xsl/html/sections.xsl
+++ b/xsl/html/sections.xsl
@@ -480,10 +480,6 @@
       </xsl:if>
     </xsl:if>
     <xsl:if test="$allow-anchors != 0">
-      <xsl:call-template name="id.attribute">
-        <xsl:with-param name="node" select="$section"/>
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
       <xsl:call-template name="anchor">
         <xsl:with-param name="node" select="$section"/>
         <xsl:with-param name="conditional" select="0"/>