some real tbl(7) regression tests

8 files changed, 162 insertions, 2 deletions

diff --git a/regress/usr.bin/mandoc/Makefile b/regress/usr.bin/mandoc/Makefile
index 3be6048497b..36e9d64e001 100644
--- a/regress/usr.bin/mandoc/Makefile
+++ b/regress/usr.bin/mandoc/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.7 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.8 2012/05/27 02:01:38 schwarze Exp $
 
-SUBDIR+= roff char mdoc man
+SUBDIR+= roff char mdoc man tbl
 
 ascii groff groff-clean obj-clean tman: _SUBDIRUSE
 
diff --git a/regress/usr.bin/mandoc/tbl/Makefile b/regress/usr.bin/mandoc/tbl/Makefile
new file mode 100644
index 00000000000..8e0a5eb7678
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/Makefile
@@ -0,0 +1,13 @@
+# $OpenBSD: Makefile,v 1.1 2012/05/27 02:01:38 schwarze Exp $
+
+REGRESS_TARGETS=center numbers span
+SKIP_TMAN ?= ALL
+
+TBL=/usr/local/bin/tbl
+
+.for t in ${REGRESS_TARGETS}
+${t}.out_ascii: ${t}.in
+	${TBL} ${.ALLSRC} | ${NROFF} > ${.TARGET}
+.endfor
+
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/tbl/center.in b/regress/usr.bin/mandoc/tbl/center.in
new file mode 100644
index 00000000000..179858ddfa2
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/center.in
@@ -0,0 +1,22 @@
+.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
new file mode 100644
index 00000000000..983069e973b
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/center.out_ascii
@@ -0,0 +1,22 @@
+TBL-CENTER(1)              OpenBSD Reference 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/numbers.in b/regress/usr.bin/mandoc/tbl/numbers.in
new file mode 100644
index 00000000000..e09857284f1
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/numbers.in
@@ -0,0 +1,12 @@
+.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
new file mode 100644
index 00000000000..94b96f24b79
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/numbers.out_ascii
@@ -0,0 +1,18 @@
+TBL-NUMBERS(1)             OpenBSD Reference 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/span.in b/regress/usr.bin/mandoc/tbl/span.in
new file mode 100644
index 00000000000..5341d2602db
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/span.in
@@ -0,0 +1,40 @@
+.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
new file mode 100644
index 00000000000..db3ec60acb7
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/span.out_ascii
@@ -0,0 +1,33 @@
+TBL-SPAN(1)                OpenBSD Reference 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)