It turns out association of tbl spans with layout rows is simpler than

i thought.  Fixing a bug in curs_addch(3) and minus 25 lines of code.

4 files changed, 48 insertions, 3 deletions

diff --git a/regress/usr.bin/mandoc/tbl/data/Makefile b/regress/usr.bin/mandoc/tbl/data/Makefile
index 52f6d305083..07a5573d4c0 100644
--- a/regress/usr.bin/mandoc/tbl/data/Makefile
+++ b/regress/usr.bin/mandoc/tbl/data/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2017/06/15 00:27:23 schwarze Exp $
+# $OpenBSD: Makefile,v 1.4 2017/07/04 20:59:17 schwarze Exp $
 
-REGRESS_TARGETS	 = blankline block_unclosed block_width block_wrap empty
-LINT_TARGETS	 = block_unclosed empty
+REGRESS_TARGETS  = blankline block_unclosed block_width block_wrap empty insert
+LINT_TARGETS	 = block_unclosed empty insert
 
 # groff-1.22.3 defect:
 # - When a table ends in the middle of a block,
diff --git a/regress/usr.bin/mandoc/tbl/data/insert.in b/regress/usr.bin/mandoc/tbl/data/insert.in
new file mode 100644
index 00000000000..942a496154c
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/insert.in
@@ -0,0 +1,21 @@
+.\" $OpenBSD: insert.in,v 1.1 2017/07/04 20:59:17 schwarze Exp $
+.TH TBL-DATA-INSERT 1 "July 4, 2017"
+.SH NAME
+tbl-data-insert \- insertion of empty spans for line-only layout rows
+.SH DESCRIPTION
+initial text
+.TS
+tab(:);
+_ _
+l l
+- -
+l r
+_ ^
+r.
+colum one:column two
+left:right
+not:printed
+right:left
+.TE
+.sp
+final text
diff --git a/regress/usr.bin/mandoc/tbl/data/insert.out_ascii b/regress/usr.bin/mandoc/tbl/data/insert.out_ascii
new file mode 100644
index 00000000000..50ce3484aa9
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/insert.out_ascii
@@ -0,0 +1,22 @@
+TBL-DATA-INSERT(1)          General Commands Manual         TBL-DATA-INSERT(1)
+
+
+
+NNAAMMEE
+       tbl-data-insert - insertion of empty spans for line-only layout rows
+
+DDEESSCCRRIIPPTTIIOONN
+       initial text
+
+       -----------------------
+       colum one   column two
+       -----------------------
+       left             right
+       -----------
+           right   left
+
+       final text
+
+
+
+OpenBSD                          July 4, 2017               TBL-DATA-INSERT(1)
diff --git a/regress/usr.bin/mandoc/tbl/data/insert.out_lint b/regress/usr.bin/mandoc/tbl/data/insert.out_lint
new file mode 100644
index 00000000000..380b5e6bcac
--- /dev/null
+++ b/regress/usr.bin/mandoc/tbl/data/insert.out_lint
@@ -0,0 +1,2 @@
+mandoc: insert.in:17:1: ERROR: ignoring data in spanned tbl cell: not
+mandoc: insert.in:17:5: ERROR: ignoring data in spanned tbl cell: printed