version 1.16, 2011/01/11 14:12:01 |
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)--; |
(*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); |
} |
} |
|
|
|
|
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 189 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 193 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
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 205 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 210 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
|
|
if (TBL_CELL_SPAN == c) { |
if (TBL_CELL_SPAN == c) { |
if (NULL == rp->first) { |
if (NULL == rp->first) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
} else if (rp->last) |
} else if (rp->last) |
switch (rp->last->pos) { |
switch (rp->last->pos) { |
Line 213 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 219 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
case (TBL_CELL_DVERT): |
case (TBL_CELL_DVERT): |
case (TBL_CELL_HORIZ): |
case (TBL_CELL_HORIZ): |
case (TBL_CELL_DHORIZ): |
case (TBL_CELL_DHORIZ): |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos, NULL); |
return(0); |
return(0); |
default: |
default: |
break; |
break; |
Line 226 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 233 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
*/ |
*/ |
|
|
if (TBL_CELL_DOWN == c && rp == tbl->first_row) { |
if (TBL_CELL_DOWN == c && rp == tbl->first_row) { |
TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos); |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos, NULL); |
return(0); |
return(0); |
} |
} |
|
|
Line 244 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; |
} |
} |