version 1.219, 2014/07/02 05:52:25 |
version 1.228, 2014/07/05 12:34:17 |
Line 84 static int ewarn_le1(POST_ARGS); |
|
Line 84 static int ewarn_le1(POST_ARGS); |
|
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq0(POST_ARGS); |
static int hwarn_eq1(POST_ARGS); |
static int hwarn_eq1(POST_ARGS); |
static int hwarn_ge1(POST_ARGS); |
static int hwarn_ge1(POST_ARGS); |
static int hwarn_le1(POST_ARGS); |
|
|
|
static int post_an(POST_ARGS); |
static int post_an(POST_ARGS); |
static int post_at(POST_ARGS); |
static int post_at(POST_ARGS); |
Line 137 static int pre_std(PRE_ARGS); |
|
Line 136 static int pre_std(PRE_ARGS); |
|
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_at[] = { post_at, post_defaults, NULL }; |
static v_post posts_at[] = { post_at, post_defaults, NULL }; |
static v_post posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bf[] = { hwarn_le1, post_bf, NULL }; |
static v_post posts_bf[] = { post_bf, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL }; |
static v_post posts_bk[] = { hwarn_eq0, bwarn_ge1, 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_bx[] = { post_bx, NULL }; |
static v_post posts_bx[] = { post_bx, NULL }; |
Line 515 hwarn_ge1(POST_ARGS) |
|
Line 514 hwarn_ge1(POST_ARGS) |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0)); |
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0)); |
} |
} |
|
|
static int |
|
hwarn_le1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2)); |
|
} |
|
|
|
static void |
static void |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
Line 591 pre_display(PRE_ARGS) |
|
Line 584 pre_display(PRE_ARGS) |
|
break; |
break; |
|
|
if (node) |
if (node) |
mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP); |
mandoc_vmsg(MANDOCERR_BD_NEST, |
|
mdoc->parse, n->line, n->pos, |
|
"%s in Bd", mdoc_macronames[n->tok]); |
|
|
return(1); |
return(1); |
} |
} |
Line 599 pre_display(PRE_ARGS) |
|
Line 594 pre_display(PRE_ARGS) |
|
static int |
static int |
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
int i, comp, dup; |
|
const char *offs, *width; |
|
enum mdoc_list lt; |
|
struct mdoc_node *np; |
struct mdoc_node *np; |
|
struct mdoc_argv *argv; |
|
int i; |
|
enum mdoc_list lt; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
if (ENDBODY_NOT != n->end) { |
if (ENDBODY_NOT != n->end) { |
Line 624 pre_bl(PRE_ARGS) |
|
Line 619 pre_bl(PRE_ARGS) |
|
*/ |
*/ |
|
|
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
|
argv = n->args->argv + i; |
lt = LIST__NONE; |
lt = LIST__NONE; |
dup = comp = 0; |
switch (argv->arg) { |
width = offs = NULL; |
|
switch (n->args->argv[i].arg) { |
|
/* Set list types. */ |
/* Set list types. */ |
case MDOC_Bullet: |
case MDOC_Bullet: |
lt = LIST_bullet; |
lt = LIST_bullet; |
Line 664 pre_bl(PRE_ARGS) |
|
Line 658 pre_bl(PRE_ARGS) |
|
break; |
break; |
/* Set list arguments. */ |
/* Set list arguments. */ |
case MDOC_Compact: |
case MDOC_Compact: |
dup = n->norm->Bl.comp; |
if (n->norm->Bl.comp) |
comp = 1; |
mandoc_msg(MANDOCERR_ARG_REP, |
|
mdoc->parse, argv->line, |
|
argv->pos, "Bl -compact"); |
|
n->norm->Bl.comp = 1; |
break; |
break; |
case MDOC_Width: |
case MDOC_Width: |
/* NB: this can be empty! */ |
if (0 == argv->sz) { |
if (n->args->argv[i].sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
width = n->args->argv[i].value[0]; |
mdoc->parse, argv->line, |
dup = (NULL != n->norm->Bl.width); |
argv->pos, "Bl -width"); |
|
n->norm->Bl.width = "0n"; |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
if (NULL != n->norm->Bl.width) |
|
mandoc_vmsg(MANDOCERR_ARG_REP, |
|
mdoc->parse, argv->line, |
|
argv->pos, "Bl -width %s", |
|
argv->value[0]); |
|
n->norm->Bl.width = argv->value[0]; |
break; |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
/* NB: this can be empty! */ |
if (0 == argv->sz) { |
if (n->args->argv[i].sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
offs = n->args->argv[i].value[0]; |
mdoc->parse, argv->line, |
dup = (NULL != n->norm->Bl.offs); |
argv->pos, "Bl -offset"); |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
if (NULL != n->norm->Bl.offs) |
|
mandoc_vmsg(MANDOCERR_ARG_REP, |
|
mdoc->parse, argv->line, |
|
argv->pos, "Bl -offset %s", |
|
argv->value[0]); |
|
n->norm->Bl.offs = argv->value[0]; |
break; |
break; |
default: |
default: |
continue; |
continue; |
} |
} |
|
if (LIST__NONE == lt) |
|
continue; |
|
|
/* Check: duplicate auxiliary arguments. */ |
|
|
|
if (dup) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
|
|
|
if (comp && ! dup) |
|
n->norm->Bl.comp = comp; |
|
if (offs && ! dup) |
|
n->norm->Bl.offs = offs; |
|
if (width && ! dup) |
|
n->norm->Bl.width = width; |
|
|
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE) |
if (LIST__NONE != n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP); |
mandoc_msg(MANDOCERR_BL_REP, |
|
mdoc->parse, n->line, n->pos, |
/* Assign list type. */ |
mdoc_argnames[argv->arg]); |
|
continue; |
if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) { |
|
n->norm->Bl.type = lt; |
|
/* Set column information, too. */ |
|
if (LIST_column == lt) { |
|
n->norm->Bl.ncols = |
|
n->args->argv[i].sz; |
|
n->norm->Bl.cols = (void *) |
|
n->args->argv[i].value; |
|
} |
|
} |
} |
|
|
/* The list type should come first. */ |
/* The list type should come first. */ |
|
|
if (n->norm->Bl.type == LIST__NONE) |
if (n->norm->Bl.width || |
if (n->norm->Bl.width || |
n->norm->Bl.offs || |
n->norm->Bl.offs || |
n->norm->Bl.comp) |
n->norm->Bl.comp) |
mandoc_msg(MANDOCERR_BL_LATETYPE, |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
mdoc->parse, n->line, n->pos, |
|
mdoc_argnames[n->args->argv[0].arg]); |
|
|
continue; |
n->norm->Bl.type = lt; |
|
if (LIST_column == lt) { |
|
n->norm->Bl.ncols = argv->sz; |
|
n->norm->Bl.cols = (void *)argv->value; |
|
} |
} |
} |
|
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->norm->Bl.type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE); |
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
Line 747 pre_bl(PRE_ARGS) |
|
Line 741 pre_bl(PRE_ARGS) |
|
switch (n->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case LIST_tag: |
case LIST_tag: |
if (NULL == n->norm->Bl.width) |
if (NULL == n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG); |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOWIDTH); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 783 pre_bl(PRE_ARGS) |
|
Line 777 pre_bl(PRE_ARGS) |
|
static int |
static int |
pre_bd(PRE_ARGS) |
pre_bd(PRE_ARGS) |
{ |
{ |
int i, dup, comp; |
|
enum mdoc_disp dt; |
|
const char *offs; |
|
struct mdoc_node *np; |
struct mdoc_node *np; |
|
struct mdoc_argv *argv; |
|
int i; |
|
enum mdoc_disp dt; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
if (ENDBODY_NOT != n->end) { |
if (ENDBODY_NOT != n->end) { |
Line 802 pre_bd(PRE_ARGS) |
|
Line 796 pre_bd(PRE_ARGS) |
|
} |
} |
|
|
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
|
argv = n->args->argv + i; |
dt = DISP__NONE; |
dt = DISP__NONE; |
dup = comp = 0; |
|
offs = NULL; |
|
|
|
switch (n->args->argv[i].arg) { |
switch (argv->arg) { |
case MDOC_Centred: |
case MDOC_Centred: |
dt = DISP_centred; |
dt = DISP_centred; |
break; |
break; |
Line 826 pre_bd(PRE_ARGS) |
|
Line 819 pre_bd(PRE_ARGS) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP); |
mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP); |
return(0); |
return(0); |
case MDOC_Offset: |
case MDOC_Offset: |
/* NB: this can be empty! */ |
if (0 == argv->sz) { |
if (n->args->argv[i].sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
offs = n->args->argv[i].value[0]; |
mdoc->parse, argv->line, |
dup = (NULL != n->norm->Bd.offs); |
argv->pos, "Bd -offset"); |
break; |
break; |
} |
} |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
if (NULL != n->norm->Bd.offs) |
|
mandoc_vmsg(MANDOCERR_ARG_REP, |
|
mdoc->parse, argv->line, |
|
argv->pos, "Bd -offset %s", |
|
argv->value[0]); |
|
n->norm->Bd.offs = argv->value[0]; |
break; |
break; |
case MDOC_Compact: |
case MDOC_Compact: |
comp = 1; |
if (n->norm->Bd.comp) |
dup = n->norm->Bd.comp; |
mandoc_msg(MANDOCERR_ARG_REP, |
|
mdoc->parse, argv->line, |
|
argv->pos, "Bd -compact"); |
|
n->norm->Bd.comp = 1; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
if (DISP__NONE == dt) |
|
continue; |
|
|
/* Check whether we have duplicates. */ |
if (DISP__NONE == n->norm->Bd.type) |
|
|
if (dup) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP); |
|
|
|
/* Make our auxiliary assignments. */ |
|
|
|
if (offs && ! dup) |
|
n->norm->Bd.offs = offs; |
|
if (comp && ! dup) |
|
n->norm->Bd.comp = comp; |
|
|
|
/* Check whether a type has already been assigned. */ |
|
|
|
if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP); |
|
|
|
/* Make our type assignment. */ |
|
|
|
if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE) |
|
n->norm->Bd.type = dt; |
n->norm->Bd.type = dt; |
|
else |
|
mandoc_msg(MANDOCERR_BD_REP, |
|
mdoc->parse, n->line, n->pos, |
|
mdoc_argnames[argv->arg]); |
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE); |
mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
Line 932 pre_std(PRE_ARGS) |
|
Line 920 pre_std(PRE_ARGS) |
|
if (MDOC_Std == n->args->argv[0].arg) |
if (MDOC_Std == n->args->argv[0].arg) |
return(1); |
return(1); |
|
|
mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV); |
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
return(1); |
} |
} |
|
|
Line 994 pre_dd(PRE_ARGS) |
|
Line 983 pre_dd(PRE_ARGS) |
|
static int |
static int |
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np, *nch; |
enum mdocargt arg; |
enum mdocargt arg; |
|
|
/* |
/* |
Line 1021 post_bf(POST_ARGS) |
|
Line 1010 post_bf(POST_ARGS) |
|
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_BLOCK == np->parent->type); |
assert(MDOC_Bf == np->parent->tok); |
assert(MDOC_Bf == np->parent->tok); |
|
|
/* |
/* Check the number of arguments. */ |
* Cannot have both argument and parameter. |
|
* If neither is specified, let it through with a warning. |
|
*/ |
|
|
|
if (np->parent->args && np->child) { |
nch = np->child; |
mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT); |
if (NULL == np->parent->args) { |
return(0); |
if (NULL == nch) { |
} else if (NULL == np->parent->args && NULL == np->child) { |
mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT); |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
return(1); |
return(1); |
} |
|
nch = nch->next; |
} |
} |
|
if (NULL != nch) |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
|
nch->line, nch->pos, "Bf ... %s", nch->string); |
|
|
/* Extract argument into data. */ |
/* Extract argument into data. */ |
|
|
Line 1058 post_bf(POST_ARGS) |
|
Line 1048 post_bf(POST_ARGS) |
|
else if (0 == strcmp(np->child->string, "Sy")) |
else if (0 == strcmp(np->child->string, "Sy")) |
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
|
np->child->line, np->child->pos, |
|
"Bf %s", np->child->string); |
|
|
return(1); |
return(1); |
} |
} |
Line 1091 post_lb(POST_ARGS) |
|
Line 1083 post_lb(POST_ARGS) |
|
static int |
static int |
post_eoln(POST_ARGS) |
post_eoln(POST_ARGS) |
{ |
{ |
|
const struct mdoc_node *n; |
|
|
if (mdoc->last->child) |
n = mdoc->last; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
if (n->child) |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
mdoc->parse, n->line, n->pos, |
|
"%s %s", mdoc_macronames[n->tok], |
|
n->child->string); |
return(1); |
return(1); |
} |
} |
|
|
Line 1115 post_vt(POST_ARGS) |
|
Line 1112 post_vt(POST_ARGS) |
|
|
|
for (n = mdoc->last->child; n; n = n->next) |
for (n = mdoc->last->child; n; n = n->next) |
if (MDOC_TEXT != n->type) |
if (MDOC_TEXT != n->type) |
mdoc_nmsg(mdoc, n, MANDOCERR_CHILD); |
mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
|
return(1); |
return(1); |
} |
} |
Line 1220 post_at(POST_ARGS) |
|
Line 1218 post_at(POST_ARGS) |
|
|
|
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
if (NULL == (std_att = mdoc_a2att(n->string))) { |
if (NULL == (std_att = mdoc_a2att(n->string))) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT); |
mandoc_msg(MANDOCERR_AT_BAD, mdoc->parse, |
|
n->line, n->pos, n->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
} else |
} else |
att = mandoc_strdup(std_att); |
att = mandoc_strdup(std_att); |
Line 1267 post_it(POST_ARGS) |
|
Line 1266 post_it(POST_ARGS) |
|
{ |
{ |
int i, cols; |
int i, cols; |
enum mdoc_list lt; |
enum mdoc_list lt; |
struct mdoc_node *n, *c; |
struct mdoc_node *nbl, *nit, *nch; |
enum mandocerr er; |
enum mandocerr er; |
|
|
if (MDOC_BLOCK != mdoc->last->type) |
nit = mdoc->last; |
|
if (MDOC_BLOCK != nit->type) |
return(1); |
return(1); |
|
|
n = mdoc->last->parent->parent; |
nbl = nit->parent->parent; |
lt = n->norm->Bl.type; |
lt = nbl->norm->Bl.type; |
|
|
if (LIST__NONE == lt) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE); |
|
return(1); |
|
} |
|
|
|
switch (lt) { |
switch (lt) { |
case LIST_tag: |
case LIST_tag: |
if (mdoc->last->head->child) |
/* FALLTHROUGH */ |
break; |
|
/* FIXME: give this a dummy value. */ |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
|
break; |
|
case LIST_hang: |
case LIST_hang: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_ohang: |
case LIST_ohang: |
Line 1295 post_it(POST_ARGS) |
|
Line 1286 post_it(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_diag: |
case LIST_diag: |
if (NULL == mdoc->last->head->child) |
if (NULL == nit->head->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS); |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
|
mdoc->parse, nit->line, nit->pos, |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1305 post_it(POST_ARGS) |
|
Line 1298 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 (NULL == nit->body->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
mandoc_msg(MANDOCERR_IT_NOBODY, |
|
mdoc->parse, nit->line, nit->pos, |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if (mdoc->last->head->child) |
if (NULL != nit->head->child) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST); |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
mdoc->parse, nit->line, nit->pos, |
|
"It %s", nit->head->child->string); |
break; |
break; |
case LIST_column: |
case LIST_column: |
cols = (int)n->norm->Bl.ncols; |
cols = (int)nbl->norm->Bl.ncols; |
|
|
assert(NULL == mdoc->last->head->child); |
assert(NULL == nit->head->child); |
|
|
if (NULL == mdoc->last->body->child) |
for (i = 0, nch = nit->child; nch; nch = nch->next) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY); |
if (MDOC_BODY == nch->type) |
|
|
for (i = 0, c = mdoc->last->child; c; c = c->next) |
|
if (MDOC_BODY == c->type) |
|
i++; |
i++; |
|
|
if (i < cols) |
if (i < cols) |
Line 1331 post_it(POST_ARGS) |
|
Line 1325 post_it(POST_ARGS) |
|
else |
else |
er = MANDOCERR_SYNTARGCOUNT; |
er = MANDOCERR_SYNTARGCOUNT; |
|
|
mandoc_vmsg(er, mdoc->parse, |
mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos, |
mdoc->last->line, mdoc->last->pos, |
|
"columns == %d (have %d)", cols, i); |
"columns == %d (have %d)", cols, i); |
return(MANDOCERR_ARGCOUNT == er); |
return(MANDOCERR_ARGCOUNT == er); |
default: |
default: |
break; |
abort(); |
} |
} |
|
|
return(1); |
return(1); |
Line 1429 post_bl_block_width(POST_ARGS) |
|
Line 1422 post_bl_block_width(POST_ARGS) |
|
width = 6; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width))) |
return(1); |
return(1); |
else if (0 == (width = macro2len(tok))) { |
else |
mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH); |
width = macro2len(tok); |
return(1); |
|
} |
|
|
|
/* The value already exists: free and reallocate it. */ |
/* The value already exists: free and reallocate it. */ |
|
|
Line 1611 post_bl(POST_ARGS) |
|
Line 1602 post_bl(POST_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD); |
mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse, |
|
nchild->line, nchild->pos, |
|
mdoc_macronames[nchild->tok]); |
|
|
/* |
/* |
* Move the node out of the Bl block. |
* Move the node out of the Bl block. |
Line 1661 post_bl(POST_ARGS) |
|
Line 1654 post_bl(POST_ARGS) |
|
static int |
static int |
ebool(struct mdoc *mdoc) |
ebool(struct mdoc *mdoc) |
{ |
{ |
|
struct mdoc_node *nch; |
|
enum mdoct tok; |
|
|
if (NULL == mdoc->last->child) { |
tok = mdoc->last->tok; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
nch = mdoc->last->child; |
mdoc_node_delete(mdoc, mdoc->last); |
|
|
if (NULL == nch) { |
|
if (MDOC_Sm == tok) |
|
mdoc->flags ^= MDOC_SMOFF; |
return(1); |
return(1); |
} |
} |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1); |
|
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2); |
|
|
if (0 == strcmp(mdoc->last->child->string, "on")) { |
assert(MDOC_TEXT == nch->type); |
if (MDOC_Sm == mdoc->last->tok) |
|
|
if (0 == strcmp(nch->string, "on")) { |
|
if (MDOC_Sm == tok) |
mdoc->flags &= ~MDOC_SMOFF; |
mdoc->flags &= ~MDOC_SMOFF; |
return(1); |
return(1); |
} |
} |
if (0 == strcmp(mdoc->last->child->string, "off")) { |
if (0 == strcmp(nch->string, "off")) { |
if (MDOC_Sm == mdoc->last->tok) |
if (MDOC_Sm == tok) |
mdoc->flags |= MDOC_SMOFF; |
mdoc->flags |= MDOC_SMOFF; |
return(1); |
return(1); |
} |
} |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL); |
mandoc_vmsg(MANDOCERR_SM_BAD, |
return(1); |
mdoc->parse, nch->line, nch->pos, |
|
"%s %s", mdoc_macronames[tok], nch->string); |
|
return(mdoc_node_relink(mdoc, nch)); |
} |
} |
|
|
static int |
static int |
Line 1719 post_root(POST_ARGS) |
|
Line 1720 post_root(POST_ARGS) |
|
static int |
static int |
post_st(POST_ARGS) |
post_st(POST_ARGS) |
{ |
{ |
struct mdoc_node *ch; |
struct mdoc_node *n, *nch; |
const char *p; |
const char *p; |
|
|
if (NULL == (ch = mdoc->last->child)) { |
n = mdoc->last; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY); |
nch = n->child; |
mdoc_node_delete(mdoc, mdoc->last); |
|
|
if (NULL == nch) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
mdoc_node_delete(mdoc, n); |
return(1); |
return(1); |
} |
} |
|
|
assert(MDOC_TEXT == ch->type); |
assert(MDOC_TEXT == nch->type); |
|
|
if (NULL == (p = mdoc_a2st(ch->string))) { |
if (NULL == (p = mdoc_a2st(nch->string))) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD); |
mandoc_msg(MANDOCERR_ST_BAD, mdoc->parse, |
mdoc_node_delete(mdoc, mdoc->last); |
nch->line, nch->pos, nch->string); |
|
mdoc_node_delete(mdoc, n); |
} else { |
} else { |
free(ch->string); |
free(nch->string); |
ch->string = mandoc_strdup(p); |
nch->string = mandoc_strdup(p); |
} |
} |
|
|
return(1); |
return(1); |
Line 1780 post_rs(POST_ARGS) |
|
Line 1786 post_rs(POST_ARGS) |
|
} |
} |
|
|
next = nn->next; |
next = nn->next; |
mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD); |
mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse, |
|
nn->line, nn->pos, mdoc_macronames[nn->tok]); |
mdoc_node_delete(mdoc, nn); |
mdoc_node_delete(mdoc, nn); |
} |
} |
|
|
Line 1903 post_ns(POST_ARGS) |
|
Line 1910 post_ns(POST_ARGS) |
|
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (MDOC_LINE & mdoc->last->flags) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP); |
return(1); |
return(1); |
} |
} |
|
|