groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 10/12: Revert "[me]: Fix Savannah #58736."


From: G. Branden Robinson
Subject: [groff] 10/12: Revert "[me]: Fix Savannah #58736."
Date: Thu, 16 Dec 2021 07:11:25 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit 757ea37560caf6deac85ac936496e918b3166c3d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Dec 16 18:54:01 2021 +1100

    Revert "[me]: Fix Savannah #58736."
    
    This reverts commit ab55f50af0599028bf7d3fd0fc50358471595b3c.
    
    It had undesired side effects.  The interactions of traps, footnotes,
    multi-column mode, and extreme page lengths are complex (and were not
    all completely settled even in 4.4BSD me, if the output of Heirloom
    Doctools troff is any indication).
    
    tmac/tests/e_footnotes-work-with-columns.sh fails at this commit.
---
 ChangeLog   | 10 ----------
 tmac/e.tmac |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d847206..2908dd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2954,16 +2954,6 @@
 
 2021-08-13  G. Branden Robinson <g.branden.robinson@gmail.com>
 
-       * tmac/e.tmac (1c): Fix problem when combining multiple columns,
-       footnotes, and return to single-column mode: do not place the
-       single-column text below the footnote.  Space to the end of the
-       page (\n[nl]), not the page "high-water mark" (\n[.h]).  Thanks
-       to Bjarni Ingi Gislason for the suggestion.
-
-       Fixes <https://savannah.gnu.org/bugs/?58736>.
-
-2021-08-13  G. Branden Robinson <g.branden.robinson@gmail.com>
-
        Add regression test for Savannah #58736.
 
        * tmac/tests/e_footnotes_work_with_columns.sh: Test it.
diff --git a/tmac/e.tmac b/tmac/e.tmac
index 3cc3fc6..37e2634 100644
--- a/tmac/e.tmac
+++ b/tmac/e.tmac
@@ -971,7 +971,7 @@
 .nr $c 1
 .nr $m 1
 .ll \\n(_Lu\"                  return to normal output
-.sp |\\n(nlu
+.sp |\\n(.hu
 .@O \\n(_ou
 ..
 .



reply via email to

[Prev in Thread] Current Thread [Next in Thread]