mandoc/tbl_data.c - diff

Return to tbl_data.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/tbl_data.c between version 1.15 and 1.16

version 1.15, 2011/01/09 23:14:41

version 1.16, 2011/01/10 14:40:30

Line 37 data(struct tbl_node *tbl, struct tbl_span *dp,

{

struct tbl_dat *dat;

struct tbl_cell *cp;

int sv;

int sv, spans;

cp = NULL;

if (dp->last && dp->last->layout)

Line 55 data(struct tbl_node *tbl, struct tbl_span *dp,

TBL_CELL_SPAN == cp->pos))

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->layout = cp;

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) {

dp->last->next = dat;

dp->last = dat;

Line 100 data(struct tbl_node *tbl, struct tbl_span *dp,

Line 120 data(struct tbl_node *tbl, struct tbl_span *dp,

dat->pos = TBL_DATA_NDHORIZ;

else

dat->pos = TBL_DATA_DATA;

if (NULL == dat->layout)

return(1);

if (TBL_CELL_HORIZ == dat->layout->pos ||

TBL_CELL_DHORIZ == dat->layout->pos)

CVSweb