[groff] 05/08: tmac/an-old.tmac: Use correct point size default.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 61dedb74a7568e440dc2284d50f50636b17f3f52
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Sep 14 21:49:42 2020 +1000

    tmac/an-old.tmac: Use correct point size default.
    
    ...for X{75,100}-12 devices.  If the user hasn't specified a point size
    default, and if the output device is either of these, use a point size
    of 12 instead of 10.
    
    Konrad Schwarz reported this problem with these devices to man-db
    earlier this year.  I had noticed ugly rendering with "groff -TX100-12
    -man" long ago but never understood the cause.  Colin Watson added a
    workaround (pass "-rS12") to man-db, but the fix really should have
    taken place in groff.  (man-db needs its workaround for existing groff
    releases anyway.)
    
    Because we use a sane parameter-determination method, you can still
    reproduce the authentic unpleasantness prior to this change.
        groff -X -TX100-12 -rS10 -t -man page.1
    
    Also organize comments better as I steadily move all these
    configuration knobs to the end of the macro file.
---
 ChangeLog        |  5 +++++
 tmac/an-old.tmac | 22 ++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 545cbb8..8a61fce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2020-09-14  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * tmac/an-old.tmac: Use correct point size default for
+       X{75,100}-12 devices.
+
+2020-09-14  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * tmac/mdoc/doc-common-u (doc-prepare-section-heading): New
        macro defines new string doc-sec-head to anable recognition of
        mixed-case section headings in mdoc man pages.  For example,
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 58d2bc2..69e70e2 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -40,7 +40,6 @@
 .
 .if !r D .nr D 0
 .if !r C .nr C 0
-.if !r S .nr S 10
 .\" We must use consecutive page numbers when using PostScript to
 .\" generate HTML images, and we must not reset the page number at the
 .\" beginning (the 'ps4html' register is automatically added to the
@@ -678,15 +677,17 @@
 .\" Load local modifications.
 .mso man.local
 .
-.\" Determine page title and section heading full-capitalization if and
-.\" only if -r options or man.local did not.
+.\" Set rendering parameters only if -[dr] options or man.local did not.
+.
+.\" full capitalization of section headings
 .if !r CS \
 .  nr CS 0
 .
+.\" full capitalization of page title
 .if !r CT \
 .  nr CT 0
 .
-.\" Similarly for hyphenation mode.
+.\" hyphenation mode
 .if !r HY \{\
 .  \" No page breaks occur in continuous rendering.
 .  ie \n[cR] \
@@ -695,11 +696,20 @@
 .    nr HY 6
 .\}
 .
-.\" Set the default adjustment mode and heading font only if -d options
-.\" or man.local did not.
+.\" point size
+.if !r S \{\
+.  nr S 10
+.  if '\*[.T]'X75-12' \
+.    nr S 12
+.  if '\*[.T]'X100-12' \
+.    nr S 12
+.\}
+.
+.\" adjustment mode
 .if !d AD \
 .  ds AD b\"
 .
+.\" section heading font
 .if !d HF \
 .  ds HF B\"
 .