From: Bob Stayton <bobs@sagehill.net>
Date: Mon, 24 Aug 2015 20:23:37 +0000 (+0000)
Subject: Fix bug #1363 synopsis in variablelist term mangles line breaks.
X-Git-Tag: release/1.79.1~6^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1058d65f30cfe94c8725d33727509af1816c7429;p=docbook-dsssl

Fix bug #1363 synopsis in variablelist term mangles line breaks.
---

diff --git a/xsl/manpages/block.xsl b/xsl/manpages/block.xsl
index 74f809eee..d90def216 100644
--- a/xsl/manpages/block.xsl
+++ b/xsl/manpages/block.xsl
@@ -139,6 +139,7 @@
       and not(substring(local-name(..),
       string-length(local-name(..))-7) = 'synopsis')
       and not(ancestor::*[local-name() = 'refsynopsisdiv'])
+      and not(ancestor::*[local-name() = 'term'])
       ">
       <xsl:text>Yes</xsl:text>
     </xsl:if>
diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index bcab51f10..0c359649b 100644
--- a/xsl/manpages/lists.xsl
+++ b/xsl/manpages/lists.xsl
@@ -71,7 +71,15 @@
     <xsl:variable name="content">
       <xsl:apply-templates/>
     </xsl:variable>
-    <xsl:value-of select="normalize-space($content)"/>
+    <xsl:choose>
+      <!-- don't normalize verbatim synopsis -->
+      <xsl:when test="child::synopsis">
+        <xsl:value-of select="$content"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="normalize-space($content)"/>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:choose>
       <xsl:when test="position() = last()"/> <!-- do nothing -->
       <xsl:otherwise>