version 1.36, 2009/07/17 12:40:48 |
version 1.42, 2009/08/20 13:22:48 |
Line 81 static int hwarn_eq1(POST_ARGS); |
|
Line 81 static int hwarn_eq1(POST_ARGS); |
|
static int hwarn_le1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
|
|
static int post_an(POST_ARGS); |
static int post_an(POST_ARGS); |
static int post_args(POST_ARGS); |
|
static int post_at(POST_ARGS); |
static int post_at(POST_ARGS); |
static int post_bf(POST_ARGS); |
static int post_bf(POST_ARGS); |
static int post_bl(POST_ARGS); |
static int post_bl(POST_ARGS); |
Line 118 static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NUL |
|
Line 117 static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NUL |
|
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bl[] = { bwarn_ge1, post_bl, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_bool[] = { eerr_eq1, ebool, NULL }; |
static v_post posts_ex[] = { eerr_eq0, post_args, NULL }; |
|
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_in[] = { eerr_eq1, NULL }; |
static v_post posts_in[] = { eerr_eq1, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
static v_post posts_it[] = { post_it, NULL }; |
Line 127 static v_post posts_nd[] = { berr_ge1, NULL }; |
|
Line 125 static v_post posts_nd[] = { berr_ge1, NULL }; |
|
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_nm[] = { post_nm, NULL }; |
static v_post posts_notext[] = { eerr_eq0, NULL }; |
static v_post posts_notext[] = { eerr_eq0, NULL }; |
static v_post posts_pf[] = { eerr_eq1, NULL }; |
static v_post posts_pf[] = { eerr_eq1, NULL }; |
static v_post posts_rv[] = { eerr_eq0, post_args, NULL }; |
|
static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sp[] = { post_sp, NULL }; |
static v_post posts_sp[] = { post_sp, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
Line 176 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 173 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ pres_er, posts_text }, /* Er */ |
{ pres_er, posts_text }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_ex, posts_ex }, /* Ex */ |
{ pres_ex, NULL }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ pres_fd, posts_wtext }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
Line 190 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 187 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_wline }, /* Op */ |
{ NULL, posts_wline }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Pa */ |
{ NULL, NULL }, /* Pa */ |
{ pres_rv, posts_rv }, /* Rv */ |
{ pres_rv, NULL }, /* Rv */ |
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_text }, /* Vt */ |
{ NULL, posts_text }, /* Vt */ |
Line 862 post_bf(POST_ARGS) |
|
Line 859 post_bf(POST_ARGS) |
|
return(1); |
return(1); |
else if (0 == strcmp(p, "Li")) |
else if (0 == strcmp(p, "Li")) |
return(1); |
return(1); |
else if (0 == strcmp(p, "Sm")) |
else if (0 == strcmp(p, "Sy")) |
return(1); |
return(1); |
|
|
return(mdoc_nerr(mdoc, head, EFONT)); |
return(mdoc_nerr(mdoc, head, EFONT)); |
Line 912 post_an(POST_ARGS) |
|
Line 909 post_an(POST_ARGS) |
|
if (mdoc->last->args) { |
if (mdoc->last->args) { |
if (NULL == mdoc->last->child) |
if (NULL == mdoc->last->child) |
return(1); |
return(1); |
return(mdoc_nerr(mdoc, mdoc->last, ELINE)); |
return(mdoc_nerr(mdoc, mdoc->last, ENOLINE)); |
} |
} |
|
|
if (mdoc->last->child) |
if (mdoc->last->child) |
Line 922 post_an(POST_ARGS) |
|
Line 919 post_an(POST_ARGS) |
|
|
|
|
|
static int |
static int |
post_args(POST_ARGS) |
|
{ |
|
|
|
if (mdoc->last->args) |
|
return(1); |
|
return(mdoc_nerr(mdoc, mdoc->last, ELINE)); |
|
} |
|
|
|
|
|
static int |
|
post_it(POST_ARGS) |
post_it(POST_ARGS) |
{ |
{ |
int type, i, cols; |
int type, i, cols; |
Line 1028 post_it(POST_ARGS) |
|
Line 1015 post_it(POST_ARGS) |
|
c = mdoc->last->child; |
c = mdoc->last->child; |
for (i = 0; c && MDOC_HEAD == c->type; c = c->next) |
for (i = 0; c && MDOC_HEAD == c->type; c = c->next) |
i++; |
i++; |
if (i == cols) |
|
|
if (i < cols || i == (cols + 1)) { |
|
if ( ! mdoc_vwarn(mdoc, mdoc->last->line, |
|
mdoc->last->pos, "column " |
|
"mismatch: have %d, want %d", |
|
i, cols)) |
|
return(0); |
break; |
break; |
return(mdoc_verr(mdoc, mdoc->last->line, mdoc->last->pos, |
} else if (i == cols) |
"column mismatch (have %d, want %d)", |
break; |
i, cols)); |
|
|
return(mdoc_verr(mdoc, mdoc->last->line, |
|
mdoc->last->pos, "column mismatch: " |
|
"have %d, want %d", i, cols)); |
default: |
default: |
break; |
break; |
} |
} |
Line 1210 post_sh_body(POST_ARGS) |
|
Line 1206 post_sh_body(POST_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
|
assert(n); |
if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok) |
if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok) |
return(1); |
return(1); |
return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC)); |
return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC)); |