Make consistent handling of titleabbrev in xrefs.

diff --git a/xsl/common/gentext.xsl b/xsl/common/gentext.xsl
index 197815fd63b88ddf4bd45c88f942ce4d09109209..6cfad535e8530abc6b20a1751c2f9b30416dbc2f 100644 (file)
--- 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 86b50a0c6036309c55e92a9832c1cb661f06839a..db95815f9dfafdd67ac39a587a1574345828c3fd 100644 (file)
--- 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 6ba899233dc75e631a6900b8baf490437673ef30..d8b5d6fcbac60f02f27bced284b281aa39317d1d 100644 (file)
--- 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"/>