[groff] 05/07: [mdoc]: Align header/footer spacing with man(7).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit bf4b3dde3ba442a0cf52e986d2549f1dc47f43c5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu May 20 11:45:10 2021 +1000

    [mdoc]: Align header/footer spacing with man(7).
    
    * tmac/mdoc/doc-common-u (doc-end-macro): When continuously rendering,
      increase page length by same amount we vertically space after flushing
      a pending output line, for symmetry with other spacing requests (and
      to prevent nasty surprises analogous to those in Savannah #60611).
    
      (doc-header): Put 3 vees of space after the header in continuous
      rendering mode, not 1 (and increase page length accordingly).
---
 ChangeLog              |  7 ++++++-
 tmac/mdoc/doc-common-u | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa1dd69..980ae18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,12 @@
        * tmac/mdoc/doc-common-u (doc-end-macro): When continuously
        rendering and after flushing the last line of the body text of a
        page, vertically space by 3 vees instead of 1, for consistency
-       with our man(7) implementation.
+       with our man(7) implementation.  Also increase page length by
+       same amount _after_ flushing a pending output line, for symmetry
+       with other spacing requests (and to prevent nasty surprises
+       analogous to those in Savannah #60611).
+       (doc-header): Put 3 vees of space after the header in continuous
+       rendering mode, not 1 (and increase page length accordingly).
 
 2021-05-20  G. Branden Robinson <g.branden.robinson@gmail.com>
 
diff --git a/tmac/mdoc/doc-common-u b/tmac/mdoc/doc-common-u
index 3d6cfb5..571f979 100644
--- a/tmac/mdoc/doc-common-u
+++ b/tmac/mdoc/doc-common-u
@@ -955,8 +955,10 @@
 .  tl 
\*[doc-caption-font]\*[doc-header-string]\f[]\*[doc-caption-font2]\*[doc-volume]\f[]\*[doc-caption-font]\*[doc-header-string]\f[]
 .  ie !\n[cR] \
 .    sp \n[doc-header-space]u
-.  el \
-.    sp 1v
+.  el \{\
+.    pl +3v
+.    sp 3v
+.  \}
 .  ev
 .  ns
 ..
@@ -1017,13 +1019,11 @@
 .  \" footer.  So we fudge the page length to make sure that the last
 .  \" page is never ejected until we want it to be.
 .
-.  if \n[cR] \
-.    pl +3v
 .  fl
-.
 .  doc-check-depth
 .
 .  if \n[cR] \{\
+.    pl +3v
 .    sp 3v
 .    tl 
\*[doc-caption-font]\*[doc-operating-system]\f[]\*[doc-caption-font2]\*[doc-date-string]\f[]\*[doc-caption-font]\*[doc-operating-system]\f[]
 .    \" suppress empty lines after the footer