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 | b3ea03504ba905470ba5c486ba69062c89034488 (patch) | |
| tree | df4cbcc9f5102817e214499b8ce04b165972afbf /mandoc.h | |
| parent | 8b2891b502ff415c363420b6f4238ec3561efd97 (diff) | |
| download | mandoc-b3ea03504ba905470ba5c486ba69062c89034488.tar.gz mandoc-b3ea03504ba905470ba5c486ba69062c89034488.tar.zst mandoc-b3ea03504ba905470ba5c486ba69062c89034488.zip | |
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 | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: mandoc.h,v 1.49 2011/01/06 13:45:47 kristaps Exp $ */ +/* $Id: mandoc.h,v 1.50 2011/01/10 14:40:30 kristaps Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -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; |