[groff] 06/09: Fix Savannah #60037.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 18476a2c07d8dad1bfba7c676bb576204b214961
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Mar 3 11:58:14 2021 +1100

    Fix Savannah #60037.
    
    * doc/groff.texi (Optional man extensions) <CW, EX, PN, Pn>:
      (Highlighting in ms <CW>):
      (Additional ms macros <CW>): Use "monospaced" to refer to font
      selected, retaining "constant-width" term only where it explains the
      macro mnemonic.  Thanks to Dave Kemper for pointing out the issue.
      Also fix error: .CW in the ms package seems to have originated with
      Research Unix, not Berkeley.
    
    * doc/ms.ms (Highlighting) <CW>: Sync with our Texinfo manual.
    * tmac/groff_ms.7.man: Sync with ms.ms, omitting FAM advice.
    
    Fixes <https://savannah.gnu.org/bugs/?60037>.
---
 ChangeLog           | 15 +++++++++++++++
 doc/groff.texi      | 28 +++++++++++++++-------------
 doc/ms.ms           | 20 +++++++++++++++++++-
 tmac/groff_ms.7.man |  6 +++++-
 4 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e842b8..c5d7cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2021-03-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * doc/groff.texi (Optional man extensions) <CW, EX, PN, Pn>:
+       (Highlighting in ms <CW>):
+       (Additional ms macros <CW>): Use "monospaced" to refer to font
+       selected, retaining "constant-width" term only where it explains
+       the macro mnemonic.  Thanks to Dave Kemper for pointing out the
+       issue.  Also fix error: .CW in the ms package seems to have
+       originated with Research Unix, not Berkeley.
+
+       * doc/ms.ms (Highlighting) <CW>: Sync with our Texinfo manual.
+       * tmac/groff_ms.7.man: Sync with ms.ms, omitting FAM advice.
+
+       Fixes <https://savannah.gnu.org/bugs/?60037>.
+
 2021-03-02  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/groff.texi (Identifiers, Strings, Writing Macros,
diff --git a/doc/groff.texi b/doc/groff.texi
index 1c053c0..09975d6 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -2276,7 +2276,8 @@ Print @samp{<CTRL/@var{key}>}.
 @endDefmac
 
 @Defmac {CW, , man}
-Print subsequent text using the constant-width typeface (Courier).
+Print subsequent text using a ``constant-width'' (monospaced) typeface
+(Courier roman).
 @endDefmac
 
 @Defmac {Ds, , man}
@@ -2288,7 +2289,7 @@ End a non-filled display started with @code{Ds}.
 @endDefmac
 
 @Defmac {EX, [@Var{indent}], man}
-Begin a non-filled display using the constant-width typeface (Courier).
+Begin a non-filled display using a monospaced typeface (Courier roman).
 Use the optional @var{indent} argument to indent the display.
 @endDefmac
 
@@ -2337,15 +2338,15 @@ End a note begun with @code{NT}.
 @endDefmac
 
 @Defmac {PN, @Var{path} [@Var{punct}], man}
-Set the path name in a constant-width typeface (Courier), followed by
+Set the path name in a monospaced typeface (Courier roman), followed by
 optional punctuation.
 @endDefmac
 
 @Defmac {Pn, [@Var{punct}] @Var{path} [@Var{punct}], man}
 If called with two arguments, identical to @code{PN}.  If called with
-three arguments, set the second argument in a constant-width typeface
-(Courier), bracketed by the first and third arguments in the current
-font.
+three arguments, set the second argument in a monospaced typeface
+(Courier roman), bracketed by the first and third arguments in the
+current font.
 @endDefmac
 
 @Defmac {R, , man}
@@ -3295,13 +3296,14 @@ the @code{B}@tie{}macro otherwise.
 @endDefmac
 
 @Defmac {CW, [@Var{txt} [@Var{post} [@Var{pre}]]], ms}
-Sets its first argument in a @code{constant-width typeface}.  It
-operates similarly to the @code{B}@tie{}macro otherwise.  This is a
-Berkeley extension.
+Sets its first argument in a @code{constant-width} (monospaced)
+roman typeface.  It operates similarly to the @code{B}@tie{}macro
+otherwise.  This is a Version@tie{}10 Research Unix extension.
+@c Possibly V9, but definitely not Berkeley.
 
 In @code{groff} @file{ms} you might prefer to change the font family to
-Courier---a constant-width typeface---by setting the @code{FAM} string
-to @samp{C}.  You can then use all four style macros above, returning to
+Courier, which is monospaced, by setting the @code{FAM} string to
+@samp{C}.  You can then use all four style macros above, returning to
 the default family (Times) with @samp{.ds FAM T}.
 @endDefmac
 
@@ -4300,8 +4302,8 @@ for details.  This is a Berkeley extension.
 @endDefmac
 
 @Defmac {CW, , ms}
-Set text in a @code{constant-width} font (Courier).  This is a Berkeley
-extension.
+Set text in a @code{constant-width} (monospaced) typeface.  This is a
+Version@tie{}10 Research Unix extension.
 @endDefmac
 
 @Defmac {IX, , ms}
diff --git a/doc/ms.ms b/doc/ms.ms
index 23c95f1..f7b348b 100644
--- a/doc/ms.ms
+++ b/doc/ms.ms
@@ -1017,11 +1017,29 @@ T}
 _
 \&.CW [txt [post [pre]]]       T{
 Sets its first argument in a
-.CW "constant width face" .
+.CW constant-width
+(monospaced) roman typeface.
 .
 It operates similarly to the
 .CW .B
 macro otherwise.
+.
+This is a Version\~10 Research Unix extension.
+.\" Possibly V9, but definitely not Berkeley.
+.
+.
+.sp \n[PD]u
+In
+.I "groff ms"
+you might prefer to change the font family to Courier\[em]a monospaced
+typeface\[em]by setting
+.CW \[rs]*[FAM]
+to
+.CW C \[rq]. \[lq]
+.
+You can then use all four style macros above,
+returning to the default family (Times) with
+.CW ".ds FAM T" \[rq]. \[lq]
 T}
 _
 \&.BX [txt]    T{
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 2eb4df9..7753b81 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -699,12 +699,16 @@ macro otherwise.
 .TP
 .B .CW\c
 .RI " [" txt " [" post " [" pre ]]]
-Sets its first argument in a constant-width face.
+Sets its first argument in a \[lq]constant-width\[rq] (monospaced) roman
+typeface.
 .
 It operates similarly to the
 .B B
 macro otherwise.
 .
+This is a Version\~10 Research Unix extension.
+.\" Possibly V9, but definitely not Berkeley.
+.
 .
 .TP
 .B .BX\c