version 1.33, 2015/01/21 00:47:04 |
version 1.36, 2015/01/28 17:32:07 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
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; |
} |
} |
|
|
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 166 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); |
} |
} |
Line 190 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
Line 187 newspan(struct tbl_node *tbl, int line, struct tbl_row |
|
dp->opts = &tbl->opts; |
dp->opts = &tbl->opts; |
dp->layout = rp; |
dp->layout = rp; |
dp->head = tbl->first_head; |
dp->head = tbl->first_head; |
|
dp->prev = tbl->last_span; |
|
|
if (tbl->last_span) { |
if (dp->prev == NULL) { |
tbl->last_span->next = dp; |
tbl->first_span = dp; |
tbl->last_span = dp; |
|
} else { |
|
tbl->last_span = tbl->first_span = dp; |
|
tbl->current_span = NULL; |
tbl->current_span = NULL; |
dp->flags |= TBL_SPAN_FIRST; |
dp->flags |= TBL_SPAN_FIRST; |
} |
} else |
|
dp->prev->next = dp; |
|
tbl->last_span = dp; |
|
|
return(dp); |
return(dp); |
} |
} |
|
|
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 259 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
Line 255 tbl_data(struct tbl_node *tbl, int ln, const char *p) |
|
|
|
dp->pos = TBL_SPAN_DATA; |
dp->pos = TBL_SPAN_DATA; |
|
|
pos = 0; |
|
while ('\0' != p[pos]) |
while ('\0' != p[pos]) |
getdata(tbl, dp, ln, p, &pos); |
getdata(tbl, dp, ln, p, &pos); |
} |
} |