summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2009-01-03 14:50:55 +0000
committerwl <wl>2009-01-03 14:50:55 +0000
commitfee312aa198cf03641b3e968b45e5414f0cd1f79 (patch)
tree838171d4ec6d1ef9ba8c96fa76cb371e50ab22d7
parentabeb1d96103b220cabfcc39e4164832a45ad7519 (diff)
downloadgroff-fee312aa198cf03641b3e968b45e5414f0cd1f79.tar.gz
* src/preproc/tbl/table.cpp (table::compute_expand_width,
table::compute_separation_factor): In warning messages, don't refer to pages but to input line numbers.
-rw-r--r--ChangeLog6
-rw-r--r--src/preproc/tbl/table.cpp19
2 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 325b3745..176ce50c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2009-01-03 Werner LEMBERG <wl@gnu.org>
+ * src/preproc/tbl/table.cpp (table::compute_expand_width,
+ table::compute_separation_factor): In warning messages, don't refer
+ to pages but to input line numbers.
+
+2009-01-03 Werner LEMBERG <wl@gnu.org>
+
* tmac/groff_ms.man: Improve formatting of tables.
2009-01-03 Werner LEMBERG <wl@gnu.org>
diff --git a/src/preproc/tbl/table.cpp b/src/preproc/tbl/table.cpp
index 1fd2c6ba..a7ee5204 100644
--- a/src/preproc/tbl/table.cpp
+++ b/src/preproc/tbl/table.cpp
@@ -1,5 +1,6 @@
// -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2003, 2004, 2007, 2008
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2003, 2004, 2007, 2008,
+ 2009
Free Software Foundation, Inc.
Written by James Clark (jjc@jclark.com)
@@ -2077,8 +2078,9 @@ void table::compute_expand_width()
if (total_separation)
printfs("-%1n", as_string(total_separation));
prints("\n");
- prints(".if \\n[" EXPAND_REG "]<0 \\{"
- ".tm warning: page \\n%: table wider than line width\n"
+ prints(".if \\n[" EXPAND_REG "]<0 \\{");
+ entry_list->set_location();
+ prints(".tm warning: around line \\n[.c]: table wider than line width\n"
".nr " EXPAND_REG " 0\n"
".\\}\n");
if (colcount > 1)
@@ -2114,12 +2116,15 @@ void table::compute_separation_factor()
for (int i = 0; i < ncolumns; i++)
printfs("-\\n[%1]", span_width_reg(i, i));
printfs("/%1\n", as_string(total_separation));
- prints(".ie \\n[" SEPARATION_FACTOR_REG "]<=0 \\{"
- ".tm warning: page \\n%: column separation set to zero\n"
+ prints(".ie \\n[" SEPARATION_FACTOR_REG "]<=0 \\{");
+ entry_list->set_location();
+ prints(".tm warning: around line \\n[.c]: column separation set to zero\n"
".nr " SEPARATION_FACTOR_REG " 0\n"
".\\}\n"
- ".el .if \\n[" SEPARATION_FACTOR_REG "]<1n "
- ".tm warning: page \\n%: table squeezed horizontally to fit line length\n");
+ ".el .if \\n[" SEPARATION_FACTOR_REG "]<1n \\{");
+ entry_list->set_location();
+ prints(".tm warning: around line \\n[.c]: table squeezed horizontally to fit line length\n"
+ ".\\}\n");
}
void table::compute_column_positions()