version 1.34, 2015/01/27 05:21:45 |
version 1.36, 2015/01/28 17:32:07 |
|
|
|
|
|
|
enum rofferr |
enum rofferr |
tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) |
tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos) |
{ |
{ |
const char *cp; |
const char *cp; |
int active; |
int active; |
Line 46 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
Line 46 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
if (tbl->part == TBL_PART_OPTS) { |
if (tbl->part == TBL_PART_OPTS) { |
tbl->part = TBL_PART_LAYOUT; |
tbl->part = TBL_PART_LAYOUT; |
active = 1; |
active = 1; |
for (cp = p; *cp != '\0'; cp++) { |
for (cp = p + pos; *cp != '\0'; cp++) { |
switch (*cp) { |
switch (*cp) { |
case '(': |
case '(': |
active = 0; |
active = 0; |
Line 64 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
Line 64 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
break; |
break; |
} |
} |
if (*cp == ';') { |
if (*cp == ';') { |
tbl_option(tbl, ln, p); |
tbl_option(tbl, ln, p, &pos); |
if (*(p = cp + 1) == '\0') |
if (p[pos] == '\0') |
return(ROFF_IGN); |
return(ROFF_IGN); |
} |
} |
} |
} |
Line 74 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
Line 74 tbl_read(struct tbl_node *tbl, int ln, const char *p, |
|
|
|
switch (tbl->part) { |
switch (tbl->part) { |
case TBL_PART_LAYOUT: |
case TBL_PART_LAYOUT: |
tbl_layout(tbl, ln, p); |
tbl_layout(tbl, ln, p, pos); |
return(ROFF_IGN); |
return(ROFF_IGN); |
case TBL_PART_CDATA: |
case TBL_PART_CDATA: |
return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN); |
return(tbl_cdata(tbl, ln, p, pos) ? ROFF_TBL : ROFF_IGN); |
default: |
default: |
break; |
break; |
} |
} |
|
|
tbl_data(tbl, ln, p); |
tbl_data(tbl, ln, p, pos); |
return(ROFF_TBL); |
return(ROFF_TBL); |
} |
} |
|
|
Line 143 tbl_free(struct tbl_node *tbl) |
|
Line 143 tbl_free(struct tbl_node *tbl) |
|
void |
void |
tbl_restart(int line, int pos, struct tbl_node *tbl) |
tbl_restart(int line, int pos, struct tbl_node *tbl) |
{ |
{ |
if (TBL_PART_CDATA == tbl->part) |
if (tbl->part == TBL_PART_CDATA) |
mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse, |
tbl->line, tbl->pos, NULL); |
line, pos, "T&"); |
|
|
tbl->part = TBL_PART_LAYOUT; |
tbl->part = TBL_PART_LAYOUT; |
tbl->line = line; |
tbl->line = line; |
tbl->pos = pos; |
tbl->pos = pos; |
|
|
if (NULL == tbl->first_span || NULL == tbl->first_span->first) |
|
mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, |
|
tbl->line, tbl->pos, NULL); |
|
} |
} |
|
|
const struct tbl_span * |
const struct tbl_span * |
Line 169 tbl_span(struct tbl_node *tbl) |
|
Line 165 tbl_span(struct tbl_node *tbl) |
|
return(span); |
return(span); |
} |
} |
|
|
void |
int |
tbl_end(struct tbl_node **tblp) |
tbl_end(struct tbl_node **tblp) |
{ |
{ |
struct tbl_node *tbl; |
struct tbl_node *tbl; |
Line 178 tbl_end(struct tbl_node **tblp) |
|
Line 174 tbl_end(struct tbl_node **tblp) |
|
tbl = *tblp; |
tbl = *tblp; |
*tblp = NULL; |
*tblp = NULL; |
|
|
|
if (tbl->part == TBL_PART_CDATA) |
|
mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->parse, |
|
tbl->line, tbl->pos, "TE"); |
|
|
sp = tbl->first_span; |
sp = tbl->first_span; |
while (sp != NULL && sp->first == NULL) |
while (sp != NULL && sp->first == NULL) |
sp = sp->next; |
sp = sp->next; |
if (sp == NULL) |
if (sp == NULL) { |
mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse, |
mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->parse, |
tbl->line, tbl->pos, NULL); |
tbl->line, tbl->pos, NULL); |
|
return(0); |
|
} |
|
|
if (tbl->last_span) |
if (tbl->last_span != NULL) |
tbl->last_span->flags |= TBL_SPAN_LAST; |
tbl->last_span->flags |= TBL_SPAN_LAST; |
|
|
if (TBL_PART_CDATA == tbl->part) |
return(1); |
mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse, |
|
tbl->line, tbl->pos, NULL); |
|
} |
} |