gbranden pushed a commit to branch master
in repository groff.
commit 04ce1bc254446ea4065fe335e271289088e3b523
Author: G. Branden Robinson <[email protected]>
AuthorDate: Mon Nov 9 06:07:11 2026 -0600
[tbl]: Reform and document terminology.
Migrate "continued format" to "continued description", and define this
term in tbl's man page.
---
src/preproc/tbl/main.cpp | 16 ++++++++++------
src/preproc/tbl/tbl.1.man | 5 ++++-
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
index 84b2d45d8..63e162448 100644
--- a/src/preproc/tbl/main.cpp
+++ b/src/preproc/tbl/main.cpp
@@ -1248,7 +1248,8 @@ static format *process_format(table_input &in, options
*opt,
format *f;
if (current_format != 0 /* nullptr */) {
if (ncolumns > current_format->ncolumns) {
- error("cannot increase the number of columns in a continued format");
+ error("cannot increase the number of columns"
+ " in continued description");
free_input_entry_format_list(list);
list = 0 /* nullptr */;
return 0 /* nullptr */;
@@ -1268,7 +1269,8 @@ static format *process_format(table_input &in, options
*opt,
// use the greatest separation
if (tem->separation > f->separation[col]) {
if (current_format != 0 /* nullptr */)
- error("cannot change column separation in continued format");
+ error("cannot change column separation"
+ " in continued description");
else
f->separation[col] = tem->separation;
}
@@ -1277,13 +1279,15 @@ static format *process_format(table_input &in, options
*opt,
error("column separation specified for last column");
if (tem->is_equal_width && !f->equal[col]) {
if (current_format != 0 /* nullptr */)
- error("cannot change which columns are equal in continued format");
+ error("cannot change which columns are equal"
+ " in continued description");
else
f->equal[col] = 1;
}
if (tem->expand && !f->expand[col]) {
if (current_format != 0 /* nullptr */)
- error("cannot change which columns are expanded in continued format");
+ error("cannot change which columns are expanded"
+ " in continued description");
else {
f->expand[col] = 1;
have_expand = true;
@@ -1649,8 +1653,8 @@ static table *process_data(table_input &in, format *f,
options *opt)
delete tbl;
return 0;
}
- // Do this here rather than at the beginning in case continued formats
- // change it.
+ // Do this here rather than at the beginning in case a continued
+ // description changes it.
int i;
for (i = 0; i < ncolumns - 1; i++)
if (f->separation[i] >= 0)
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index 8828f308a..c5e2fc80f 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -156,7 +156,10 @@ Each table region encloses one or more
.I "table descriptions."
.
Within a table region,
-table descriptions beyond the first must each be preceded
+table descriptions beyond the first
+are called
+.I "continued descriptions"
+and must each be preceded
by an input line beginning with
.BR .T& .
.
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit