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. --- main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 2be68a93..941fa5e2 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.135 2011/01/04 15:02:00 kristaps Exp $ */ +/* $Id: main.c,v 1.136 2011/01/10 14:40:30 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -178,9 +178,6 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "unknown escape sequence", "unterminated quoted string", - /* related to tables */ - "extra data cells", - "generic error", /* related to tables */ @@ -191,6 +188,7 @@ static const char * const mandocerrs[MANDOCERR_MAX] = { "no table data cells specified", "ignore data in cell", "data block still open", + "ignoring extra data cells", "input stack limit exceeded, infinite loop?", "skipping bad character", -- cgit v1.2.3-56-ge451