diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-10 14:40:30 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2011-01-10 14:40:30 +0000 |
commit | dede963eacb17dcdbe0624bf76ab3f4045147541 (patch) | |
tree | c83ed7ba5f2d938f2f5cd04b659ac67d5da157ee /mandoc.h | |
parent | 4f674421b17961b1c6630a984ebea196eb7eed7a (diff) | |
download | mandoc-dede963eacb17dcdbe0624bf76ab3f4045147541.tar.gz |
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.
Diffstat (limited to 'mandoc.h')
-rw-r--r-- | mandoc.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -100,9 +100,6 @@ enum mandocerr { MANDOCERR_BADESCAPE, /* unknown escape sequence */ MANDOCERR_BADQUOTE, /* unterminated quoted string */ - /* related to tables */ - MANDOCERR_TBLEXTRADAT, /* extra data cells */ - MANDOCERR_ERROR, /* ===== start of errors ===== */ /* related to tables */ @@ -113,6 +110,7 @@ enum mandocerr { MANDOCERR_TBLNODATA, /* no table data cells specified */ MANDOCERR_TBLIGNDATA, /* ignore data in cell */ MANDOCERR_TBLBLOCK, /* data block still open */ + MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */ MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */ MANDOCERR_BADCHAR, /* skipping bad character */ @@ -238,6 +236,7 @@ enum tbl_datt { */ struct tbl_dat { struct tbl_cell *layout; /* layout cell: CAN BE NULL */ + int spans; /* how many spans follow */ struct tbl_dat *next; char *string; enum tbl_datt pos; |