[groff] 08/26: [ms]: Make default typesetter line length 6.5i.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 4f8e25d291070e5827e29ad2a271463e03247a32
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri Dec 16 14:27:27 2022 -0600

    [ms]: Make default typesetter line length 6.5i.
    
    * tmac/s.tmac (par@load-init): Do it.
    
    * doc/groff.texi (ms Document Control Settings):
    * doc/ms.ms (Document control settings):
    * tmac/groff_ms.7.man (Document control settings): Document it.
    
    * tmac/tests/s_honor-MINGW-when-two-columns.sh:
    * tmac/tests/s_mark-column-start-correctly.sh: Update test expectations.
    
    * NEWS: Add item.
    
    Also tweak ms.ms document:
    * Widen required line length in nroff mode; unfortunately the new
      parenthesized terminal defaults and footnote markings fattened the
      document settings table by two ens.
    * Reduce type size of Courier-using columns by one point in same table.
    * Annotate same table with pseudo-footnotes.
    * Bump document date.
---
 ChangeLog                                    | 16 ++++++++++++++
 NEWS                                         |  6 +++++
 doc/groff.texi                               | 14 ++++++++----
 doc/ms.ms                                    | 33 +++++++++++++++++++---------
 tmac/groff_ms.7.man                          | 18 ++++++++++++---
 tmac/s.tmac                                  |  2 +-
 tmac/tests/s_honor-MINGW-when-two-columns.sh |  3 ++-
 tmac/tests/s_mark-column-start-correctly.sh  |  6 ++---
 8 files changed, 76 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 325fdce1a..392611b70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2022-12-16  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [ms]: Change default line length to 6.5 inches.
+
+       * tmac/s.tmac (par@load-init): Do it.
+
+       * doc/groff.texi (ms Document Control Settings):
+       * doc/ms.ms (Document control settings):
+       * tmac/groff_ms.7.man (Document control settings): Document it.
+
+       * tmac/tests/s_honor-MINGW-when-two-columns.sh:
+       * tmac/tests/s_mark-column-start-correctly.sh: Update test
+       expectations.
+
+       * NEWS: Add item.
+
 2022-12-15  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/an.tmac (TH): Relocate `an-break-body-text` trap to be
diff --git a/NEWS b/NEWS
index 8fdd2d958..d1cf9358f 100644
--- a/NEWS
+++ b/NEWS
@@ -464,6 +464,12 @@ o The s (ms) macro package supports new macros `XN` and 
`XH` to ease the
   without requiring retyping of the heading text as the package
   previously encouraged.  Thanks to Keith Marshall.
 
+o The s (ms) macro package now uses a default line length of 6.5 inches
+  by default, resulting in 1-inch left and right margins.  When the
+  "papersize.tmac" package is used by employing the "-d paper" groff(1)
+  option on typesetting devices, the default page offset and line length
+  are adjusted to maintain these margins.
+
 o The "a4.tmac" file has been dropped from the distribution.  Its
   successor, "papersize.tmac", has been present and documented for
   nearly 20 years.  See subsection "Paper format" of groff(1).
diff --git a/doc/groff.texi b/doc/groff.texi
index e66f93ff1..5182ccf10 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -2708,7 +2708,9 @@ Defines the page offset (i.e., the left margin).
 
 Effective: next page.
 
-Default value: 1@dmn{i}.
+Default: Varies by output device and paper format; 1@dmn{i} is used for
+typesetters using U.S.@: letter paper, and zero for terminals.
+@xref{Paper Format}.
 @endDefmpreg
 
 @Defmpreg {LL, ms}
@@ -2716,16 +2718,20 @@ Defines the line length (i.e., the width of the body 
text).
 
 Effective: next paragraph.
 
-Default: 6@dmn{i}.
+Default: Varies by output device and paper format; 6.5@dmn{i} is used
+for typesetters using U.S.@: letter paper (@pxref{Paper Format}) and
+65@dmn{n} on terminals.
 @endDefmpreg
 
 @Defmpreg {LT, ms}
 Defines the title line length (i.e., the header and footer width).  This
-is usually the same as @code{LL}, but not necessarily.
+is usually the same as @code{LL}, but need not be.
 
 Effective: next paragraph.
 
-Default: 6@dmn{i}.
+Default: Varies by output device and paper format; 6.5@dmn{i} is used
+for typesetters using U.S.@: letter paper (@pxref{Paper Format}) and
+65@dmn{n} on terminals.
 @endDefmpreg
 
 @Defmpreg {HM, ms}
diff --git a/doc/ms.ms b/doc/ms.ms
index 341572c79..51a924300 100644
--- a/doc/ms.ms
+++ b/doc/ms.ms
@@ -14,7 +14,7 @@
 .fchar \[dg] *
 .\".RP
 .ie t .nr LL 6.5i
-.el   .nr LL 84n
+.el   .nr LL 86n
 .nr LT \n[LL]
 .nr PS 11
 .nr VS 13
@@ -22,8 +22,8 @@
 .nr TC-MARGIN \w'00' \" expect 2-digit page numbers at most
 .ie t .nr PI 3.5n
 .el   .nr PI 4n
-.ND October 2022
-.EH '%''October 2022'
+.ND December 2022
+.EH '%''December 2022'
 .EF ''''
 .OH 'Using \f[I]groff\f[] with the \f[I]ms\f[] macros''%'
 .OF ''''
@@ -517,13 +517,16 @@ see the discussion in the applicable section.
 .TS H
 box;
 cb | cb cb cb cb
-l | lf(CR) lx l lf(CR).
+l | lf(CR)p-1 lx l lf(CR)p-1.
 Type   Parameter       Definition      Next    Default
 _
 .TH
-Margins        \[rs]n[PO]      Page offset (left margin)       page    1i
-\^     \[rs]n[LL]      Line length     paragraph       6i
-\^     \[rs]n[LT]      Title line length       paragraph       6i
+Margins        \[rs]n[PO]      Page offset (left margin)       page\
+       1i (0)\*{*\*}
+\^     \[rs]n[LL]      Line length     paragraph       \
+6.5i (65n)\*{*\*}
+\^     \[rs]n[LT]      Title line length       paragraph       \
+6.5i (65n)\*{*\*}
 \^     \[rs]n[HM]      Top (header) margin     page    1i
 \^     \[rs]n[FM]      Bottom (footer) margin  page    1i
 _
@@ -547,7 +550,7 @@ Text        \[rs]n[PS]      Type (point) size       
paragraph       10p
 _
 Paragraphs     \[rs]n[PI]      Indentation     paragraph       5n
 \^     \[rs]n[PD]      Paragraph distance (spacing)    paragraph\
-       0.3v \f[R](\f[]1v\f[R])
+       0.3v \f[R](\f[]1v\f[R])\*{\[dg]\*}
 \^     \[rs]n[QI]      Quotation indentation   paragraph       5n
 \^     \[rs]n[PORPHANS]        # of initial lines kept paragraph\
        1
@@ -571,7 +574,7 @@ Footnotes   \[rs]n[FI]      Indentation     footnote        
2n
 \^     \[rs]*[FR]      Line length ratio       \f[I]special    11/12
 _
 Displays       \[rs]n[DD]      Display distance (spacing)\
-       \f[I]special    0.5v \f[R](\f[]1v\f[R])
+       \f[I]special    0.5v \f[R](\f[]1v\f[R])\*{\[dg]\*}
 \^     \[rs]n[DI]      Display indentation     \f[I]special    0.5i
 _
 Other  \[rs]n[MINGW]   Minimum gutter width    page    2n
@@ -582,7 +585,17 @@ Other      \[rs]n[MINGW]   Minimum gutter width    page    
2n
 .TE
 .
 .
-.LP
+.IP \*{*\*}
+Defaults vary by output device and paper format;
+the values shown are for typesetters using U.S.\& letter paper,
+and then terminals.
+.
+See section \[lq]Paper format\[rq] of the
+.I groff (1)
+man page.
+.
+.
+.IP \*{\[dg]\*}
 The
 .CW PD
 and
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 386e701df..1ad3098f8 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -240,9 +240,9 @@ lf(CR) lx  l  lf(CR).
 Margin settings
 Parameter      Definition      Effective       Default
 _
-\[rs]n[PO]     Page offset (left margin)       next page       1i
-\[rs]n[LL]     Line length     next paragraph  6i
-\[rs]n[LT]     Title line length       next paragraph  6i
+\[rs]n[PO]     Page offset (left margin)       next page       1i (0)
+\[rs]n[LL]     Line length     next paragraph  6.5i (65n)
+\[rs]n[LT]     Title line length       next paragraph  6.5i (65n)
 \[rs]n[HM]     Top (header) margin     next page       1i
 \[rs]n[FM]     Bottom (footer) margin  next page       1i
 _
@@ -389,6 +389,18 @@ in the \[lq]Effective\[rq] column,
 see the discussion in the applicable section below.
 .
 The
+.BR PO ,
+.BR LL ,
+and
+.B LT
+register defaults vary by output device and paper format;
+the values shown are for typesetters using U.S.\& letter paper,
+and then terminals.
+.
+See section \[lq]Paper format\[rq] of
+.MR groff @MAN1EXT@ .
+.
+The
 .B PD
 and
 .B DD
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 54860d84d..b031e1b0b 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1131,7 +1131,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .de par@load-init
 .\" PS and VS might have been set on the command line
 .if !rPS .nr PS 10
-.if !rLL .nr LL 6i
+.if !rLL .nr LL 6.5i
 .ll \\n[LL]u
 .\" don't set LT so that it can be defaulted from LL
 .ie rLT .lt \\n[LT]u
diff --git a/tmac/tests/s_honor-MINGW-when-two-columns.sh 
b/tmac/tests/s_honor-MINGW-when-two-columns.sh
index 0f4ca8d82..b7e142bf4 100755
--- a/tmac/tests/s_honor-MINGW-when-two-columns.sh
+++ b/tmac/tests/s_honor-MINGW-when-two-columns.sh
@@ -30,7 +30,8 @@ Sed ut perspiciatis, unde omnis iste natus error sit 
voluptatem
 accusantium doloremque laudantium, totam rem aperiam eaque ipsa,'
 
 output=$(printf '%s\n' "$input" | "$groff" -Tascii -P-cbou -ms)
+echo "$output"
 
-echo "$output" | grep -Eq 'Sed +ut +perspiciatis, {5}[a-z]'
+echo "$output" | grep -Eq 'Sed +ut +perspiciatis, +unde {5}[a-z]'
 
 # vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tests/s_mark-column-start-correctly.sh 
b/tmac/tests/s_mark-column-start-correctly.sh
index b28841213..f37be3b86 100755
--- a/tmac/tests/s_mark-column-start-correctly.sh
+++ b/tmac/tests/s_mark-column-start-correctly.sh
@@ -28,11 +28,11 @@ input='.pl 15v
 Sed ut perspiciatis, unde omnis iste natus error sit voluptatem
 accusantium doloremque laudantium, totam rem aperiam eaque ipsa, quae ab
 illo inventore veritatis et quasi architecto beatae vitae dicta sunt,
-explicabo.
-'
+explicabo.'
 
 output=$(printf '%s\n' "$input" | "$groff" -Tascii -P-cbou -ms)
+echo "$output"
 
-echo "$output" | grep -Eq 'Sed +ut +perspiciatis, +sit +voluptatem'
+echo "$output" | grep -Eq 'Sed +ut +perspiciatis, unde  +voluptatem'
 
 # vim:set ai et sw=4 ts=4 tw=72: