version 1.34, 2015/01/27 05:21:45 |
version 1.39, 2015/01/30 17:32:16 |
Line 42 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 42 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
{ |
{ |
struct tbl_dat *dat; |
struct tbl_dat *dat; |
struct tbl_cell *cp; |
struct tbl_cell *cp; |
int sv, spans; |
int sv; |
|
|
cp = NULL; |
/* Advance to the next layout cell, skipping spanners. */ |
if (dp->last && dp->last->layout) |
|
cp = dp->last->layout->next; |
|
else if (NULL == dp->last) |
|
cp = dp->layout->first; |
|
|
|
/* |
cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next; |
* Skip over spanners, since |
while (cp != NULL && cp->pos == TBL_CELL_SPAN) |
* we want to match data with data layout cells in the header. |
|
*/ |
|
|
|
while (cp && TBL_CELL_SPAN == cp->pos) |
|
cp = cp->next; |
cp = cp->next; |
|
|
/* |
/* |
Line 63 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 55 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
* cells. This means that we have extra input. |
* cells. This means that we have extra input. |
*/ |
*/ |
|
|
if (NULL == cp) { |
if (cp == NULL) { |
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)++; |
return; |
return; |
} |
} |
|
|
dat = mandoc_calloc(1, sizeof(struct tbl_dat)); |
dat = mandoc_calloc(1, sizeof(*dat)); |
dat->layout = cp; |
dat->layout = cp; |
dat->pos = TBL_DATA_NONE; |
dat->pos = TBL_DATA_NONE; |
|
dat->spans = 0; |
assert(TBL_CELL_SPAN != cp->pos); |
for (cp = cp->next; cp != NULL; cp = cp->next) |
|
if (cp->pos == TBL_CELL_SPAN) |
for (spans = 0, cp = cp->next; cp; cp = cp->next) |
dat->spans++; |
if (TBL_CELL_SPAN == cp->pos) |
|
spans++; |
|
else |
else |
break; |
break; |
|
|
dat->spans = spans; |
if (dp->last == NULL) |
|
dp->first = dat; |
if (dp->last) { |
else |
dp->last->next = dat; |
dp->last->next = dat; |
dp->last = dat; |
dp->last = dat; |
} else |
|
dp->last = dp->first = dat; |
|
|
|
sv = *pos; |
sv = *pos; |
while (p[*pos] && p[*pos] != tbl->opts.tab) |
while (p[*pos] && p[*pos] != tbl->opts.tab) |
Line 102 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 90 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
* until a standalone `T}', are included in our cell. |
* until a standalone `T}', are included in our cell. |
*/ |
*/ |
|
|
if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) { |
if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') { |
tbl->part = TBL_PART_CDATA; |
tbl->part = TBL_PART_CDATA; |
return; |
return; |
} |
} |
|
|
assert(*pos - sv >= 0); |
dat->string = mandoc_strndup(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'; |
|
|
|
if (p[*pos]) |
if (p[*pos]) |
(*pos)++; |
(*pos)++; |
|
|
Line 127 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
Line 111 getdata(struct tbl_node *tbl, struct tbl_span *dp, |
|
else |
else |
dat->pos = TBL_DATA_DATA; |
dat->pos = TBL_DATA_DATA; |
|
|
if (TBL_CELL_HORIZ == dat->layout->pos || |
if ((dat->layout->pos == TBL_CELL_HORIZ || |
TBL_CELL_DHORIZ == dat->layout->pos || |
dat->layout->pos == TBL_CELL_DHORIZ || |
TBL_CELL_DOWN == dat->layout->pos) |
dat->layout->pos == TBL_CELL_DOWN) && |
if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string) |
dat->pos == TBL_DATA_DATA && *dat->string != '\0') |
mandoc_msg(MANDOCERR_TBLIGNDATA, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, |
tbl->parse, ln, sv, NULL); |
tbl->parse, ln, sv, dat->string); |
|
|
return; |
|
} |
} |
|
|
int |
int |
tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos) |
{ |
{ |
struct tbl_dat *dat; |
struct tbl_dat *dat; |
size_t sz; |
size_t sz; |
int pos; |
|
|
|
pos = 0; |
|
|
|
dat = tbl->last_span->last; |
dat = tbl->last_span->last; |
|
|
if (p[pos] == 'T' && p[pos + 1] == '}') { |
if (p[pos] == 'T' && p[pos + 1] == '}') { |
Line 155 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 134 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
pos++; |
pos++; |
getdata(tbl, tbl->last_span, ln, p, &pos); |
getdata(tbl, tbl->last_span, ln, p, &pos); |
return(1); |
return(1); |
} else if ('\0' == p[pos]) { |
} else if (p[pos] == '\0') { |
tbl->part = TBL_PART_DATA; |
tbl->part = TBL_PART_DATA; |
return(1); |
return(1); |
} |
} |
Line 165 tbl_cdata(struct tbl_node *tbl, int ln, const char *p) |
|
Line 144 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 != NULL) { |
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 (dat->layout->pos == TBL_CELL_DOWN) |
mandoc_msg(MANDOCERR_TBLIGNDATA, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse, |
ln, pos, NULL); |
ln, pos, dat->string); |
|
|
return(0); |
return(0); |
} |
} |
Line 185 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
Line 164 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
{ |
{ |
struct tbl_span *dp; |
struct tbl_span *dp; |
|
|
dp = mandoc_calloc(1, sizeof(struct tbl_span)); |
dp = mandoc_calloc(1, sizeof(*dp)); |
dp->line = line; |
dp->line = line; |
dp->opts = &tbl->opts; |
dp->opts = &tbl->opts; |
dp->layout = rp; |
dp->layout = rp; |
dp->head = tbl->first_head; |
|
dp->prev = tbl->last_span; |
dp->prev = tbl->last_span; |
|
|
if (dp->prev == NULL) { |
if (dp->prev == NULL) { |
tbl->first_span = dp; |
tbl->first_span = dp; |
tbl->current_span = NULL; |
tbl->current_span = NULL; |
dp->flags |= TBL_SPAN_FIRST; |
|
} else |
} else |
dp->prev->next = dp; |
dp->prev->next = dp; |
tbl->last_span = dp; |
tbl->last_span = dp; |
Line 204 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
Line 181 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
} |
} |
|
|
void |
void |
tbl_data(struct tbl_node *tbl, int ln, const char *p) |
tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos) |
{ |
{ |
struct tbl_span *dp; |
struct tbl_span *dp; |
struct tbl_row *rp; |
struct tbl_row *rp; |
int pos; |
|
|
|
/* |
/* |
* Choose a layout row: take the one following the last parsed |
* Choose a layout row: take the one following the last parsed |
Line 218 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 194 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
* (it doesn't "consume" the layout). |
* (it doesn't "consume" the layout). |
*/ |
*/ |
|
|
if (tbl->last_span) { |
if (tbl->last_span != NULL) { |
assert(tbl->last_span->layout); |
|
if (tbl->last_span->pos == TBL_SPAN_DATA) { |
if (tbl->last_span->pos == TBL_SPAN_DATA) { |
for (rp = tbl->last_span->layout->next; |
for (rp = tbl->last_span->layout->next; |
rp && rp->first; rp = rp->next) { |
rp != NULL && rp->first != NULL; |
|
rp = rp->next) { |
switch (rp->first->pos) { |
switch (rp->first->pos) { |
case TBL_CELL_HORIZ: |
case TBL_CELL_HORIZ: |
dp = newspan(tbl, ln, rp); |
dp = newspan(tbl, ln, rp); |
Line 240 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 216 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
} else |
} else |
rp = tbl->last_span->layout; |
rp = tbl->last_span->layout; |
|
|
if (NULL == rp) |
if (rp == NULL) |
rp = tbl->last_span->layout; |
rp = tbl->last_span->layout; |
} else |
} else |
rp = tbl->first_row; |
rp = tbl->first_row; |
Line 259 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 235 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
|
|
dp->pos = TBL_SPAN_DATA; |
dp->pos = TBL_SPAN_DATA; |
|
|
pos = 0; |
while (p[pos] != '\0') |
while ('\0' != p[pos]) |
|
getdata(tbl, dp, ln, p, &pos); |
getdata(tbl, dp, ln, p, &pos); |
} |
} |