From 63632f3b684d530b6bf64324f83b1ceda6d36bdb Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Thu, 6 Apr 2006 14:06:45 +0000
Subject: [PATCH] Made handling of Refnamediv consistent with formatting in
 HTML and manpages output; specifically, changed so that Refname
 (comma-separated list of multiple instances found) is used (instead of
 Refentrytitle as previously), then em-dash, then the Refpurpose. Closes
 #1212562.

---
 xsl/fo/refentry.xsl | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 11d1699c8..412855ae9 100644
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -400,42 +400,18 @@
       <xsl:if test="not(following-sibling::refnamediv)">
 	<xsl:attribute name="space-after">1em</xsl:attribute>
       </xsl:if>
-      <xsl:choose>
-        <xsl:when test="../refmeta/refentrytitle">
-          <xsl:apply-templates select="../refmeta/refentrytitle"/>
-        </xsl:when>
-	<xsl:when test="refdescriptor">
-          <xsl:apply-templates select="refdescriptor[1]"/>
-	</xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="refname[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="refpurpose"/>
-    </fo:block>
-
-    <!-- what was this for?
-    <fo:block>
-      <xsl:choose>
-	<xsl:when test="refdescriptor">
-	  <xsl:apply-templates select="refdescriptor"/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:for-each select="refname">
-	    <xsl:apply-templates select="."/>
-	    <xsl:if test="following-sibling::refname">
-	      <xsl:text>, </xsl:text>
-	    </xsl:if>
-	  </xsl:for-each>
-	</xsl:otherwise>
-      </xsl:choose>
+      <xsl:apply-templates/>
     </fo:block>
-    -->
   </fo:block>
 </xsl:template>
 
 <xsl:template match="refname">
-  <xsl:apply-templates/>
+  <xsl:if test="not(preceding-sibling::refdescriptor)">
+    <xsl:apply-templates/>
+    <xsl:if test="following-sibling::refname">
+      <xsl:text>, </xsl:text>
+    </xsl:if>
+  </xsl:if>
 </xsl:template>
 
 <xsl:template match="refpurpose">
-- 
2.40.0