[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 03/38: [me]: Fix Savannah #58736.
From: |
G. Branden Robinson |
Subject: |
[groff] 03/38: [me]: Fix Savannah #58736. |
Date: |
Mon, 3 Oct 2022 01:42:55 -0400 (EDT) |
gbranden pushed a commit to branch master
in repository groff.
commit 4eeba76c6c2aaf1900b1047f017f03257935ad62
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sun Sep 25 22:46:54 2022 -0500
[me]: Fix Savannah #58736.
* tmac/e.tmac: Initialize new register `_f`, the value of `$m` (column
count) of the previous pending footnote, to zero, meaning there is no
previous pending footnote.
(@o): Emit diagnostic when flushing footnotes into a different column
layout then the pending footnote last added. Set `_f` to zero.
((f): Emit diagnostic when enqueueing footnote using a different
column layout than the previous pending footnote used. Set `_f` to
`$m`.
Fixes <https://savannah.gnu.org/bugs/?58736>. Thanks to Dave Kemper for
the report and discussion.
---
ChangeLog | 15 +++++++++++++++
tmac/e.tmac | 11 +++++++++++
2 files changed, 26 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 6af7d8283..6abf3adee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2022-09-25 G. Branden Robinson <g.branden.robinson@gmail.com>
+
+ * tmac/e.tmac: Initialize new register `_f`, the value of `$m`
+ {column count} of the previous pending footnote, to zero,
+ meaning there is no previous pending footnote.
+ (@o): Emit diagnostic when flushing footnotes into a different
+ column layout then the pending footnote last added. Set `_f` to
+ zero.
+ ((f): Emit diagnostic when enqueueing footnote using a different
+ column layout than the previous pending footnote used. Set `_f`
+ to `$m`.
+
+ Fixes <https://savannah.gnu.org/bugs/?58736>. Thanks to Dave
+ Kemper for the report and discussion.
+
2022-09-25 G. Branden Robinson <g.branden.robinson@gmail.com>
* tmac/e.tmac: Explicitly initialize and annotate internal
diff --git a/tmac/e.tmac b/tmac/e.tmac
index a3b529c3e..9a222ec54 100644
--- a/tmac/e.tmac
+++ b/tmac/e.tmac
@@ -411,7 +411,12 @@
.wh -\\n(_Bu @r
.if \\n(?n \
. nm \\n(ln
+.if \\n(_f \
+. if !\\n(_f=\\n($m \
+. @err writing \\n($m-column footnote in \\n(_f-column \
+layout
.|f
+.nr _f 0
.if \\n(?n \
. nm
.fi
@@ -1600,6 +1605,11 @@
.
.de (f \" *** begin footnote
.if "\\n(.z"|f" .do @err footnotes cannot be nested
+.if \\n(_f \
+. if !\\n(_f=\\n($m \
+. @err queueing \\n($m-column footnote after \
+\\n(_f-column footnote
+.nr _f \\n($m
.ie "\\n(.z"" \
\{\
. nr _D \\n(dn
@@ -2149,6 +2159,7 @@
.@R ?C\" \" at chapter header?
.@R ?e\" \" in equation?
.@R ?f\" \" inside footnote?
+.@R _f\" \" column count of previous footnote
.@R ?H\" \" suppress headers and footers next page?
.@R ?I\" \" has the header trap been sprung?
.@R ?N\" \" numbering with shorter line length?
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 03/38: [me]: Fix Savannah #58736.,
G. Branden Robinson <=