reorg tbl(7) test suite

41 files changed, 1144 insertions, 0 deletions

diff --git a/regress/usr.bin/mandoc/tbl/data/Makefile b/regress/usr.bin/mandoc/tbl/data/Makefile
new file mode 100644
index 00000000000..cdb97f362a8
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/Makefile
@@ -0,0 +1,12 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/01/29 23:24:24 schwarze Exp $
+
+REGRESS_TARGETS	 = blankline block_unclosed empty
+LINT_TARGETS	 = block_unclosed empty
+
+# groff-1.22.3 defect:
+# - When a table ends in the middle of a block,
+#   GNU eqn produces no output whatsoever for the whole table.
+
+SKIP_GROFF	 = block_unclosed
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/data/blankline.in b/regress/usr.bin/mandoc/tbl/data/blankline.in
new file mode 100644
index 00000000000..dd11433aff1
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/blankline.in
@@ -0,0 +1,14 @@
+.TH TBL-DATA-BLANKLINE 1 "January 21, 2015" OpenBSD
+.SH NAME
+tbl-data-blankline \- blank line in a table
+.SH DESCRIPTION
+normal text
+.TS
+lb
+li
+lb.
+first
+
+last
+.TE
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/data/blankline.out_ascii b/regress/usr.bin/mandoc/tbl/data/blankline.out_ascii
new file mode 100644
index 00000000000..2cfd35a120f
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/blankline.out_ascii
@@ -0,0 +1,18 @@
+TBL-DATA-BLANKLINE(1)       General Commands Manual      TBL-DATA-BLANKLINE(1)
+
+
+
+NNAAMMEE
+       tbl-data-blankline - blank line in a table
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       ffiirrsstt
+
+       llaasstt
+       normal text
+
+
+
+OpenBSD                        January 21, 2015          TBL-DATA-BLANKLINE(1)
diff --git a/regress/usr.bin/mandoc/tbl/data/block_unclosed.in b/regress/usr.bin/mandoc/tbl/data/block_unclosed.in
new file mode 100644
index 00000000000..c7c97286c47
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/block_unclosed.in
@@ -0,0 +1,28 @@
+.TH TBL-DATA-BLOCK_UNCLOSED 1 "January 28, 2015" OpenBSD
+.SH NAME
+tbl-data-block_unclosed \- unclosed text block
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+lll.
+begin:T{
+middle
+T}:end
+incomplete:T{
+block
+.TE
+normal text
+.TS
+box tab(:);
+lll.
+begin:T{
+middle
+T}:end
+incomplete:T{
+block
+.T&
+rrr.
+reset:still:works
+.TE
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_ascii b/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_ascii
new file mode 100644
index 00000000000..a92740ed045
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_ascii
@@ -0,0 +1,25 @@
+TBL-DATA-BLOCK_UNCLOSED(1)  General Commands Manual TBL-DATA-BLOCK_UNCLOSED(1)
+
+
+
+NNAAMMEE
+       tbl-data-block_unclosed - unclosed text block
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--------------------------+
+       |begin        middle   end |
+       |incomplete   block        |
+       +--------------------------+
+       normal text
+
+       +----------------------------+
+       |begin        middle   end   |
+       |incomplete   block          |
+       |     reset    still   works |
+       +----------------------------+
+       normal text
+
+
+OpenBSD                        January 28, 2015     TBL-DATA-BLOCK_UNCLOSED(1)
diff --git a/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint b/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint
new file mode 100644
index 00000000000..452cde4d05c
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint
@@ -0,0 +1,2 @@
+mandoc: block_unclosed.in:6:1: ERROR: data block open at end of tbl: TE
+mandoc: block_unclosed.in: ERROR: data block open at end of tbl: T&
diff --git a/regress/usr.bin/mandoc/tbl/data/empty.in b/regress/usr.bin/mandoc/tbl/data/empty.in
new file mode 100644
index 00000000000..2107dcf535b
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/empty.in
@@ -0,0 +1,9 @@
+.TH TBL-DATA-EMPTY 1 "January 28, 2015" OpenBSD
+.SH NAME
+tbl-data-empty \- empty table
+.SH DESCRIPTION
+normal text
+.TS
+box; l.
+.TE
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/data/empty.out_ascii b/regress/usr.bin/mandoc/tbl/data/empty.out_ascii
new file mode 100644
index 00000000000..6aaafe7f767
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/empty.out_ascii
@@ -0,0 +1,15 @@
+TBL-DATA-EMPTY(1)           General Commands Manual          TBL-DATA-EMPTY(1)
+
+
+
+NNAAMMEE
+       tbl-data-empty - empty table
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       normal text
+
+
+
+OpenBSD                        January 28, 2015              TBL-DATA-EMPTY(1)
diff --git a/regress/usr.bin/mandoc/tbl/data/empty.out_lint b/regress/usr.bin/mandoc/tbl/data/empty.out_lint
new file mode 100644
index 00000000000..153902d0c53
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/empty.out_lint
@@ -0,0 +1 @@
+mandoc: empty.in:6:1: ERROR: tbl without any data cells
diff --git a/regress/usr.bin/mandoc/tbl/layout/Makefile b/regress/usr.bin/mandoc/tbl/layout/Makefile
new file mode 100644
index 00000000000..69d5444872d
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/01/29 23:24:24 schwarze Exp $
+
+REGRESS_TARGETS	 = center complex numbers span
+LINT_TARGETS	 = complex
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/layout/center.in b/regress/usr.bin/mandoc/tbl/layout/center.in
new file mode 100644
index 00000000000..d4ca166e5fe
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/center.in
@@ -0,0 +1,22 @@
+.TH TBL-LAYOUT-CENTER 1
+.SH NAME
+tbl-layout-center \- centering of table cells
+.SH DESCRIPTION
+normal text
+.TS
+tab(:);
+r c l
+r c l
+r c l
+c s l
+r c s
+r c l .
+*:*:*
+**:**:**
+***:***:***
+***:***
+***:***
+***:***:***
+****:****:****
+*****:*****:*****
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/layout/center.out_ascii b/regress/usr.bin/mandoc/tbl/layout/center.out_ascii
new file mode 100644
index 00000000000..27e03c990e1
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/center.out_ascii
@@ -0,0 +1,22 @@
+TBL-LAYOUT-CENTER(1)        General Commands Manual       TBL-LAYOUT-CENTER(1)
+
+
+
+NNAAMMEE
+       tbl-layout-center - centering of table cells
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+           *     *     *
+          **    **     **
+         ***    ***    ***
+            ***        ***
+         ***        ***
+         ***    ***    ***
+        ****   ****    ****
+       *****   *****   *****
+
+
+
+                                                          TBL-LAYOUT-CENTER(1)
diff --git a/regress/usr.bin/mandoc/tbl/layout/complex.in b/regress/usr.bin/mandoc/tbl/layout/complex.in
new file mode 100644
index 00000000000..185c5af2c25
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/complex.in
@@ -0,0 +1,37 @@
+.TH TBL-LAYOUT-COMPLEX 1 "January 26, 2015" OpenBSD
+.SH NAME
+tbl-layout-complex \- complex table layout
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+l|p-1l bsil|||l,l|l	ilb^|i||l.
+a:b:c:d
+e:f:g:h:i
+.TE
+.PP
+normal text
+.TS
+box tab(:);
+l ^
+l l.
+a:b
+c:d
+.TE
+.PP
+normal text
+.TS
+tab(:);
+||l||l||
+|l|l|
+ll.
+_
+a:b
+_
+c:d
+_
+e:f
+_
+.TE
+.PP
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/layout/complex.out_ascii b/regress/usr.bin/mandoc/tbl/layout/complex.out_ascii
new file mode 100644
index 00000000000..8581f2026d3
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/complex.out_ascii
@@ -0,0 +1,35 @@
+TBL-LAYOUT-COMPLEX(1)       General Commands Manual      TBL-LAYOUT-COMPLEX(1)
+
+
+
+NNAAMMEE
+       tbl-layout-complex - complex table layout
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--+-----------++--+
+       |a | bb       c ||d |
+       |e | _f   gg     ||i |
+       +--+-----------++--+
+       normal text
+
+       +------+
+       |a     |
+       |c   d |
+       +------+
+       normal text
+
+       +--++--+
+       |a ||b |
+       +--++--+
+       |c | d |
+       +--+---+
+        e   f
+       --------
+
+       normal text
+
+
+
+OpenBSD                        January 26, 2015          TBL-LAYOUT-COMPLEX(1)
diff --git a/regress/usr.bin/mandoc/tbl/layout/complex.out_lint b/regress/usr.bin/mandoc/tbl/layout/complex.out_lint
new file mode 100644
index 00000000000..a72604fbed7
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/complex.out_lint
@@ -0,0 +1,5 @@
+mandoc: complex.in:8:14: WARNING: skipping vertical bar in tbl layout
+mandoc: complex.in:8:28: WARNING: skipping vertical bar in tbl layout
+mandoc: complex.in:10:7: ERROR: ignoring data in spanned tbl cell: h
+mandoc: complex.in:16:3: WARNING: tbl column starts with span
+mandoc: complex.in:18:3: ERROR: ignoring data in spanned tbl cell: b
diff --git a/regress/usr.bin/mandoc/tbl/layout/numbers.in b/regress/usr.bin/mandoc/tbl/layout/numbers.in
new file mode 100644
index 00000000000..24f1cadad95
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/numbers.in
@@ -0,0 +1,12 @@
+.TH TBL-LAYOUT-NUMBERS 1
+.SH NAME
+tbl-layout-numbers \- alignment of numbers in tables
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+r || n | n .
+1:1.00:+42.0
+_
+10:-10.0:3.14
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/layout/numbers.out_ascii b/regress/usr.bin/mandoc/tbl/layout/numbers.out_ascii
new file mode 100644
index 00000000000..c93d12b0151
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/numbers.out_ascii
@@ -0,0 +1,18 @@
+TBL-LAYOUT-NUMBERS(1)       General Commands Manual      TBL-LAYOUT-NUMBERS(1)
+
+
+
+NNAAMMEE
+       tbl-layout-numbers - alignment of numbers in tables
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +---++-------+--------+
+       | 1 ||  1.00 | +42.0  |
+       +---++-------+--------+
+       |10 ||-10.0  |   3.14 |
+       +---++-------+--------+
+
+
+                                                         TBL-LAYOUT-NUMBERS(1)
diff --git a/regress/usr.bin/mandoc/tbl/layout/span.in b/regress/usr.bin/mandoc/tbl/layout/span.in
new file mode 100644
index 00000000000..dc172dcd952
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/span.in
@@ -0,0 +1,40 @@
+.TH TBL-LAYOUT-SPAN 1
+.SH NAME
+tbl-layout-span \- alignment of spanned cells
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+L L L L
+L S L L
+L L S L
+L L L S.
+a:b:c:d
+s:c:d
+a:s:d
+a:b:s
+.TE
+.sp
+.TS
+box tab(:);
+C C C C
+C S C C
+C C S C
+C C C S.
+a:b:c:d
+s:c:d
+a:s:d
+a:b:s
+.TE
+.sp
+.TS
+box tab(:);
+R R R R
+R S R R
+R R S R
+R R R S.
+a:b:c:d
+s:c:d
+a:s:d
+a:b:s
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/layout/span.out_ascii b/regress/usr.bin/mandoc/tbl/layout/span.out_ascii
new file mode 100644
index 00000000000..0ffb9899e92
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/span.out_ascii
@@ -0,0 +1,33 @@
+TBL-LAYOUT-SPAN(1)          General Commands Manual         TBL-LAYOUT-SPAN(1)
+
+
+
+NNAAMMEE
+       tbl-layout-span - alignment of spanned cells
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--------------+
+       |a   b   c   d |
+       |s       c   d |
+       |a   s       d |
+       |a   b   s     |
+       +--------------+
+
+       +--------------+
+       |a   b   c   d |
+       |  s     c   d |
+       |a     s     d |
+       |a   b     s   |
+       +--------------+
+
+       +--------------+
+       |a   b   c   d |
+       |    s   c   d |
+       |a       s   d |
+       |a   b       s |
+       +--------------+
+
+
+                                                            TBL-LAYOUT-SPAN(1)
diff --git a/regress/usr.bin/mandoc/tbl/macro/Makefile b/regress/usr.bin/mandoc/tbl/macro/Makefile
new file mode 100644
index 00000000000..25e415f92c0
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/Makefile
@@ -0,0 +1,11 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/01/29 23:24:24 schwarze Exp $
+
+REGRESS_TARGETS	 = man nested
+LINT_TARGETS	 = man nested
+
+# trivial difference to groff-1.22.3:
+# .TS in a table causes a blank table line in GNU tbl(1), but not in mandoc.
+
+SKIP_GROFF	 = nested
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/macro/man.in b/regress/usr.bin/mandoc/tbl/macro/man.in
new file mode 100644
index 00000000000..36e395690b1
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/man.in
@@ -0,0 +1,16 @@
+.TH TBL-MACRO-MAN 1 "December 16, 2014"
+.SH NAME
+tbl-macro-man \- man macro in a table
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+l | l .
+a:b:stray
+_
+c:T{
+.SM d
+T}
+.TE
+.PP
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/macro/man.out_ascii b/regress/usr.bin/mandoc/tbl/macro/man.out_ascii
new file mode 100644
index 00000000000..2a96f0b76b6
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/man.out_ascii
@@ -0,0 +1,20 @@
+TBL-MACRO-MAN(1)            General Commands Manual           TBL-MACRO-MAN(1)
+
+
+
+NNAAMMEE
+       tbl-macro-man - man macro in a table
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--+---+
+       |a | b |
+       +--+---+
+       |c | d |
+       +--+---+
+       normal text
+
+
+
+                               December 16, 2014              TBL-MACRO-MAN(1)
diff --git a/regress/usr.bin/mandoc/tbl/macro/man.out_lint b/regress/usr.bin/mandoc/tbl/macro/man.out_lint
new file mode 100644
index 00000000000..292af268441
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/man.out_lint
@@ -0,0 +1,2 @@
+mandoc: man.in:9:5: ERROR: ignoring extra tbl data cells: stray
+mandoc: man.in:12:2: UNSUPP: ignoring macro in table: SM d
diff --git a/regress/usr.bin/mandoc/tbl/macro/nested.in b/regress/usr.bin/mandoc/tbl/macro/nested.in
new file mode 100644
index 00000000000..35844eb5269
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/nested.in
@@ -0,0 +1,16 @@
+.TH TBL-MACRO-NESTED 1 "December 16, 2014"
+.SH NAME
+tbl-macro-nested \- nested table
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+l | l .
+a:b
+_
+c:d
+.TS
+e:f
+.TE
+.PP
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/macro/nested.out_ascii b/regress/usr.bin/mandoc/tbl/macro/nested.out_ascii
new file mode 100644
index 00000000000..24a5c17abcb
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/nested.out_ascii
@@ -0,0 +1,21 @@
+TBL-MACRO-NESTED(1)         General Commands Manual        TBL-MACRO-NESTED(1)
+
+
+
+NNAAMMEE
+       tbl-macro-nested - nested table
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--+---+
+       |a | b |
+       +--+---+
+       |c | d |
+       |e | f |
+       +--+---+
+       normal text
+
+
+
+                               December 16, 2014           TBL-MACRO-NESTED(1)
diff --git a/regress/usr.bin/mandoc/tbl/macro/nested.out_lint b/regress/usr.bin/mandoc/tbl/macro/nested.out_lint
new file mode 100644
index 00000000000..0f650c85e0e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/macro/nested.out_lint
@@ -0,0 +1 @@
+mandoc: nested.in:12:4: UNSUPP: ignoring macro in table: TS
diff --git a/regress/usr.bin/mandoc/tbl/mod/Makefile b/regress/usr.bin/mandoc/tbl/mod/Makefile
new file mode 100644
index 00000000000..9c1bdb98484
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/Makefile
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/01/29 23:24:24 schwarze Exp $
+
+REGRESS_TARGETS	 = expand font misalign
+
+# groff-1.22.3 defect:
+# - When space is insufficient (on either side) for properly aligning
+#   a number, GNU tbl(1) moves the number too much to the right,
+#   overflowing the column, even if space would be sufficient without
+#   left padding.
+
+SKIP_GROFF	 = misalign
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/mod/expand.in b/regress/usr.bin/mandoc/tbl/mod/expand.in
new file mode 100644
index 00000000000..dbb490f5463
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/expand.in
@@ -0,0 +1,225 @@
+.TH TBL-MOD-EXPAND 1 "January 27, 2015" OpenBSD
+.SH NAME
+tbl-mod-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/mod/expand.out_ascii b/regress/usr.bin/mandoc/tbl/mod/expand.out_ascii
new file mode 100644
index 00000000000..2b4d193a5d6
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/expand.out_ascii
@@ -0,0 +1,101 @@
+TBL-MOD-EXPAND(1)           General Commands Manual          TBL-MOD-EXPAND(1)
+
+
+
+NNAAMMEE
+       tbl-mod-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-MOD-EXPAND(1)
diff --git a/regress/usr.bin/mandoc/tbl/mod/font.in b/regress/usr.bin/mandoc/tbl/mod/font.in
new file mode 100644
index 00000000000..caf73e85688
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/font.in
@@ -0,0 +1,14 @@
+.TH TBL-MOD-FONT 1 2014-10-14 OpenBSD
+.SH NAME
+tbl-mod-font \- font modifiers in table layouts
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+cb | c | ci
+cFI | c | cFB .
+bold:roman:italic
+_
+italic:roman:bold
+and:so:on
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/mod/font.out_ascii b/regress/usr.bin/mandoc/tbl/mod/font.out_ascii
new file mode 100644
index 00000000000..18845607172
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/font.out_ascii
@@ -0,0 +1,19 @@
+TBL-MOD-FONT(1)             General Commands Manual            TBL-MOD-FONT(1)
+
+
+
+NNAAMMEE
+       tbl-mod-font - font modifiers in table layouts
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +-------+-------+--------+
+       | bboolldd  | roman | _i_t_a_l_i_c |
+       +-------+-------+--------+
+       |_i_t_a_l_i_c | roman |  bboolldd  |
+       | _a_n_d   |  so   |   oonn   |
+       +-------+-------+--------+
+
+
+OpenBSD                           2014-10-14                   TBL-MOD-FONT(1)
diff --git a/regress/usr.bin/mandoc/tbl/mod/misalign.in b/regress/usr.bin/mandoc/tbl/mod/misalign.in
new file mode 100644
index 00000000000..1f6bde49984
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/misalign.in
@@ -0,0 +1,16 @@
+.TH TBL-MOD-MISALIGN 1 "December 24, 2014" OpenBSD
+.SH NAME
+tbl-mod-misalign \- failing alignment in tables
+.SH DESCRIPTION
+normal text
+.TS
+box tab(:);
+n, nz.
+12.34
+_
+100.0
+0.001
+_
+1000.0
+0.0001
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/mod/misalign.out_ascii b/regress/usr.bin/mandoc/tbl/mod/misalign.out_ascii
new file mode 100644
index 00000000000..03e9b36ca6e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/mod/misalign.out_ascii
@@ -0,0 +1,22 @@
+TBL-MOD-MISALIGN(1)         General Commands Manual        TBL-MOD-MISALIGN(1)
+
+
+
+NNAAMMEE
+       tbl-mod-misalign - failing alignment in tables
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +------+
+       |12.34 |
+       +------+
+       |100.0 |
+       |0.001 |
+       +------+
+       |1000.0 |
+       |0.0001 |
+       +------+
+
+
+OpenBSD                        December 24, 2014           TBL-MOD-MISALIGN(1)
diff --git a/regress/usr.bin/mandoc/tbl/opt/Makefile b/regress/usr.bin/mandoc/tbl/opt/Makefile
new file mode 100644
index 00000000000..ed9676b51b8
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2015/01/29 23:24:24 schwarze Exp $
+
+REGRESS_TARGETS	 = box center invalid
+LINT_TARGETS	 = invalid
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/opt/box.in b/regress/usr.bin/mandoc/tbl/opt/box.in
new file mode 100644
index 00000000000..c892401c88e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/box.in
@@ -0,0 +1,39 @@
+.TH TBL-VERT 1
+.SH NAME
+tbl-vert \- vertical lines
+.SH DESCRIPTION
+no boxing:
+.TS
+tab(:);
+l l.
+a:b
+c:d
+.TE
+.sp
+automatic boxing:
+.TS
+tab(:) box;
+l l.
+a:b
+c:d
+.TE
+.sp
+manual boxing:
+.TS
+tab(:);
+||l||l||.
+_
+a:b
+_
+c:d
+_
+.TE
+.sp
+automatic and manual boxing:
+.TS
+tab(:) box;
+||l||l||.
+a:b
+_
+c:d
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/opt/box.out_ascii b/regress/usr.bin/mandoc/tbl/opt/box.out_ascii
new file mode 100644
index 00000000000..87ff5cf8003
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/box.out_ascii
@@ -0,0 +1,37 @@
+TBL-VERT(1)                 General Commands Manual                TBL-VERT(1)
+
+
+
+NNAAMMEE
+       tbl-vert - vertical lines
+
+DDEESSCCRRIIPPTTIIOONN
+       no boxing:
+
+       a   b
+       c   d
+
+       automatic boxing:
+
+       +------+
+       |a   b |
+       |c   d |
+       +------+
+       manual boxing:
+
+       +--++--+
+       |a ||b |
+       +--++--+
+       |c ||d |
+       +--++--+
+
+       automatic and manual boxing:
+
+       +--++--+
+       |a ||b |
+       +--++--+
+       |c ||d |
+       +--++--+
+
+
+                                                                   TBL-VERT(1)
diff --git a/regress/usr.bin/mandoc/tbl/opt/center.in b/regress/usr.bin/mandoc/tbl/opt/center.in
new file mode 100644
index 00000000000..7c05202c848
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/center.in
@@ -0,0 +1,98 @@
+.TH TBL-LAYOUT_CENTER 1 "January 28, 2015" OpenBSD
+.SH NAME
+tbl-layout_center \- center a table as a whole
+.SH DESCRIPTION
+normal text
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+234567890123456
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+23456789012345
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901\
+2345678901234
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901234
+.TE
+.TS
+center; l.
+1234567890123456789012345678901234567890123456789012345678901234567890123
+.TE
+.TS
+center; l.
+123456789012345678901234567890123456789012345678901234567890123456789012
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678901
+.TE
+.TS
+center; l.
+1234567890123456789012345678901234567890123456789012345678901234567890
+.TE
+.TS
+center; l.
+123456789012345678901234567890123456789012345678901234567890123456789
+.TE
+.TS
+center; l.
+12345678901234567890123456789012345678901234567890123456789012345678
+.TE
+.TS
+center; l|.
+_
+txt
+.TE
+.TS
+center; l|.
+_
+text
+.TE
+.TS
+center; |l.
+_
+txt
+.TE
+.TS
+center; |l.
+_
+text
+.TE
+.TS
+center; |l|.
+_
+txt
+.TE
+.TS
+center; |l|.
+_
+text
+.TE
+.TS
+center tab(:); |l||l|.
+_
+txt:text
+.TE
+.TS
+center tab(:); |l||l|.
+_
+text:text
+.TE
+.TS
+center box; l.
+txt
+.TE
+.PP
+normal text
+.TS
+center box; l.
+text
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/opt/center.out_ascii b/regress/usr.bin/mandoc/tbl/opt/center.out_ascii
new file mode 100644
index 00000000000..8df45eec70b
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/center.out_ascii
@@ -0,0 +1,65 @@
+TBL-LAYOUT_CENTER(1)        General Commands Manual       TBL-LAYOUT_CENTER(1)
+
+
+
+NNAAMMEE
+       tbl-layout_center - center a table as a whole
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+12345678901234567890123456789012345678901234567890123456789012345678901234567890123456
+
+1234567890123456789012345678901234567890123456789012345678901234567890123456789012345
+
+ 123456789012345678901234567890123456789012345678901234567890123456789012345678901234
+
+      12345678901234567890123456789012345678901234567890123456789012345678901234
+
+      1234567890123456789012345678901234567890123456789012345678901234567890123
+
+       123456789012345678901234567890123456789012345678901234567890123456789012
+
+       12345678901234567890123456789012345678901234567890123456789012345678901
+
+       1234567890123456789012345678901234567890123456789012345678901234567890
+
+        123456789012345678901234567890123456789012345678901234567890123456789
+
+        12345678901234567890123456789012345678901234567890123456789012345678
+
+                                        ----+
+                                        txt |
+
+                                        -----+
+                                        text |
+
+                                        +----
+                                        |txt
+
+                                        +-----
+                                        |text
+
+                                        +----+
+                                        |txt |
+
+                                       +-----+
+                                       |text |
+
+                                    +----++-----+
+                                    |txt ||text |
+
+                                    +-----++-----+
+                                    |text ||text |
+
+                                        +----+
+                                        |txt |
+                                        +----+
+       normal text
+
+                                       +-----+
+                                       |text |
+                                       +-----+
+
+
+OpenBSD                        January 28, 2015           TBL-LAYOUT_CENTER(1)
diff --git a/regress/usr.bin/mandoc/tbl/opt/invalid.in b/regress/usr.bin/mandoc/tbl/opt/invalid.in
new file mode 100644
index 00000000000..24b2fdfd7d4
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/invalid.in
@@ -0,0 +1,19 @@
+.TH TBL-OPT 1 "January 25, 2015" OpenBSD
+.SH NAME
+tbl-opt \- table options
+.SH DESCRIPTION
+normal text
+.TS
+tab decimalpoint (,x) %foo box;
+n n .
+10.0	0.01
+0.01	10.0
+.TE
+.PP
+normal text
+.TS
+ , box,tab(:)	delim($$); l l .
+a:b
+.TE
+.PP
+normal text
diff --git a/regress/usr.bin/mandoc/tbl/opt/invalid.out_ascii b/regress/usr.bin/mandoc/tbl/opt/invalid.out_ascii
new file mode 100644
index 00000000000..320b8023c0e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/invalid.out_ascii
@@ -0,0 +1,24 @@
+TBL-OPT(1)                  General Commands Manual                 TBL-OPT(1)
+
+
+
+NNAAMMEE
+       tbl-opt - table options
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--------------+
+       |10.0     0.01 |
+       | 0.01   10.0  |
+       +--------------+
+       normal text
+
+       +------+
+       |a   b |
+       +------+
+       normal text
+
+
+
+OpenBSD                        January 25, 2015                     TBL-OPT(1)
diff --git a/regress/usr.bin/mandoc/tbl/opt/invalid.out_lint b/regress/usr.bin/mandoc/tbl/opt/invalid.out_lint
new file mode 100644
index 00000000000..56c65e4767b
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/opt/invalid.out_lint
@@ -0,0 +1,5 @@
+mandoc: invalid.in:7:5: ERROR: missing tbl option argument: tab
+mandoc: invalid.in:7:19: ERROR: wrong tbl option argument size: decimalpoint want 1 have 2
+mandoc: invalid.in:7:23: ERROR: non-alphabetic character in tbl options: %
+mandoc: invalid.in:7:24: ERROR: skipping unknown tbl option: foo
+mandoc: invalid.in:15:21: UNSUPP: eqn delim option in tbl: $$