From 99a4827148d2206b3c1349d592ebfeb41193addc Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Tue, 4 Mar 2008 03:27:47 +0000
Subject: [PATCH] convert no-break space character to groff "\ \&" (instead of
 just "\ "). the reason is that if a space occurs at the end of a line, our
 processing causes it to be eaten. a real-world case of this is the mysql(1)
 man page. appending the "\&" prevents that

---
 xsl/manpages/charmap.groff.xsl | 2 +-
 xsl/manpages/other.xsl         | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xsl/manpages/charmap.groff.xsl b/xsl/manpages/charmap.groff.xsl
index 5bb22bbad..c7e776dfd 100644
--- a/xsl/manpages/charmap.groff.xsl
+++ b/xsl/manpages/charmap.groff.xsl
@@ -99,7 +99,7 @@
    character="&#x00a0;"
    u:name="NO-BREAK SPACE"
    u:entity="nbsp"
-   string="\ "
+   string="\ \&amp;"
    u:block="C1 Controls And Latin-1 Supplement (Latin-1 Supplement)"
    u:class="symbols"
    />
diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index a82521898..7c9ce2f37 100644
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -287,7 +287,11 @@ db:manvolnum
     <!-- * Unfortunately, roff seems to do some weird things with -->
     <!-- * long lines that only have words separated by "\~" -->
     <!-- * spaces, so it's safer just to stick with the "\ " space -->
-    <xsl:with-param name="replacement">\ </xsl:with-param>
+    <!-- *  -->
+    <!-- * We append a "\&" to handle the case of a no-break space that -->
+    <!-- * appears at the end of a line - because later processing will -->
+    <!-- * cause that space to get eaten otherwise. -->
+    <xsl:with-param name="replacement">\ \&amp;</xsl:with-param>
   </xsl:call-template>
 </xsl:template>
 
-- 
2.40.0