9 files changed, 117 insertions, 0 deletions
diff --git a/regress/tbl/macro/Makefile b/regress/tbl/macro/Makefile
new file mode 100644
index 00000000..70ec1b33
--- /dev/null
+++ b/regress/tbl/macro/Makefile
@@ -0,0 +1,12 @@
+# $OpenBSD: Makefile,v 1.2 2016/08/20 14:43:40 schwarze Exp $
+
+REGRESS_TARGETS	 = man nested column
+LINT_TARGETS	 = man nested
+
+# trivial differences to groff-1.22.3:
+# .TS in a table causes a blank table line in GNU tbl(1), but not in mandoc.
+# .TS in a column list causes a blank line in mandoc, but not in GNU tbl(1).
+
+SKIP_GROFF	 = nested column
+
+.include <bsd.regress.mk>
diff --git a/regress/tbl/macro/column.in b/regress/tbl/macro/column.in
new file mode 100644
index 00000000..511025ea
--- /dev/null
+++ b/regress/tbl/macro/column.in
@@ -0,0 +1,16 @@
+.Dd August 20, 2016
+.Dt TBL-COLUMN 1
+.Os OpenBSD
+.Sh NAME
+.Nm TBL-column
+.Nd tables inside column lists
+.Sh DESCRIPTION
+.Bl -column "a" "b"
+.Sy a Ta b
+.TS
+lll.
+1	2	3
+4	5	6
+.TE
+.Em c Ta d
+.El
diff --git a/regress/tbl/macro/column.out_ascii b/regress/tbl/macro/column.out_ascii
new file mode 100644
index 00000000..b4428aa6
--- /dev/null
+++ b/regress/tbl/macro/column.out_ascii
@@ -0,0 +1,13 @@
+TBL-COLUMN(1)               General Commands Manual              TBL-COLUMN(1)
+
+NNAAMMEE
+     TTBBLL--ccoolluummnn - tables inside column lists
+
+DDEESSCCRRIIPPTTIIOONN
+     aa    b
+     1   2   3
+     4   5   6
+
+     _c    d
+
+OpenBSD                         August 20, 2016                        OpenBSD
diff --git a/regress/tbl/macro/man.in b/regress/tbl/macro/man.in
new file mode 100644
index 00000000..36e39569
--- /dev/null
+++ b/regress/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/tbl/macro/man.out_ascii b/regress/tbl/macro/man.out_ascii
new file mode 100644
index 00000000..2a96f0b7
--- /dev/null
+++ b/regress/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/tbl/macro/man.out_lint b/regress/tbl/macro/man.out_lint
new file mode 100644
index 00000000..292af268
--- /dev/null
+++ b/regress/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/tbl/macro/nested.in b/regress/tbl/macro/nested.in
new file mode 100644
index 00000000..35844eb5
--- /dev/null
+++ b/regress/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/tbl/macro/nested.out_ascii b/regress/tbl/macro/nested.out_ascii
new file mode 100644
index 00000000..24a5c17a
--- /dev/null
+++ b/regress/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/tbl/macro/nested.out_lint b/regress/tbl/macro/nested.out_lint
new file mode 100644
index 00000000..0f650c85
--- /dev/null
+++ b/regress/tbl/macro/nested.out_lint
@@ -0,0 +1 @@
+mandoc: nested.in:12:4: UNSUPP: ignoring macro in table: TS