version 1.59, 2010/03/31 07:13:53 |
version 1.65, 2010/04/06 11:52:25 |
Line 133 static v_post posts_text1[] = { eerr_eq1, NULL }; |
|
Line 133 static v_post posts_text1[] = { eerr_eq1, NULL }; |
|
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL }; |
static v_post posts_wtext[] = { ewarn_ge1, NULL }; |
static v_post posts_wtext[] = { ewarn_ge1, NULL }; |
static v_post posts_xr[] = { eerr_ge1, NULL }; |
static v_post posts_xr[] = { ewarn_ge1, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, NULL }; |
static v_pre pres_bd[] = { pre_display, pre_bd, NULL }; |
static v_pre pres_bl[] = { pre_bl, NULL }; |
static v_pre pres_bl[] = { pre_bl, NULL }; |
Line 621 pre_bl(PRE_ARGS) |
|
Line 621 pre_bl(PRE_ARGS) |
|
case (MDOC_Inset): |
case (MDOC_Inset): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Column): |
case (MDOC_Column): |
if (type >= 0) |
/* |
return(mdoc_nerr(mdoc, n, EMULTILIST)); |
* Note that if a duplicate is detected, we |
|
* remove the duplicate instead of passing it |
|
* over. If we don't do this, mdoc_action will |
|
* become confused when it scans over multiple |
|
* types whilst setting its bitmasks. |
|
* |
|
* FIXME: this should occur in mdoc_action.c. |
|
*/ |
|
if (type >= 0) { |
|
if ( ! mdoc_nwarn(mdoc, n, EMULTILIST)) |
|
return(0); |
|
mdoc_argn_free(n->args, pos); |
|
break; |
|
} |
type = n->args->argv[pos].arg; |
type = n->args->argv[pos].arg; |
break; |
break; |
case (MDOC_Compact): |
case (MDOC_Compact): |
Line 1082 post_bl_head(POST_ARGS) |
|
Line 1095 post_bl_head(POST_ARGS) |
|
{ |
{ |
int i; |
int i; |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
|
const struct mdoc_argv *a; |
|
|
n = mdoc->last->parent; |
n = mdoc->last->parent; |
assert(n->args); |
assert(n->args); |
|
|
for (i = 0; i < (int)n->args->argc; i++) |
for (i = 0; i < (int)n->args->argc; i++) { |
if (n->args->argv[i].arg == MDOC_Column) |
a = &n->args->argv[i]; |
break; |
if (a->arg == MDOC_Column) { |
|
if (a->sz && mdoc->last->nchild) |
|
return(mdoc_nerr(mdoc, n, ECOLMIS)); |
|
return(1); |
|
} |
|
} |
|
|
if (i == (int)n->args->argc) |
if (0 == (i = mdoc->last->nchild)) |
return(1); |
return(1); |
|
return(warn_count(mdoc, "==", 0, "line arguments", i)); |
if (n->args->argv[i].sz && mdoc->last->child) |
|
return(mdoc_nerr(mdoc, n, ECOLMIS)); |
|
|
|
return(1); |
|
} |
} |
|
|
|
|
Line 1308 post_sh_head(POST_ARGS) |
|
Line 1323 post_sh_head(POST_ARGS) |
|
* non-CUSTOM has a conventional order to be followed. |
* non-CUSTOM has a conventional order to be followed. |
*/ |
*/ |
|
|
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed && |
return(mdoc_nerr(mdoc, mdoc->last, ESECNAME)); |
! mdoc_nwarn(mdoc, mdoc->last, ESECNAME)) |
|
return(0); |
if (SEC_CUSTOM == sec) |
if (SEC_CUSTOM == sec) |
return(1); |
return(1); |
if (sec == mdoc->lastnamed) |
if (sec == mdoc->lastnamed) |