reorg tbl(7) test suite

38 files changed, 16 insertions, 1123 deletions

diff --git a/regress/usr.bin/mandoc/tbl/Makefile b/regress/usr.bin/mandoc/tbl/Makefile
index 55f910d4738..05743c8d253 100644
--- a/regress/usr.bin/mandoc/tbl/Makefile
+++ b/regress/usr.bin/mandoc/tbl/Makefile
@@ -1,29 +1,6 @@
-# $OpenBSD: Makefile,v 1.12 2015/01/28 17:30:37 schwarze Exp $
+# $OpenBSD: Makefile,v 1.13 2015/01/29 23:34:45 schwarze Exp $
 
-REGRESS_TARGETS	 = blankline block_unclosed center
-REGRESS_TARGETS	+= empty expand fonts layout layout_center
-REGRESS_TARGETS	+= macro misalign nested numbers opt span vert
-LINT_TARGETS	 = block_unclosed empty layout macro nested opt
+SUBDIR	= opt layout mod data macro
 
-# groff-1.22.3 defects:
-# - When a table ends in the middle of a block,
-#   GNU eqn produces no output whatsoever for the whole table.
-# - 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.
-
-# 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	 = block_unclosed misalign nested
-SKIP_TMAN	?= ALL SILENT
-
-TBL = /usr/local/bin/tbl
-
-.for t in ${REGRESS_TARGETS}
-${t}.out_ascii: ${t}.in
-	${TBL} ${.ALLSRC} | ${NROFF} ${NOPTS} -Tascii > ${.TARGET}
-.endfor
-
-.include <bsd.regress.mk>
+.include "../Makefile.sub"
+.include <bsd.subdir.mk>
diff --git a/regress/usr.bin/mandoc/tbl/Makefile.inc b/regress/usr.bin/mandoc/tbl/Makefile.inc
new file mode 100644
index 00000000000..fb68716d7ce
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/Makefile.inc
@@ -0,0 +1,12 @@
+# $OpenBSD: Makefile.inc,v 1.1 2015/01/29 23:34:45 schwarze Exp $
+
+TBL = /usr/local/bin/tbl
+
+SKIP_TMAN ?= ALL SILENT
+
+.for t in ${REGRESS_TARGETS}
+${t}.out_ascii: ${t}.in
+	${TBL} ${.ALLSRC} | ${NROFF} ${NOPTS} -Tascii > ${.TARGET}
+.endfor
+
+.include "../Makefile.inc"
diff --git a/regress/usr.bin/mandoc/tbl/blankline.in b/regress/usr.bin/mandoc/tbl/blankline.in
deleted file mode 100644
index 7c42c265622..00000000000
--- a/regress/usr.bin/mandoc/tbl/blankline.in
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH TBL-BLANKLINE 1 "January 21, 2015" OpenBSD
-.SH NAME
-tbl-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/blankline.out_ascii b/regress/usr.bin/mandoc/tbl/blankline.out_ascii
deleted file mode 100644
index ae78127c8ca..00000000000
--- a/regress/usr.bin/mandoc/tbl/blankline.out_ascii
+++ /dev/null
@@ -1,18 +0,0 @@
-TBL-BLANKLINE(1)            General Commands Manual           TBL-BLANKLINE(1)
-
-
-
-NNAAMMEE
-       tbl-blankline - blank line in a table
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-       ffiirrsstt
-
-       llaasstt
-       normal text
-
-
-
-OpenBSD                        January 21, 2015               TBL-BLANKLINE(1)
diff --git a/regress/usr.bin/mandoc/tbl/block_unclosed.in b/regress/usr.bin/mandoc/tbl/block_unclosed.in
deleted file mode 100644
index 9d535a64a8d..00000000000
--- a/regress/usr.bin/mandoc/tbl/block_unclosed.in
+++ /dev/null
@@ -1,28 +0,0 @@
-.TH TBL-BLOCK_UNCLOSED 1 "January 28, 2015" OpenBSD
-.SH NAME
-tbl-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/block_unclosed.out_ascii b/regress/usr.bin/mandoc/tbl/block_unclosed.out_ascii
deleted file mode 100644
index d0ac26b8fa6..00000000000
--- a/regress/usr.bin/mandoc/tbl/block_unclosed.out_ascii
+++ /dev/null
@@ -1,25 +0,0 @@
-TBL-BLOCK_UNCLOSED(1)       General Commands Manual      TBL-BLOCK_UNCLOSED(1)
-
-
-
-NNAAMMEE
-       tbl-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-BLOCK_UNCLOSED(1)
diff --git a/regress/usr.bin/mandoc/tbl/block_unclosed.out_lint b/regress/usr.bin/mandoc/tbl/block_unclosed.out_lint
deleted file mode 100644
index 452cde4d05c..00000000000
--- a/regress/usr.bin/mandoc/tbl/block_unclosed.out_lint
+++ /dev/null
@@ -1,2 +0,0 @@
-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/center.in b/regress/usr.bin/mandoc/tbl/center.in
deleted file mode 100644
index 179858ddfa2..00000000000
--- a/regress/usr.bin/mandoc/tbl/center.in
+++ /dev/null
@@ -1,22 +0,0 @@
-.TH TBL-CENTER 1
-.SH NAME
-tbl-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/center.out_ascii b/regress/usr.bin/mandoc/tbl/center.out_ascii
deleted file mode 100644
index 7a3741152b7..00000000000
--- a/regress/usr.bin/mandoc/tbl/center.out_ascii
+++ /dev/null
@@ -1,22 +0,0 @@
-TBL-CENTER(1)               General Commands Manual              TBL-CENTER(1)
-
-
-
-NNAAMMEE
-       tbl-center - centering of table cells
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-           *     *     *
-          **    **     **
-         ***    ***    ***
-            ***        ***
-         ***        ***
-         ***    ***    ***
-        ****   ****    ****
-       *****   *****   *****
-
-
-
-                                                                 TBL-CENTER(1)
diff --git a/regress/usr.bin/mandoc/tbl/empty.in b/regress/usr.bin/mandoc/tbl/empty.in
deleted file mode 100644
index 0a9a040ec3e..00000000000
--- a/regress/usr.bin/mandoc/tbl/empty.in
+++ /dev/null
@@ -1,9 +0,0 @@
-.TH TBL-EMPTY 1 "January 28, 2015" OpenBSD
-.SH NAME
-tbl-empty \- empty table
-.SH DESCRIPTION
-normal text
-.TS
-box; l.
-.TE
-normal text
diff --git a/regress/usr.bin/mandoc/tbl/empty.out_ascii b/regress/usr.bin/mandoc/tbl/empty.out_ascii
deleted file mode 100644
index 5ffe70b2c19..00000000000
--- a/regress/usr.bin/mandoc/tbl/empty.out_ascii
+++ /dev/null
@@ -1,15 +0,0 @@
-TBL-EMPTY(1)                General Commands Manual               TBL-EMPTY(1)
-
-
-
-NNAAMMEE
-       tbl-empty - empty table
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-       normal text
-
-
-
-OpenBSD                        January 28, 2015                   TBL-EMPTY(1)
diff --git a/regress/usr.bin/mandoc/tbl/empty.out_lint b/regress/usr.bin/mandoc/tbl/empty.out_lint
deleted file mode 100644
index 153902d0c53..00000000000
--- a/regress/usr.bin/mandoc/tbl/empty.out_lint
+++ /dev/null
@@ -1 +0,0 @@
-mandoc: empty.in:6:1: ERROR: tbl without any data cells
diff --git a/regress/usr.bin/mandoc/tbl/expand.in b/regress/usr.bin/mandoc/tbl/expand.in
deleted file mode 100644
index eb92bd229a4..00000000000
--- a/regress/usr.bin/mandoc/tbl/expand.in
+++ /dev/null
@@ -1,225 +0,0 @@
-.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
deleted file mode 100644
index b1fceec9927..00000000000
--- a/regress/usr.bin/mandoc/tbl/expand.out_ascii
+++ /dev/null
@@ -1,101 +0,0 @@
-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)
diff --git a/regress/usr.bin/mandoc/tbl/fonts.in b/regress/usr.bin/mandoc/tbl/fonts.in
deleted file mode 100644
index 50984d815f3..00000000000
--- a/regress/usr.bin/mandoc/tbl/fonts.in
+++ /dev/null
@@ -1,14 +0,0 @@
-.TH TBL-FONTS 1 2014-10-14 OpenBSD
-.SH NAME
-tbl-fonts \- 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/fonts.out_ascii b/regress/usr.bin/mandoc/tbl/fonts.out_ascii
deleted file mode 100644
index 092f1b1fd0b..00000000000
--- a/regress/usr.bin/mandoc/tbl/fonts.out_ascii
+++ /dev/null
@@ -1,19 +0,0 @@
-TBL-FONTS(1)                General Commands Manual               TBL-FONTS(1)
-
-
-
-NNAAMMEE
-       tbl-fonts - 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-FONTS(1)
diff --git a/regress/usr.bin/mandoc/tbl/layout.in b/regress/usr.bin/mandoc/tbl/layout.in
deleted file mode 100644
index 648018320ff..00000000000
--- a/regress/usr.bin/mandoc/tbl/layout.in
+++ /dev/null
@@ -1,37 +0,0 @@
-.TH TBL-LAYOUT 1 "January 26, 2015" OpenBSD
-.SH NAME
-tbl-layout \- 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.out_ascii b/regress/usr.bin/mandoc/tbl/layout.out_ascii
deleted file mode 100644
index bbf360437ef..00000000000
--- a/regress/usr.bin/mandoc/tbl/layout.out_ascii
+++ /dev/null
@@ -1,35 +0,0 @@
-TBL-LAYOUT(1)               General Commands Manual              TBL-LAYOUT(1)
-
-
-
-NNAAMMEE
-       tbl-layout - 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(1)
diff --git a/regress/usr.bin/mandoc/tbl/layout.out_lint b/regress/usr.bin/mandoc/tbl/layout.out_lint
deleted file mode 100644
index 6f8587cea50..00000000000
--- a/regress/usr.bin/mandoc/tbl/layout.out_lint
+++ /dev/null
@@ -1,5 +0,0 @@
-mandoc: layout.in:8:14: WARNING: skipping vertical bar in tbl layout
-mandoc: layout.in:8:28: WARNING: skipping vertical bar in tbl layout
-mandoc: layout.in:10:7: ERROR: ignoring data in spanned tbl cell: h
-mandoc: layout.in:16:3: WARNING: tbl column starts with span
-mandoc: layout.in:18:3: ERROR: ignoring data in spanned tbl cell: b
diff --git a/regress/usr.bin/mandoc/tbl/layout_center.in b/regress/usr.bin/mandoc/tbl/layout_center.in
deleted file mode 100644
index 7c05202c848..00000000000
--- a/regress/usr.bin/mandoc/tbl/layout_center.in
+++ /dev/null
@@ -1,98 +0,0 @@
-.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/layout_center.out_ascii b/regress/usr.bin/mandoc/tbl/layout_center.out_ascii
deleted file mode 100644
index 8df45eec70b..00000000000
--- a/regress/usr.bin/mandoc/tbl/layout_center.out_ascii
+++ /dev/null
@@ -1,65 +0,0 @@
-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/macro.in b/regress/usr.bin/mandoc/tbl/macro.in
deleted file mode 100644
index f941ab93528..00000000000
--- a/regress/usr.bin/mandoc/tbl/macro.in
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH TBL-MACRO 1 "December 16, 2014"
-.SH NAME
-tbl-macro \- 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.out_ascii b/regress/usr.bin/mandoc/tbl/macro.out_ascii
deleted file mode 100644
index ee0ddc9e5e5..00000000000
--- a/regress/usr.bin/mandoc/tbl/macro.out_ascii
+++ /dev/null
@@ -1,20 +0,0 @@
-TBL-MACRO(1)                General Commands Manual               TBL-MACRO(1)
-
-
-
-NNAAMMEE
-       tbl-macro - macro in a table
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-       +--+---+
-       |a | b |
-       +--+---+
-       |c | d |
-       +--+---+
-       normal text
-
-
-
-                               December 16, 2014                  TBL-MACRO(1)
diff --git a/regress/usr.bin/mandoc/tbl/macro.out_lint b/regress/usr.bin/mandoc/tbl/macro.out_lint
deleted file mode 100644
index 992369f9a1b..00000000000
--- a/regress/usr.bin/mandoc/tbl/macro.out_lint
+++ /dev/null
@@ -1,2 +0,0 @@
-mandoc: macro.in:9:5: ERROR: ignoring extra tbl data cells: stray
-mandoc: macro.in:12:2: UNSUPP: ignoring macro in table: SM d
diff --git a/regress/usr.bin/mandoc/tbl/misalign.in b/regress/usr.bin/mandoc/tbl/misalign.in
deleted file mode 100644
index d7d3226240b..00000000000
--- a/regress/usr.bin/mandoc/tbl/misalign.in
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH TBL-MISALIGN 1 "December 24, 2014" OpenBSD
-.SH NAME
-tbl-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/misalign.out_ascii b/regress/usr.bin/mandoc/tbl/misalign.out_ascii
deleted file mode 100644
index 324ee7e518c..00000000000
--- a/regress/usr.bin/mandoc/tbl/misalign.out_ascii
+++ /dev/null
@@ -1,22 +0,0 @@
-TBL-MISALIGN(1)             General Commands Manual            TBL-MISALIGN(1)
-
-
-
-NNAAMMEE
-       tbl-misalign - failing alignment in tables
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-       +------+
-       |12.34 |
-       +------+
-       |100.0 |
-       |0.001 |
-       +------+
-       |1000.0 |
-       |0.0001 |
-       +------+
-
-
-OpenBSD                        December 24, 2014               TBL-MISALIGN(1)
diff --git a/regress/usr.bin/mandoc/tbl/nested.in b/regress/usr.bin/mandoc/tbl/nested.in
deleted file mode 100644
index 7231f56b177..00000000000
--- a/regress/usr.bin/mandoc/tbl/nested.in
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH TBL-NESTED 1 "December 16, 2014"
-.SH NAME
-tbl-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/nested.out_ascii b/regress/usr.bin/mandoc/tbl/nested.out_ascii
deleted file mode 100644
index 550270fca1e..00000000000
--- a/regress/usr.bin/mandoc/tbl/nested.out_ascii
+++ /dev/null
@@ -1,21 +0,0 @@
-TBL-NESTED(1)               General Commands Manual              TBL-NESTED(1)
-
-
-
-NNAAMMEE
-       tbl-nested - nested table
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-       +--+---+
-       |a | b |
-       +--+---+
-       |c | d |
-       |e | f |
-       +--+---+
-       normal text
-
-
-
-                               December 16, 2014                 TBL-NESTED(1)
diff --git a/regress/usr.bin/mandoc/tbl/nested.out_lint b/regress/usr.bin/mandoc/tbl/nested.out_lint
deleted file mode 100644
index 0f650c85e0e..00000000000
--- a/regress/usr.bin/mandoc/tbl/nested.out_lint
+++ /dev/null
@@ -1 +0,0 @@
-mandoc: nested.in:12:4: UNSUPP: ignoring macro in table: TS
diff --git a/regress/usr.bin/mandoc/tbl/numbers.in b/regress/usr.bin/mandoc/tbl/numbers.in
deleted file mode 100644
index e09857284f1..00000000000
--- a/regress/usr.bin/mandoc/tbl/numbers.in
+++ /dev/null
@@ -1,12 +0,0 @@
-.TH TBL-NUMBERS 1
-.SH NAME
-tbl-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/numbers.out_ascii b/regress/usr.bin/mandoc/tbl/numbers.out_ascii
deleted file mode 100644
index c87f60e26c0..00000000000
--- a/regress/usr.bin/mandoc/tbl/numbers.out_ascii
+++ /dev/null
@@ -1,18 +0,0 @@
-TBL-NUMBERS(1)              General Commands Manual             TBL-NUMBERS(1)
-
-
-
-NNAAMMEE
-       tbl-numbers - alignment of numbers in tables
-
-DDEESSCCRRIIPPTTIIOONN
-       normal text
-
-       +---++-------+--------+
-       | 1 ||  1.00 | +42.0  |
-       +---++-------+--------+
-       |10 ||-10.0  |   3.14 |
-       +---++-------+--------+
-
-
-                                                                TBL-NUMBERS(1)
diff --git a/regress/usr.bin/mandoc/tbl/opt.in b/regress/usr.bin/mandoc/tbl/opt.in
deleted file mode 100644
index 24b2fdfd7d4..00000000000
--- a/regress/usr.bin/mandoc/tbl/opt.in
+++ /dev/null
@@ -1,19 +0,0 @@
-.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.out_ascii b/regress/usr.bin/mandoc/tbl/opt.out_ascii
deleted file mode 100644
index 320b8023c0e..00000000000
--- a/regress/usr.bin/mandoc/tbl/opt.out_ascii
+++ /dev/null
@@ -1,24 +0,0 @@
-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.out_lint b/regress/usr.bin/mandoc/tbl/opt.out_lint
deleted file mode 100644
index 1802b2fd78a..00000000000
--- a/regress/usr.bin/mandoc/tbl/opt.out_lint
+++ /dev/null
@@ -1,5 +0,0 @@
-mandoc: opt.in:7:5: ERROR: missing tbl option argument: tab
-mandoc: opt.in:7:19: ERROR: wrong tbl option argument size: decimalpoint want 1 have 2
-mandoc: opt.in:7:23: ERROR: non-alphabetic character in tbl options: %
-mandoc: opt.in:7:24: ERROR: skipping unknown tbl option: foo
-mandoc: opt.in:15:21: UNSUPP: eqn delim option in tbl: $$
diff --git a/regress/usr.bin/mandoc/tbl/span.in b/regress/usr.bin/mandoc/tbl/span.in
deleted file mode 100644
index 5341d2602db..00000000000
--- a/regress/usr.bin/mandoc/tbl/span.in
+++ /dev/null
@@ -1,40 +0,0 @@
-.TH TBL-SPAN 1
-.SH NAME
-tbl-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/span.out_ascii b/regress/usr.bin/mandoc/tbl/span.out_ascii
deleted file mode 100644
index 78f7ee8eb9e..00000000000
--- a/regress/usr.bin/mandoc/tbl/span.out_ascii
+++ /dev/null
@@ -1,33 +0,0 @@
-TBL-SPAN(1)                 General Commands Manual                TBL-SPAN(1)
-
-
-
-NNAAMMEE
-       tbl-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-SPAN(1)
diff --git a/regress/usr.bin/mandoc/tbl/vert.in b/regress/usr.bin/mandoc/tbl/vert.in
deleted file mode 100644
index c892401c88e..00000000000
--- a/regress/usr.bin/mandoc/tbl/vert.in
+++ /dev/null
@@ -1,39 +0,0 @@
-.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/vert.out_ascii b/regress/usr.bin/mandoc/tbl/vert.out_ascii
deleted file mode 100644
index 87ff5cf8003..00000000000
--- a/regress/usr.bin/mandoc/tbl/vert.out_ascii
+++ /dev/null
@@ -1,37 +0,0 @@
-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)