Fixed handling of verbatims (address, screen, etc.) within

listitem instances in varlistentry and glossentry. (We now always
use .RS instead of .TP). Closes bug 1551922 and closes Debian bug
385940. Thanks to Daniel Leidert and Jakub Wilk.

diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index 94e10ea9d98dd59709774a313697a736638b1342..951d7114c16c5d4b13cd0f625bfe4c9d9dcf4e08 100644 (file)
--- a/xsl/manpages/lists.xsl
+++ b/xsl/manpages/lists.xsl
@@ -56,22 +56,7 @@
 </xsl:template>
 
 <xsl:template match="varlistentry|glossentry">
-  <xsl:choose>
-    <!-- * if we have multiple terms in the same varlistentry, we can't -->
-    <!-- * use the .TP macro; we need to use .PP instead, then manually -->
-    <!-- * indent the listitem using .RS and .RE (see further down)-->
-    <xsl:when test="count(term) > 1">
-      <xsl:text>.PP&#10;</xsl:text> 
-    </xsl:when>
-    <xsl:otherwise> <!-- * we only have one term, so use .TP -->
-      <xsl:text>.TP</xsl:text> 
-      <xsl:if test="not($list-indent = '')">
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="$list-indent"/>
-      </xsl:if>
-      <xsl:text>&#10;</xsl:text> 
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:text>.PP&#10;</xsl:text> 
   <xsl:for-each select="term|glossterm">
     <xsl:variable name="content">
       <xsl:apply-templates/>
@@ -97,23 +82,14 @@
     </xsl:choose>
   </xsl:for-each>
   <xsl:text>&#10;</xsl:text>
-  <xsl:choose>
-    <!-- * if we have multiple terms in the same varlistentry, we need to-->
-    <!-- *  manually indent the listitem using .RS and .RE -->
-    <xsl:when test="count(term) > 1">
-      <xsl:text>.RS</xsl:text> 
-      <xsl:if test="not($list-indent = '')">
-        <xsl:text> </xsl:text>
-        <xsl:value-of select="$list-indent"/>
-      </xsl:if>
-      <xsl:text>&#10;</xsl:text>
-      <xsl:apply-templates/>
-      <xsl:text>.RE&#10;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise> <!-- * we only have one term, so just apply-templates -->
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
+  <xsl:text>.RS</xsl:text> 
+  <xsl:if test="not($list-indent = '')">
+    <xsl:text> </xsl:text>
+    <xsl:value-of select="$list-indent"/>
+  </xsl:if>
+  <xsl:text>&#10;</xsl:text>
+  <xsl:apply-templates/>
+  <xsl:text>.RE&#10;</xsl:text>
 </xsl:template>
 
 <xsl:template match="varlistentry/term"/>