Allow leading and trailing vertical lines,

and format them in the same way as groff.
While here, do not require whitespace before vertical lines
in layout specifications.
Issues found by bentley@ in mpv(1).

3 files changed, 79 insertions, 3 deletions

diff --git a/regress/usr.bin/mandoc/tbl/Makefile b/regress/usr.bin/mandoc/tbl/Makefile
index 8e0a5eb7678..25c061d66f7 100644
--- a/regress/usr.bin/mandoc/tbl/Makefile
+++ b/regress/usr.bin/mandoc/tbl/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2012/05/27 02:01:38 schwarze Exp $
+# $OpenBSD: Makefile,v 1.2 2014/03/28 23:25:54 schwarze Exp $
 
-REGRESS_TARGETS=center numbers span
+REGRESS_TARGETS = center numbers span vert
 SKIP_TMAN ?= ALL
 
-TBL=/usr/local/bin/tbl
+TBL = /usr/local/bin/tbl
 
 .for t in ${REGRESS_TARGETS}
 ${t}.out_ascii: ${t}.in
diff --git a/regress/usr.bin/mandoc/tbl/vert.in b/regress/usr.bin/mandoc/tbl/vert.in
new file mode 100644
index 00000000000..c892401c88e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/vert.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/vert.out_ascii b/regress/usr.bin/mandoc/tbl/vert.out_ascii
new file mode 100644
index 00000000000..c8c630c083d
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/vert.out_ascii
@@ -0,0 +1,37 @@
+TBL-VERT(1)                OpenBSD Reference 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)