[bug #65884] [mm] with \n[Pt]=2, indentation not restored correctly after implicit paragraph

[G. Branden Robinson]

Update of bug #65884 (group groff):

                  Status:             In Progress => Fixed                  
             Assigned to:                    None => gbranden               
             Open/Closed:                    Open => Closed                 
         Planned Release:                    None => 1.24.0                 

    _______________________________________________________

Follow-up Comment #1:

I goofed the commit messages, alas, but the bug is fixed.

Here's what the commit messages SHOULD have looked like.


commit xxxBOGUSxxx8a423cd26ea49cb3846684f11e640771a62a8f03
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Jun 15 06:17:51 2024 -0500

    [mm]: Fix Savannah #65865 (suppress P indent).
    
    * contrib/mm/m.tmac (hd*trap): New macro shuts off suppression of
      paragraph indentation.
    
      (H): Stop trying to figure out whether we should suppress indentation
      based on whether the heading is run-in or not; that is not the
      relevant criterion.  What matters is whether formatted output (such as
      implied paragraph text) follows the heading call.  To that end, set a
      1-line input trap calling the new macro `hd*trap`.
    
    Fixes <https://savannah.gnu.org/bugs/?65865>.  Problem introduced by me
    in commit 814e204d16, 24 January 2023.

commit xxxBOGUSxxx93948e20870f9740ce7de392e3e61c54a2a07f96
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Jun 15 06:05:40 2024 -0500

    [mm]: Regression-test Savannah #65884.
    
    * contrib/mm/tests/P-indentation-works.sh: Do it.

    Test fails at this commit.


Here's the patch.


diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index a84f30d90..f1965d09c 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1037,6 +1037,10 @@ .de HU
 .H 0 \\$@
 ..
 .\"-------------
+.de hd*trap
+.nr par@suppress-indentation 0
+..
+.\"-------------
 .de H
 .if !r hd*cur-bline .nr hd*cur-bline \\n[nl]
 .br
@@ -1177,10 +1181,7 @@ .de H
 .      if (\\n[Hi]=1)&(\\n[Pt]=1) .ti +\\n[Pi]n
 .      \"      indent size of mark if Hi=2
 .      if \\n[hd*htype]&(\\n[Hi]>1) .ti +\\n[hd*mark-size]u
-.      nr par@suppress-indentation 1
 .\}
-.\" We're setting a run-in heading; the next paragraph is normal.
-.el .nr par@suppress-indentation 0
 .\"
 .\"    check if it is time to reset footnotes
 .if (\\n[hd*level]=1)&\\n[ft*clear-at-header] .nr ft*nr 0 1
@@ -1198,6 +1199,8 @@ .de H
 .nr hd*last-hsize \\n[.k]
 .\" HTML: end of heading
 .misc@tag EO-H
+.\" _Any_ output after this heading resets suppression of indentation.
+.itc 1 hd*trap
 ..
 .\"--------
 .de HM




    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?65884>

_______________________________________________
Message sent via Savannah
https://savannah.gnu.org/