From 0d4897ab1add3f23f8b4b0285fb231ebe4aedb2b Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Thu, 16 Oct 2014 01:01:39 +0000
Subject: [PATCH] If a link or xref has an @id or @xml:id, then add a span to
 include the id because simple.xlink no longer generates the id attribute.

---
 xsl/html/xref.xsl | 50 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index de33ae5a9..2289c855a 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -122,9 +122,22 @@
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
+  <xsl:variable name="id" select="(@id | @xml:id)[1]"/> 
+
+  <xsl:choose>
+    <xsl:when test="$id">
+      <span id="{$id}">
+        <xsl:call-template name="simple.xlink">
+          <xsl:with-param name="content" select="$content"/>
+        </xsl:call-template>
+      </span>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="simple.xlink">
+        <xsl:with-param name="content" select="$content"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
 
 </xsl:template>
 
@@ -999,13 +1012,30 @@
     </xsl:choose>
   </xsl:variable>
 
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="node" select="."/>
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="a.target" select="$a.target"/>
-    <xsl:with-param name="xhref" select="$xhref"/>
-  </xsl:call-template>
+  <xsl:variable name="id" select="(@id | @xml:id)[1]"/> 
+
+  <xsl:choose>
+    <xsl:when test="$id">
+      <span id="{$id}">
+        <xsl:call-template name="simple.xlink">
+          <xsl:with-param name="node" select="."/>
+          <xsl:with-param name="linkend" select="$linkend"/>
+          <xsl:with-param name="content" select="$content"/>
+          <xsl:with-param name="a.target" select="$a.target"/>
+          <xsl:with-param name="xhref" select="$xhref"/>
+        </xsl:call-template>
+      </span>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="simple.xlink">
+        <xsl:with-param name="node" select="."/>
+        <xsl:with-param name="linkend" select="$linkend"/>
+        <xsl:with-param name="content" select="$content"/>
+        <xsl:with-param name="a.target" select="$a.target"/>
+        <xsl:with-param name="xhref" select="$xhref"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
 
 </xsl:template>
 
-- 
2.50.1