[groff] 06/10: [tbl]: Update diagnostic messages.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit b25e04b317ef24d4d3065ae57638fa08cdcea7f1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Nov 10 12:16:20 2021 +1100

    [tbl]: Update diagnostic messages.
    
    * src/preproc/tbl/main.cpp (process_options, process_format):
    * src/preproc/tbl/table.cpp (table::add_entry): Align diagnostic text
      with terminology now used in tbl(1) man page.
      - "global option" -> "region option"
      - "specifier" -> "column modifier"
      - "format" -> "column classifier"
---
 ChangeLog                 | 11 +++++++++++
 src/preproc/tbl/main.cpp  |  7 ++++---
 src/preproc/tbl/table.cpp |  8 ++++----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0caf586..dc26a12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2021-11-10  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       [tbl]: Update diagnostic messages.
+
+       * src/preproc/tbl/main.cpp (process_options, process_format):
+       * src/preproc/tbl/table.cpp (table::add_entry): Align diagnostic
+       text with terminology now used in tbl(1) man page.
+         - "global option" -> "region option"
+         - "specifier" -> "column modifier"
+         - "format" -> "column classifier"
+
+2021-11-10  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        [libgroff]: Fix missing colon in diagnostic messages.
 
        * src/libs/libgroff/error.cpp (do_error_with_file_and_line):
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
index 2c2d879..4906860 100644
--- a/src/preproc/tbl/main.cpp
+++ b/src/preproc/tbl/main.cpp
@@ -514,7 +514,7 @@ options *process_options(table_input &in)
       opt->flags |= table::EXPERIMENTAL;
     }
     else {
-      error("unrecognised global option '%1'", p);
+      error("unrecognized region option '%1'", p);
       // delete opt;
       // return 0;
     }
@@ -1095,7 +1095,7 @@ format *process_format(table_input &in, options *opt,
     } while (success);
     if (list->vline > 2) {
       list->vline = 2;
-      error("more than 2 vertical bars between key letters");
+      error("more than 2 vertical bars between column descriptors");
     }
     if (c == '\n' || c == ',') {
       c = in.get();
@@ -1224,7 +1224,8 @@ format *process_format(table_input &in, options *opt,
     return 0;
   }
   if (have_expand && (opt->flags & table::EXPAND)) {
-    error("ignoring global 'expand' option because of 'x' specifiers");
+    error("'x' column modifier encountered; ignoring region option"
+         " 'expand'");
     opt->flags &= ~table::EXPAND;
   }
   return f;
diff --git a/src/preproc/tbl/table.cpp b/src/preproc/tbl/table.cpp
index 06774b8..efcbf63 100644
--- a/src/preproc/tbl/table.cpp
+++ b/src/preproc/tbl/table.cpp
@@ -1625,15 +1625,15 @@ void table::add_entry(int r, int c, const string &str,
     case FORMAT_HLINE:
       if (str.length() != 0)
        error_with_file_and_line(fn, ln,
-                                "non-empty data entry for '_' format"
-                                " ignored");
+                                "ignoring non-empty data entry using"
+                                " '_' column classifier");
       e = new single_line_entry(this, f);
       break;
     case FORMAT_DOUBLE_HLINE:
       if (str.length() != 0)
        error_with_file_and_line(fn, ln,
-                                "non-empty data entry for '=' format"
-                                " ignored");
+                                "ignoring non-empty data entry using"
+                                " '=' column classifier");
       e = new double_line_entry(this, f);
       break;
     default: