diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-04 15:02:00 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-04 15:02:00 +0000 |
| commit | 2a7ad7cc27a054ffb9b426860d023ebc687b10c9 (patch) | |
| tree | 51c4df0ecca7c1c0a288eb7ed01772cec498c44f /tbl.c | |
| parent | df93d3ceecb1d865ef7249ba9348370ffc024e60 (diff) | |
| download | mandoc-2a7ad7cc27a054ffb9b426860d023ebc687b10c9.tar.gz mandoc-2a7ad7cc27a054ffb9b426860d023ebc687b10c9.tar.zst mandoc-2a7ad7cc27a054ffb9b426860d023ebc687b10c9.zip | |
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.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: tbl.c,v 1.20 2011/01/03 13:59:21 kristaps Exp $ */ +/* $Id: tbl.c,v 1.21 2011/01/04 15:02:00 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -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); } |