gbranden pushed a commit to branch master
in repository groff.
commit 8d8ef2261776da04017162036413a676e4194a94
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Jun 22 18:20:06 2024 -0500
[mm]: Rename macros to get out of user name space.
* contrib/mm/m.tmac (debug): Rename this macro...
(debug@little-dump): ...to this.
(debug-all): ...and this one.
(debug@big-dump): ...to this.
(pg@next-page, pg@disable-trap, pg@footnotes): Update (commented-out)
call sites.
---
contrib/mm/ChangeLog | 11 +++++++++++
contrib/mm/m.tmac | 25 +++++++++++++------------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 149c41926..51133a984 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,14 @@
+2024-06-22 G. Branden Robinson <[email protected]>
+
+ Rename macros to get out of user name space.
+
+ * m.tmac (debug): Rename this macro...
+ (debug@little-dump): ...to this.
+ (debug-all): ...and this one...
+ (debug@big-dump): ...to this.
+ (pg@next-page, pg@disable-trap, pg@footnotes): Update
+ {commented-out} call sites.
+
2024-06-22 G. Branden Robinson <[email protected]>
* m.tmac (init@reset): Rename this macro...
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 9799a4cad..584c8b0b4 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -391,17 +391,18 @@ http://savannah.gnu.org/bugs/?group=groff.
.br
..
.\" ####### module debug #################################
-.de debug
-.tm \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s],\\n[.ps] \
-in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
+.de debug@little-dump
+.tmc \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s],\\n[.ps]
+.tm1 " in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
..
-.de debug-all
+.de debug@big-dump
.nr debug*n 1n
.nr debug*m 1m
-.tm \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s] in=\\n[.i]\
- ad=\\n[.j] fi=\\n[.u] pl=\\n[.p] page=\\n[%] .o=\\n[.o]
-.tm _______ .d=\\n[.d] .f=\\n[.f] .h=\\n[.h] .k=\\n[.k] .n=\\n[.n]\
- .p=\\n[.p] .t=\\n[.t] .z=\\n[.z] nl=\\n[nl] dn=\\n[dn] n=\\n[debug*n]
+.tmc \\$1:\\n[.F]:\\n[c.] ll=\\n[.l] vs=\\n[.v] ps=\\n[.s] in=\\n[.i]
+.tm1 " ad=\\n[.j] fi=\\n[.u] pl=\\n[.p] page=\\n[%] .o=\\n[.o]
+.tmc _______ .d=\\n[.d] .f=\\n[.f] .h=\\n[.h] .k=\\n[.k] .n=\\n[.n]
+.tmc " .p=\\n[.p] .t=\\n[.t] .z=\\n[.z] nl=\\n[nl] dn=\\n[dn]
+.tm1 " n=\\n[debug*n]
..
.\" ####### module par #################################
.nr par*indentation-eligible 1 \" indent following P if Pt=2
@@ -1274,10 +1275,10 @@ numeric; got '\\$1'
.\"-------------------------
.\" stop output and begin on next page. Fix footnotes and all that.
.de pg@next-page
-.\".debug next-page
+.\".debug@little-dump next-page
.br
.if \\n[pg*at-end-of-input] \c
-.ne 999i \" activate trap
+.ne 999i \" activate trap; TODO: use \n[.R]; see Savannah #63587
.\" .pg@footer
..
.\"-------------------------
@@ -1377,7 +1378,7 @@ numeric; got '\\$1'
.ec
.if \\n[D]>2 .tm Footer# \\n[%] (\\n[.F]:\\n[c.]) nl=\\n[nl]
.pg@disable-trap
-.\".debug footer
+.\".debug@little-dump footer
.tbl@bottom-hook
.\" increment pageoffset for MC
.\" move to the exact start of footer.
@@ -1491,7 +1492,7 @@ numeric; got '\\$1'
.\"-------------------------
.\" end of page processing
.de pg@footnotes
-.\".debug footnotes
+.\".debug@little-dump footnotes
.\" output footnotes. set trap for block
.\"
..
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
