Make a title attribute on HTML anchors for links to things with titles

diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 9195cb12c23f6e1148a497ee9ff34d2c2c02f61a..142cfadefa7d418229c1f6a2307c4ea8e8b0bec7 100644 (file)
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -40,7 +40,7 @@
   </xsl:if>
 
   <xsl:choose>
-    <xsl:when test="$refelem=''">
+    <xsl:when test="count($target) = 0">
       <xsl:message>
        <xsl:text>XRef to nonexistent id: </xsl:text>
        <xsl:value-of select="@linkend"/>
@@ -233,6 +233,31 @@
       </xsl:call-template>
     </xsl:attribute>
 
+    <!-- FIXME: is there a better way to tell what elements have a title? -->
+    <xsl:if test="local-name($target) = 'book'
+                  or local-name($target) = 'set'
+                  or local-name($target) = 'chapter'
+                  or local-name($target) = 'preface'
+                  or local-name($target) = 'appendix'
+                  or local-name($target) = 'bibliography'
+                  or local-name($target) = 'glossary'
+                  or local-name($target) = 'index'
+                  or local-name($target) = 'part'
+                  or local-name($target) = 'refentry'
+                  or local-name($target) = 'reference'
+                  or local-name($target) = 'example'
+                  or local-name($target) = 'equation'
+                  or local-name($target) = 'table'
+                  or local-name($target) = 'figure'
+                  or local-name($target) = 'simplesect'
+                  or starts-with(local-name($target),'sect')
+                  or starts-with(local-name($target),'refsect')">
+      <xsl:attribute name="title">
+        <xsl:apply-templates select="$target"
+                             mode="object.title.markup.textonly"/>
+      </xsl:attribute>
+    </xsl:if>
+
     <xsl:apply-templates/>
   </a>
 </xsl:template>
@@ -268,38 +293,6 @@
 
 <!-- ==================================================================== -->
 
-<xsl:template name="title.xref">
-  <xsl:param name="target" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($target) = 'figure'
-                    or local-name($target) = 'example'
-                    or local-name($target) = 'equation'
-                    or local-name($target) = 'table'
-                    or local-name($target) = 'dedication'
-                    or local-name($target) = 'preface'
-                    or local-name($target) = 'bibliography'
-                    or local-name($target) = 'glossary'
-                    or local-name($target) = 'index'
-                    or local-name($target) = 'setindex'
-                    or local-name($target) = 'colophon'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates select="$target" mode="title.markup"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <i>
-        <xsl:apply-templates select="$target" mode="title.markup"/>
-      </i>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="number.xref">
-  <xsl:apply-templates select="." mode="label.markup"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
 <xsl:template name="xref.xreflabel">
   <!-- called to process an xreflabel...you might use this to make  -->
   <!-- xreflabels come out in the right font for different targets, -->