test tbl_term.c rev. 1.61 and tbl_data.c rev. 1.40:

incomplete short layout lines followed by longer lines,
and spans at the beginning of layout lines

6 files changed, 39 insertions, 11 deletions

diff --git a/regress/usr.bin/mandoc/tbl/layout/Makefile b/regress/usr.bin/mandoc/tbl/layout/Makefile
index 1009d96e5b4..2cff58512fb 100644
--- a/regress/usr.bin/mandoc/tbl/layout/Makefile
+++ b/regress/usr.bin/mandoc/tbl/layout/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.5 2019/12/31 22:49:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2020/01/11 20:56:26 schwarze Exp $
 
-REGRESS_TARGETS	 = center complex empty emptycol emptyline
+REGRESS_TARGETS	 = badspan center complex empty emptycol emptyline
 REGRESS_TARGETS	+= lines lines-nogroff numbers shortlines span
-LINT_TARGETS	 = complex empty
+LINT_TARGETS	 = badspan complex empty
 
 # groff-1.22.3 defects:
 # - When the layout is completely empty,
diff --git a/regress/usr.bin/mandoc/tbl/layout/badspan.in b/regress/usr.bin/mandoc/tbl/layout/badspan.in
new file mode 100644
index 00000000000..4d276450e4e
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/badspan.in
@@ -0,0 +1,13 @@
+.\" $OpenBSD: badspan.in,v 1.1 2020/01/11 20:56:26 schwarze Exp $
+.TH TBL-LAYOUT-BADSPAN 1 "January 11, 2020"
+.SH NAME
+tbl-layout-badspan \- invalid spanned cells
+.SH DESCRIPTION
+normal text
+.TS
+allbox tab(:);
+S L S S
+L L L L L L.
+span:end
+1:2:3:4:5:6
+.TE
diff --git a/regress/usr.bin/mandoc/tbl/layout/badspan.out_ascii b/regress/usr.bin/mandoc/tbl/layout/badspan.out_ascii
new file mode 100644
index 00000000000..36d062dc745
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/badspan.out_ascii
@@ -0,0 +1,18 @@
+TBL-LAYOUT-BADSPAN(1)       General Commands Manual      TBL-LAYOUT-BADSPAN(1)
+
+
+
+NNAAMMEE
+       tbl-layout-badspan - invalid spanned cells
+
+DDEESSCCRRIIPPTTIIOONN
+       normal text
+
+       +--+-----------+-----+---+
+       |  | span      | end |   |
+       +--+---+---+---+-----+---+
+       |1 | 2 | 3 | 4 | 5   | 6 |
+       +--+---+---+---+-----+---+
+
+
+OpenBSD                        January 11, 2020          TBL-LAYOUT-BADSPAN(1)
diff --git a/regress/usr.bin/mandoc/tbl/layout/badspan.out_lint b/regress/usr.bin/mandoc/tbl/layout/badspan.out_lint
new file mode 100644
index 00000000000..883d5763c56
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/layout/badspan.out_lint
@@ -0,0 +1 @@
+mandoc: badspan.in:9:1: WARNING: tbl line starts with span
diff --git a/regress/usr.bin/mandoc/tbl/layout/shortlines.in b/regress/usr.bin/mandoc/tbl/layout/shortlines.in
index f6434619442..85983c474af 100644
--- a/regress/usr.bin/mandoc/tbl/layout/shortlines.in
+++ b/regress/usr.bin/mandoc/tbl/layout/shortlines.in
@@ -1,5 +1,5 @@
-.\" $OpenBSD: shortlines.in,v 1.1 2019/06/11 15:40:41 schwarze Exp $
-.TH TBL-LAYOUT-SHORTLINES 1 "June 11, 2019"
+.\" $OpenBSD: shortlines.in,v 1.2 2020/01/11 20:56:26 schwarze Exp $
+.TH TBL-LAYOUT-SHORTLINES 1 "January 11, 2020"
 .SH NAME
 tbl-layout-shortlines \- table lines of different length
 .SH DESCRIPTION
@@ -39,11 +39,9 @@ very short
 .TS
 allbox tab(:);
 L
-L L
+L
 L L L.
 very short
 short:line
 left:middle:right
 .TE
-
-
diff --git a/regress/usr.bin/mandoc/tbl/layout/shortlines.out_ascii b/regress/usr.bin/mandoc/tbl/layout/shortlines.out_ascii
index 02fe01d7822..cb4e6148711 100644
--- a/regress/usr.bin/mandoc/tbl/layout/shortlines.out_ascii
+++ b/regress/usr.bin/mandoc/tbl/layout/shortlines.out_ascii
@@ -43,6 +43,4 @@ DDEESSCCRRIIPPTTIIOONN
        +-----------+--------+-------+
 
 
-
-
-OpenBSD                          June 11, 2019        TBL-LAYOUT-SHORTLINES(1)
+OpenBSD                        January 11, 2020       TBL-LAYOUT-SHORTLINES(1)