version 1.35, 2015/01/28 15:03:45 |
version 1.36, 2015/01/28 17:32:07 |
Line 64 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 64 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
*/ |
*/ |
|
|
if (NULL == cp) { |
if (NULL == cp) { |
mandoc_msg(MANDOCERR_TBLEXTRADAT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
ln, *pos, NULL); |
ln, *pos, p + *pos); |
/* Skip to the end... */ |
/* Skip to the end... */ |
while (p[*pos]) |
while (p[*pos]) |
(*pos)++; |
(*pos)++; |
Line 131 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 131 getdata(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) |
mandoc_msg(MANDOCERR_TBLIGNDATA, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
tbl->parse, ln, sv, NULL); |
tbl->parse, ln, sv, dat->string); |
|
|
return; |
return; |
} |
} |
Line 163 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
Line 163 tbl_cdata(struct tbl_node *tbl, int ln, const char *p, |
|
dat->pos = TBL_DATA_DATA; |
dat->pos = TBL_DATA_DATA; |
|
|
if (dat->string) { |
if (dat->string) { |
sz = strlen(p) + strlen(dat->string) + 2; |
sz = strlen(p + pos) + strlen(dat->string) + 2; |
dat->string = mandoc_realloc(dat->string, sz); |
dat->string = mandoc_realloc(dat->string, sz); |
(void)strlcat(dat->string, " ", sz); |
(void)strlcat(dat->string, " ", sz); |
(void)strlcat(dat->string, p, sz); |
(void)strlcat(dat->string, p + pos, sz); |
} else |
} else |
dat->string = mandoc_strdup(p); |
dat->string = mandoc_strdup(p + pos); |
|
|
if (TBL_CELL_DOWN == dat->layout->pos) |
if (TBL_CELL_DOWN == dat->layout->pos) |
mandoc_msg(MANDOCERR_TBLIGNDATA, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, |
ln, pos, NULL); |
ln, pos, dat->string); |
|
|
return(0); |
return(0); |
} |
} |