First, make extra data cells be thrown away. This makes "dp->layout"

always hold, which cleans up the table stuff a bit.

Second, set a "spans" value per data cell consisting of the number of
skipped TBL_CELL_SPAN layout cells.

Third, make tbl_term.c understand how to skip over spanned sections when
iterating over the header queue.

What remains is to calculate the widths of spanned cells.

1 files changed, 6 insertions, 2 deletions

diff --git a/tbl.7 b/tbl.7
index fe4ca7a5..abc2ba3a 100644
--- a/tbl.7
+++ b/tbl.7
@@ -209,8 +209,12 @@ Justify a number around its last decimal point.
 If the decimal point is not found on the number, it's assumed to trail
 the number.
 .It Cm s
-This option is not supported by
-.Xr mandoc 1 .
+Span columns from the last non-span data cell.
+It is an error if spanning columns follow a
+.Cm \-
+or
+.Cm \(ba
+cell, or come first.
 .It Cm a
 Left-justify a literal string and pad with one space.
 .It Cm ^