version 1.17, 2011/01/10 14:56:06 |
version 1.19, 2011/01/11 14:12:01 |
Line 122 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 122 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
dat->pos = TBL_DATA_DATA; |
dat->pos = TBL_DATA_DATA; |
|
|
if (TBL_CELL_HORIZ == dat->layout->pos || |
if (TBL_CELL_HORIZ == dat->layout->pos || |
TBL_CELL_DHORIZ == dat->layout->pos) |
TBL_CELL_DHORIZ == dat->layout->pos || |
|
TBL_CELL_DOWN == dat->layout->pos) |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); |
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv); |
|
|
Line 165 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 166 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
} else |
} else |
dat->string = mandoc_strdup(p); |
dat->string = mandoc_strdup(p); |
|
|
|
if (TBL_CELL_DOWN == dat->layout->pos) |
|
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos); |
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 188 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 192 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
* If there's no last parsed span, use the first row. Lastly, |
* If there's no last parsed span, use the first row. Lastly, |
* if the last span was a horizontal line, use the same layout |
* if the last span was a horizontal line, use the same layout |
* (it doesn't "consume" the layout). |
* (it doesn't "consume" the layout). |
* |
|
* In the end, this can be NULL! |
|
*/ |
*/ |
|
|
if (tbl->last_span) { |
if (tbl->last_span) { |
Line 198 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 200 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
rp = tbl->last_span->layout->next; |
rp = tbl->last_span->layout->next; |
else |
else |
rp = tbl->last_span->layout; |
rp = tbl->last_span->layout; |
|
|
if (NULL == rp) |
if (NULL == rp) |
rp = tbl->last_span->layout; |
rp = tbl->last_span->layout; |
} else |
} else |
rp = tbl->first_row; |
rp = tbl->first_row; |
|
|
|
assert(rp); |
|
|
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
dp->tbl = &tbl->opts; |
dp->tbl = &tbl->opts; |