version 1.16, 2011/01/10 14:40:30 |
version 1.18, 2011/01/10 15:31:00 |
Line 140 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 140 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
pos = 0; |
pos = 0; |
|
|
dat = tbl->last_span->last; |
dat = tbl->last_span->last; |
dat->pos = TBL_DATA_DATA; |
|
|
|
if (p[pos] == 'T' && p[pos + 1] == '}') { |
if (p[pos] == 'T' && p[pos + 1] == '}') { |
pos += 2; |
pos += 2; |
Line 156 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 155 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
/* Fallthrough: T} is part of a word. */ |
/* Fallthrough: T} is part of a word. */ |
} |
} |
|
|
|
dat->pos = TBL_DATA_DATA; |
|
|
if (dat->string) { |
if (dat->string) { |
sz = strlen(p) + strlen(dat->string) + 2; |
sz = strlen(p) + strlen(dat->string) + 2; |
dat->string = mandoc_realloc(dat->string, sz); |
dat->string = mandoc_realloc(dat->string, sz); |
Line 187 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 188 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 197 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 196 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; |