adjust formatting for the tbl(7) layout 'x' modifier (maximize column)

to match groff for up to six maximized columns

3 files changed, 328 insertions, 2 deletions

diff --git a/regress/usr.bin/mandoc/tbl/Makefile b/regress/usr.bin/mandoc/tbl/Makefile
index 02d0da2b96d..865c0b65cd7 100644
--- a/regress/usr.bin/mandoc/tbl/Makefile
+++ b/regress/usr.bin/mandoc/tbl/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2015/01/26 18:41:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.10 2015/01/28 02:23:33 schwarze Exp $
 
-REGRESS_TARGETS	 = blankline center fonts layout macro misalign
+REGRESS_TARGETS	 = blankline center expand fonts layout macro misalign
 REGRESS_TARGETS	+= nested numbers opt span vert
 LINT_TARGETS	 = layout macro nested opt
 
diff --git a/regress/usr.bin/mandoc/tbl/expand.in b/regress/usr.bin/mandoc/tbl/expand.in
new file mode 100644
index 00000000000..eb92bd229a4
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/expand.in
@@ -0,0 +1,225 @@
+.TH TBL-EXPAND 1 "January 27, 2015" OpenBSD
+.SH NAME
+tbl-expand \- expand modifier in table layout
+.SH DESCRIPTION
+normal text
+.TS
+tab(:);
+lx lx l.
+x:x:123456789012345678901234567890123456789012345678901234567890123
+.TE
+.TS
+tab(:);
+lx lx l.
+x:x:12345678901234567890123456789012345678901234567890123456789012
+.TE
+.TS
+tab(:);
+lx lx l.
+x:x:1234567890123456789012345678901234567890123456789012345678901
+.TE
+.TS
+tab(:);
+lx lx l.
+x:x:123456789012345678901234567890123456789012345678901234567890
+.TE
+.TS
+tab(:);
+lx lx lx l.
+x:x:x:12345678901234567890123456789012345678901234567890123456789
+.TE
+.TS
+tab(:);
+lx lx lx l.
+x:x:x:1234567890123456789012345678901234567890123456789012345678
+.TE
+.TS
+tab(:);
+lx lx lx l.
+x:x:x:123456789012345678901234567890123456789012345678901234567
+.TE
+.TS
+tab(:);
+lx lx lx l.
+x:x:x:12345678901234567890123456789012345678901234567890123456
+.TE
+.TS
+tab(:);
+lx lx lx lx l.
+x:x:x:x:1234567890123456789012345678901234567890123456789012345
+.TE
+.TS
+tab(:);
+lx lx lx lx l.
+x:x:x:x:123456789012345678901234567890123456789012345678901234
+.TE
+.TS
+tab(:);
+lx lx lx lx l.
+x:x:x:x:12345678901234567890123456789012345678901234567890123
+.TE
+.TS
+tab(:);
+lx lx lx lx l.
+x:x:x:x:1234567890123456789012345678901234567890123456789012
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l.
+x:x:x:x:x:123456789012345678901234567890123456789012345678901
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l.
+x:x:x:x:x:12345678901234567890123456789012345678901234567890
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l.
+x:x:x:x:x:1234567890123456789012345678901234567890123456789
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l.
+x:x:x:x:x:123456789012345678901234567890123456789012345678
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l.
+x:x:x:x:x:12345678901234567890123456789012345678901234567
+.TE
+.TS
+tab(:);
+lx lx lx lx lx lx l.
+x:x:x:x:x:x:1234567890123456789012345678901234567890123456
+.TE
+.TS
+tab(:);
+lx lx lx lx lx lx l.
+x:x:x:x:x:x:123456789012345678901234567890123456789012345
+.TE
+.TS
+tab(:);
+lx lx lx lx lx lx l.
+x:x:x:x:x:x:12345678901234567890123456789012345678901234
+.TE
+.TS
+tab(:);
+lx lx lx lx lx lx l.
+x:x:x:x:x:x:1234567890123456789012345678901234567890123
+.TE
+.TS
+tab(:);
+lx lx lx lx lx lx l.
+x:x:x:x:x:x:123456789012345678901234567890123456789012
+.TE
+.TS
+tab(:);
+lx l rx.
+x:123456789012345678901234567890123456789012345678901234567890123:x
+.TE
+.TS
+tab(:);
+lx l rx.
+x:12345678901234567890123456789012345678901234567890123456789012:x
+.TE
+.TS
+tab(:);
+lx l rx.
+x:1234567890123456789012345678901234567890123456789012345678901:x
+.TE
+.TS
+tab(:);
+lx l rx.
+x:123456789012345678901234567890123456789012345678901234567890:x
+.TE
+.TS
+tab(:);
+lx lx l rx.
+x:x:12345678901234567890123456789012345678901234567890123456789:x
+.TE
+.TS
+tab(:);
+lx lx l rx.
+x:x:1234567890123456789012345678901234567890123456789012345678:x
+.TE
+.TS
+tab(:);
+lx lx l rx.
+x:x:123456789012345678901234567890123456789012345678901234567:x
+.TE
+.TS
+tab(:);
+lx lx l rx.
+x:x:12345678901234567890123456789012345678901234567890123456:x
+.TE
+.TS
+tab(:);
+lx lx lx l rx.
+x:x:x:1234567890123456789012345678901234567890123456789012345:x
+.TE
+.TS
+tab(:);
+lx lx lx l rx.
+x:x:x:123456789012345678901234567890123456789012345678901234:x
+.TE
+.TS
+tab(:);
+lx lx lx l rx.
+x:x:x:12345678901234567890123456789012345678901234567890123:x
+.TE
+.TS
+tab(:);
+lx lx lx l rx.
+x:x:x:1234567890123456789012345678901234567890123456789012:x
+.TE
+.TS
+tab(:);
+lx lx lx lx l rx.
+x:x:x:x:123456789012345678901234567890123456789012345678901:x
+.TE
+.TS
+tab(:);
+lx lx lx lx l rx.
+x:x:x:x:12345678901234567890123456789012345678901234567890:x
+.TE
+.TS
+tab(:);
+lx lx lx lx l rx.
+x:x:x:x:1234567890123456789012345678901234567890123456789:x
+.TE
+.TS
+tab(:);
+lx lx lx lx l rx.
+x:x:x:x:123456789012345678901234567890123456789012345678:x
+.TE
+.TS
+tab(:);
+lx lx lx lx l rx.
+x:x:x:x:12345678901234567890123456789012345678901234567:x
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l rx.
+x:x:x:x:x:1234567890123456789012345678901234567890123456:x
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l rx.
+x:x:x:x:x:123456789012345678901234567890123456789012345:x
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l rx.
+x:x:x:x:x:12345678901234567890123456789012345678901234:x
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l rx.
+x:x:x:x:x:1234567890123456789012345678901234567890123:x
+.TE
+.TS
+tab(:);
+lx lx lx lx lx l rx.
+x:x:x:x:x:123456789012345678901234567890123456789012:x
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/expand.out_ascii b/regress/usr.bin/mandoc/tbl/expand.out_ascii
new file mode 100644
index 00000000000..b1fceec9927
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/expand.out_ascii
@@ -0,0 +1,101 @@
+TBL-EXPAND(1)               General Commands Manual              TBL-EXPAND(1)
+
+
+
+NNAAMMEE
+       tbl-expand - expand modifier in table layout
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       x   x   123456789012345678901234567890123456789012345678901234567890123
+
+       x   x    12345678901234567890123456789012345678901234567890123456789012
+
+       x    x    1234567890123456789012345678901234567890123456789012345678901
+
+       x    x     123456789012345678901234567890123456789012345678901234567890
+
+       x   x   x   12345678901234567890123456789012345678901234567890123456789
+
+       x   x    x   1234567890123456789012345678901234567890123456789012345678
+
+       x    x   x    123456789012345678901234567890123456789012345678901234567
+
+       x    x    x    12345678901234567890123456789012345678901234567890123456
+
+       x   x   x   x   1234567890123456789012345678901234567890123456789012345
+
+       x   x   x    x   123456789012345678901234567890123456789012345678901234
+
+       x   x    x   x    12345678901234567890123456789012345678901234567890123
+
+       x    x   x    x    1234567890123456789012345678901234567890123456789012
+
+       x   x   x   x   x   123456789012345678901234567890123456789012345678901
+
+       x   x   x   x    x   12345678901234567890123456789012345678901234567890
+
+       x   x    x   x   x    1234567890123456789012345678901234567890123456789
+
+       x    x   x    x   x    123456789012345678901234567890123456789012345678
+
+       x    x    x   x    x    12345678901234567890123456789012345678901234567
+
+       x   x   x   x    x   x   1234567890123456789012345678901234567890123456
+
+       x   x    x   x   x    x   123456789012345678901234567890123456789012345
+
+       x   x    x   x    x   x    12345678901234567890123456789012345678901234
+
+       x    x   x    x    x   x    1234567890123456789012345678901234567890123
+
+       x    x    x   x    x    x    123456789012345678901234567890123456789012
+
+       x   123456789012345678901234567890123456789012345678901234567890123   x
+
+       x   12345678901234567890123456789012345678901234567890123456789012    x
+
+       x    1234567890123456789012345678901234567890123456789012345678901    x
+
+       x    123456789012345678901234567890123456789012345678901234567890     x
+
+       x   x   12345678901234567890123456789012345678901234567890123456789   x
+
+       x   x    1234567890123456789012345678901234567890123456789012345678   x
+
+       x    x   123456789012345678901234567890123456789012345678901234567    x
+
+       x    x    12345678901234567890123456789012345678901234567890123456    x
+
+       x   x   x   1234567890123456789012345678901234567890123456789012345   x
+
+       x   x   x    123456789012345678901234567890123456789012345678901234   x
+
+       x   x    x   12345678901234567890123456789012345678901234567890123    x
+
+       x    x   x    1234567890123456789012345678901234567890123456789012    x
+
+       x   x   x   x   123456789012345678901234567890123456789012345678901   x
+
+       x   x   x   x    12345678901234567890123456789012345678901234567890   x
+
+       x   x    x   x   1234567890123456789012345678901234567890123456789    x
+
+       x    x   x    x   123456789012345678901234567890123456789012345678    x
+
+       x    x    x   x    12345678901234567890123456789012345678901234567    x
+
+       x   x   x   x    x   1234567890123456789012345678901234567890123456   x
+
+       x   x    x   x   x    123456789012345678901234567890123456789012345   x
+
+       x   x    x   x    x   12345678901234567890123456789012345678901234    x
+
+       x    x   x    x    x   1234567890123456789012345678901234567890123    x
+
+       x    x    x   x    x    123456789012345678901234567890123456789012    x
+
+
+
+OpenBSD                        January 27, 2015                  TBL-EXPAND(1)