From 2a7ad7cc27a054ffb9b426860d023ebc687b10c9 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Tue, 4 Jan 2011 15:02:00 +0000 Subject: Support `T{' and `T}' data blocks. When a standalone `T{' is encountered as a line's last data cell, move into TBL_PART_CDATA mode whilst leaving the cell's designation as TBL_DATA_NONE. When new data arrives that's not a standalone `T}', append it to the cell contends. Close out and warn appropriately. --- tbl_term.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'tbl_term.c') diff --git a/tbl_term.c b/tbl_term.c index a6c78e1d..267c3d14 100644 --- a/tbl_term.c +++ b/tbl_term.c @@ -1,4 +1,4 @@ -/* $Id: tbl_term.c,v 1.9 2011/01/04 13:21:45 kristaps Exp $ */ +/* $Id: tbl_term.c,v 1.10 2011/01/04 15:02:00 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -253,6 +253,9 @@ tbl_data(struct termp *tp, const struct tbl *tbl, } switch (dp->pos) { + case (TBL_DATA_NONE): + tbl_char(tp, ASCII_NBRSP, tbp->width); + return; case (TBL_DATA_HORIZ): /* FALLTHROUGH */ case (TBL_DATA_NHORIZ): @@ -420,14 +423,9 @@ tbl_calc(struct termp *tp, const struct tbl_span *sp) hp = sp->head; for ( ; sp; sp = sp->next) { - switch (sp->pos) { - case (TBL_DATA_HORIZ): - /* FALLTHROUGH */ - case (TBL_DATA_DHORIZ): + if (TBL_SPAN_DATA != sp->pos) continue; - default: - break; - } + for (dp = sp->first; dp; dp = dp->next) { if (NULL == dp->layout) continue; -- cgit v1.2.3