gbranden pushed a commit to branch master
in repository groff.
commit 084c44dd7bdf7d25bf1777ccd75bf1e00ce40827
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Jul 2 20:50:56 2024 -0500
[mm]: Make `VL`'s first argument optional.
...as done with `BVL` on 30 June.
* contrib/mm/m.tmac (VL): Make first argument optional. If omitted, use
the paragraph indentation amount (register `Pi`) for the list item's
text indentation.
* contrib/mm/groff_mm.7.man (Macros) <VL>:
* NEWS: Document this.
---
NEWS | 6 +++---
contrib/mm/ChangeLog | 6 ++++++
contrib/mm/groff_mm.7.man | 13 +++++++------
contrib/mm/m.tmac | 7 ++++---
4 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/NEWS b/NEWS
index 1bdfe4c73..4d5cf31d2 100644
--- a/NEWS
+++ b/NEWS
@@ -330,9 +330,9 @@ o The m (mm) macro package's `Li` register now configures
the text
indentation of items in `RL` lists (as it long has for `AL` lists)
instead of hard-coding a value of 6 ens as DWB 3.3 mm does.
-o The m (mm) macro package's `BVL` macro's first argument is now
- optional. If omitted, the paragraph indentation amount (register
- `Pi`) is used for the list item's text indentation.
+o The m (mm) macro package's `BVL` and `VL` macros' first arguments are
+ now optional. If omitted, the paragraph indentation amount (register
+ `Pi`) is used for list items' text indentations.
o The m (mm) macro package's `DS` macro now interprets its third
argument (a right-hand indentation) in ens by default, for consistency
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 916c90e6a..51eee69f7 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,9 @@
+2024-07-02 G. Branden Robinson <[email protected]>
+
+ * m.tmac (VL): Make first argument optional. If omitted, use
+ the paragraph indentation amount (register `Pi`) for the list
+ item's text indentation.
+
2024-07-02 G. Branden Robinson <[email protected]>
* m.tmac (LI): Improve overlong mark detection: count the
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 3f03783a6..1f14b9937 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -3938,9 +3938,9 @@ End verbatim display.
.
.
.TP
-.BI VL\~ text-indent\c
-.RI \~[ mark-indent \~[\c
-.BR 1 ]]
+.BR VL \~[\c
+.IR text-indent \~[ mark-indent \~[\c
+.BR 1 ]]]
Begin variable-item
(or \[lq]tagged\[rq])
list.
@@ -3948,11 +3948,12 @@ list.
Each item should supply its own mark,
or tag.
.
+A
.I text-indent
-sets the indentation of the text,
-and
+argument overrides register
+.BR Pi ;
.I mark-indent
-the distance from the current list indentation to the mark.
+sets the distance from the indentation of the current list to the mark.
.
A third argument suppresses the vertical space that normally precedes
each list item;
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 900af6e14..eb144d773 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -2474,9 +2474,10 @@ exceeds depth of nested lists (\\n[li*lvl])
.de VL
.if \\n[D]>2 .tm VL \\$@
.if \\n[.$]>3 .@warning \\$0: ignoring excess arguments
-.if \\n[.$]<1 .@error \\$0: expected 1 to 3 arguments, got \\n[.$]
-.ie \\n[.$]<3 .LB 0\\$1 0\\$2 0 0
-.el .LB 0\\$1 0\\$2 0 0 \& 0 1
+.ie \\n[.$]<1 .nr li*text-indent \\n[Pi]
+.el .nr li*text-indent \\$1
+.ie \\n[.$]<3 .LB 0\\n[li*text-indent] 0\\$2 0 0
+.el .LB 0\\n[li*text-indent] 0\\$2 0 0 \& 0 1
..
.\" `BVL` always breaks after the tag, so the mark cannot overset.
.de BVL
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
