[groff] 21/49: [mdoc]: Trivially refactor.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 380d49212957fb57c0b8a9d48260dba3d3b4e7c8
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Nov 3 07:14:22 2022 -0500

    [mdoc]: Trivially refactor.
    
    * tmac/mdoc/doc-ditroff:
    * tmac/mdoc/doc-nroff: Rename strings for clarity.
      - doc-caption-font -> doc-page-topic-font
      - doc-caption-font2 -> doc-page-section-font
    * tmac/mdoc/doc-common (doc-header, doc-footer): Use new names.
---
 ChangeLog             |  8 ++++++++
 tmac/mdoc/doc-common  | 16 ++++++++--------
 tmac/mdoc/doc-ditroff |  4 ++--
 tmac/mdoc/doc-nroff   |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 413e66e9e..b0ff762c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2022-11-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/mdoc/doc-ditroff:
+       * tmac/mdoc/doc-nroff: Rename strings for clarity.
+       - doc-caption-font -> doc-page-topic-font
+       - doc-caption-font2 -> doc-page-section-font
+       * tmac/mdoc/doc-common (doc-header, doc-footer): Use new names.
+
 2022-11-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/doc.tmac: Delete suppression of `Pa` font selection in a
diff --git a/tmac/mdoc/doc-common b/tmac/mdoc/doc-common
index d76917166..19cf0c022 100644
--- a/tmac/mdoc/doc-common
+++ b/tmac/mdoc/doc-common
@@ -1022,14 +1022,14 @@
 .  doc-setup-page-layout
 .  ie \n[cR] .pl +1v
 .  el        .sp .5i
-.  nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-pageref]\f[]'
-.  nr doc-reg-dh1 \w'\*[doc-caption-font2]\*[doc-volume]\f[]'
+.  nr doc-reg-dh \w'\*[doc-page-topic-font]\*[doc-pageref]\f[]'
+.  nr doc-reg-dh1 \w'\*[doc-page-section-font]\*[doc-volume]\f[]'
 .  if (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
 .    while (\n[doc-reg-dh] + \n[doc-reg-dh1] + \n[doc-reg-dh] >= \n[.lt]) \{\
 .      length doc-hs-len-prev \*[doc-pageref]
 .      substring doc-pageref 0 -2
 .      length doc-hs-len \*[doc-pageref]
-.      nr doc-reg-dh \w'\*[doc-caption-font]\*[doc-pageref]\|.\|.\|.\f[]'
+.      nr doc-reg-dh \w'\*[doc-page-topic-font]\*[doc-pageref]\|.\|.\|.\f[]'
 .      \" If header string didn't actually get shorter, stop trying.
 .      if (\n[doc-hs-len-prev] <= \n[doc-hs-len]) \
 .        break
@@ -1038,7 +1038,7 @@
 .    rr doc-hs-len-prev
 .    as doc-pageref "\|.\|.\|.
 .  \}
-.  tl 
'\*[doc-caption-font]\*[doc-pageref]\f[]'\*[doc-caption-font2]\*[doc-volume]\f[]'\*[doc-caption-font]\*[doc-pageref]\f[]'
+.  tl 
'\*[doc-page-topic-font]\*[doc-pageref]\f[]'\*[doc-page-section-font]\*[doc-volume]\f[]'\*[doc-page-topic-font]\*[doc-pageref]\f[]'
 .  ie \n[cR] \{\
 .    pl +1v
 .    sp 1v
@@ -1067,15 +1067,15 @@
 .  doc-setup-page-layout
 .  ie \n[D] \{\
 .    ie e \
-.      tl 
'%'\*[doc-caption-font2]\*[doc-date-string]\f[]'\*[doc-caption-font]\*[doc-operating-system]\f[]'
+.      tl 
'%'\*[doc-page-section-font]\*[doc-date-string]\f[]'\*[doc-page-topic-font]\*[doc-operating-system]\f[]'
 .    el \
-.      tl 
'\*[doc-caption-font]\*[doc-operating-system]\f[]'\*[doc-caption-font2]\*[doc-date-string]\f[]'%'
+.      tl 
'\*[doc-page-topic-font]\*[doc-operating-system]\f[]'\*[doc-page-section-font]\*[doc-date-string]\f[]'%'
 .  \}
 .  el \{\
 .    ie \n[cR] \
-.      tl 
'\*[doc-caption-font]\*[doc-operating-system]\f[]'\*[doc-caption-font2]\*[doc-date-string]\f[]'\*[doc-pageref]'
+.      tl 
'\*[doc-page-topic-font]\*[doc-operating-system]\f[]'\*[doc-page-section-font]\*[doc-date-string]\f[]'\*[doc-pageref]'
 .    el \
-.      tl 
'\*[doc-caption-font]\*[doc-operating-system]\f[]'\*[doc-caption-font2]\*[doc-date-string]\f[]'%'
+.      tl 
'\*[doc-page-topic-font]\*[doc-operating-system]\f[]'\*[doc-page-section-font]\*[doc-date-string]\f[]'%'
 .  \}
 .  if !\n[cR] .bp
 .  ev
diff --git a/tmac/mdoc/doc-ditroff b/tmac/mdoc/doc-ditroff
index 7c7313cc6..eaad2cc37 100644
--- a/tmac/mdoc/doc-ditroff
+++ b/tmac/mdoc/doc-ditroff
@@ -51,8 +51,8 @@
 .
 .\" the 'doc-xx-font' strings must not be empty!
 .
-.ds doc-caption-font \f[R]
-.ds doc-caption-font2 \f[R]
+.ds doc-page-topic-font \f[R]
+.ds doc-page-section-font \f[R]
 .ds doc-Ad-font \f[I]
 .ds doc-Ar-font \f[CI]
 .ds doc-Cm-font \f[CB]
diff --git a/tmac/mdoc/doc-nroff b/tmac/mdoc/doc-nroff
index c4efff854..1d91f69d4 100644
--- a/tmac/mdoc/doc-nroff
+++ b/tmac/mdoc/doc-nroff
@@ -43,8 +43,8 @@
 .
 .\" the 'doc-xx-font' strings must not be empty!
 .
-.ds doc-caption-font \f[R]
-.ds doc-caption-font2 \f[R]
+.ds doc-page-topic-font \f[R]
+.ds doc-page-section-font \f[R]
 .ds doc-Ad-font \f[I]
 .ds doc-Ar-font \f[I]
 .ds doc-Cm-font \f[B]