version 1.12, 2011/01/07 14:59:52 |
version 1.17, 2011/03/20 16:02:05 |
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
|
tbl->parse, ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
|
|
/* No greater than 4 digits. */ |
/* No greater than 4 digits. */ |
|
|
if (4 == i) { |
if (4 == i) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
*pos += i; |
*pos += i; |
cp->spacing = atoi(buf); |
cp->spacing = (size_t)atoi(buf); |
|
|
goto mod; |
goto mod; |
/* NOTREACHED */ |
/* NOTREACHED */ |
|
|
|
|
/* TODO: GNU has many more extensions. */ |
/* TODO: GNU has many more extensions. */ |
|
|
switch (tolower(p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case ('z'): |
case ('z'): |
cp->flags |= TBL_CELL_WIGN; |
cp->flags |= TBL_CELL_WIGN; |
goto mod; |
goto mod; |
|
|
(*pos)--; |
(*pos)--; |
break; |
break; |
default: |
default: |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
switch (tolower(p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case ('b'): |
case ('b'): |
cp->flags |= TBL_CELL_BOLD; |
cp->flags |= TBL_CELL_BOLD; |
goto mod; |
goto mod; |
|
|
break; |
break; |
} |
} |
|
|
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 185 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 189 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
/* Parse the column position (`r', `R', `|', ...). */ |
/* Parse the column position (`r', `R', `|', ...). */ |
|
|
for (i = 0; i < KEYS_MAX; i++) |
for (i = 0; i < KEYS_MAX; i++) |
if (tolower(p[*pos]) == keys[i].name) |
if (tolower((unsigned char)p[*pos]) == keys[i].name) |
break; |
break; |
|
|
if (KEYS_MAX == i) { |
if (KEYS_MAX == i) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 197 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 202 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
|
|
/* |
/* |
* If a span cell is found first, raise a warning and abort the |
* If a span cell is found first, raise a warning and abort the |
* parse. FIXME: recover from this somehow? |
* parse. If a span cell is found and the last layout element |
|
* isn't a "normal" layout, bail. |
|
* |
|
* FIXME: recover from this somehow? |
*/ |
*/ |
|
|
if (NULL == rp->first && TBL_CELL_SPAN == c) { |
if (TBL_CELL_SPAN == c) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
if (NULL == rp->first) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
|
return(0); |
|
} else if (rp->last) |
|
switch (rp->last->pos) { |
|
case (TBL_CELL_VERT): |
|
case (TBL_CELL_DVERT): |
|
case (TBL_CELL_HORIZ): |
|
case (TBL_CELL_DHORIZ): |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
|
return(0); |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
/* |
|
* If a vertical spanner is found, we may not be in the first |
|
* row. |
|
*/ |
|
|
|
if (TBL_CELL_DOWN == c && rp == tbl->first_row) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 219 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 251 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) && |
if (rp->last && (TBL_CELL_VERT == c || TBL_CELL_DVERT == c) && |
(TBL_CELL_VERT == rp->last->pos || |
(TBL_CELL_VERT == rp->last->pos || |
TBL_CELL_DVERT == rp->last->pos)) { |
TBL_CELL_DVERT == rp->last->pos)) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos - 1); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); |
return(0); |
return(0); |
} |
} |
|
|
|
|
if ('.' == p[*pos]) { |
if ('.' == p[*pos]) { |
tbl->part = TBL_PART_DATA; |
tbl->part = TBL_PART_DATA; |
if (NULL == tbl->first_row) |
if (NULL == tbl->first_row) |
TBL_MSG(tbl, MANDOCERR_TBLNOLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLNOLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
(*pos)++; |
(*pos)++; |
return; |
return; |
} |
} |