From b85a3c63e82d650dfc860ca711ab316846ea2248 Mon Sep 17 00:00:00 2001
From: Bob Stayton <bobs@sagehill.net>
Date: Fri, 8 Aug 2014 17:54:56 +0000
Subject: [PATCH] Fix bug #1340 by omitting indexterm and remark elements from
 the output.  Trying to include them as nroff comments resulted in extra
 whitespace in certain instances, so they are omitted.

---
 xsl/manpages/inline.xsl | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/xsl/manpages/inline.xsl b/xsl/manpages/inline.xsl
index 5a97096b1..e8e296d3b 100644
--- a/xsl/manpages/inline.xsl
+++ b/xsl/manpages/inline.xsl
@@ -189,13 +189,9 @@
   <xsl:apply-templates/>
 </xsl:template>
 
-<!-- * indexterm instances produce groff comments like this: -->
-<!-- * .\" primary: secondary: tertiary -->
-<xsl:template match="indexterm">
-  <xsl:text>.\" </xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
+<!-- * indexterm instances are omitted from output since there 
+is no nroff markup to handle them. -->
+<xsl:template match="indexterm"/>
 
 <xsl:template match="primary">
   <xsl:value-of select="normalize-space(.)"/>
@@ -206,14 +202,8 @@
   <xsl:value-of select="normalize-space(.)"/>
 </xsl:template>
 
-<!-- * non-empty remark instances produce groff comments -->
-<xsl:template match="remark">
-  <xsl:variable name="content" select="normalize-space(.)"/>
-  <xsl:if test="not($content = '')">
-    <xsl:text>.\" </xsl:text>
-    <xsl:value-of select="$content"/>
-    <xsl:text>&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
+<!-- * remark instances are omitted from output since they
+can mess up whitespace management. -->
+<xsl:template match="remark"/>
 
 </xsl:stylesheet>
-- 
2.40.0