[groff] 66/127: [mm]: Slightly revise index output.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit fd563aa652360ac566a60812afa6005cd29a0aea
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu May 25 06:12:07 2023 -0500

    [mm]: Slightly revise index output.
    
    * contrib/mm/m.tmac (INDP): Call `SK` if `TXIND` is not defined, instead
      of as the first thing if `TYIND` is not defined.  This is easier to
      rationalize in the documentation as something that happens before the
      index caption is written.  This way any page breaking or spacing prior
      to the index is strictly `TXIND`'s responsibility, and the formatting
      of the index caption itself, followed by any formatting changes
      appropriate to the index entries, belongs to `TYIND`.
    
    * NEWS: Add item.
---
 NEWS                 |  4 ++++
 contrib/mm/ChangeLog | 13 +++++++++++++
 contrib/mm/m.tmac    |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 74a28dc7b..4f6a386ec 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,10 @@ Macro packages
 o The new macro file "koi8-r.tmac" supports the KOI8-R character
   encoding, which supports the new Russian locale for groff.
 
+o The m (mm) macro package's `IND` macro (a GNU extension), now calls
+  `SK` only if no `TXIND` macro is defined, instead of performing this
+  action as part of the fallback when no `TYIND` macro is defined.
+
 o The s (ms) macro package now sets the vertical spacing register
   defaults for normal (`VS`) and footnote (`FVS`) text to 120% of the
   existing type size rather than 2 points larger to comport with
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 64af14fb3..7e66855ce 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,16 @@
+2023-05-25  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       Slightly revise index output.
+
+       * m.tmac (INDP): Call `SK` if `TXIND` is not defined, instead of
+       as the first thing if `TYIND` is not defined.  This is easier to
+       rationalize in the documentation as something that happens
+       before the index caption is written.  This way any page breaking
+       or spacing prior to the index is strictly `TXIND`'s
+       responsibility, and the formatting of the index caption itself,
+       followed by any formatting changes appropriate to the index
+       entries, belongs to `TYIND`.
+
 2023-07-04 G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * m.tmac (IND): Use `hd@mark-trimmed` instead of `hd*mark` in
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 5f066cfd6..04d79e230 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3385,10 +3385,10 @@ exceeds depth of nested lists (\\n[li*lvl])
 .      if !\\n[Cp] .pg@next-page
 .      \" print INDEX
 .      \" execute user-defined macros
-.      if d TXIND .TXIND
+.      ie d TXIND .TXIND
+.      el .SK
 .      ie d TYIND .TYIND
 .      el \{\
-.              SK
 .              ce
 \\*[Index]
 .              SP 3