From 69edf228370ba4527ab1a1de4d029e439da676c4 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 29 Jun 2005 09:57:39 +0000
Subject: [PATCH] Removed unnecessary additional linebreak that was getting
 added after each varlistentry. Also, in a couple places that needed it, added
 check for *info/title (instead of just title). Also, added support of
 processing title or *info/title on Refsynopsisdiv (still falls back to
 gentext SYNOPSIS title if no hard-coded title found.

---
 xsl/manpages/lists.xsl    |  1 -
 xsl/manpages/other.xsl    |  2 +-
 xsl/manpages/refentry.xsl | 27 ++++++++++++++++-----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index 4510d11c3..a1a5469c7 100644
--- a/xsl/manpages/lists.xsl
+++ b/xsl/manpages/lists.xsl
@@ -79,7 +79,6 @@
 
 <xsl:template match="varlistentry/listitem|glossdef">
   <xsl:apply-templates/>
-  <xsl:text>&#10;</xsl:text>
 </xsl:template>
 
 <xsl:template match="itemizedlist/listitem">
diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 449910b93..a6d19cd26 100644
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -100,7 +100,7 @@
     <!-- * If the value of man.hypenate is zero (the default), then -->
     <!-- * disable hyphenation (".nh" = "no hyphenation") -->
     <xsl:if test="$man.hyphenate = 0">
-      <xsl:text>.\" disable hypenation&#10;</xsl:text>
+      <xsl:text>.\" disable hyphenation&#10;</xsl:text>
       <xsl:text>.nh&#10;</xsl:text>
     </xsl:if>
     <!-- * If the value of man.justify is zero (the default), then -->
diff --git a/xsl/manpages/refentry.xsl b/xsl/manpages/refentry.xsl
index 3c102313b..257cd05ea 100644
--- a/xsl/manpages/refentry.xsl
+++ b/xsl/manpages/refentry.xsl
@@ -48,13 +48,7 @@
   <xsl:template match="refsynopsisdiv">
     <xsl:call-template name="mark.subheading"/>
     <xsl:text>.SH "</xsl:text>
-    <xsl:call-template name="string.upper">
-      <xsl:with-param name="string">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'RefSynopsisDiv'"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
+    <xsl:apply-templates select="." mode="title.markup"/>
     <xsl:text>"&#10;</xsl:text>
     <xsl:call-template name="mark.subheading"/>
     <xsl:apply-templates/>
@@ -64,7 +58,10 @@
     <xsl:call-template name="mark.subheading"/>
     <xsl:text>.SH "</xsl:text>
     <xsl:call-template name="string.upper">
-      <xsl:with-param name="string" select="title"/>
+      <xsl:with-param name="string" select="(info/title
+                                            |refsectioninfo/title
+                                            |refsect1info/title
+                                            |title)[1]"/>
     </xsl:call-template>
     <xsl:text>"&#10;</xsl:text>
     <xsl:call-template name="mark.subheading"/>
@@ -74,7 +71,10 @@
   <xsl:template match="refsect2|refentry/refsection/refsection">
     <xsl:call-template name="mark.subheading"/>
     <xsl:text>.SS "</xsl:text>
-    <xsl:value-of select="title[1]"/>
+    <xsl:value-of select="(info/title
+                          |refsectioninfo/title
+                          |refsect1info/title
+                          |title)[1]"/>
     <xsl:text>"&#10;</xsl:text>
     <xsl:call-template name="mark.subheading"/>
     <xsl:apply-templates/>
@@ -114,8 +114,13 @@
     <xsl:call-template name="string.upper">
       <xsl:with-param name="string">
         <xsl:choose>
-          <xsl:when test="title">
-            <xsl:apply-templates select="title" mode="title.markup">
+          <xsl:when test="info/title
+                          |refsynopsisdivinfo/title
+                          |title">
+            <xsl:apply-templates
+                select="(info/title
+                        |refsynopsisdivinfo/title
+                        |title)[1]" mode="title.markup">
               <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
             </xsl:apply-templates>
           </xsl:when>
-- 
2.40.0