gbranden pushed a commit to branch master
in repository groff.
commit 97a1e260b3d2447b1917c1125d5b78640c9575bc
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sat Jun 22 11:22:58 2024 -0500
[mm]: Fix code style and nomenclatural nits.
* contrib/mm/m.tmac (MULN, DF): Fix code style nit, favoring assembly of
long strings with both `ds` and `as` instead of using input line
continuation. Refer to displays as such in comments and diagnostic
messages, not as "keep"; mm tradition seems not to use the latter
term.
---
contrib/mm/ChangeLog | 8 ++++++++
contrib/mm/m.tmac | 18 ++++++++++++------
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index fcb737604..797d1da93 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,11 @@
+2024-06-22 G. Branden Robinson <[email protected]>
+
+ * m.tmac (MULN, DF): Fix code style nit, favoring assembly of
+ long strings with both `ds` and `as` instead of using input line
+ continuation. Refer to displays as such in comments and
+ diagnostic messages, not as "keep"; mm tradition seems not to
+ use the latter term.
+
2024-06-22 G. Branden Robinson <[email protected]>
* m.tmac: Actually remove temporary register `*vs-default`.
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index df96fad2d..a72c99419 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1720,8 +1720,11 @@ breaking page
.\"-----------
.de MULN
.if \\n[pg*cols-per-page]<2 .@error \\$0: not in multi-column mode
-.if \\n[pg*mul-x]>=\\n[pg*mul-max-col] .@abort undefined column width \
-(pg*mul-x=\\n[pg*mul-x >= pg*mul-max-col=\\n[pg*mul-max])
+.if \\n[pg*mul-x]>=\\n[pg*mul-max-col] \{\
+. ds pg*msg .@abort undefined column width \"
+. as (pg*mul-x=\\n[pg*mul-x] >= pg*mul-max-col=\\n[pg*mul-max])\"
+. @abort \\*[pg*msg]
+.\}
.br
.if \\n[.d]>\\n[pg*mul-last] .nr pg*mul-last \\n[.d]
.rt +0
@@ -1951,8 +1954,11 @@ breaking page
.\" floating display start
.\" nested DF/DE is not allowed.
.de DF
-.if \\n[df*float] .@error \\$0: cannot nest floating keeps; use DS \
-within DF/DE
+.if \\n[df*float] \{\
+. ds df*msg \\$0: cannot nest floating displays; \"
+. as df@msg use DS within DF/DE\"
+. @error \\*[df*msg]
+.\}
.ds ds@macro \\$0
.ds@set-format \\$@
.\"
@@ -2216,8 +2222,8 @@ within DF/DE
.\"--------------------------------------------
.de ds@end
.\" We hard-code the DE macro name here since this macro is internal but
-.\" only DE calls it. We also know we're closing a static keep because
-.\" df@end is called otherwise. See `DE`.
+.\" only DE calls it. We also know we're closing a static display
+.\" because df@end is called otherwise. See `DE`.
.if \\n-[ds*lvl]<0 .@error DE: no corresponding DS
.br
.di
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
