[groff] 23/51: [mdoc]: Manage footer formatting more coherently.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit a241f55c920b45fcb42f7b8a33bc7a2bbd8f6722
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Sep 6 20:32:05 2022 -0500

    [mdoc]: Manage footer formatting more coherently.
    
    * tmac/mdoc/doc-common (doc-footer): Pull more footer concerns into this
      macro.  Don't bail out if continuously rendering; instead, format the
      appropriate footer text if we are.  For now, break the page only if we
      are not continuously rendering.
    
      (doc-end-macro): Call `doc-footer` instead of fomatting footer here.
    
    Fixes <https://savannah.gnu.org/bugs/?62774> (4/7).
    
    Indentation is _not_ corrected in this commit, for clarity.
---
 ChangeLog            | 11 +++++++++++
 tmac/mdoc/doc-common | 14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eefb4e6e2..76d45a894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2022-09-06  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/mdoc/doc-common (doc-footer): Pull more footer concerns
+       into this macro.  Don't bail out if continuously rendering;
+       instead, format the appropriate footer text if we are.  For now,
+       break the page only if we are not continuously rendering.
+       (doc-end-macro): Call `doc-footer` instead of fomatting footer
+       here.
+
+       Fixes <https://savannah.gnu.org/bugs/?62774> (4/7).
+
 2022-09-06  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/mdoc/doc-common (doc-end-macro): When continuously
diff --git a/tmac/mdoc/doc-common b/tmac/mdoc/doc-common
index 5de25b0ab..7785c5ada 100644
--- a/tmac/mdoc/doc-common
+++ b/tmac/mdoc/doc-common
@@ -970,9 +970,6 @@
 .
 .eo
 .de doc-footer
-.  ie \n[cR] \
-.    br
-.  el \{\
 .    ev doc-caption-enviroment
 .    doc-setup-page-layout
 .    sp \n[doc-footer-space]u
@@ -982,11 +979,14 @@
 .      el \
 .        tl 
\*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]%
 .    \}
-.    el \
+.    el \{\
+.      ie \n[cR] \
+.      tl 
\*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-header-string]
+.      el \
 .      tl 
\*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]%
-.    bp
+.    \}
+.    if !\n[cR] .bp
 .    ev
-.  \}
 ..
 .ec
 .
@@ -1034,7 +1034,7 @@
 .  if \n[cR] \{\
 .    pl +1v
 .    sp 1v
-.    tl 
\*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-header-string]
+.    doc-footer
 .    \" If we're processing multiple documents and have started a new
 .    \" one, draw a line between this footer and the next header.
 .    if !'\n[.F]'' \{\