gbranden pushed a commit to branch master
in repository groff.
commit 47c37b2e042af8db65b099733e5312877e50daad
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Jun 10 12:15:51 2024 -0500
[mm]: Sand off an "abstract" wart.
Replace `AST` macro and `cov*abs-name` string with `Abstract` string.
* contrib/mm/m.tmac: Define `Abstract` instead of `cov*abs-name` string
at initialization.
(AST): Throw warning if called, but honor the instruction (using
new string name).
* contrib/mm/mm/0.MT:
* contrib/mm/mm/4.MT (cov*print-abstract):
* contrib/mm/mm/ms.cov (COVEND): Use new string name.
* contrib/mm/groff_mm.7.man (Macros) <AST>: De-document.
(Strings) <Abstract>: Document.
* contrib/mm/NOTES: De-document `cov*abs-name`.
* tmac/trans.tmac: For mm package, alias new string name `Abstract`
instead of old (and internal!) one, `cov*abs-name`.
---
ChangeLog | 5 +++++
NEWS | 4 ++++
contrib/mm/ChangeLog | 18 ++++++++++++++++++
contrib/mm/NOTES | 2 --
contrib/mm/groff_mm.7.man | 19 ++++++-------------
contrib/mm/m.tmac | 7 ++++---
contrib/mm/mm/0.MT | 2 +-
contrib/mm/mm/4.MT | 2 +-
contrib/mm/mm/ms.cov | 4 ++--
tmac/trans.tmac | 2 +-
10 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 686b342a1..d3502ca1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-06-10 G. Branden Robinson <[email protected]>
+
+ * tmac/trans.tmac: For mm package, alias new string name
+ `Abstract` instead of old (and internal!) one, `cov*abs-name`.
+
2024-06-10 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (token::next, interpolate_arg):
diff --git a/NEWS b/NEWS
index 56f018326..cdcdc3ce8 100644
--- a/NEWS
+++ b/NEWS
@@ -310,6 +310,10 @@ o The doc (mdoc) macro package now honors the `U` register
and `MF`
o The new macro file "koi8-r.tmac" supports the KOI8-R character
encoding, which supports the new Russian locale for groff.
+o The m (mm) macro package's `AST` macro is deprecated, warns upon
+ usage, and is slated for withdrawal in the next release. Assign to
+ the new string `Abstract` instead.
+
o The m (mm) macro package's `EPIC` macro (a GNU extension) now
interprets its "width" argument in ens by default, and its "height"
argument in vees, instead of basic units, for consistency with the
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 702672784..e2409811e 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,21 @@
+2024-06-10 G. Branden Robinson <[email protected]>
+
+ Replace `AST` macro and `cov*abs-name` string with `Abstract`
+ string.
+
+ * m.tmac: Define `Abstract` instead of `cov*abs-name` string at
+ initialization.
+ (AST): Throw warning if called, but honor the instruction (using
+ new string name).
+ * mm/0.MT:
+ * mm/4.MT (cov*print-abstract):
+ * mm/ms.cov (COVEND): Use new string name.
+
+ * groff_mm.7.man (Macros) <AST>: De-document.
+ (Strings) <Abstract>: Document.
+
+ * NOTES: De-document `cov*abs-name`.
+
2024-06-10 G. Branden Robinson <[email protected]>
* m.tmac:
diff --git a/contrib/mm/NOTES b/contrib/mm/NOTES
index 2495d3123..e487fb580 100644
--- a/contrib/mm/NOTES
+++ b/contrib/mm/NOTES
@@ -72,8 +72,6 @@ cov*abstract-placement I Placement argument to
.AS.
cov*abstract-indent I Indentation argument to .AS.
-cov*abs-name S The string 'ABSTRACT', changed with .AST
-
cov*abstract M The abstract.
cov*new-date S date (today if .ND not used)
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 22549155d..2e5798b8a 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -859,18 +859,6 @@ The default
.RB is\~ 0 .
.
.
-.\" XXX: Do we need a macro for this? Why is it not a string like App
-.\" or Licon? It is usefully localizable.
-.TP
-.BR AST \~\c
-.RI [ caption ]
-Set the caption above the abstract to
-.IR caption ,
-or clear it if there is no argument.
-.
-The default is \[lq]ABSTRACT\[rq].
-.
-.
.TP
.BI AT\~ title\c
\~.\|.\|.
@@ -4014,7 +4002,12 @@ localizable text.
These are presented in quotation marks.
.
.
-.TP 9.5n \" "Letnsdef" + 2n + hand-tuned for PDF
+.TP 10n \" "Abstract" + 2n
+.B Abstract
+\[lq]ABSTRACT\[rq]
+.
+.
+.TP
.B App
\[lq]APPENDIX\[rq]
.
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index cd9baba02..20c195264 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -43,6 +43,7 @@ Index array!index
.
.mso devtag.tmac
.\" ######## init #######
+.ds Abstract ABSTRACT\"
.\" create table of contents entry for headings of level <= Cl
.nr Cl 2
.\" Eject page between LIST OF XXXX if Cp == 0
@@ -3111,8 +3112,6 @@ exceeds depth of nested lists (\\n[li*lvl])
.\" new date (if .ND exists) is stored in cov*new-date
.\"
.\"
-.ds cov*abs-name ABSTRACT
-.\"
.nr cov*au 0
.de TL
.ds @cover \\$0
@@ -3165,8 +3164,10 @@ exceeds depth of nested lists (\\n[li*lvl])
.de AF
.if !''\\$1' .ds cov*firm \\$1
..
+.\" Kill this macro off in groff 1.25.
.de AST
-.ds cov*abs-name "\\$1\"
+.@warning \\$0: macro is deprecated; define string 'Abstract' instead
+.ds Abstract "\\$1\"
..
.de AS
.pg@disable-top-trap
diff --git a/contrib/mm/mm/0.MT b/contrib/mm/mm/0.MT
index a59fc6b68..d5f985fe3 100644
--- a/contrib/mm/mm/0.MT
+++ b/contrib/mm/mm/0.MT
@@ -160,7 +160,7 @@ TM
. cov@print-firm
. cov@print-date date
. cov@print-authors from
-. cov@print-abstract \\*[cov*abs-name]
+. cov@print-abstract \\*[Abstract]
. SP 3
. if (\*[cov*mt-type]>=1)&(\*[cov*mt-type]<=3) \{\
. ce
diff --git a/contrib/mm/mm/4.MT b/contrib/mm/mm/4.MT
index cfc958fa9..99338c50d 100644
--- a/contrib/mm/mm/4.MT
+++ b/contrib/mm/mm/4.MT
@@ -71,7 +71,7 @@ http://savannah.gnu.org/bugs/?group=groff.
. ll -\\n[cov*abstract-indent]u
. \}
. ce
-\fI\\*[cov*abs-name]\fP
+\fI\\*[Abstract]\fP
. SP 2
. fi
. cov*abstract
diff --git a/contrib/mm/mm/ms.cov b/contrib/mm/mm/ms.cov
index c25cc50bc..b9019be86 100644
--- a/contrib/mm/mm/ms.cov
+++ b/contrib/mm/mm/ms.cov
@@ -102,13 +102,13 @@ http://savannah.gnu.org/bugs/?group=groff.
.cov@print-title
.cov@print-authors
.cov@print-firm
-.cov@print-abstract "\\*[cov*abs-name]"
+.cov@print-abstract "\\*[Abstract]"
.cov@print-date
.pg@enable-top-trap
.bp 1
.pg@enable-trap
.if r cov*abstract-placement .if \\n[cov*abstract-placement] \{\
-. cov@print-abstract ABSTRACT
+. cov@print-abstract "\\*[Abstract]"
. SP 2
.\}
..
diff --git a/tmac/trans.tmac b/tmac/trans.tmac
index 5da114c3e..9973fc2f7 100644
--- a/tmac/trans.tmac
+++ b/tmac/trans.tmac
@@ -76,8 +76,8 @@
.
.\" mm package
.if d PH \{\
+. als Abstract \*[locale]-abstract
. als App \*[locale]-app
-. als cov*abs-name \*[locale]-abstract
. als Le \*[locale]-le
. als LetAT \*[locale]-letat
. als LetCN \*[locale]-letcn
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
