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

diff --git a/xsl/manpages/charmap.groff.xsl b/xsl/manpages/charmap.groff.xsl
index 5bb22bbad83050e4d3f168fc3bd6a33826051582..c7e776dfdfb2483aa3a97e3ef1f010423c9fd6f0 100644 (file)
--- a/xsl/manpages/charmap.groff.xsl
+++ b/xsl/manpages/charmap.groff.xsl
@@ -99,7 +99,7 @@
    character=" "
    u:name="NO-BREAK SPACE"
    u:entity="nbsp"
-   string="\ "
+   string="\ \&"
    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 a82521898c73bbe6702dca3e48a208f6e5150fc6..7c9ce2f374cdebe4e4244cfa6e472bd6a323ff99 100644 (file)
--- 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>