version 1.140, 2010/12/15 23:39:40 |
version 1.144, 2010/12/16 17:14:48 |
Line 170 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 904 pre_an(PRE_ARGS) |
|
Line 904 pre_an(PRE_ARGS) |
|
{ |
{ |
int i; |
int i; |
|
|
|
assert(NULL == n->data.An); |
|
n->data.An = mandoc_calloc(1, sizeof(struct mdoc_an)); |
|
|
if (NULL == n->args) |
if (NULL == n->args) |
return(1); |
return(1); |
|
|
Line 912 pre_an(PRE_ARGS) |
|
Line 915 pre_an(PRE_ARGS) |
|
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
|
|
if (MDOC_Split == n->args->argv[0].arg) |
if (MDOC_Split == n->args->argv[0].arg) |
n->data.An.auth = AUTH_split; |
n->data.An->auth = AUTH_split; |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
n->data.An.auth = AUTH_nosplit; |
n->data.An->auth = AUTH_nosplit; |
else |
else |
abort(); |
abort(); |
|
|
Line 1247 post_an(POST_ARGS) |
|
Line 1250 post_an(POST_ARGS) |
|
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE != np->data.An.auth && np->child) |
if (AUTH__NONE != np->data.An->auth && np->child) |
return(eerr_eq0(mdoc)); |
return(eerr_eq0(mdoc)); |
|
|
/* |
/* |
* FIXME: make this ewarn and make sure that the front-ends |
* FIXME: make this ewarn and make sure that the front-ends |
* don't print the arguments. |
* don't print the arguments. |
*/ |
*/ |
if (AUTH__NONE != np->data.An.auth || np->child) |
if (AUTH__NONE != np->data.An->auth || np->child) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS); |
Line 1564 post_bl(POST_ARGS) |
|
Line 1567 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 1908 pre_par(PRE_ARGS) |
|
Line 1910 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 1916 pre_par(PRE_ARGS) |
|
Line 1920 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); |
|
if (MDOC_It == n->tok && n->parent->data.Bl->comp) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR); |