From ed59eded506b2e36687b7db93174d6583a90735f Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Tue, 22 Jan 2013 22:08:30 +0000
Subject: [PATCH] Make consistent handling of titleabbrev in xrefs.

---
 xsl/common/gentext.xsl | 6 ++++++
 xsl/fo/xref.xsl        | 5 ++---
 xsl/html/xref.xsl      | 5 ++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index 197815fd6..6cfad535e 100644
--- a/xsl/common/gentext.xsl
+++ b/xsl/common/gentext.xsl
@@ -477,6 +477,12 @@
                 <xsl:when test="$title != ''">
                   <xsl:copy-of select="$title"/>
                 </xsl:when>
+                <xsl:when test="$purpose = 'xref'">
+                  <xsl:apply-templates select="." mode="titleabbrev.markup">
+                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
+                    <xsl:with-param name="verbose" select="$verbose"/>
+                  </xsl:apply-templates>
+                </xsl:when>
                 <xsl:otherwise>
                   <xsl:apply-templates select="." mode="title.markup">
                     <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 86b50a0c6..db95815f9 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -1431,9 +1431,8 @@
   <xsl:param name="title"/>
 
   <xsl:choose>
-    <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+    <xsl:when test="$purpose = 'xref'">
+      <xsl:copy-of select="$title"/>
     </xsl:when>
     <xsl:otherwise>
       <xsl:copy-of select="$title"/>
diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 6ba899233..d8b5d6fcb 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -1240,9 +1240,8 @@
   <xsl:param name="title"/>
 
   <xsl:choose>
-    <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
+    <xsl:when test="$purpose = 'xref'">
+      <xsl:copy-of select="$title"/>
     </xsl:when>
     <xsl:otherwise>
       <xsl:copy-of select="$title"/>
-- 
2.40.0