Improve formatting of reference pages

diff --git a/xsl/fo/refentry.xsl b/xsl/fo/refentry.xsl
index 001882ea5ce9f653a6c26ff9cad3b7e304384e70..dddefcc20bd3e758d07c1ce51a3f37f543849674 100644 (file)
--- a/xsl/fo/refentry.xsl
+++ b/xsl/fo/refentry.xsl
@@ -175,25 +175,48 @@
 
 <xsl:template match="refnamediv">
   <fo:block>
+    <xsl:choose>
+      <xsl:when 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:when>
+      <xsl:when test="$refentry.generate.title != 0">
+        <fo:block font-size="18pt" font-weight="bold">
+          <xsl:choose>
+            <xsl:when test="../refmeta/refentrytitle">
+              <xsl:apply-templates select="../refmeta/refentrytitle"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:apply-templates select="refname[1]"/>
+            </xsl:otherwise>
+          </xsl:choose>
+        </fo:block>
+      </xsl:when>
+    </xsl:choose>
+
     <fo:block>
-      <xsl:apply-templates select="refname[1]"/>
+      <xsl:choose>
+        <xsl:when test="../refmeta/refentrytitle">
+          <xsl:apply-templates select="../refmeta/refentrytitle"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="refname[1]"/>
+        </xsl:otherwise>
+      </xsl:choose>
       <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: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>
   </fo:block>
 </xsl:template>