[groff] 14/30: [mm]: Rename `Li*` strings to `Cap*`.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 10d60b1b620c5d8e8ff3a4d77edf24c1759f2744
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Nov 4 03:08:00 2024 -0600

    [mm]: Rename `Li*` strings to `Cap*`.
    
    * contrib/mm/m.tmac: Rename several strings to make their purposes less
      obscure; they determine the content of captions, not list items.
         `Licon` -> `Capcon`
         `Liec`  -> `Capec`
         `Liex`  -> `Capex`
         `Lifg`  -> `Capfg`
         `Litb`  -> `Captb`
      The old names remain as aliases.
    
    * groff_mm.7.man (Macros) <EC, EX, FG, TB, TC>
      (Strings) <Capcon, Capec, Capex, Capfg, Captb>
      <Licon, Liec, Liex, Lifg, Litb>: Update.
---
 NEWS                      | 10 +++++++
 contrib/mm/ChangeLog      | 15 +++++++++++
 contrib/mm/groff_mm.7.man | 68 +++++++++++++++++++++++------------------------
 contrib/mm/m.tmac         | 16 +++++++----
 4 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/NEWS b/NEWS
index 7d1ef58d5..cbc7cfa25 100644
--- a/NEWS
+++ b/NEWS
@@ -502,6 +502,16 @@ Macro packages
 *  The m (mm) macro package's `Rpe` register is now named `Rpej` for
    better symmetry with `Ej`.  The old name remains as an alias.
 
+*  The m (mm) macro package has renamed several strings to make their
+   purposes less obscure; they determine the content of captions, not
+   list items.
+     `Licon` -> `Capcon`
+     `Liec`  -> `Capec`
+     `Liex`  -> `Capex`
+     `Lifg`  -> `Capfg`
+     `Litb`  -> `Captb`
+   The old names remain as aliases.
+
 *  The s (ms) macro package now sets the vertical spacing register
    defaults for normal (`VS`) and footnote (`FVS`) text to 120% of the
    type size configured in the `PS` and `FPS` registers, respectively,
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index c1ba1ce0e..f3b305ad4 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,18 @@
+2024-11-04  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m.tmac: Rename several strings to make their purposes less
+       obscure; they determine the content of captions, not list items.
+            `Licon` -> `Capcon`
+            `Liec`  -> `Capec`
+            `Liex`  -> `Capex`
+            `Lifg`  -> `Capfg`
+            `Litb`  -> `Captb`
+       The old names remain as aliases.
+
+       * groff_mm.7.man (Macros) <EC, EX, FG, TB, TC>
+       (Strings) <Capcon, Capec, Capex, Capfg, Captb>
+       <Licon, Liec, Liex, Lifg, Litb>: Update.
+
 2024-11-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * examples/SETR:
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 9af129720..6bdf2d67f 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -1383,7 +1383,7 @@ to \[lq]0\[rq] to suppress it.
 Caption an equation.
 .
 A caption comprises the string
-.B Liec
+.B Capec
 followed by an automatically incrementing counter stored in the register
 .BR Ec ,
 punctuation configured by the register
@@ -1599,7 +1599,7 @@ The register
 is the exhibit counter.
 .
 The string
-.B Liex
+.B Capex
 precedes the exhibit number and any
 .I title.
 .
@@ -1712,7 +1712,7 @@ The register
 is the figure counter.
 .
 The string
-.B Lifg
+.B Capfg
 precedes the figure number and any
 .I title.
 .
@@ -3690,7 +3690,7 @@ The register
 is the table counter.
 .
 The string
-.B Litb
+.B Captb
 precedes the table number and any
 .I title.
 .
@@ -3735,7 +3735,7 @@ calls
 .
 It then begins a new page with the contents caption,
 stored in the string
-.BR Licon ,
+.BR Capcon ,
 centered at the top.
 .
 The entries follow after three vees of space.
@@ -3827,11 +3827,11 @@ is \[lq]FG\[rq],
 \[lq]EC\[rq],
 or \[lq]EX\[rq],
 and strings
-.BR Lifg ,
-.BR Litb ,
-.BR Liec ,
+.BR Capfg ,
+.BR Captb ,
+.BR Capec ,
 and
-.B Liex
+.B Capex
 analogously configure the output of each captioned list.
 .
 .
@@ -4201,6 +4201,31 @@ interpolates a bullet mark,
 .
 .
 .TP
+.B Capcon
+\[lq]CONTENTS\[rq]
+.
+.
+.TP
+.B Capec
+\[lq]Equation\[rq]
+.
+.
+.TP
+.B Capex
+\[lq]Exhibit\[rq]
+.
+.
+.TP
+.B Capfg
+\[lq]Figure\[rq]
+.
+.
+.TP
+.B Captb
+\[lq]Table\[rq]
+.
+.
+.TP
 .B Ci
 assigns indentation amounts used by each heading level listed
 in a table of contents,
@@ -4440,31 +4465,6 @@ The default
 .
 .
 .TP
-.B Licon
-\[lq]CONTENTS\[rq]
-.
-.
-.TP
-.B Liec
-\[lq]Equation\[rq]
-.
-.
-.TP
-.B Liex
-\[lq]Exhibit\[rq]
-.
-.
-.TP
-.B Lifg
-\[lq]Figure\[rq]
-.
-.
-.TP
-.B Litb
-\[lq]Table\[rq]
-.
-.
-.TP
 .B Lt
 \[lq]LIST OF TABLES\[rq]
 .
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 08d663422..e2b514440 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -336,12 +336,18 @@ http://savannah.gnu.org/bugs/?group=groff.
 .\" flag for mkindex (XXX: undocumented: do we need this?)
 .if !r Idxf .nr Idxf 0
 .\" captions for displays
-.ds Lifg Figure
-.ds Litb Table
-.ds Liex Exhibit
-.ds Liec Equation
+.ds Capec Equation
+.ds Capex Exhibit
+.ds Capfg Figure
+.ds Captb Table
 .\" caption for the table of contents
-.ds Licon CONTENTS
+.ds Capcon CONTENTS
+.\" aliases for groff <= 1.23 compatibility
+.als Licon Capcon
+.als Liec Capec
+.als Liex Capex
+.als Lifg Capfg
+.als Litb Captb
 .\" Lsp controls the height of an empty line. Normally 0.5v
 .\" Normally used for nroff compatibility.
 .ie t .nr Lsp 0.5v