summaryrefslogtreecommitdiffstats
path: root/tbl.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2011-01-04 15:02:00 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2011-01-04 15:02:00 +0000
commit169a2d82c18ba1ee663ba1da329795f3e1753e8d (patch)
tree26abfc46221fcb93c3697f6ed426ea8c590cb98d /tbl.c
parent6f6927e6a5ffb72da4a382768a7d53d045cf5590 (diff)
downloadmandoc-169a2d82c18ba1ee663ba1da329795f3e1753e8d.tar.gz
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.
Diffstat (limited to 'tbl.c')
-rw-r--r--tbl.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/tbl.c b/tbl.c
index e463eaa0..a212d70a 100644
--- a/tbl.c
+++ b/tbl.c
@@ -52,7 +52,9 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
case (TBL_PART_LAYOUT):
return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
- case (TBL_PART_DATA):
+ case (TBL_PART_CDATA):
+ return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+ default:
break;
}
@@ -122,6 +124,8 @@ tbl_free(struct tbl_node *p)
void
tbl_restart(int line, int pos, struct tbl_node *tbl)
{
+ if (TBL_PART_CDATA == tbl->part)
+ TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
tbl->part = TBL_PART_LAYOUT;
tbl->line = line;
@@ -148,5 +152,8 @@ tbl_end(struct tbl_node *tbl)
if (tbl->last_span)
tbl->last_span->flags |= TBL_SPAN_LAST;
+
+ if (TBL_PART_CDATA == tbl->part)
+ TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
}