version 1.47, 2018/12/14 01:18:26 |
version 1.48, 2018/12/14 05:18:03 |
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, ln, *pos, NULL); |
ln, *pos, NULL); |
|
return; |
return; |
} |
} |
|
|
|
|
cp->flags |= TBL_CELL_ITALIC; |
cp->flags |= TBL_CELL_ITALIC; |
goto mod; |
goto mod; |
case 'm': |
case 'm': |
mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, ln, *pos, "m"); |
ln, *pos, "m"); |
|
goto mod; |
goto mod; |
case 'p': |
case 'p': |
case 'v': |
case 'v': |
|
|
cp->vert++; |
cp->vert++; |
else |
else |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
tbl->parse, ln, *pos - 1, NULL); |
ln, *pos - 1, NULL); |
goto mod; |
goto mod; |
default: |
default: |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR, |
ln, *pos - 1, "%c", p[*pos - 1]); |
ln, *pos - 1, "%c", p[*pos - 1]); |
goto mod; |
goto mod; |
} |
} |
|
|
/* Support only one-character font-names for now. */ |
/* Support only one-character font-names for now. */ |
|
|
if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) { |
if (p[*pos] == '\0' || (p[*pos + 1] != ' ' && p[*pos + 1] != '.')) { |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
mandoc_msg(MANDOCERR_FT_BAD, |
ln, *pos, "TS %s", p + *pos - 1); |
ln, *pos, "TS %s", p + *pos - 1); |
if (p[*pos] != '\0') |
if (p[*pos] != '\0') |
(*pos)++; |
(*pos)++; |
|
|
case 'R': |
case 'R': |
goto mod; |
goto mod; |
default: |
default: |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
mandoc_msg(MANDOCERR_FT_BAD, |
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
goto mod; |
goto mod; |
} |
} |
Line 218 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 216 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
rp->vert++; |
rp->vert++; |
else |
else |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
tbl->parse, ln, *pos, NULL); |
ln, *pos, NULL); |
} |
} |
(*pos)++; |
(*pos)++; |
} |
} |
|
|
break; |
break; |
|
|
if (i == KEYS_MAX) { |
if (i == KEYS_MAX) { |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_CHAR, |
ln, *pos, "%c", p[*pos]); |
ln, *pos, "%c", p[*pos]); |
(*pos)++; |
(*pos)++; |
goto again; |
goto again; |
|
|
|
|
if (c == TBL_CELL_SPAN) { |
if (c == TBL_CELL_SPAN) { |
if (rp->last == NULL) |
if (rp->last == NULL) |
mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, |
mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
|
else if (rp->last->pos == TBL_CELL_HORIZ || |
else if (rp->last->pos == TBL_CELL_HORIZ || |
rp->last->pos == TBL_CELL_DHORIZ) |
rp->last->pos == TBL_CELL_DHORIZ) |
c = rp->last->pos; |
c = rp->last->pos; |
} else if (c == TBL_CELL_DOWN && rp == tbl->first_row) |
} else if (c == TBL_CELL_DOWN && rp == tbl->first_row) |
mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, |
mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
|
|
|
(*pos)++; |
(*pos)++; |
|
|
Line 298 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
Line 294 tbl_layout(struct tbl_node *tbl, int ln, const char *p |
|
} |
} |
if (tbl->first_row->first == NULL) { |
if (tbl->first_row->first == NULL) { |
mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, |
mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, |
tbl->parse, ln, pos, NULL); |
ln, pos, NULL); |
cell_alloc(tbl, tbl->first_row, |
cell_alloc(tbl, tbl->first_row, |
TBL_CELL_LEFT); |
TBL_CELL_LEFT); |
if (tbl->opts.lvert < tbl->first_row->vert) |
if (tbl->opts.lvert < tbl->first_row->vert) |