[groff] 105/115: [tbl]: Process 'p' and 'v' more Postelianly.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2022-06-01
in repository groff.

commit 357e2511035921b9f15379682374b4918b55507e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Fri May 19 03:45:18 2023 -0500

    [tbl]: Process 'p' and 'v' more Postelianly.
    
    * src/preproc/tbl/main.cpp (process_format): Accept (and discard) space
      and tab characters after [pPvV] in a column descriptor, as is already
      done for [fFmMwW].  Modify [wW] to use the same loop style as the
      others, for consistency.
---
 ChangeLog                |  7 +++++++
 src/preproc/tbl/main.cpp | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a37b0b84a..7680c4b40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-05-19  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/preproc/tbl/main.cpp (process_format): Accept (and
+       discard) space and tab characters after [pPvV] in a column
+       descriptor, as is already done for [fFmMwW].  Modify [wW] to use
+       the same loop style as the others, for consistency.
+
 2023-05-19  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/preproc/eqn/box.cpp (half_space_box::output)
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
index 61265538d..b02baaeec 100644
--- a/src/preproc/tbl/main.cpp
+++ b/src/preproc/tbl/main.cpp
@@ -992,6 +992,9 @@ format *process_format(table_input &in, options *opt,
          ps.val = 0;
          ps.inc = 0;
          c = in.get();
+         do {
+           c = in.get();
+         } while (c == ' ' || c == '\t');
          if (c == '+' || c == '-') {
            ps.inc = (c == '+' ? 1 : -1);
            c = in.get();
@@ -1034,6 +1037,9 @@ format *process_format(table_input &in, options *opt,
          vs.val = 0;
          vs.inc = 0;
          c = in.get();
+         do {
+           c = in.get();
+         } while (c == ' ' || c == '\t');
          if (c == '+' || c == '-') {
            vs.inc = (c == '+' ? 1 : -1);
            c = in.get();
@@ -1062,9 +1068,9 @@ format *process_format(table_input &in, options *opt,
        }
       case 'w':
       case 'W':
-       c = in.get();
-       while (c == ' ' || c == '\t')
+       do {
          c = in.get();
+       } while (c == ' ' || c == '\t');
        if (c == '(') {
          list->width = "";
          c = in.get();