Feature #481793: support xref to refentry

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 97fa5651e5356d72cc2d6a59235fd5cd3de20d6b..001882ea5ce9f653a6c26ff9cad3b7e304384e70 100644 (file)
--- 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 57350cec845fe0bbc1a7538fe3324f37947df2e0..5338991026d00448b08f717e41cba91945ad37e8 100644 (file)
--- 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 4fec41a6c9ce6d7f0737692a280ee2b7b471bdfc..fd7d56f9b6cb52ca3a211a97499e1045190ada94 100644 (file)
--- 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'"/>