From 7031cd64ad6a42a8d7fede72dda6031205c6faff Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Mon, 15 Jan 2007 17:15:40 +0000
Subject: [PATCH] Changed manpages stylesheet to always output a U+2591
 character as the internal representation of a dash. The string-substitution
 map is then used to output a real dash when the final contents are
 serialized. Also, made a change that causes dots and dashes in the top
 comment to be unescaped.

---
 xsl/manpages/info.xsl               | 10 ++++----
 xsl/manpages/lists.xsl              |  6 ++---
 xsl/manpages/other.xsl              | 37 ++++++++++++++++++-----------
 xsl/manpages/synop.xsl              |  4 ++--
 xsl/manpages/table.xsl              |  2 +-
 xsl/manpages/utility.xsl            | 30 ++++++++++++++++++++---
 xsl/params/man.string.subst.map.xml | 10 ++------
 7 files changed, 63 insertions(+), 36 deletions(-)

diff --git a/xsl/manpages/info.xsl b/xsl/manpages/info.xsl
index ba46e9d25..a6e784014 100644
--- a/xsl/manpages/info.xsl
+++ b/xsl/manpages/info.xsl
@@ -308,7 +308,7 @@
 
   <xsl:template name="publisher.attribution">
     <xsl:text>&#10;</xsl:text>
-    <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+    <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
     <xsl:text>&#x2302;IP ""</xsl:text> 
     <xsl:if test="not($blurb-indent = '')">
       <xsl:text> </xsl:text>
@@ -432,7 +432,7 @@
       <!-- * Editor, then render the corresponding localized gentext -->
       <xsl:when test="self::author">
         <xsl:text>&#10;</xsl:text>
-        <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+        <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
         <xsl:text>&#x2302;IP ""</xsl:text> 
         <xsl:if test="not($blurb-indent = '')">
           <xsl:text> </xsl:text>
@@ -446,7 +446,7 @@
       </xsl:when>
       <xsl:when test="self::editor">
         <xsl:text>&#10;</xsl:text>
-        <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+        <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
         <xsl:text>&#x2302;IP ""</xsl:text> 
         <xsl:if test="not($blurb-indent = '')">
           <xsl:text> </xsl:text>
@@ -464,7 +464,7 @@
         <xsl:choose>
           <xsl:when test="@class and @class != 'other'">
             <xsl:text>&#10;</xsl:text>
-            <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+            <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
             <xsl:text>&#x2302;IP ""</xsl:text> 
             <xsl:if test="not($blurb-indent = '')">
               <xsl:text> </xsl:text>
@@ -529,7 +529,7 @@
                 |../othername|../lineage|../honorific
                 |../affiliation|../email|../address">
         <xsl:text>&#10;</xsl:text>
-        <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+        <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
         <xsl:text>&#x2302;IP ""</xsl:text> 
         <xsl:if test="not($blurb-indent = '')">
           <xsl:text> </xsl:text>
diff --git a/xsl/manpages/lists.xsl b/xsl/manpages/lists.xsl
index 2a00b3ad3..dbdb3beea 100644
--- a/xsl/manpages/lists.xsl
+++ b/xsl/manpages/lists.xsl
@@ -135,7 +135,7 @@
     <xsl:value-of select="$list-indent"/>
   </xsl:if>
   <xsl:text>&#10;</xsl:text>
-  <xsl:text>\h'-</xsl:text>
+  <xsl:text>\h'&#x2591;</xsl:text>
     <xsl:if test="not($list-indent = '')">
     <xsl:text>0</xsl:text>
     <xsl:value-of select="$list-indent"/>
@@ -160,7 +160,7 @@
     <xsl:value-of select="$list-indent"/>
   </xsl:if>
   <xsl:text>&#10;</xsl:text>
-  <xsl:text>\h'-</xsl:text>
+  <xsl:text>\h'&#x2591;</xsl:text>
     <xsl:if test="not($list-indent = '')">
     <xsl:text>0</xsl:text>
     <xsl:value-of select="$list-indent"/>
@@ -314,7 +314,7 @@
   <!-- * .TE = "Table End" -->
   <xsl:text>&#x2302;TE&#10;</xsl:text>
   <xsl:text>&#x2302;\" line length decrease back to previous value&#10;</xsl:text>
-  <xsl:text>&#x2302;ll -(\n(LLu * 62u / 100u)&#10;</xsl:text>
+  <xsl:text>&#x2302;ll &#x2591;(\n(LLu * 62u / 100u)&#10;</xsl:text>
   <!-- * put a blank line of space below the table -->
   <xsl:text>&#x2302;sp&#10;</xsl:text>
 </xsl:template>
diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index cc3f6a1b5..532758b39 100644
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -170,30 +170,39 @@ db:manvolnum
     <xsl:param name="manual"/>
     <xsl:param name="source"/>
     <xsl:text>&#x2302;\"     Title: </xsl:text>
-    <xsl:value-of select="$title"/>
+    <xsl:call-template name="replace.dots.and.dashes">
+      <xsl:with-param name="content" select="$title"/>
+    </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
     <xsl:text>&#x2302;\"    Author: </xsl:text>
-      <xsl:call-template name="make.roff.metadata.author">
-        <xsl:with-param name="info" select="$info"/>
-      </xsl:call-template>
+    <xsl:call-template name="replace.dots.and.dashes">
+      <xsl:with-param name="content">
+        <xsl:call-template name="make.roff.metadata.author">
+          <xsl:with-param name="info" select="$info"/>
+        </xsl:call-template>
+      </xsl:with-param>
+    </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
     <xsl:text>&#x2302;\" Generator: DocBook XSL Stylesheets v</xsl:text>
-    <xsl:value-of select="$VERSION"/>
-    <xsl:text> &lt;http://docbook.sf.net/></xsl:text>
+    <xsl:call-template name="replace.dots.and.dashes">
+      <xsl:with-param name="content" select="$VERSION"/>
+    </xsl:call-template>
+    <xsl:text> &lt;http://docbook&#x2302;sf&#x2302;net/></xsl:text>
     <xsl:text>&#10;</xsl:text>
     <xsl:text>&#x2302;\"      Date: </xsl:text>
-      <xsl:call-template name="string.subst">
-        <!-- * replace hyphens in date with dots -->
-        <xsl:with-param name="string" select="$date"/>
-        <xsl:with-param name="target" select="'-'"/>
-        <xsl:with-param name="replacement" select="'.'"/>
-      </xsl:call-template>
+    <xsl:call-template name="replace.dots.and.dashes">
+      <xsl:with-param name="content" select="$date"/>
+    </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
     <xsl:text>&#x2302;\"    Manual: </xsl:text>
-    <xsl:value-of select="$manual"/>
+    <xsl:call-template name="replace.dots.and.dashes">
+      <xsl:with-param name="content" select="$manual"/>
+    </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
     <xsl:text>&#x2302;\"    Source: </xsl:text>
-    <xsl:value-of select="$source"/>
+    <xsl:call-template name="replace.dots.and.dashes">
+      <xsl:with-param name="content" select="$source"/>
+    </xsl:call-template>
     <xsl:text>&#10;</xsl:text>
     <xsl:text>&#x2302;\"</xsl:text>
     <xsl:text>&#10;</xsl:text>
diff --git a/xsl/manpages/synop.xsl b/xsl/manpages/synop.xsl
index 9fc95c19a..f5d92120d 100644
--- a/xsl/manpages/synop.xsl
+++ b/xsl/manpages/synop.xsl
@@ -50,7 +50,7 @@
   <!-- * up one line vertically to negate the line of vertical space -->
   <!-- * that's added by the .HP macro -->
   <xsl:if test="preceding-sibling::*[1][self::synopfragment]">
-    <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+    <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
   </xsl:if>
   <xsl:text>&#x2302;HP </xsl:text>
   <!-- * For each Synopfragment, make a hanging paragraph, with the -->
@@ -237,7 +237,7 @@
   <!-- * (because funcdef is always followed by one open paren char) -->
   <xsl:value-of select="string-length (normalize-space ($funcprototype.string.value)) + 1"/>
   <xsl:text>&#10;</xsl:text>
-  <xsl:text>.</xsl:text>
+  <xsl:text>&#x2302;</xsl:text>
   <xsl:value-of select="$man.font.funcprototype"/>
   <xsl:text> </xsl:text>
   <!-- * The following quotation mark (and the one further below) are -->
diff --git a/xsl/manpages/table.xsl b/xsl/manpages/table.xsl
index 3405bc6b7..24873d76f 100644
--- a/xsl/manpages/table.xsl
+++ b/xsl/manpages/table.xsl
@@ -134,7 +134,7 @@
         </xsl:if>
         <xsl:value-of select="normalize-space($title)"/>
         <xsl:text>&#10;</xsl:text>
-        <xsl:text>&#x2302;sp -1n&#10;</xsl:text>
+        <xsl:text>&#x2302;sp &#x2591;1n&#10;</xsl:text>
       </xsl:if>
       
       <!-- * mark the start of the table -->
diff --git a/xsl/manpages/utility.xsl b/xsl/manpages/utility.xsl
index 39409d4c2..ba953e0ae 100644
--- a/xsl/manpages/utility.xsl
+++ b/xsl/manpages/utility.xsl
@@ -101,15 +101,39 @@
 
   <!-- ================================================================== -->
 
+  <!-- * The replace.dots.and.dashes template is used to cause real -->
+  <!-- * dots and dashes to be output in the top comment (instead of -->
+  <!-- * escaped ones as in the source for the text displayed in the -->
+  <!-- * body of the page) -->
+  <xsl:template name="replace.dots.and.dashes">
+    <xsl:param name="content">
+      <xsl:apply-templates/>
+    </xsl:param>
+    <xsl:variable name="dot-content">
+      <xsl:call-template name="string.subst">
+        <xsl:with-param name="string" select="$content"/>
+        <xsl:with-param name="target" select="'.'"/>
+        <xsl:with-param name="replacement" select="'&#x2302;'"/>
+      </xsl:call-template>
+    </xsl:variable>
+    <xsl:call-template name="string.subst">
+      <xsl:with-param name="string" select="$dot-content"/>
+      <xsl:with-param name="target" select="'-'"/>
+      <xsl:with-param name="replacement" select="'&#x2591;'"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <!-- ================================================================== -->
+
   <!-- * The nested-section-title template is called for refsect3, and any -->
   <!-- * refsection nested more than 2 levels deep. -->
   <xsl:template name="nested-section-title">
     <!-- * The next few lines are some arcane roff code to control line -->
     <!-- * spacing after headings. -->
     <xsl:text>&#x2302;sp&#10;</xsl:text>
-    <xsl:text>&#x2302;it 1 an-trap&#10;</xsl:text>
-    <xsl:text>&#x2302;nr an-no-space-flag 1&#10;</xsl:text>
-    <xsl:text>&#x2302;nr an-break-flag 1&#10;</xsl:text>
+    <xsl:text>&#x2302;it 1 an&#x2591;trap&#10;</xsl:text>
+    <xsl:text>&#x2302;nr an&#x2591;no&#x2591;space&#x2591;flag 1&#10;</xsl:text>
+    <xsl:text>&#x2302;nr an&#x2591;break&#x2591;flag 1&#10;</xsl:text>
     <xsl:text>&#x2302;br&#10;</xsl:text>
     <!-- * make title wrapper so that we can use mode="bold" template to -->
     <!-- * apply character formatting to it -->
diff --git a/xsl/params/man.string.subst.map.xml b/xsl/params/man.string.subst.map.xml
index dd2229b93..13cfcbf3a 100644
--- a/xsl/params/man.string.subst.map.xml
+++ b/xsl/params/man.string.subst.map.xml
@@ -44,14 +44,8 @@
   <!-- * argument for a command across a line, if that argument contains -->
   <!-- * a dash/hyphen); so, we must globally change all hyphens to "\-" -->
   <substitution oldstring="-" newstring="\-"/>
-  <!-- * now, we need to restore single-hypens in all roff requests -->
-  <!-- * (because the substitution above added backslashes before them) -->
-  <substitution oldstring="\h'\-" newstring="\h'-"/>
-  <substitution oldstring=".sp \-" newstring=".sp -"/>
-  <substitution oldstring=".it 1 an\-trap" newstring=".it 1 an-trap"/>
-  <substitution oldstring=".nr an\-no\-space\-flag 1" newstring=".nr an-no-space-flag 1"/>
-  <substitution oldstring=".nr an\-break\-flag 1" newstring=".nr an-break-flag 1"/>
-  <substitution oldstring=".ll \-" newstring=".ll -"/>
+  <!-- * restore dashes in all roff requests and comments -->
+  <substitution oldstring="&#x2591;" newstring="-"/>
   <!-- * squeeze multiple newlines before a roff request  -->
   <substitution oldstring="&#10;&#10;." newstring="&#10;."/>
   <!-- * remove any .sp occurences that directly follow a .PP  -->
-- 
2.40.0