version 1.106, 2010/07/02 13:12:47 |
version 1.109, 2010/07/04 21:59:30 |
Line 647 pre_bl(PRE_ARGS) |
|
Line 647 pre_bl(PRE_ARGS) |
|
|
|
/* Assign list type. */ |
/* Assign list type. */ |
|
|
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) |
if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) { |
n->data.Bl->type = lt; |
n->data.Bl->type = lt; |
|
/* Set column information, too. */ |
|
if (LIST_column == lt) { |
|
n->data.Bl->ncols = |
|
n->args->argv[i].sz; |
|
n->data.Bl->cols = (const char **) |
|
n->args->argv[i].value; |
|
} |
|
} |
|
|
/* The list type should come first. */ |
/* The list type should come first. */ |
|
|
|
|
pre_an(PRE_ARGS) |
pre_an(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == n->args || 1 == n->args->argc) |
if (NULL == n->args) |
return(1); |
return(1); |
mdoc_vmsg(mdoc, MANDOCERR_SYNTARGCOUNT, |
if (n->args->argc > 1) |
n->line, n->pos, |
if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGCOUNT)) |
"line arguments == 1 (have %d)", |
return(0); |
n->args->argc); |
|
return(0); |
if (MDOC_Split == n->args->argv[0].arg) |
|
n->data.An.auth = AUTH_split; |
|
else if (MDOC_Nosplit == n->args->argv[0].arg) |
|
n->data.An.auth = AUTH_nosplit; |
|
else |
|
abort(); |
|
|
|
return(1); |
} |
} |
|
|
|
|
Line 1076 post_at(POST_ARGS) |
|
Line 1091 post_at(POST_ARGS) |
|
static int |
static int |
post_an(POST_ARGS) |
post_an(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *np; |
|
|
if (mdoc->last->args) { |
np = mdoc->last; |
if (NULL == mdoc->last->child) |
if (AUTH__NONE != np->data.An.auth && np->child) |
return(1); |
return(mdoc_nmsg(mdoc, np, MANDOCERR_ARGCOUNT)); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGCOUNT)); |
if (AUTH__NONE != np->data.An.auth || np->child) |
} |
|
|
|
if (mdoc->last->child) |
|
return(1); |
return(1); |
return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)); |
return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS)); |
} |
} |
|
|
|
|
Line 1127 post_it(POST_ARGS) |
|
Line 1140 post_it(POST_ARGS) |
|
if (NULL == mdoc->last->head->child) |
if (NULL == mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS)) |
return(0); |
return(0); |
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
|
break; |
break; |
case (LIST_bullet): |
case (LIST_bullet): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1138 post_it(POST_ARGS) |
|
Line 1148 post_it(POST_ARGS) |
|
case (LIST_enum): |
case (LIST_enum): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_hyphen): |
case (LIST_hyphen): |
|
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (LIST_item): |
case (LIST_item): |
if (mdoc->last->head->child) |
if (mdoc->last->head->child) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)) |
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST)) |
return(0); |
return(0); |
if (NULL == mdoc->last->body->child) |
|
if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY)) |
|
return(0); |
|
break; |
break; |
case (LIST_column): |
case (LIST_column): |
cols = -1; |
cols = (int)n->data.Bl->ncols; |
for (i = 0; i < (int)n->args->argc; i++) |
|
if (MDOC_Column == n->args->argv[i].arg) { |
|
cols = (int)n->args->argv[i].sz; |
|
break; |
|
} |
|
|
|
assert(-1 != cols); |
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == mdoc->last->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
if (NULL == mdoc->last->body->child) |
Line 1195 post_bl_head(POST_ARGS) |
|
Line 1199 post_bl_head(POST_ARGS) |
|
n = mdoc->last->parent; |
n = mdoc->last->parent; |
|
|
if (LIST_column == n->data.Bl->type) { |
if (LIST_column == n->data.Bl->type) { |
for (i = 0; i < (int)n->args->argc; i++) |
if (n->data.Bl->ncols && mdoc->last->nchild) { |
if (MDOC_Column == n->args->argv[i].arg) |
|
break; |
|
assert(i < (int)n->args->argc); |
|
|
|
if (n->args->argv[i].sz && mdoc->last->nchild) { |
|
mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS); |
mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS); |
return(0); |
return(0); |
} |
} |