From b3ea03504ba905470ba5c486ba69062c89034488 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Mon, 10 Jan 2011 14:40:30 +0000 Subject: 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. --- tbl.7 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tbl.7') diff --git a/tbl.7 b/tbl.7 index e901623b..683e80f1 100644 --- a/tbl.7 +++ b/tbl.7 @@ -1,4 +1,4 @@ -.\" $Id: tbl.7,v 1.7 2011/01/08 17:30:03 kristaps Exp $ +.\" $Id: tbl.7,v 1.8 2011/01/10 14:40:30 kristaps Exp $ .\" .\" Copyright (c) 2010 Kristaps Dzonsons .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: January 8 2011 $ +.Dd $Mdocdate: January 10 2011 $ .Dt TBL 7 .Os .Sh NAME @@ -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 ^ -- cgit v1.2.3-56-ge451