[groff] 01/23: [troff]: Fix the Savannah #60955 fix.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit edc31f220ce9b4a67ba5ae17c1b9dadc32d8a193
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Nov 21 11:19:30 2024 -0600

    [troff]: Fix the Savannah #60955 fix.
    
    * src/roff/troff/number.cpp (is_valid_term): Accept scaling unit of `u`
      in contexts where `f` is expected; `u` is valid in all contexts.
    
    Continues commit 6f08ec9815, 4 September.  See
    <https://savannah.gnu.org/bugs/?60955>.
---
 ChangeLog                 | 9 +++++++++
 src/roff/troff/number.cpp | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03df62bba..b0dddc571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-11-21  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/troff/number.cpp (is_valid_term): Accept scaling unit
+       of `u` in contexts where `f` is expected; `u` is valid in all
+       contexts.
+
+       Continues commit 6f08ec9815, 4 September.  See
+       <https://savannah.gnu.org/bugs/?60955>.
+
 2024-11-19  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [troff]: Fix Savannah #64484.  This change restores groff
diff --git a/src/roff/troff/number.cpp b/src/roff/troff/number.cpp
index b8fce3739..f0b231cb3 100644
--- a/src/roff/troff/number.cpp
+++ b/src/roff/troff/number.cpp
@@ -541,9 +541,9 @@ static bool is_valid_term(units *u, int scaling_unit,
       warning(WARN_SCALE, "scaling unit invalid in context");
       break;
     case 'f':
-      if (c != 'f') {
+      if (c != 'f' && c != 'u') {
        warning(WARN_SCALE, "'%1' scaling unit invalid in context;"
-               " use 'f'", c);
+               " use 'f' or 'u'", c);
        break;
       }
       si = c;