gbranden pushed a commit to branch master
in repository groff.

commit 3a8fd6c3788ae9c279ce9db120c73cd86b9026db
Author: Deri James <[email protected]>
AuthorDate: Mon May 18 12:57:59 2026 +0000

    [ms]: Fix Savannah #68537.
    
    * tmac/s.tmac: ...making automatically numbered footnotes (`\*[*]` or
      `\**`) usable in tbl(1) table entries.
    
      (pg@end-text): Remove autoincrement from `fn*text-num` register.
    
      (@FS): Increment `fn*text-num` only if given no arguments.
    
    Fixes <https://savannah.gnu.org/bugs/?68527>.  (Problem appears to date
    back to groff's birth.  --GBR)
---
 ChangeLog   | 11 +++++++++++
 tmac/s.tmac |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f210bebef..30c52200b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2026-05-18  Deri James  <[email protected]>
+
+       * tmac/s.tmac: Fix Savannah #68537, making automatically
+       numbered footnotes (`\*[*]` or `\**`) usable in tbl(1) table
+       entries.
+       (pg@end-text): Remove autoincrement from `fn*text-num` register.
+       (@FS): Increment `fn*text-num` only if given no arguments.
+
+       Fixes <https://savannah.gnu.org/bugs/?68527>.  (Problem appears
+       to date back to groff's birth.  --GBR)
+
 2026-07-18  G. Branden Robinson <[email protected]>
 
        [ms]: Regression-test Savannah #68537.
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 4052368d8..da3a2cf29 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -864,7 +864,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .vs \n[fn@sep-dist]u
 .nr fn@sep-dist \n[.v]
 .ev
-.nr fn*text-num 0 1
+.nr fn*text-num 1
 .nr fn*note-num 0 1
 .nr fn*open 0
 .\" Handle initialition tasks deferred until par module is set up.
@@ -884,6 +884,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .FS-MARK \\$@
 .ie \\n[.$] .fn*do-FS "\\$1" no
 .el \{\
+.      nr fn*text-num +1
 .      ie \\n[fn*text-num]>\\n[fn*note-num] .fn*do-FS \\n+[fn*note-num]
 .      el .fn*do-FS
 .\}

_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to