[groff] 16/25: [mm]: Slightly refactor.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 72e64619958f79bfd2b65d0d92904dfe47305e69
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Oct 27 23:08:07 2024 -0500

    [mm]: Slightly refactor.
    
    * contrib/mm/m.tmac: Slightly refactor; the entirety of a letter's
      header was being formatted in the `pg*tl-ev` environment.  This seemed
      unnecessary and with pending changes, caused the body text of the
      letter to be set in that environment too, which is quite wrong.
    
      (pg@header): If `let@header` is defined, delegate any required
      environment switching to it.
    
      (let@print-head): Don't bother switching environments, but do enable
      filling before starting the body text.
---
 contrib/mm/ChangeLog | 12 ++++++++++++
 contrib/mm/m.tmac    |  7 ++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 544b2ef3b..4be0b72e2 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,15 @@
+2024-10-27  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * m.tmac: Slightly refactor; the entirety of a letter's header
+       was being formatted in the `pg*tl-ev` environment.  This seemed
+       unnecessary and with pending changes, caused the body text of
+       the letter to be set in that environment too, which is quite
+       wrong.
+       (pg@header): If `let@header` is defined, delegate any required
+       environment switching to it.
+       (let@print-head): Don't bother switching environments, but do
+       enable filling before starting the body text.
+
 2024-10-26  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * m.tmac (let@print-head): Accept new second argument indicating
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 8cf94f262..9110c38e7 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1394,10 +1394,10 @@ numeric; got '\\$1'
 .\".   pg@disable-top-trap
 .      if \\n[pg*extra-header-size] 'sp \\n[pg*extra-header-size]u
 .      if \\n[pg*top-margin] 'sp \\n[pg*top-margin]u
-.      ev pg*tl-ev
-.      pg@set-env
 .      ie d let@header .let@header
 .      el \{\
+.              ev pg*tl-ev
+.              pg@set-env
 .              ie d TP .TP
 .              el \{\
 '                      sp 3
@@ -1410,8 +1410,8 @@ numeric; got '\\$1'
 .                      el .tl \\*[pg*even-header]
 '                      sp 2
 .              \}
+.              ev
 .      \}
-.      ev
 .      \" why no-space??
 .      if d PX \{\
 .              ns
@@ -3910,6 +3910,7 @@ undefined
 .      sp
 .\}
 .sp
+.fi
 ..
 .\"-------------------
 .\" .IA [name [title]]