version 1.22, 2011/02/06 22:02:58 |
version 1.25, 2012/05/27 17:54:54 |
Line 49 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 49 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
cp = dp->layout->first; |
cp = dp->layout->first; |
|
|
/* |
/* |
* Skip over spanners and vertical lines to data formats, since |
* Skip over spanners, since |
* we want to match data with data layout cells in the header. |
* we want to match data with data layout cells in the header. |
*/ |
*/ |
|
|
while (cp && (TBL_CELL_VERT == cp->pos || |
while (cp && TBL_CELL_SPAN == cp->pos) |
TBL_CELL_DVERT == cp->pos || |
|
TBL_CELL_SPAN == cp->pos)) |
|
cp = cp->next; |
cp = cp->next; |
|
|
/* |
/* |
Line 64 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 62 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
*/ |
*/ |
|
|
if (NULL == cp) { |
if (NULL == cp) { |
TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLEXTRADAT, |
|
tbl->parse, ln, *pos, NULL); |
/* Skip to the end... */ |
/* Skip to the end... */ |
while (p[*pos]) |
while (p[*pos]) |
(*pos)++; |
(*pos)++; |
Line 106 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 105 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
return(0); |
return(0); |
} |
} |
|
|
dat->string = mandoc_malloc(*pos - sv + 1); |
assert(*pos - sv >= 0); |
memcpy(dat->string, &p[sv], *pos - sv); |
|
|
dat->string = mandoc_malloc((size_t)(*pos - sv + 1)); |
|
memcpy(dat->string, &p[sv], (size_t)(*pos - sv)); |
dat->string[*pos - sv] = '\0'; |
dat->string[*pos - sv] = '\0'; |
|
|
if (p[*pos]) |
if (p[*pos]) |
Line 128 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 129 data(struct tbl_node *tbl, struct tbl_span *dp, |
|
TBL_CELL_DHORIZ == dat->layout->pos || |
TBL_CELL_DHORIZ == dat->layout->pos || |
TBL_CELL_DOWN == 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); |
mandoc_msg(MANDOCERR_TBLIGNDATA, |
|
tbl->parse, ln, sv, NULL); |
|
|
return(1); |
return(1); |
} |
} |
Line 170 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 172 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
dat->string = mandoc_strdup(p); |
dat->string = mandoc_strdup(p); |
|
|
if (TBL_CELL_DOWN == dat->layout->pos) |
if (TBL_CELL_DOWN == dat->layout->pos) |
TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos); |
mandoc_msg(MANDOCERR_TBLIGNDATA, |
|
tbl->parse, ln, pos, NULL); |
|
|
return(0); |
return(0); |
} |
} |
Line 208 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 211 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
pos = 0; |
pos = 0; |
|
|
if ('\0' == p[pos]) { |
if ('\0' == p[pos]) { |
TBL_MSG(tbl, MANDOCERR_TBL, ln, pos); |
mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|