[groff] 10/49: tmac/an-old.tmac: Improve name space usage.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 664613412bd99758e31cf46156464474144ade1c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Jun 16 22:35:57 2021 +1000

    tmac/an-old.tmac: Improve name space usage.
    
    * tmac/an-old.tmac: Properly situate devtag flag-related register names
      in the package name space.  Rename `need_eo_h` to
      `an-devtag-needs-end-of-heading'.  Rename `need_col2` to
      `an-devtag-needs-second-column`.
    
      (an-input-trap, SH, SS, HP, (initialization)): Do it.
    
      (an-input-trap): Test their values more idiomatically.
    
    Fixes one third of <https://savannah.gnu.org/bugs/?42515>.
    
    Problem noted by Werner Lemberg in
    <http://lists.gnu.org/archive/html/groff/2014-01/msg00048.html> (but
    watch out for the Time-Cube-esque URL quoted there).
---
 ChangeLog        | 11 +++++++++++
 tmac/an-old.tmac | 18 +++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d77b2f..8cf179e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2021-06-16  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * tmac/an-old.tmac: Properly situate devtag flag-related
+       register names in the package name space.  Rename `need_eo_h` to
+       `an-devtag-needs-end-of-heading'.  Rename `need_col2` to
+       `an-devtag-needs-second-column`.
+       (an-input-trap, SH, SS, HP, (initialization)): Do it.
+       (an-input-trap): Test their values more idiomatically.
+
+       Fixes one third of <https://savannah.gnu.org/bugs/?42515>.
+
+2021-06-16  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * src/roff/troff/input.cpp (do_if_request): Improve diagnostic
        message; say "conditional operator", not just "conditional".
 
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 44ff676..18968ee 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -468,10 +468,10 @@
 .\" Handle macros that may take an "argument" on the next input line;
 .\" .SH, .SS, .B, .I, .SM, .SB--and .TP, which does so mandatorily.
 .de1 an-input-trap
-.  if \\n[need_eo_h]>0 .DEVTAG-EO-H
-.  nr need_eo_h 0
-.  if \\n[need_col2]>0 .DEVTAG-COL 2
-.  nr need_col2 0
+.  if \\n[an-devtag-needs-end-of-heading] .DEVTAG-EO-H
+.  nr an-devtag-needs-end-of-heading 0
+.  if \\n[an-devtag-needs-second-column] .DEVTAG-COL 2
+.  nr an-devtag-needs-second-column 0
 .  ft R
 .  ps \\n[PS]u
 .  vs \\n[VS]u
@@ -493,7 +493,7 @@
 .  fi
 .  in \\n[an-margin]u
 .  ti 0
-.  nr need_eo_h 1
+.  nr an-devtag-needs-end-of-heading 1
 .  DEVTAG-SH 1
 .  itc 1 an-input-trap
 .  nr an-need-no-space-mode 1
@@ -517,7 +517,7 @@
 .  fi
 .  in \\n[IN]u
 .  ti \\n[SN]u
-.  nr need_eo_h 1
+.  nr an-devtag-needs-end-of-heading 1
 .  DEVTAG-SH 2
 .  itc 1 an-input-trap
 .  nr an-need-no-space-mode 1
@@ -618,7 +618,7 @@
 .  in (\\n[an-margin]u + \\n[an-prevailing-indent]u)
 .  ti \\n[an-margin]u
 .  DEVTAG-COL 1
-.  nr need_col2 1
+.  nr an-devtag-needs-second-column 1
 .  ns
 ..
 .
@@ -883,8 +883,8 @@
 .\" === Initialize. ===
 .
 .mso devtag.tmac
-.nr need_eo_h 0 \" need to mark end of a heading?
-.nr need_col2 0 \" need two-column layout?
+.nr an-devtag-needs-end-of-heading 0
+.nr an-devtag-needs-second-column 0
 .
 .nr an-do-draw-line-after-document 0
 .nr an-is-first-page-of-document 1