From 67d6f237d66e45bbac0e0662b1a1e7f6e302eb3d Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Tue, 4 Dec 2001 19:42:25 +0000
Subject: [PATCH] Feature #481793: support xref to refentry

---
 xsl/fo/refentry.xsl | 32 +++++++++++++++++++++-----------
 xsl/fo/xref.xsl     | 12 ++++++++++++
 xsl/html/xref.xsl   | 12 ++++++++++++
 3 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 97fa5651e..001882ea5 100644
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -174,21 +174,31 @@
 </xsl:template>
 
 <xsl:template match="refnamediv">
-  <xsl:call-template name="block.object"/>
+  <fo:block>
+    <fo:block>
+      <xsl:apply-templates select="refname[1]"/>
+      <xsl:apply-templates select="refpurpose"/>
+    </fo:block>
+
+    <xsl:if test="$refentry.generate.name != 0">
+      <fo:block font-size="18pt" font-weight="bold">
+        <xsl:call-template name="gentext">
+          <xsl:with-param name="key" select="'RefName'"/>
+        </xsl:call-template>
+      </fo:block>
+    </xsl:if>
+
+    <xsl:for-each select="refname">
+      <xsl:apply-templates select="."/>
+      <xsl:if test="following-sibling::refname">
+        <xsl:text>, </xsl:text>
+      </xsl:if>
+    </xsl:for-each>
+  </fo:block>
 </xsl:template>
 
 <xsl:template match="refname">
-  <xsl:if test="$refentry.generate.name != 0">
-    <fo:block font-size="18pt" font-weight="bold">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'RefName'"/>
-      </xsl:call-template>
-     </fo:block>
-  </xsl:if>
   <xsl:apply-templates/>
-  <xsl:if test="following-sibling::refname">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
 </xsl:template>
 
 <xsl:template match="refpurpose">
diff --git a/xsl/fo/xref.xsl b/xsl/fo/xref.xsl
index 57350cec8..533899102 100644
--- a/xsl/fo/xref.xsl
+++ b/xsl/fo/xref.xsl
@@ -250,6 +250,18 @@
   <xsl:apply-templates select="." mode="object.xref.markup"/>
 </xsl:template>
 
+<xsl:template match="refentry" mode="xref-to">
+  <xsl:choose>
+    <xsl:when test="refmeta/refentrytitle">
+      <xsl:apply-templates select="refmeta/refentrytitle"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="refnamediv/refname[1]"/>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:apply-templates select="refmeta/manvolnum"/>
+</xsl:template>
+
 <xsl:template match="step" mode="xref-to">
   <xsl:call-template name="gentext">
     <xsl:with-param name="key" select="'Step'"/>
diff --git a/xsl/html/xref.xsl b/xsl/html/xref.xsl
index 4fec41a6c..fd7d56f9b 100644
--- a/xsl/html/xref.xsl
+++ b/xsl/html/xref.xsl
@@ -284,6 +284,18 @@
   <xsl:apply-templates select="." mode="object.xref.markup"/>
 </xsl:template>
 
+<xsl:template match="refentry" mode="xref-to">
+  <xsl:choose>
+    <xsl:when test="refmeta/refentrytitle">
+      <xsl:apply-templates select="refmeta/refentrytitle"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates select="refnamediv/refname[1]"/>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:apply-templates select="refmeta/manvolnum"/>
+</xsl:template>
+
 <xsl:template match="step" mode="xref-to">
   <xsl:call-template name="gentext">
     <xsl:with-param name="key" select="'Step'"/>
-- 
2.50.1