[groff] 02/02: [me]: Drop unnecessary code.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 1652d1801d4b2518db9c3d6834561a8d26eacf48
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Mon Jan 3 07:41:32 2022 +1100

    [me]: Drop unnecessary code.
    
    Apart from being superfluous, it prevented a user-defined value of the
    `sx` register from being applied to the first footnote marker
    interpolated, a subtlety that escaped my notice because the first
    footnotes in our "meref" and "meintro" documents are not numeric, but
    symbolic, and their markers occurred on lines with vertical space above
    and below.  (The bug was further masked by an otherwise redundant
    redefinition of the `*` string inside the `)f` macro.)
    
    * tmac/e.tmac ()f, +c): Stop redefining footnote marker string `*` after
      updating the automatic footnote number; its interpolation is already
      backslash-protected.
    
      ()d, pd): Stop redefining delayed text marker string `#` for an
      analogous reason.
    
      (initialization): Drop unneeded `_*` and `_#` strings.
    
    Thanks to Robert Goulding for his feedback and patience.  See
    <https://savannah.gnu.org/bugs/?61025>.
---
 ChangeLog   | 21 +++++++++++++++++++++
 tmac/e.tmac | 10 ++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81e36bb8..21c5ec38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2022-01-03  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [me]: Drop unnecessary code.  Apart from being superfluous, it
+       prevented a user-defined value of the `sx` register from being
+       applied to the first footnote marker interpolated, a subtlety
+       that escaped my notice because the first footnotes in our
+       "meref" and "meintro" documents are not numeric, but symbolic,
+       and their markers occurred on lines with vertical space above
+       and below.  (The bug was further masked by an otherwise
+       redundant redefinition of the `*` string inside the `)f` macro.)
+
+       * tmac/e.tmac ()f, +c): Stop redefining footnote marker string
+       `*` after updating the automatic footnote number; its
+       interpolation is already backslash-protected.
+       ()d, pd): Stop redefining delayed text marker string `#` for an
+       analogous reason.
+       (initialization): Drop unneeded `_*` and `_#` strings.
+
+       Thanks to Robert Goulding for his feedback and patience.  See
+       <https://savannah.gnu.org/bugs/?61025>.
+
 2022-01-03  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/tests/e_footnote-marks-work.sh: Enhance test.  Confirm
diff --git a/tmac/e.tmac b/tmac/e.tmac
index de49a6e5..98962d39 100644
--- a/tmac/e.tmac
+++ b/tmac/e.tmac
@@ -1661,7 +1661,6 @@
 .ie "\\n(.z"|f" \
 \{\
 .      if \\n* .nr $f +1
-.      ds * \\*{\\n($f\\*}\k*\"
 .      nr * 0
 .      in 0
 .      da
@@ -1708,14 +1707,12 @@
 .
 .de )d                 \" *** end delayed text
 .nr $d +1
-.ds # \\*(_#
 ..
 .
 .de pd                 \" *** print delayed text
 .|d
 .rm |d
 .nr $d 1
-.ds # \\*(_#
 ..
 .
 .
@@ -1877,7 +1874,6 @@
 .\}
 .nr ?C 1
 .nr $f 1
-.ds * \\*(_*\"
 .if \\n(?R \
 .      pn 1
 .bp
@@ -2145,11 +2141,9 @@
 .nr _L \n(.lu                  \" line length of page
 .nr $c 1                       \" current column number
 .nr $f 1                       \" footnote number
-.ds _* \\*{\\n($f\\*}\k*\"
-.ds * \*(_*\"                  \" footnote mark
+.ds * \\*{\\n($f\\*}\k*\"      \" footnote mark
 .nr $d 1                       \" delayed text number
-.ds _# [\\n($d]\"
-.ds # \*(_#\"                  \" delayed text mark
+.ds # [\\n($d]\"               \" delayed text mark
 .nr _M 1                       \" encoded document segment type
 .ds lq \(lq\"                  \" left quote
 .ds rq \(rq\"                  \" right quote