[groff] 06/07: [mm]: Trace use of user-defined hooks.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 610477d3011399cf39850159734cf09ea33b86c7
Author: G. Branden Robinson 
AuthorDate: Sat Feb 8 15:01:04 2025 -0600

[mm]: Trace use of user-defined hooks.

* contrib/mm/m.tmac (pg@print-footer): ...for `EOP`.
  (ref@print-refs): ...for `RPX`.

* contrib/mm/mm/0.MT:
* contrib/mm/mm/4.MT: ...and for `AFX`.
---
 contrib/mm/ChangeLog |  9 +
 contrib/mm/m.tmac| 12 +---
 contrib/mm/mm/0.MT   |  7 +--
 contrib/mm/mm/4.MT   |  7 +--
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index ce1377061..986527e17 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,12 @@
+2025-02-08  G. Branden Robinson 
+
+   Trace use of user-defined hooks.
+
+   * m.tmac (pg@print-footer): ...for `EOP`.
+   (ref@print-refs): ...for `RPX`.
+   * mm/0.MT:
+   * mm/4.MT: ...and for `AFX`.
+
 2024-12-21  G. Branden Robinson 
 
* mmroff.pl: If asked for `--help`, summarize command purpose in
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 0356fa9fe..033d52b44 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2024 Free Software Foundation, Inc.
+Copyright (C) 1991-2025 Free Software Foundation, Inc.
 groff mm is written by J�rgen H�gg 
 based on groff ms by James Clark 
 and further developed by Werner Lemberg 
@@ -1582,7 +1582,10 @@ numeric; got '\\$1'
 .pg@set-env
 .vpt 0
 .\" user defined end-of-page macro
-.ie d EOP .EOP
+.ie d EOP \{\
+.  if \\n[D]>=5 .tm \\$0: calling user-defined EOP macro
+.  EOP
+.\}
 .el \{\
 .  ie o \{\
 .  if \\n[D]>=3 .tm Footer "\\*[pg*odd-footer]"
@@ -3335,7 +3338,10 @@ argument: '\\$2'
 .\" prints the references
 .de ref@print-refs
 .toc@save 1 "" "\\*[Rp]" \\n[%]
-.ie d RPX .RPX
+.ie d RPX \{\
+.  if \\n[D]>=5 .tm \\$0: calling user-defined RPX macro
+.  RPX
+.\}
 .el \{\
 .  SP 2
 .  ce
diff --git a/contrib/mm/mm/0.MT b/contrib/mm/mm/0.MT
index 57a5d494b..eb95f5bcc 100644
--- a/contrib/mm/mm/0.MT
+++ b/contrib/mm/mm/0.MT
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2024 Free Software Foundation, Inc.
+Copyright (C) 1991-2025 Free Software Foundation, Inc.
 mm is written by J�rgen H�gg 
 
 Modified by G. Branden Robinson  to more
@@ -269,7 +269,10 @@ http://savannah.gnu.org/bugs/?group=groff.
 .\" definition.)
 .if !d cov*mt-printed \{\
 .  cov@print-title subject
-.  ie d AFX .AFX
+.  ie d AFX \{\
+.  if \\n[D]>=5 .tm calling user-defined AFX macro
+.  AFX
+.  \}
 .  el   .cov@print-firm
 .  cov@print-date date
 .  cov@print-authors from
diff --git a/contrib/mm/mm/4.MT b/contrib/mm/mm/4.MT
index aae99d3bb..c98885fdc 100644
--- a/contrib/mm/mm/4.MT
+++ b/contrib/mm/mm/4.MT
@@ -1,6 +1,6 @@
 .ig
 
-Copyright (C) 1991-2024 Free Software Foundation, Inc.
+Copyright (C) 1991-2025 Free Software Foundation, Inc.
 mm is written by J�rgen H�gg 
 
 Modified by G. Branden Robinson  to more
@@ -98,7 +98,10 @@ http://savannah.gnu.org/bugs/?group=groff.
 .if !d cov*mt-printed \{\
 .  cov@print-title
 .  cov@print-authors
-.  ie d AFX .AFX
+.  ie d AFX \{\
+.  if \\n[D]>=5 .tm calling user-defined AFX macro
+.  AFX
+.  \}
 .  el   .cov@print-firm
 .  if d cov*abstract \{\
 .  if !\n[cov*abstract-placement] .cov@print-abstract

___
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/07: [groff]: Test "es" and "ru" l10n files more.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 379902c992d805a26cac970b5ee3a633987edea4
Author: G. Branden Robinson 
AuthorDate: Sat Feb 8 15:08:19 2025 -0600

[groff]: Test "es" and "ru" l10n files more.

* src/roff/groff/tests/initialization-is-quiet.sh: Add new "es" and "ru"
  localization macro files as test scenarios.
* tmac/LOCALIZATION: Document this step, since I forgot it.
---
 ChangeLog   | 6 ++
 src/roff/groff/tests/initialization-is-quiet.sh | 2 +-
 tmac/LOCALIZATION   | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d229aad40..fb3707812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-02-08  G. Branden Robinson 
+
+   * src/roff/groff/tests/initialization-is-quiet.sh: Add new "es"
+   and "ru" localization macro files as test scenarios.
+   * tmac/LOCALIZATION: Document this step, since I forgot it.
+
 2025-02-07  G. Branden Robinson 
 
* src/roff/groff/groff.am (groff_XFAIL_TESTS): Add
diff --git a/src/roff/groff/tests/initialization-is-quiet.sh 
b/src/roff/groff/tests/initialization-is-quiet.sh
index 46c847c54..48dc130b1 100755
--- a/src/roff/groff/tests/initialization-is-quiet.sh
+++ b/src/roff/groff/tests/initialization-is-quiet.sh
@@ -43,7 +43,7 @@ fi
 
 for compat in "" " -C"
 do
-  for locale in cs de en fr it ja sv zh
+  for locale in cs de en es fr it ja ru sv zh
   do
 echo testing \"-m $locale$compat\" >&2
 output=$("$groff" -ww -m $locale$compat -a -Tutf8 https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 07/07: [mm]: Fix Savannah #66758 (broken gpresent(1)).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 82bd10163b89f63b73d63d3cdbd29c8ba63098a8
Author: Colin Watson 
AuthorDate: Sat Feb 8 21:10:23 2025 +

[mm]: Fix Savannah #66758 (broken gpresent(1)).

* contrib/mm/m.tmac (pg@print-footer): Fix missing brace escape
  sequence.

Fixes .  [Problem introduced by me
in commit 88cd50aa, 27 October.  Thanks to Deri James for the report and
tracking down the (huge) offending commit.  --GBR]
---
 contrib/mm/ChangeLog | 9 +
 contrib/mm/m.tmac| 1 +
 2 files changed, 10 insertions(+)

diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 986527e17..62f4ab835 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,12 @@
+2025-02-08  Colin Watson 
+
+   * m.tmac (pg@print-footer): Fix missing brace escape sequence.
+
+   Fixes .  [Problem
+   introduced by me in commit 88cd50aa, 27 October.  Thanks to Deri
+   James for the report and tracking down the (huge) offending
+   commit.  --GBR]
+
 2025-02-08  G. Branden Robinson 
 
Trace use of user-defined hooks.
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 033d52b44..b74bc7ce3 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1600,6 +1600,7 @@ numeric; got '\\$1'
 .  ie (\\n[P]=1)&(\\n[N]=1) \{\
 .  if \\n[D]>=3 .tm Footer "\\*[pg*header]" \" that's right
 .  tl \\*[pg*header]
+.  \}
 .  el \{\
 .  if \\n[D]>=3 .tm Footer "\\*[pg*footer]"
 .  tl \\*[pg*footer]

___
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/07: ChangeLog: Correct old entry.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 0b3d7f5e5bbc226c0ab48de56670686c01d2c7ae
Author: G. Branden Robinson 
AuthorDate: Sat Feb 8 15:02:59 2025 -0600

ChangeLog: Correct old entry.
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 21599ae0f..d229aad40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,8 +64,8 @@
 
(do_overstrike, do_bracket, do_name_test, do_zero_width_output)
(read_size, do_register, do_width, do_device_extension)
-   (read_drawing_command): Throw warning in "delimiter" category
-   and explain ambiguity of delimiter instead of emitting error and
+   (read_drawing_command): Throw warning in "delim" category and
+   explain ambiguity of delimiter instead of emitting error and
refusing further interpretation of the escape sequence being
parsed.  Leave behind "#if"ed code for restoration of former
stricter behavior in a future groff release (which would fix

___
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 04/07: src/roff/troff/input.cpp: Fix code style nit.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 9620b0b1244f52592805f0bc3d1701732f1f384b
Author: G. Branden Robinson 
AuthorDate: Sat Feb 8 15:11:51 2025 -0600

src/roff/troff/input.cpp: Fix code style nit.

Explicitly compare variable of pointer type to null pointer literal
instead of letting it pun down to a Boolean.
---
 ChangeLog| 6 ++
 src/roff/troff/input.cpp | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fb3707812..8690bfbeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-02-08  G. Branden Robinson 
+
+   * src/roff/troff/input.cpp (interpolate_environment_variable):
+   Explicitly compare variable of pointer type to null pointer
+   literal instead of letting it pun down to a Boolean.
+
 2025-02-08  G. Branden Robinson 
 
* src/roff/groff/tests/initialization-is-quiet.sh: Add new "es"
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 84c6de1e8..1a66d242d 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -5463,7 +5463,7 @@ void unformat_macro()
 static void interpolate_environment_variable(symbol nm)
 {
   const char *s = getenv(nm.contents());
-  if (s && *s)
+  if ((s != 0 /* nullptr */) && (*s != 0 /* nullptr */))
 input_stack::push(make_temp_iterator(s));
 }
 

___
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 05/07: doc/groff.texi.in: Sync line breaks with troff(1).

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 41d2e45cefb0efa3aad6868d871c436481726170
Author: G. Branden Robinson 
AuthorDate: Sat Feb 8 15:13:07 2025 -0600

doc/groff.texi.in: Sync line breaks with troff(1).
---
 doc/groff.texi.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/groff.texi.in b/doc/groff.texi.in
index 07e38da05..f09bcc6a0 100644
--- a/doc/groff.texi.in
+++ b/doc/groff.texi.in
@@ -17721,7 +17721,9 @@ because it is also meaningful when beginning a numeric 
expression,
 or
 the closing delimiter in an escape sequence was missing or mismatched.
 
-A future @code{groff} release may reject ambiguous delimiters.
+A future
+@code{groff}
+release may reject ambiguous delimiters.
 In compatibility mode,
 ambiguous delimiters are accepted without warning.
 

___
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 03/07: src/roff/troff/input.cpp: Fix typo.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 9b789a0a335eefe821fcf7cf0a04f1cb5224226a
Author: G. Branden Robinson 
AuthorDate: Sat Feb 8 15:09:32 2025 -0600

src/roff/troff/input.cpp: Fix typo.

...in "#if 0"-ed code.
---
 src/roff/troff/input.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 03fd0c52a..84c6de1e8 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -5632,7 +5632,7 @@ static bool read_size(int *x)
" in a numeric expression", tok.description());
 // TODO: groff 1.25?
 #if 0
-  else if (!to.is_usable_as_delimiter(true /* report error */))
+  else if (!tok.is_usable_as_delimiter(true /* report error */))
 return false;
 #endif
   else {

___
groff-commit mailing list
groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit