gbranden pushed a commit to branch master
in repository groff.
commit 639ff3c23000900ddd2db9668e861507892a7df6
Author: G. Branden Robinson <[email protected]>
AuthorDate: Wed Jan 14 19:33:43 2026 -0600
[mm]: Fix Savannah #67907 (`Le` register default).
* contrib/mm/m.tmac: Initialize register `Le` to `1`, not `0`. This
makes its default consistent with the `Lf`, `Lt`, and `Lx` registers
of similar purpose, but inconsistently with DWB 3.3 mm. Explicitly
assigning the `Le` register in a document's preamble continues to work
as it always has.
* contrib/mm/groff_mm.7.man (Description): Document it.
* contrib/mm/tests/toc-captions-ident-correctly.sh: Update test input to
omit explicit `Le` assignment, and thereby regression-test this
change.
Fixes <https://savannah.gnu.org/bugs/?67907>.
NEWS: Add item.
---
NEWS | 5 +++++
contrib/mm/ChangeLog | 18 +++++++++++++++-
contrib/mm/groff_mm.7.man | 27 ++++++++++++++++++------
contrib/mm/m.tmac | 2 +-
contrib/mm/tests/toc-captions-ident-correctly.sh | 1 -
5 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/NEWS b/NEWS
index 19b3bfa3e..907a936b8 100644
--- a/NEWS
+++ b/NEWS
@@ -592,6 +592,11 @@ Macro packages
* The m (mm) macro package's `Limsp` register (a GNU extension) has
been removed; see the item regarding the `LI` macro below.
+* The m (mm) macro package's `Le` register now defaults to `1`,
+ consistently with the `Lf`, `Lt`, and `Lx` registers of similar
+ purpose, but inconsistently with DWB 3.3 mm. Explicitly assigning
+ the `Le` register in a document's preamble works as it always has.
+
* The m (mm) macro package's `AST` macro (a GNU extension) is
deprecated, warns upon usage, and is slated for withdrawal in a
future release. Assign to the new string `Abstract` instead.
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 5d2d21854..034ca6fe5 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,19 @@
+2026-01-14 G. Branden Robinson <[email protected]>
+
+ * m.tmac: Initialize register `Le` to `1`, not `0`. This makes
+ its default consistent with the `Lf`, `Lt`, and `Lx` registers
+ of similar purpose, but inconsistently with DWB 3.3 mm.
+ Explicitly assigning the `Le` register in a document's preamble
+ continues to work as it always has.
+
+ * groff_mm.7.man (Description): Document it.
+
+ * tests/toc-captions-ident-correctly.sh: Update test input to
+ omit explicit `Le` assignment, and thereby regression-test this
+ change.
+
+ Fixes <https://savannah.gnu.org/bugs/?67907>.
+
2026-01-14 G. Branden Robinson <[email protected]>
* m.tmac (AST, ISODATE, GETHN, GETPN, GETR, IND, INDP, FC, AV)
@@ -3377,7 +3393,7 @@ Sun Jan 1 00:00:00 1991 Joergen Haegg (jh at efd.lth.se)
________________________________________________________________________
Copyright 1991-2021 Free Software Foundation, Inc.
-Copyright 2021-2025 G. Branden Robinson
+Copyright 2021-2026 G. Branden Robinson
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 639ad6b4b..1b3bfa7d9 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -10,7 +10,7 @@ groff_mm \- memorandum macros for GNU
.\" ====================================================================
.\"
.\" Copyright 1989-2019 Free Software Foundation, Inc.
-.\" 2020-2024 G. Branden Robinson
+.\" 2020-2026 G. Branden Robinson
.\"
.\" This file is part of mm, a reimplementation of the Documenter's
.\" Workbench (DWB) troff memorandum macro package for use with GNU
@@ -226,6 +226,23 @@ use an explicit scaling unit to avoid surprises.
.
.IP \[bu]
The
+.B Le
+register defaults to
+.BR 1 ,
+consistently with
+.BR Lf ,
+.BR Lt ,
+and
+.B Lx
+in DWB;
+equations captioned with
+.B EC
+appear in tables of contents produced by
+.BR TC .
+.
+.
+.IP \[bu]
+The
.B Li
register configures the text indentation of
.B RL
@@ -5188,11 +5205,9 @@ respectively,
after a table of contents;
see
.B TC
-(Boolean-valued;
-.BR Le :\~ 0 ;
-.BR Lf ,
-.BR Lt ,
-.BR Lx :\~ 1 ).
+(all:
+Boolean-valued;
+.BR 1 ).
.
.
.\" XXX: What is the rationale for this feature?
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 16e2533ca..4f66eec56 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -239,7 +239,7 @@ http://savannah.gnu.org/bugs/?group=groff.
.ds Lx LIST OF EXHIBITS
.nr Lx 1
.ds Le LIST OF EQUATIONS
-.nr Le 0
+.nr Le 1 \" This default differs from DWB 3.3 mm.
.\" list indentation in ens
.nr Li 5
.\" put vertical space before list items of nesting level <= Ls
diff --git a/contrib/mm/tests/toc-captions-ident-correctly.sh
b/contrib/mm/tests/toc-captions-ident-correctly.sh
index 17656c108..62bbb0caf 100755
--- a/contrib/mm/tests/toc-captions-ident-correctly.sh
+++ b/contrib/mm/tests/toc-captions-ident-correctly.sh
@@ -30,7 +30,6 @@ wail () {
# reproducer by Alexis Hildebrant.
input='.
-.nr Le 1 \" enable equation list in TOC
.ds Rule \l#\\n[.l]u-1n#
.ds Captc A\*[Rule]
.ds Le B\*[Rule]
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
