gbranden pushed a commit to branch master
in repository groff.
commit e4095f019f4863bf532a3ee652e8f90222bbe234
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Aug 5 08:01:02 2025 -0500
[mm]: Adjust default bottom margin size.
* contrib/mm/m.tmac ([initializtion): Configure a 3v margin (one
half-inch when typesetting using the defaults of 10 point type on 12
point spacing) below the footer, instead of 2v.
* contrib/mm/groff_mm.7.man (Description) <VM>: Update.
* contrib/mm/tests/artifacts/letter_with_bottom_block:
* contrib/mm/tests/short-pages-do-not-overflow-stack.sh: Update test
expectations.
* NEWS: Add item.
---
NEWS | 7 +++++++
contrib/mm/ChangeLog | 14 ++++++++++++++
contrib/mm/groff_mm.7.man | 9 ++++++---
contrib/mm/m.tmac | 6 ++++--
contrib/mm/tests/artifacts/letter_with_bottom_block | 6 +++---
contrib/mm/tests/artifacts/memorandum.0 | 10 +++++-----
contrib/mm/tests/artifacts/memorandum.1 | 18 +++++++++---------
contrib/mm/tests/artifacts/memorandum.2 | 18 +++++++++---------
contrib/mm/tests/artifacts/memorandum.3 | 18 +++++++++---------
contrib/mm/tests/artifacts/memorandum.custom | 18 +++++++++---------
contrib/mm/tests/short-pages-do-not-overflow-stack.sh | 8 ++++----
11 files changed, 79 insertions(+), 53 deletions(-)
diff --git a/NEWS b/NEWS
index 4112482ee..a3fa58d12 100644
--- a/NEWS
+++ b/NEWS
@@ -542,6 +542,13 @@ Macro packages
* The new macro file "koi8-r.tmac" supports the KOI8-R character
encoding, which supports the new Russian locale for groff.
+* The m (mm) macro package now uses a 3v bottom margin rather than 2v.
+ (Using the default type size and vertical spacing, the result is a
+ half-inch margin, just like the existing top margin.) When
+ formatting for terminals, content aligned to the bottom of the page
+ (footers, footnotes, `BS`/`BE` bottom blocks, and similar) now sets
+ one line higher than before.
+
* The m (mm) macro package's `Limsp` register (a GNU extension) has
been removed; see the item regarding the `LI` macro below.
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index ba6d7317e..b92e0250e 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,17 @@
+2025-08-05 G. Branden Robinson <[email protected]>
+
+ * m.tmac ([initializtion): Configure a 3v margin (one half-inch
+ when typesetting using the defaults of 10 point type on 12 point
+ spacing) below the footer, instead of 2v.
+ * tests/artifacts/letter_with_bottom_block:
+ * tests/artifacts/memorandum.0:
+ * tests/artifacts/memorandum.1:
+ * tests/artifacts/memorandum.2:
+ * tests/artifacts/memorandum.3:
+ * tests/artifacts/memorandum.custom:
+ * tests/short-pages-do-not-overflow-stack.sh: Update test
+ expectations.
+
2025-08-03 G. Branden Robinson <[email protected]>
* mm/0.MT: Let right-most column of document heading stretch to
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 15fe63b27..394dcbd6f 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -4058,11 +4058,14 @@ is specified, set those margins to
and
.IR bottom .
.
-If no argument is given, reset the margin to zero, or to the default
-(\[lq]7v 5v\[rq])
+If no measurement arguments are given,
+reset the margins to zero,
+or,
if
.B \-T
-is used.
+is used,
+to the defaults
+(\[lq]7v 6v\[rq])
.
It is highly recommended that macros
.B TP
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index fc8d78b47..4610c252f 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1,6 +1,8 @@
.ig
-Copyright (C) 1991-2025 Free Software Foundation, Inc.
+Copyright (C) 1991-2018 Free Software Foundation, Inc.
+ 2021-2025 G. Branden Robinson
+
groff mm is written by J�rgen H�gg <[email protected]>
based on groff ms by James Clark <[email protected]>
and further developed by Werner Lemberg <[email protected]>
@@ -1361,7 +1363,7 @@ numeric; got '\\$1'
.nr pg*top-margin 0
.nr pg*foot-margin 0
.nr pg*block-size 0
-.nr pg*footer-size 5v\" 1v+footer+even/odd footer+2v
+.nr pg*footer-size 6v\" 1v+footer+even/odd footer+3v
.nr pg*header-size 7v\" 3v+header+even/odd header+2v
.nr pg*extra-footer-size 0
.nr pg*extra-header-size 0
diff --git a/contrib/mm/tests/artifacts/letter_with_bottom_block
b/contrib/mm/tests/artifacts/letter_with_bottom_block
index 540dfcd9b..2785e8d81 100644
--- a/contrib/mm/tests/artifacts/letter_with_bottom_block
+++ b/contrib/mm/tests/artifacts/letter_with_bottom_block
@@ -56,9 +56,9 @@
56
57
58
- 59
- 60 Contact Tax ID Bank Account/IBAN
- 61 me@org 98765 DE12123121231212
+ 59 Contact Tax ID Bank Account/IBAN
+ 60 me@org 98765 DE12123121231212
+ 61
62
63
64
diff --git a/contrib/mm/tests/artifacts/memorandum.0
b/contrib/mm/tests/artifacts/memorandum.0
index 62dcccb28..f3165c981 100644
--- a/contrib/mm/tests/artifacts/memorandum.0
+++ b/contrib/mm/tests/artifacts/memorandum.0
@@ -57,8 +57,8 @@
57 Chairman
58 Wealthy Industrialist
59
- 60 Copy to
- 61 A. Pratt
+ 60
+ 61
62
63
64
@@ -71,9 +71,9 @@
71
72
73
- 74 B. Sharpe
- 75
- 76
+ 74 Copy to
+ 75 A. Pratt
+ 76 B. Sharpe
77
78
79
diff --git a/contrib/mm/tests/artifacts/memorandum.1
b/contrib/mm/tests/artifacts/memorandum.1
index 155594726..9672e55ab 100644
--- a/contrib/mm/tests/artifacts/memorandum.1
+++ b/contrib/mm/tests/artifacts/memorandum.1
@@ -57,8 +57,8 @@
57
58
59
- 60 J-K-axv/hep-QRS H. E. Pennypacker
- 61 Chairman
+ 60
+ 61
62
63
64
@@ -71,13 +71,13 @@
71
72
73
- 74 Wealthy Industrialist
- 75
- 76 Copy to
- 77 A. Pratt
- 78 B. Sharpe
- 79
- 80
+ 74 J-K-axv/hep-QRS H. E. Pennypacker
+ 75 Chairman
+ 76 Wealthy Industrialist
+ 77
+ 78 Copy to
+ 79 A. Pratt
+ 80 B. Sharpe
81
82
83
diff --git a/contrib/mm/tests/artifacts/memorandum.2
b/contrib/mm/tests/artifacts/memorandum.2
index 3c9b60b5b..a5773d9ce 100644
--- a/contrib/mm/tests/artifacts/memorandum.2
+++ b/contrib/mm/tests/artifacts/memorandum.2
@@ -57,8 +57,8 @@
57
58
59
- 60 J-K-axv/hep-QRS H. E. Pennypacker
- 61 Chairman
+ 60
+ 61
62
63
64
@@ -71,13 +71,13 @@
71
72
73
- 74 Wealthy Industrialist
- 75
- 76 Copy to
- 77 A. Pratt
- 78 B. Sharpe
- 79
- 80
+ 74 J-K-axv/hep-QRS H. E. Pennypacker
+ 75 Chairman
+ 76 Wealthy Industrialist
+ 77
+ 78 Copy to
+ 79 A. Pratt
+ 80 B. Sharpe
81
82
83
diff --git a/contrib/mm/tests/artifacts/memorandum.3
b/contrib/mm/tests/artifacts/memorandum.3
index cad93b82d..b8bf8af3c 100644
--- a/contrib/mm/tests/artifacts/memorandum.3
+++ b/contrib/mm/tests/artifacts/memorandum.3
@@ -57,8 +57,8 @@
57
58
59
- 60 J-K-axv/hep-QRS H. E. Pennypacker
- 61 Chairman
+ 60
+ 61
62
63
64
@@ -71,13 +71,13 @@
71
72
73
- 74 Wealthy Industrialist
- 75
- 76 Copy to
- 77 A. Pratt
- 78 B. Sharpe
- 79
- 80
+ 74 J-K-axv/hep-QRS H. E. Pennypacker
+ 75 Chairman
+ 76 Wealthy Industrialist
+ 77
+ 78 Copy to
+ 79 A. Pratt
+ 80 B. Sharpe
81
82
83
diff --git a/contrib/mm/tests/artifacts/memorandum.custom
b/contrib/mm/tests/artifacts/memorandum.custom
index b08c43d77..95b1ede81 100644
--- a/contrib/mm/tests/artifacts/memorandum.custom
+++ b/contrib/mm/tests/artifacts/memorandum.custom
@@ -57,8 +57,8 @@
57
58
59
- 60 J-K-axv/hep-QRS H. E. Pennypacker
- 61 Chairman
+ 60
+ 61
62
63
64
@@ -71,13 +71,13 @@
71
72
73
- 74 Wealthy Industrialist
- 75
- 76 Copy to
- 77 A. Pratt
- 78 B. Sharpe
- 79
- 80
+ 74 J-K-axv/hep-QRS H. E. Pennypacker
+ 75 Chairman
+ 76 Wealthy Industrialist
+ 77
+ 78 Copy to
+ 79 A. Pratt
+ 80 B. Sharpe
81
82
83
diff --git a/contrib/mm/tests/short-pages-do-not-overflow-stack.sh
b/contrib/mm/tests/short-pages-do-not-overflow-stack.sh
index b1d5fd3e1..8105ac940 100755
--- a/contrib/mm/tests/short-pages-do-not-overflow-stack.sh
+++ b/contrib/mm/tests/short-pages-do-not-overflow-stack.sh
@@ -47,13 +47,13 @@ test "$(echo "$output" | wc -l)" -eq 132 || wail # 66 lines
* 2 pages
echo "checking that sample document fits using -rL5v" >&2
output=$(printf "%s\n" "$input" \
- | "$groff" -b -rL5v -mm -Tascii -P-cbou | nl -ba)
+ | "$groff" -b -rL6v -mm -Tascii -P-cbou | nl -ba)
echo "$output"
-test "$(echo "$output" | wc -l)" -eq 40 || wail # 5 lines * 8 pages
+test "$(echo "$output" | wc -l)" -eq 48 || wail # 6 lines * 8 pages
-echo "checking that sample document fails gracefully using -rL4v" >&2
+echo "checking that sample document fails gracefully using -rL5v" >&2
error=$(printf "%s\n" "$input" \
- | "$groff" -b -rL4v -mm -Tascii -P-cbou -z 2>&1)
+ | "$groff" -b -rL5v -mm -Tascii -P-cbou -z 2>&1)
# Assume that >= 10 lines of stderr must be due to a giant backtrace.
test $(echo "$error" | wc -l) -lt 10 || wail
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
