Implement w layout specifier (minimum column width).

Improve width calculation of text blocks.
Reduces the groff/mandoc diff in Base+Xenocara by about 800 lines.

3 files changed, 32 insertions, 2 deletions

diff --git a/regress/usr.bin/mandoc/tbl/mod/Makefile b/regress/usr.bin/mandoc/tbl/mod/Makefile
index ab087b1e64c..df1e8f4787b 100644
--- a/regress/usr.bin/mandoc/tbl/mod/Makefile
+++ b/regress/usr.bin/mandoc/tbl/mod/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.3 2017/05/01 20:53:58 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2017/06/08 18:11:15 schwarze Exp $
 
-REGRESS_TARGETS	 = badfont expand expand-toowide font misalign
+REGRESS_TARGETS	 = badfont expand expand-toowide font misalign width
 LINT_TARGETS	 = badfont font
 
 # groff-1.22.3 defects:
diff --git a/regress/usr.bin/mandoc/tbl/mod/width.in b/regress/usr.bin/mandoc/tbl/mod/width.in
new file mode 100644
index 00000000000..702dd19e77e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/width.in
@@ -0,0 +1,14 @@
+.TH TBL-MOD-WIDTH 1 "June 8, 2017" OpenBSD
+.SH NAME
+tbl-mod-width \- width modifier in table layout
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+lw2 | lw(2n) | lw(0.2i) | lw2 .
+a:abcd:T{
+a
+T}:T{
+.SM abcd
+T}
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/mod/width.out_ascii b/regress/usr.bin/mandoc/tbl/mod/width.out_ascii
new file mode 100644
index 00000000000..8ff6bf197ab
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/width.out_ascii
@@ -0,0 +1,16 @@
+TBL-MOD-WIDTH(1)            General Commands Manual           TBL-MOD-WIDTH(1)
+
+
+
+NNAAMMEE
+       tbl-mod-width - width modifier in table layout
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +---+------+----+------+
+       |a  | abcd | a  | abcd |
+       +---+------+----+------+
+
+
+OpenBSD                          June 8, 2017                 TBL-MOD-WIDTH(1)