gbranden pushed a commit to branch master
in repository groff.
commit a0cf99898128d18f45082dfaa134e0ee55cdef5e
Author: G. Branden Robinson <[email protected]>
AuthorDate: Tue Jul 21 02:05:17 2026 -0500
[troff]: Fix Savannah #68542.
* src/roff/troff/input.cpp (read_crement_and_escape_sequence_parameter):
Emit warning in category "style" if -crementing interpolation is
applied to non-auto-crementing register.
* doc/groff.texi.in (Warnings):
* src/roff/troff/troff.1.man (Warnings): Document it.
Fixes <https://savannah.gnu.org/bugs/?68542>.
---
ChangeLog | 12 ++++++++++++
NEWS | 11 +++++++++++
doc/groff.texi.in | 2 ++
src/roff/troff/input.cpp | 26 ++++++++++++++++++++++----
src/roff/troff/troff.1.man | 2 ++
5 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ecea890ae..ec4af2060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2026-07-21 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp
+ (read_crement_and_escape_sequence_parameter): Emit warning in
+ category "style" if -crementing interpolation is applied to
+ non-auto-crementing register.
+
+ * doc/groff.texi.in (Warnings):
+ * src/roff/troff/troff.1.man (Warnings): Document it.
+
+ Fixes <https://savannah.gnu.org/bugs/?68542>.
+
2026-11-08 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (file_iterator::close): Raise a
diff --git a/NEWS b/NEWS
index d74e09d8e..ff0b9cf9b 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,17 @@ This file describes recent user-visible changes in groff.
Bug fixes are
not described. groff's man pages and Texinfo manual offer more details.
See the ChangeLog* files for release dates.
+VERSION next
+============
+
+troff
+-----
+
+* The formatter now emits a warning in category "style" if -crementing
+ interpolation (such as `\n+[myreg]` or `\n-[count]`) is (uselessly)
+ applied to a non-auto-crementing register.
+
+
VERSION 1.25.0
==============
diff --git a/doc/groff.texi.in b/doc/groff.texi.in
index 63324d7c2..4c6c15ec8 100644
--- a/doc/groff.texi.in
+++ b/doc/groff.texi.in
@@ -23735,6 +23735,8 @@ Input was non-idiomatic or likely to produce an
unexpected result
(or none at all),
but is not invalid:
a brace escape sequence was employed uselessly;
+an in- or decrementing interpolation was applied
+to a register that lacked an auto-in- or -decrement amount;
the end of a sentence was detected prior to the end of a text line;
or
an attempt was made to combine temporary indentation
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 2b968a2da..8005e0287 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -1162,11 +1162,29 @@ static symbol
read_crement_and_escape_sequence_parameter(int *incp)
*incp = 0;
return read_two_character_escape_sequence_parameter();
case '+':
- *incp = 1;
- return read_escape_sequence_parameter();
+ {
+ *incp = 1;
+ symbol identifier = read_escape_sequence_parameter();
+ reg *r = look_up_register(identifier,
+ true /* suppress creation */);
+ if (r->get_increment() == 0)
+ warning(WARN_STYLE, "applying incrementing interpolation"
+ " to register '%1' lacking an auto-{in,de}crement",
+ identifier.contents());
+ return identifier;
+ }
case '-':
- *incp = -1;
- return read_escape_sequence_parameter();
+ {
+ *incp = -1;
+ symbol identifier = read_escape_sequence_parameter();
+ reg *r = look_up_register(identifier,
+ true /* suppress creation */);
+ if (r->get_increment() == 0)
+ warning(WARN_STYLE, "applying decrementing interpolation"
+ " to register '%1' lacking an auto-{in,de}crement",
+ identifier.contents());
+ return identifier;
+ }
case '[':
if (!want_att_compat) {
*incp = 0;
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 5bef582ee..1b3888ab5 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -854,6 +854,8 @@ Input was non-idiomatic or likely to produce an unexpected
result
(or none at all),
but is not invalid:
a brace escape sequence was employed uselessly;
+an in- or decrementing interpolation was applied
+to a register that lacked an auto-in- or -decrement amount;
the end of a sentence was detected prior to the end of a text line;
or
an attempt was made to combine temporary indentation
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit