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.

diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index 4510d11c39042a8318cbd8d9a62c8aa748311c53..a1a5469c741ca4c7f8f3217d0a35c75d498b1622 100644 (file)
--- 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 449910b93e4a5034ff7130532f323945ca968286..a6d19cd260d3bf4119031aeed67c18f7809ee75e 100644 (file)
--- 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 3c102313bb361842fd504d0a0395c32cab99e8d5..257cd05ea5f9fc3b24b51485d1615fe225f9c668 100644 (file)
--- 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>