version 1.1, 2010/12/29 16:44:23 |
version 1.4, 2011/01/01 13:37:40 |
Line 31 data(struct tbl *tbl, struct tbl_span *dp, |
|
Line 31 data(struct tbl *tbl, struct tbl_span *dp, |
|
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
struct tbl_dat *dat; |
struct tbl_dat *dat; |
|
struct tbl_cell *cp; |
int sv; |
int sv; |
|
|
|
cp = NULL; |
|
if (dp->last && dp->last->layout) |
|
cp = dp->last->layout->next; |
|
else if (NULL == dp->last) |
|
cp = dp->layout->first; |
|
|
|
/* Skip over spanners to data formats. */ |
|
|
|
while (cp && (TBL_CELL_VERT == cp->pos || |
|
TBL_CELL_DVERT == cp->pos)) |
|
cp = cp->next; |
|
|
/* FIXME: warn about losing data contents if cell is HORIZ. */ |
/* FIXME: warn about losing data contents if cell is HORIZ. */ |
|
|
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
|
dat->layout = cp; |
|
|
if (dp->last) { |
if (dp->last) { |
dp->last->next = dat; |
dp->last->next = dat; |
Line 66 data(struct tbl *tbl, struct tbl_span *dp, |
|
Line 80 data(struct tbl *tbl, struct tbl_span *dp, |
|
dat->flags |= TBL_DATA_NDHORIZ; |
dat->flags |= TBL_DATA_NDHORIZ; |
} |
} |
|
|
struct tbl_span * |
int |
tbl_data(struct tbl *tbl, int ln, const char *p) |
tbl_data(struct tbl *tbl, int ln, const char *p) |
{ |
{ |
struct tbl_span *dp; |
struct tbl_span *dp; |
|
struct tbl_row *rp; |
int pos; |
int pos; |
|
|
pos = 0; |
pos = 0; |
|
|
if ('\0' == p[pos]) { |
if ('\0' == p[pos]) { |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
return(NULL); |
return(0); |
} |
} |
|
|
|
/* |
|
* Choose a layout row: take the one following the last parsed |
|
* 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 |
|
* be NULL! |
|
*/ |
|
|
|
if (tbl->last_span) { |
|
assert(tbl->last_span->layout); |
|
rp = tbl->last_span->layout->next; |
|
if (NULL == rp) |
|
rp = tbl->last_span->layout; |
|
} else |
|
rp = tbl->first_row; |
|
|
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
|
dp->layout = rp; |
|
|
|
if (tbl->last_span) { |
|
tbl->last_span->next = dp; |
|
tbl->last_span = dp; |
|
} else |
|
tbl->last_span = tbl->first_span = dp; |
|
|
if ( ! strcmp(p, "_")) { |
if ( ! strcmp(p, "_")) { |
dp->flags |= TBL_SPAN_HORIZ; |
dp->flags |= TBL_SPAN_HORIZ; |
return(dp); |
return(1); |
} else if ( ! strcmp(p, "=")) { |
} else if ( ! strcmp(p, "=")) { |
dp->flags |= TBL_SPAN_DHORIZ; |
dp->flags |= TBL_SPAN_DHORIZ; |
return(dp); |
return(1); |
} |
} |
|
|
while ('\0' != p[pos]) |
while ('\0' != p[pos]) |
data(tbl, dp, ln, p, &pos); |
data(tbl, dp, ln, p, &pos); |
|
|
return(dp); |
return(1); |
} |
} |