Proper href handling for XREF elements.

Author: Sanders Kleinfeld

htmlbook-xsl/xrefgen.xsl

@@ -19,21 +19,16 @@
   <!-- All XREFs must be tagged with a @data-type containing XREF -->
   <xsl:template match="h:a[contains(@data-type, 'xref')]">
     <xsl:param name="autogenerate-xrefs" select="$autogenerate-xrefs"/>
-    <xsl:variable name="href-anchor">
-      <xsl:choose>
-	<!-- If href contains an # (as it should), we're going to assume the subsequent text is the referent id -->
-	<xsl:when test="contains(@href, '#')">
-	  <xsl:value-of select="substring-after(@href, '#')"/>
-	</xsl:when>
-	<!-- Otherwise, we'll just assume the entire href is the referent id -->
-	<xsl:otherwise>
-	  <xsl:value-of select="@href"/>
-	</xsl:otherwise>
-      </xsl:choose>
+    <xsl:variable name="calculated-output-href">
+      <xsl:call-template name="calculate-output-href">
+	<xsl:with-param name="source-href-value" select="@href"/>
+      </xsl:call-template>
     </xsl:variable>
+    <xsl:variable name="href-anchor" select="substring-after($calculated-output-href, '#')"/>
     <xsl:copy>
-      <xsl:apply-templates select="@*"/>
-	<xsl:choose>
+      <xsl:apply-templates select="@*[not(name(.) = 'href')]"/>
+      <xsl:attribute name="href" select="$calculated-output-href"/>
+        <xsl:choose>
 	  <!-- Generate XREF text node if $autogenerate-xrefs is enabled -->
 	  <xsl:when test="$autogenerate-xrefs = 1">
 	    <xsl:choose>