version 1.42, 2017/06/08 18:11:22 |
version 1.43, 2017/06/16 20:01:06 |
Line 51 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 51 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
cp = cp->next; |
cp = cp->next; |
|
|
/* |
/* |
* Stop processing when we reach the end of the available layout |
* If the current layout row is out of cells, allocate |
* cells. This means that we have extra input. |
* a new cell if another row of the table has at least |
|
* this number of columns, or discard the input if we |
|
* are beyond the last column of the table as a whole. |
*/ |
*/ |
|
|
if (cp == NULL) { |
if (cp == NULL) { |
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
if (dp->layout->last->col + 1 < dp->opts->cols) { |
ln, *pos, p + *pos); |
cp = mandoc_calloc(1, sizeof(*cp)); |
/* Skip to the end... */ |
cp->pos = TBL_CELL_LEFT; |
while (p[*pos]) |
dp->layout->last->next = cp; |
(*pos)++; |
cp->col = dp->layout->last->col + 1; |
return; |
dp->layout->last = cp; |
|
} else { |
|
mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse, |
|
ln, *pos, p + *pos); |
|
while (p[*pos]) |
|
(*pos)++; |
|
return; |
|
} |
} |
} |
|
|
dat = mandoc_calloc(1, sizeof(*dat)); |
dat = mandoc_calloc(1, sizeof(*dat)); |
Line 185 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
Line 194 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
void |
void |
tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) |
tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) |
{ |
{ |
struct tbl_span *dp; |
|
struct tbl_row *rp; |
struct tbl_row *rp; |
|
struct tbl_cell *cp; |
|
struct tbl_span *sp, *spi; |
|
struct tbl_dat *dp; |
|
int have_data, spans; |
|
|
/* |
rp = (sp = tbl->last_span) == NULL ? tbl->first_row : |
* Choose a layout row: take the one following the last parsed |
sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ? |
* span's. If that doesn't exist, use the last parsed span's. |
sp->layout->next : sp->layout; |
* If there's no last parsed span, use the first row. Lastly, |
|
* if the last span was a horizontal line, use the same layout |
|
* (it doesn't "consume" the layout). |
|
*/ |
|
|
|
if (tbl->last_span != NULL) { |
assert(rp != NULL); |
if (tbl->last_span->pos == TBL_SPAN_DATA) { |
|
for (rp = tbl->last_span->layout->next; |
|
rp != NULL && rp->first != NULL; |
|
rp = rp->next) { |
|
switch (rp->first->pos) { |
|
case TBL_CELL_HORIZ: |
|
dp = newspan(tbl, ln, rp); |
|
dp->pos = TBL_SPAN_HORIZ; |
|
continue; |
|
case TBL_CELL_DHORIZ: |
|
dp = newspan(tbl, ln, rp); |
|
dp->pos = TBL_SPAN_DHORIZ; |
|
continue; |
|
default: |
|
break; |
|
} |
|
break; |
|
} |
|
} else |
|
rp = tbl->last_span->layout; |
|
|
|
if (rp == NULL) |
sp = newspan(tbl, ln, rp); |
rp = tbl->last_span->layout; |
|
} else |
|
rp = tbl->first_row; |
|
|
|
assert(rp); |
|
|
|
dp = newspan(tbl, ln, rp); |
|
|
|
if ( ! strcmp(p, "_")) { |
if ( ! strcmp(p, "_")) { |
dp->pos = TBL_SPAN_HORIZ; |
sp->pos = TBL_SPAN_HORIZ; |
return; |
return; |
} else if ( ! strcmp(p, "=")) { |
} else if ( ! strcmp(p, "=")) { |
dp->pos = TBL_SPAN_DHORIZ; |
sp->pos = TBL_SPAN_DHORIZ; |
return; |
return; |
} |
} |
|
sp->pos = TBL_SPAN_DATA; |
|
|
dp->pos = TBL_SPAN_DATA; |
|
|
|
while (p[pos] != '\0') |
while (p[pos] != '\0') |
getdata(tbl, dp, ln, p, &pos); |
getdata(tbl, sp, ln, p, &pos); |
|
|
|
/* |
|
* If this span contains some data, |
|
* make sure at least part of it gets printed. |
|
*/ |
|
|
|
have_data = 0; |
|
cp = rp->first; |
|
for (dp = sp->first; dp != NULL; dp = dp->next) { |
|
if (dp->pos == TBL_DATA_DATA && *dp->string != '\0') { |
|
if (cp == NULL || |
|
(cp->pos != TBL_CELL_HORIZ && |
|
cp->pos != TBL_CELL_DHORIZ)) |
|
return; |
|
have_data = 1; |
|
} |
|
spans = dp->spans; |
|
while (spans-- >= 0) { |
|
if (cp != NULL) |
|
cp = cp->next; |
|
} |
|
} |
|
if (have_data == 0 || rp->next == NULL) |
|
return; |
|
|
|
/* |
|
* There is some data, but it would all get lost |
|
* due to horizontal lines in the layout. |
|
* Insert an empty span to consume the layout row. |
|
*/ |
|
|
|
tbl->last_span = sp->prev; |
|
spi = newspan(tbl, ln, rp); |
|
spi->pos = TBL_SPAN_DATA; |
|
spi->next = sp; |
|
tbl->last_span = sp; |
|
sp->prev = spi; |
|
sp->layout = rp->next; |
|
cp = sp->layout->first; |
|
for (dp = sp->first; dp != NULL; dp = dp->next) { |
|
dp->layout = cp; |
|
dp->spans = 0; |
|
if (cp != NULL) |
|
cp = cp->next; |
|
while (cp != NULL && cp->pos == TBL_CELL_SPAN) { |
|
dp->spans++; |
|
cp = cp->next; |
|
} |
|
} |
} |
} |