[groff] 01/01: man: Correctly reset margins.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit 3c9796e3b2055429007907b27ddd44a4f1bf62c3
Author: Ingo Schwarze <address@hidden>
Date:   Thu Mar 13 07:46:01 2014 +0100

    man: Correctly reset margins.
    
    See
    
      http://lists.gnu.org/archive/html/groff/2013-11/msg00026.html
    
    for more.
    
    * tmac/an-old.tmac (set-an-margin): Whenever (re)setting
    `\n[an-level]' to 1 (which happens when encountering `.TH', `.SH',
    and `.SS') make sure to also (re)set `\n[an-saved-margin1]' and
    `\n[an-saved-prevailing-indent1]' to a sane value such that an
    immediate `.RE' cannot wreak havoc.
    (TH, SH, SS): Updated.
---
 ChangeLog        |   17 +++++++++++++++++
 tmac/an-old.tmac |   10 ++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 02b2c99..3aedd81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2014-03-13  Ingo Schwarze  <address@hidden> (tiny change)
+
+       man: Correctly reset margins.
+
+       See
+
+         http://lists.gnu.org/archive/html/groff/2013-11/msg00026.html
+
+       for more.
+
+       * tmac/an-old.tmac (set-an-margin): Whenever (re)setting
+       `\n[an-level]' to 1 (which happens when encountering `.TH', `.SH',
+       and `.SS') make sure to also (re)set `\n[an-saved-margin1]' and
+       `\n[an-saved-prevailing-indent1]' to a sane value such that an
+       immediate `.RE' cannot wreak havoc.
+       (TH, SH, SS): Updated.
+
 2014-03-11  Ingo Schwarze  <address@hidden> (tiny change)
 
        * Makefile.in: Do not forget to install gropdf manuals.
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index e83f568..040be95 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -122,7 +122,11 @@
 .\}
 .
 .de set-an-margin
+.  nr an-level 1
 .  nr an-margin \\n[IN]
+.  nr an-saved-margin1 \\n[IN]
+.  nr an-prevailing-indent \\n[IN]
+.  nr an-saved-prevailing-indent1 \\n[IN]
 ..
 .
 .ds an-extra1
@@ -198,9 +202,7 @@
 .  PD
 .  if !r SN \
 .    nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
-.  nr an-level 1
 .  set-an-margin
-.  nr an-prevailing-indent \\n[IN]
 .  nr an-tag-sep 1n
 .
 .  nr an-no-space-flag 0
@@ -342,9 +344,7 @@
 .
 .de1 SH
 .  sp \\n[PD]u
-.  nr an-level 1
 .  set-an-margin
-.  nr an-prevailing-indent \\n[IN]
 .  fi
 .  in \\n[an-margin]u
 .  ti 0
@@ -361,9 +361,7 @@
 .
 .de1 SS
 .  sp \\n[PD]u
-.  nr an-level 1
 .  set-an-margin
-.  nr an-prevailing-indent \\n[IN]
 .  fi
 .  in \\n[IN]u
 .  ti \\n[SN]u