version 1.13, 2011/01/07 13:20:58 |
version 1.18, 2011/01/10 15:31:00 |
Line 37 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 37 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
{ |
{ |
struct tbl_dat *dat; |
struct tbl_dat *dat; |
struct tbl_cell *cp; |
struct tbl_cell *cp; |
int sv; |
int sv, spans; |
|
|
cp = NULL; |
cp = NULL; |
if (dp->last && dp->last->layout) |
if (dp->last && dp->last->layout) |
Line 55 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 55 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
TBL_CELL_SPAN == cp->pos)) |
TBL_CELL_SPAN == cp->pos)) |
cp = cp->next; |
cp = cp->next; |
|
|
|
/* |
|
* Stop processing when we reach the end of the available layout |
|
* cells. This means that we have extra input. |
|
*/ |
|
|
|
if (NULL == cp) { |
|
TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); |
|
/* Skip to the end... */ |
|
while (p[*pos]) |
|
(*pos)++; |
|
return(1); |
|
} |
|
|
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat->layout = cp; |
dat->layout = cp; |
dat->pos = TBL_DATA_NONE; |
dat->pos = TBL_DATA_NONE; |
|
|
if (NULL == dat->layout) |
assert(TBL_CELL_SPAN != cp->pos); |
TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); |
|
|
|
|
for (spans = 0, cp = cp->next; cp; cp = cp->next) |
|
if (TBL_CELL_SPAN == cp->pos) |
|
spans++; |
|
else |
|
break; |
|
|
|
dat->spans = spans; |
|
|
if (dp->last) { |
if (dp->last) { |
dp->last->next = dat; |
dp->last->next = dat; |
dp->last = dat; |
dp->last = dat; |
Line 101 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 121 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
else |
else |
dat->pos = TBL_DATA_DATA; |
dat->pos = TBL_DATA_DATA; |
|
|
if (NULL == dat->layout) |
|
return(1); |
|
|
|
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) |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
Line 118 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 135 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
{ |
{ |
struct tbl_dat *dat; |
struct tbl_dat *dat; |
size_t sz; |
size_t sz; |
|
int pos; |
|
|
if (0 == strcmp(p, "T}")) { |
pos = 0; |
tbl->part = TBL_PART_DATA; |
|
return(1); |
|
} |
|
|
|
dat = tbl->last_span->last; |
dat = tbl->last_span->last; |
|
|
|
if (p[pos] == 'T' && p[pos + 1] == '}') { |
|
pos += 2; |
|
if (p[pos] == tbl->opts.tab) { |
|
tbl->part = TBL_PART_DATA; |
|
pos++; |
|
return(data(tbl, tbl->last_span, ln, p, &pos)); |
|
} else if ('\0' == p[pos]) { |
|
tbl->part = TBL_PART_DATA; |
|
return(1); |
|
} |
|
|
|
/* Fallthrough: T} is part of a word. */ |
|
} |
|
|
dat->pos = TBL_DATA_DATA; |
dat->pos = TBL_DATA_DATA; |
|
|
if (dat->string) { |
if (dat->string) { |
Line 155 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 185 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
/* |
/* |
* Choose a layout row: take the one following the last parsed |
* Choose a layout row: take the one following the last parsed |
* span's. If that doesn't exist, use the last parsed span's. |
* span's. If that doesn't exist, use the last parsed span's. |
* If there's no last parsed span, use the first row. This can |
* If there's no last parsed span, use the first row. Lastly, |
* be NULL! |
* if the last span was a horizontal line, use the same layout |
|
* (it doesn't "consume" the layout). |
*/ |
*/ |
|
|
if (tbl->last_span) { |
if (tbl->last_span) { |
assert(tbl->last_span->layout); |
assert(tbl->last_span->layout); |
rp = tbl->last_span->layout->next; |
if (tbl->last_span->pos == TBL_SPAN_DATA) |
|
rp = tbl->last_span->layout->next; |
|
else |
|
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; |