[groff] 30/49: tmac/s.tmac: Rename devtag-related registers.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit ead1255bd11ae4c4f16e19185a9d301df21f0146
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Jun 17 06:15:36 2021 +1000

    tmac/s.tmac: Rename devtag-related registers.
    
    * tmac/s.tmac: Properly situate devtag flag-related register names in
      the package name space.  Rename `need_eo_h` to
      `s@devtag-needs-end-of-heading'.  Rename `need_eo_tl` to
      `s@devtag-needs-end-of-title`.
    
      ((initialization), par@reset, @SH, par@finish, @NH): Do it.
    
      (par@reset): Test their values more idiomatically.
    
    Fixes last third of <https://savannah.gnu.org/bugs/?42515>.
---
 ChangeLog   | 11 +++++++++++
 tmac/s.tmac | 21 +++++++++++----------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ba102b..2af59f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2021-06-17  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * tmac/s.tmac: Properly situate devtag flag-related register
+       names in the package name space.  Rename `need_eo_h` to
+       `s@devtag-needs-end-of-heading'.  Rename `need_eo_tl` to
+       `s@devtag-needs-end-of-title`.
+       ((initialization), par@reset, @SH, par@finish, @NH): Do it.
+       (par@reset): Test their values more idiomatically.
+
+       Fixes last third of <https://savannah.gnu.org/bugs/?42515>.
+
+2021-06-17  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * tmac/e.tmac-u (@h): Migrate SCCS revision 2.37 to be idiomatic
        for groff (and not throw warnings of type 'mac').
 
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 84a1623..9b7d0dc 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -28,10 +28,11 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .
 .\" See if already loaded.
 .if r GS .nx
-.mso devtag.tmac
 .nr GS 1
-.nr need_eo_h 0
-.nr need_eo_tl 0
+.
+.mso devtag.tmac
+.nr s@devtag-needs-end-of-heading 0
+.nr s@devtag-needs-end-of-title 0
 .
 .\" Define a string for use in diagnostic messages.
 .ds @s s.tmac\"
@@ -1207,10 +1208,10 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .\" par@reset
 .de par@reset
 .br
-.if \\n[need_eo_tl]>0 .DEVTAG-EO-TL
-.nr need_eo_tl 0
-.if \\n[need_eo_h]>0 .DEVTAG-EO-H
-.nr need_eo_h 0
+.if \\n[s@devtag-needs-end-of-title] .DEVTAG-EO-TL
+.nr s@devtag-needs-end-of-title 0
+.if \\n[s@devtag-needs-end-of-heading] .DEVTAG-EO-H
+.nr s@devtag-needs-end-of-heading 0
 .ce 0
 .rj 0
 .ul 0
@@ -1480,7 +1481,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .  if 0\\$1>0 .nr sh*psincr (\\n[GROWPS]-0\\$1)*\\n[PSINCR]
 .  SH-NO-TAG
 .  DEVTAG-SH 1
-.  if '\*(.T'html' .nr need_eo_h 1
+.  if '\*(.T'html' .nr s@devtag-needs-end-of-heading 1
 ..
 .\" TL, AU, and AI are aliased to these in cov*ab-init.
 .de par@TL
@@ -1491,7 +1492,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .vs +3p
 .ce 9999
 .DEVTAG-TL
-.nr need_eo_tl 1
+.nr s@devtag-needs-end-of-title 1
 ..
 .de par@AU
 .par@finish
@@ -1683,7 +1684,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .nr sh*psincr (\\n[GROWPS]-\\n[nh*hl])*\\n[PSINCR]
 .SH-NO-TAG
 .DEVTAG-NH "\\$1"
-.  if '\*(.T'html' .nr need_eo_h 1
+.  if '\*(.T'html' .nr s@devtag-needs-end-of-heading 1
 \\*[SN-STYLE]
 ..
 .\" ****************************