version 1.135, 2010/12/05 15:37:30 |
version 1.141, 2010/12/16 00:25:35 |
Line 107 static int post_it(POST_ARGS); |
|
Line 107 static int post_it(POST_ARGS); |
|
static int post_lb(POST_ARGS); |
static int post_lb(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_nm(POST_ARGS); |
static int post_os(POST_ARGS); |
static int post_os(POST_ARGS); |
|
static int post_ignpar(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_prol(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_root(POST_ARGS); |
static int post_rs(POST_ARGS); |
static int post_rs(POST_ARGS); |
Line 150 static v_post posts_nm[] = { post_nm, NULL }; |
|
Line 151 static v_post posts_nm[] = { post_nm, NULL }; |
|
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_notext[] = { ewarn_eq0, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_os[] = { post_os, post_prol, NULL }; |
static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL }; |
static v_post posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL }; |
static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sh[] = { post_ignpar, herr_ge1, bwarn_ge1, post_sh, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
static v_post posts_sp[] = { eerr_le1, NULL }; |
static v_post posts_ss[] = { herr_ge1, NULL }; |
static v_post posts_ss[] = { post_ignpar, herr_ge1, bwarn_ge1, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_st[] = { eerr_eq1, post_st, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
static v_post posts_text[] = { eerr_ge1, NULL }; |
Line 169 static v_pre pres_dd[] = { pre_dd, NULL }; |
|
Line 170 static v_pre pres_dd[] = { pre_dd, NULL }; |
|
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
static v_pre pres_er[] = { NULL, NULL }; |
static v_pre pres_fd[] = { NULL, NULL }; |
static v_pre pres_fd[] = { NULL, NULL }; |
static v_pre pres_it[] = { pre_it, NULL }; |
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
Line 210 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 211 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_defaults }, /* Li */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nm }, /* Nm */ |
{ NULL, posts_nm }, /* Nm */ |
{ NULL, posts_wline }, /* Op */ |
{ NULL, NULL }, /* Op */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_std, posts_std }, /* Rv */ |
{ pres_std, posts_std }, /* Rv */ |
Line 231 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 232 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_text }, /* %V */ |
{ NULL, posts_text }, /* %V */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ac */ |
{ NULL, NULL }, /* Ao */ |
{ NULL, NULL }, /* Ao */ |
{ NULL, posts_wline }, /* Aq */ |
{ NULL, NULL }, /* Aq */ |
{ NULL, posts_at }, /* At */ |
{ NULL, posts_at }, /* At */ |
{ NULL, NULL }, /* Bc */ |
{ NULL, NULL }, /* Bc */ |
{ NULL, posts_bf }, /* Bf */ |
{ NULL, posts_bf }, /* Bf */ |
{ NULL, NULL }, /* Bo */ |
{ NULL, NULL }, /* Bo */ |
{ NULL, posts_wline }, /* Bq */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bx */ |
{ NULL, NULL }, /* Bx */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, posts_bool }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Do */ |
{ NULL, NULL }, /* Do */ |
{ NULL, posts_wline }, /* Dq */ |
{ NULL, NULL }, /* Dq */ |
{ NULL, NULL }, /* Ec */ |
{ NULL, NULL }, /* Ec */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Em */ |
{ NULL, NULL }, /* Em */ |
Line 256 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 257 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, posts_text1 }, /* Pf */ |
{ NULL, posts_text1 }, /* Pf */ |
{ NULL, NULL }, /* Po */ |
{ NULL, NULL }, /* Po */ |
{ NULL, posts_wline }, /* Pq */ |
{ NULL, NULL }, /* Pq */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, posts_wline }, /* Ql */ |
{ NULL, NULL }, /* Ql */ |
{ NULL, NULL }, /* Qo */ |
{ NULL, NULL }, /* Qo */ |
{ NULL, posts_wline }, /* Qq */ |
{ NULL, NULL }, /* Qq */ |
{ NULL, NULL }, /* Re */ |
{ NULL, NULL }, /* Re */ |
{ NULL, posts_rs }, /* Rs */ |
{ NULL, posts_rs }, /* Rs */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, posts_wline }, /* Sq */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_bool }, /* Sm */ |
{ NULL, posts_text }, /* Sx */ |
{ NULL, posts_text }, /* Sx */ |
{ NULL, posts_text }, /* Sy */ |
{ NULL, posts_text }, /* Sy */ |
Line 287 const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 288 const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_notext }, /* Lp */ |
{ NULL, posts_notext }, /* Lp */ |
{ NULL, posts_text }, /* Lk */ |
{ NULL, posts_text }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_wline }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, posts_text }, /* %C */ |
{ NULL, posts_text }, /* %C */ |
Line 753 pre_bl(PRE_ARGS) |
|
Line 754 pre_bl(PRE_ARGS) |
|
case (LIST_inset): |
case (LIST_inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (NULL == n->data.Bl->width) |
if (n->data.Bl->width) |
break; |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG); |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 895 pre_it(PRE_ARGS) |
|
Line 895 pre_it(PRE_ARGS) |
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return(1); |
|
|
/* |
|
* FIXME: this can probably be lifted if we make the It into |
|
* something else on-the-fly? |
|
*/ |
|
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
} |
} |
|
|
Line 1449 post_bl_block_tag(POST_ARGS) |
|
Line 1445 post_bl_block_tag(POST_ARGS) |
|
assert(MDOC_BLOCK == nn->type); |
assert(MDOC_BLOCK == nn->type); |
nn = nn->head->child; |
nn = nn->head->child; |
|
|
if (nn == NULL) { |
if (nn == NULL) |
/* No -width for .Bl and first .It is emtpy */ |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
|
break; |
break; |
} |
|
|
|
if (MDOC_TEXT == nn->type) { |
if (MDOC_TEXT == nn->type) { |
sz = strlen(nn->string) + 1; |
sz = strlen(nn->string) + 1; |
Line 1462 post_bl_block_tag(POST_ARGS) |
|
Line 1455 post_bl_block_tag(POST_ARGS) |
|
|
|
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
if (0 != (ssz = mdoc_macro2len(nn->tok))) |
sz = ssz; |
sz = ssz; |
else |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
|
|
|
break; |
break; |
} |
} |
Line 1573 post_bl(POST_ARGS) |
|
Line 1564 post_bl(POST_ARGS) |
|
return(post_bl_block(mdoc)); |
return(post_bl_block(mdoc)); |
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return(1); |
if (NULL == mdoc->last->child) |
|
return(1); |
|
|
|
/* |
|
* We only allow certain children of `Bl'. This is usually on |
|
* `It', but apparently `Sm' occurs here and there, so we let |
|
* that one through, too. |
|
*/ |
|
|
|
/* LINTED */ |
|
for (n = mdoc->last->child; n; n = n->next) { |
for (n = mdoc->last->child; n; n = n->next) { |
if (MDOC_BLOCK == n->type && MDOC_It == n->tok) |
switch (n->tok) { |
|
case (MDOC_It): |
continue; |
continue; |
if (MDOC_Sm == n->tok) |
case (MDOC_Sm): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Pp): |
|
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
continue; |
continue; |
|
default: |
|
break; |
|
} |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD); |
return(0); |
return(0); |
} |
} |
Line 1889 post_sh_head(POST_ARGS) |
|
Line 1879 post_sh_head(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_ignpar(POST_ARGS) |
|
{ |
|
struct mdoc_node *np; |
|
|
|
if (MDOC_BODY != mdoc->last->type) |
|
return(1); |
|
|
|
if (NULL != (np = mdoc->last->child)) |
|
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
|
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, np); |
|
} |
|
|
|
if (NULL != (np = mdoc->last->last)) |
|
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
|
mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR); |
|
mdoc_node_delete(mdoc, np); |
|
} |
|
|
|
return(1); |
|
} |
|
|
|
static int |
pre_par(PRE_ARGS) |
pre_par(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->last) |
if (NULL == mdoc->last) |
return(1); |
return(1); |
|
if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type) |
|
return(1); |
|
|
/* |
/* |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
Line 1902 pre_par(PRE_ARGS) |
|
Line 1917 pre_par(PRE_ARGS) |
|
|
|
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) |
if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok) |
return(1); |
return(1); |
|
|
if (MDOC_Bl == n->tok && n->data.Bl->comp) |
if (MDOC_Bl == n->tok && n->data.Bl->comp) |
return(1); |
return(1); |
if (MDOC_Bd == n->tok && n->data.Bd->comp) |
if (MDOC_Bd == n->tok && n->data.Bd->comp) |
return(1); |
return(1); |
|
if (MDOC_It == n->tok && n->parent->data.Bl->comp) |
|
return(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
Line 2130 post_os(POST_ARGS) |
|
Line 2146 post_os(POST_ARGS) |
|
return(0); |
return(0); |
} |
} |
#else /*!OSNAME */ |
#else /*!OSNAME */ |
if (-1 == uname(&utsname)) |
if (uname(&utsname)) { |
return(mdoc_nmsg(mdoc, n, MANDOCERR_UTSNAME)); |
mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); |
|
mdoc->meta.os = mandoc_strdup("UNKNOWN"); |
|
return(post_prol(mdoc)); |
|
} |
|
|
if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) { |
if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) { |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
return(0); |
return(0); |
} |
} |
if (strlcat(buf, " ", 64) >= BUFSIZ) { |
if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) { |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
mdoc_nmsg(mdoc, n, MANDOCERR_MEM); |
return(0); |
return(0); |
} |
} |