version 1.229, 2014/07/06 19:09:00 |
version 1.240, 2014/08/01 17:40:34 |
|
|
|
|
static int check_count(struct mdoc *, enum mdoc_type, |
static int check_count(struct mdoc *, enum mdoc_type, |
enum check_lvl, enum check_ineq, int); |
enum check_lvl, enum check_ineq, int); |
static int check_parent(PRE_ARGS, enum mdoct, enum mdoc_type); |
|
static void check_text(struct mdoc *, int, int, char *); |
static void check_text(struct mdoc *, int, int, char *); |
static void check_argv(struct mdoc *, |
static void check_argv(struct mdoc *, |
struct mdoc_node *, struct mdoc_argv *); |
struct mdoc_node *, struct mdoc_argv *); |
Line 100 static int post_dt(POST_ARGS); |
|
Line 99 static int post_dt(POST_ARGS); |
|
static int post_en(POST_ARGS); |
static int post_en(POST_ARGS); |
static int post_es(POST_ARGS); |
static int post_es(POST_ARGS); |
static int post_eoln(POST_ARGS); |
static int post_eoln(POST_ARGS); |
|
static int post_ex(POST_ARGS); |
static int post_hyph(POST_ARGS); |
static int post_hyph(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static int post_it(POST_ARGS); |
static int post_it(POST_ARGS); |
Line 116 static int post_sh(POST_ARGS); |
|
Line 116 static int post_sh(POST_ARGS); |
|
static int post_sh_body(POST_ARGS); |
static int post_sh_body(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
static int post_st(POST_ARGS); |
static int post_st(POST_ARGS); |
static int post_std(POST_ARGS); |
|
static int post_vt(POST_ARGS); |
static int post_vt(POST_ARGS); |
static int pre_an(PRE_ARGS); |
static int pre_an(PRE_ARGS); |
static int pre_bd(PRE_ARGS); |
static int pre_bd(PRE_ARGS); |
Line 124 static int pre_bl(PRE_ARGS); |
|
Line 123 static int pre_bl(PRE_ARGS); |
|
static int pre_dd(PRE_ARGS); |
static int pre_dd(PRE_ARGS); |
static int pre_display(PRE_ARGS); |
static int pre_display(PRE_ARGS); |
static int pre_dt(PRE_ARGS); |
static int pre_dt(PRE_ARGS); |
static int pre_it(PRE_ARGS); |
|
static int pre_literal(PRE_ARGS); |
static int pre_literal(PRE_ARGS); |
static int pre_obsolete(PRE_ARGS); |
static int pre_obsolete(PRE_ARGS); |
static int pre_os(PRE_ARGS); |
static int pre_os(PRE_ARGS); |
static int pre_par(PRE_ARGS); |
static int pre_par(PRE_ARGS); |
static int pre_sh(PRE_ARGS); |
|
static int pre_ss(PRE_ARGS); |
|
static int pre_std(PRE_ARGS); |
static int pre_std(PRE_ARGS); |
|
|
static v_post posts_an[] = { post_an, NULL }; |
static v_post posts_an[] = { post_an, NULL }; |
Line 149 static v_post posts_dl[] = { post_literal, bwarn_ge1, |
|
Line 145 static v_post posts_dl[] = { post_literal, bwarn_ge1, |
|
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_dt[] = { post_dt, post_prol, NULL }; |
static v_post posts_en[] = { post_en, NULL }; |
static v_post posts_en[] = { post_en, NULL }; |
static v_post posts_es[] = { post_es, NULL }; |
static v_post posts_es[] = { post_es, NULL }; |
|
static v_post posts_ex[] = { post_ex, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL }; |
static v_post posts_hyph[] = { post_hyph, NULL }; |
static v_post posts_hyph[] = { post_hyph, NULL }; |
static v_post posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL }; |
static v_post posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL }; |
Line 165 static v_post posts_sh[] = { post_ignpar,hwarn_ge1,po |
|
Line 162 static v_post posts_sh[] = { post_ignpar,hwarn_ge1,po |
|
static v_post posts_sp[] = { post_par, ewarn_le1, NULL }; |
static v_post posts_sp[] = { post_par, ewarn_le1, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL }; |
static v_post posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL }; |
static v_post posts_st[] = { post_st, NULL }; |
static v_post posts_st[] = { post_st, NULL }; |
static v_post posts_std[] = { post_std, NULL }; |
|
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
Line 176 static v_pre pres_d1[] = { pre_display, NULL }; |
|
Line 172 static v_pre pres_d1[] = { pre_display, NULL }; |
|
static v_pre pres_dl[] = { pre_literal, pre_display, NULL }; |
static v_pre pres_dl[] = { pre_literal, pre_display, NULL }; |
static v_pre pres_dd[] = { pre_dd, NULL }; |
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_it[] = { pre_it, pre_par, NULL }; |
static v_pre pres_it[] = { pre_par, NULL }; |
static v_pre pres_obsolete[] = { pre_obsolete, NULL }; |
static v_pre pres_obsolete[] = { pre_obsolete, 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_ss[] = { pre_ss, NULL }; |
|
static v_pre pres_std[] = { pre_std, NULL }; |
static v_pre pres_std[] = { pre_std, NULL }; |
|
|
static const struct valids mdoc_valids[MDOC_MAX] = { |
static const struct valids mdoc_valids[MDOC_MAX] = { |
Line 189 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 183 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ pres_dd, posts_dd }, /* Dd */ |
{ pres_dd, posts_dd }, /* Dd */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pres_os, posts_os }, /* Os */ |
{ pres_os, posts_os }, /* Os */ |
{ pres_sh, posts_sh }, /* Sh */ |
{ NULL, posts_sh }, /* Sh */ |
{ pres_ss, posts_ss }, /* Ss */ |
{ NULL, posts_ss }, /* Ss */ |
{ pres_pp, posts_pp }, /* Pp */ |
{ pres_pp, posts_pp }, /* Pp */ |
{ pres_d1, posts_d1 }, /* D1 */ |
{ pres_d1, posts_d1 }, /* D1 */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pres_dl, posts_dl }, /* Dl */ |
Line 207 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 201 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_std, posts_std }, /* Ex */ |
{ pres_std, posts_ex }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, posts_text }, /* Fd */ |
{ NULL, posts_text }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
Line 221 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 215 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Op */ |
{ NULL, NULL }, /* Op */ |
{ pres_obsolete, NULL }, /* Ot */ |
{ pres_obsolete, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_std, posts_std }, /* Rv */ |
{ pres_std, NULL }, /* Rv */ |
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_vt }, /* Vt */ |
Line 534 check_argv(struct mdoc *mdoc, struct mdoc_node *n, str |
|
Line 528 check_argv(struct mdoc *mdoc, struct mdoc_node *n, str |
|
|
|
for (i = 0; i < (int)v->sz; i++) |
for (i = 0; i < (int)v->sz; i++) |
check_text(mdoc, v->line, v->pos, v->value[i]); |
check_text(mdoc, v->line, v->pos, v->value[i]); |
|
|
/* FIXME: move to post_std(). */ |
|
|
|
if (MDOC_Std == v->arg) |
|
if ( ! (v->sz || mdoc->meta.name)) |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NONAME); |
|
} |
} |
|
|
static void |
static void |
Line 556 check_text(struct mdoc *mdoc, int ln, int pos, char *p |
|
Line 544 check_text(struct mdoc *mdoc, int ln, int pos, char *p |
|
} |
} |
|
|
static int |
static int |
check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t) |
|
{ |
|
|
|
assert(n->parent); |
|
if ((MDOC_ROOT == t || tok == n->parent->tok) && |
|
(t == n->parent->type)) |
|
return(1); |
|
|
|
mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse, |
|
n->line, n->pos, "want parent %s", |
|
MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]); |
|
return(0); |
|
} |
|
|
|
|
|
static int |
|
pre_display(PRE_ARGS) |
pre_display(PRE_ARGS) |
{ |
{ |
struct mdoc_node *node; |
struct mdoc_node *node; |
|
|
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
struct mdoc_argv *argv; |
struct mdoc_argv *argv, *wa; |
int i; |
int i; |
|
enum mdocargt mdoclt; |
enum mdoc_list lt; |
enum mdoc_list lt; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
Line 619 pre_bl(PRE_ARGS) |
|
Line 592 pre_bl(PRE_ARGS) |
|
* ones. If we find no list type, we default to LIST_item. |
* ones. If we find no list type, we default to LIST_item. |
*/ |
*/ |
|
|
|
wa = n->args->argv; |
|
mdoclt = MDOC_ARG_MAX; |
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; |
argv = n->args->argv + i; |
lt = LIST__NONE; |
lt = LIST__NONE; |
Line 666 pre_bl(PRE_ARGS) |
|
Line 641 pre_bl(PRE_ARGS) |
|
n->norm->Bl.comp = 1; |
n->norm->Bl.comp = 1; |
break; |
break; |
case MDOC_Width: |
case MDOC_Width: |
|
wa = argv; |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
mdoc->parse, argv->line, |
Line 699 pre_bl(PRE_ARGS) |
|
Line 675 pre_bl(PRE_ARGS) |
|
} |
} |
if (LIST__NONE == lt) |
if (LIST__NONE == lt) |
continue; |
continue; |
|
mdoclt = argv->arg; |
|
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != n->norm->Bl.type) { |
if (LIST__NONE != n->norm->Bl.type) { |
mandoc_msg(MANDOCERR_BL_REP, |
mandoc_vmsg(MANDOCERR_BL_REP, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
mdoc_argnames[argv->arg]); |
"Bl -%s", mdoc_argnames[argv->arg]); |
continue; |
continue; |
} |
} |
|
|
Line 714 pre_bl(PRE_ARGS) |
|
Line 691 pre_bl(PRE_ARGS) |
|
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, |
mandoc_vmsg(MANDOCERR_BL_LATETYPE, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, "Bl -%s", |
mdoc_argnames[n->args->argv[0].arg]); |
mdoc_argnames[n->args->argv[0].arg]); |
|
|
n->norm->Bl.type = lt; |
n->norm->Bl.type = lt; |
Line 728 pre_bl(PRE_ARGS) |
|
Line 705 pre_bl(PRE_ARGS) |
|
/* 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_BL_NOTYPE); |
mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse, |
|
n->line, n->pos, "Bl"); |
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
Line 742 pre_bl(PRE_ARGS) |
|
Line 720 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_BL_NOWIDTH); |
mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse, |
|
n->line, n->pos, "Bl -tag"); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 754 pre_bl(PRE_ARGS) |
|
Line 733 pre_bl(PRE_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if (n->norm->Bl.width) |
if (n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse, |
|
wa->line, wa->pos, "Bl -%s", |
|
mdoc_argnames[mdoclt]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 802 pre_bd(PRE_ARGS) |
|
Line 783 pre_bd(PRE_ARGS) |
|
|
|
switch (argv->arg) { |
switch (argv->arg) { |
case MDOC_Centred: |
case MDOC_Centred: |
dt = DISP_centred; |
dt = DISP_centered; |
break; |
break; |
case MDOC_Ragged: |
case MDOC_Ragged: |
dt = DISP_ragged; |
dt = DISP_ragged; |
Line 817 pre_bd(PRE_ARGS) |
|
Line 798 pre_bd(PRE_ARGS) |
|
dt = DISP_literal; |
dt = DISP_literal; |
break; |
break; |
case MDOC_File: |
case MDOC_File: |
mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP); |
mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse, |
|
n->line, n->pos, NULL); |
return(0); |
return(0); |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
Line 850 pre_bd(PRE_ARGS) |
|
Line 832 pre_bd(PRE_ARGS) |
|
if (DISP__NONE == n->norm->Bd.type) |
if (DISP__NONE == n->norm->Bd.type) |
n->norm->Bd.type = dt; |
n->norm->Bd.type = dt; |
else |
else |
mandoc_msg(MANDOCERR_BD_REP, |
mandoc_vmsg(MANDOCERR_BD_REP, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
mdoc_argnames[argv->arg]); |
"Bd -%s", mdoc_argnames[argv->arg]); |
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE); |
mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse, |
|
n->line, n->pos, "Bd"); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
Line 864 pre_bd(PRE_ARGS) |
|
Line 847 pre_bd(PRE_ARGS) |
|
} |
} |
|
|
static int |
static int |
pre_ss(PRE_ARGS) |
|
{ |
|
|
|
if (MDOC_BLOCK != n->type) |
|
return(1); |
|
return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY)); |
|
} |
|
|
|
static int |
|
pre_sh(PRE_ARGS) |
|
{ |
|
|
|
if (MDOC_BLOCK != n->type) |
|
return(1); |
|
return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT)); |
|
} |
|
|
|
static int |
|
pre_it(PRE_ARGS) |
|
{ |
|
|
|
if (MDOC_BLOCK != n->type) |
|
return(1); |
|
|
|
return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY)); |
|
} |
|
|
|
static int |
|
pre_an(PRE_ARGS) |
pre_an(PRE_ARGS) |
{ |
{ |
int i; |
struct mdoc_argv *argv; |
|
size_t i; |
|
|
if (NULL == n->args) |
if (n->args == NULL) |
return(1); |
return(1); |
|
|
for (i = 1; i < (int)n->args->argc; i++) |
for (i = 1; i < n->args->argc; i++) { |
mdoc_pmsg(mdoc, n->args->argv[i].line, |
argv = n->args->argv + i; |
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
mandoc_vmsg(MANDOCERR_AN_REP, |
|
mdoc->parse, argv->line, argv->pos, |
|
"An -%s", mdoc_argnames[argv->arg]); |
|
} |
|
|
if (MDOC_Split == n->args->argv[0].arg) |
argv = n->args->argv; |
|
if (argv->arg == MDOC_Split) |
n->norm->An.auth = AUTH_split; |
n->norm->An.auth = AUTH_split; |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
else if (argv->arg == MDOC_Nosplit) |
n->norm->An.auth = AUTH_nosplit; |
n->norm->An.auth = AUTH_nosplit; |
else |
else |
abort(); |
abort(); |
Line 1016 post_bf(POST_ARGS) |
|
Line 976 post_bf(POST_ARGS) |
|
nch = np->child; |
nch = np->child; |
if (NULL == np->parent->args) { |
if (NULL == np->parent->args) { |
if (NULL == nch) { |
if (NULL == nch) { |
mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT); |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
|
np->line, np->pos, "Bf"); |
return(1); |
return(1); |
} |
} |
nch = nch->next; |
nch = nch->next; |
Line 1128 post_nm(POST_ARGS) |
|
Line 1089 post_nm(POST_ARGS) |
|
|
|
mdoc_deroff(&mdoc->meta.name, mdoc->last); |
mdoc_deroff(&mdoc->meta.name, mdoc->last); |
|
|
if (NULL == mdoc->meta.name) { |
if (NULL == mdoc->meta.name) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME); |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mdoc->meta.name = mandoc_strdup("UNKNOWN"); |
mdoc->last->line, mdoc->last->pos, "Nm"); |
} |
|
return(1); |
return(1); |
} |
} |
|
|
Line 1219 post_at(POST_ARGS) |
|
Line 1179 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))) { |
mandoc_msg(MANDOCERR_AT_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
n->line, n->pos, n->string); |
n->line, n->pos, "At %s", 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 1268 post_it(POST_ARGS) |
|
Line 1228 post_it(POST_ARGS) |
|
int i, cols; |
int i, cols; |
enum mdoc_list lt; |
enum mdoc_list lt; |
struct mdoc_node *nbl, *nit, *nch; |
struct mdoc_node *nbl, *nit, *nch; |
enum mandocerr er; |
|
|
|
nit = mdoc->last; |
nit = mdoc->last; |
if (MDOC_BLOCK != nit->type) |
if (MDOC_BLOCK != nit->type) |
Line 1288 post_it(POST_ARGS) |
|
Line 1247 post_it(POST_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_diag: |
case LIST_diag: |
if (NULL == nit->head->child) |
if (NULL == nit->head->child) |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
mandoc_vmsg(MANDOCERR_IT_NOHEAD, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
|
"Bl -%s It", |
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
Line 1300 post_it(POST_ARGS) |
|
Line 1260 post_it(POST_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
if (NULL == nit->body->child) |
if (NULL == nit->body->child) |
mandoc_msg(MANDOCERR_IT_NOBODY, |
mandoc_vmsg(MANDOCERR_IT_NOBODY, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
|
"Bl -%s It", |
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
Line 1319 post_it(POST_ARGS) |
|
Line 1280 post_it(POST_ARGS) |
|
if (MDOC_BODY == nch->type) |
if (MDOC_BODY == nch->type) |
i++; |
i++; |
|
|
if (i < cols) |
if (i < cols || i > cols + 1) |
er = MANDOCERR_ARGCOUNT; |
mandoc_vmsg(MANDOCERR_ARGCOUNT, |
else if (i == cols || i == cols + 1) |
mdoc->parse, nit->line, nit->pos, |
break; |
"columns == %d (have %d)", cols, i); |
else |
break; |
er = MANDOCERR_SYNTARGCOUNT; |
|
|
|
mandoc_vmsg(er, mdoc->parse, nit->line, nit->pos, |
|
"columns == %d (have %d)", cols, i); |
|
return(MANDOCERR_ARGCOUNT == er); |
|
default: |
default: |
abort(); |
abort(); |
} |
} |
|
|
post_bl_head(POST_ARGS) |
post_bl_head(POST_ARGS) |
{ |
{ |
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *np, *nn, *nnp; |
|
struct mdoc_argv *argv; |
int i, j; |
int i, j; |
|
|
if (LIST_column != mdoc->last->norm->Bl.type) |
if (LIST_column != mdoc->last->norm->Bl.type) |
Line 1522 post_bl_head(POST_ARGS) |
|
Line 1479 post_bl_head(POST_ARGS) |
|
return(hwarn_eq0(mdoc)); |
return(hwarn_eq0(mdoc)); |
|
|
/* |
/* |
* Convert old-style lists, where the column width specifiers |
* Append old-style lists, where the column width specifiers |
* trail as macro parameters, to the new-style ("normal-form") |
* trail as macro parameters, to the new-style ("normal-form") |
* lists where they're argument values following -column. |
* lists where they're argument values following -column. |
*/ |
*/ |
|
|
/* First, disallow both types and allow normal-form. */ |
if (mdoc->last->child == NULL) |
|
|
/* |
|
* TODO: technically, we can accept both and just merge the two |
|
* lists, but I'll leave that for another day. |
|
*/ |
|
|
|
if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); |
|
return(0); |
|
} else if (NULL == mdoc->last->child) |
|
return(1); |
return(1); |
|
|
np = mdoc->last->parent; |
np = mdoc->last->parent; |
Line 1548 post_bl_head(POST_ARGS) |
|
Line 1495 post_bl_head(POST_ARGS) |
|
break; |
break; |
|
|
assert(j < (int)np->args->argc); |
assert(j < (int)np->args->argc); |
assert(0 == np->args->argv[j].sz); |
|
|
|
/* |
/* |
* Accommodate for new-style groff column syntax. Shuffle the |
* Accommodate for new-style groff column syntax. Shuffle the |
Line 1556 post_bl_head(POST_ARGS) |
|
Line 1502 post_bl_head(POST_ARGS) |
|
* column field. Then, delete the head children. |
* column field. Then, delete the head children. |
*/ |
*/ |
|
|
np->args->argv[j].sz = (size_t)mdoc->last->nchild; |
argv = np->args->argv + j; |
np->args->argv[j].value = mandoc_reallocarray(NULL, |
i = argv->sz; |
(size_t)mdoc->last->nchild, sizeof(char *)); |
argv->sz += mdoc->last->nchild; |
|
argv->value = mandoc_reallocarray(argv->value, |
|
argv->sz, sizeof(char *)); |
|
|
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.ncols = argv->sz; |
mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; |
mdoc->last->norm->Bl.cols = (void *)argv->value; |
|
|
for (i = 0, nn = mdoc->last->child; nn; i++) { |
for (nn = mdoc->last->child; nn; i++) { |
np->args->argv[j].value[i] = nn->string; |
argv->value[i] = nn->string; |
nn->string = NULL; |
nn->string = NULL; |
nnp = nn; |
nnp = nn; |
nn = nn->next; |
nn = nn->next; |
Line 1691 ebool(struct mdoc *mdoc) |
|
Line 1639 ebool(struct mdoc *mdoc) |
|
static int |
static int |
post_root(POST_ARGS) |
post_root(POST_ARGS) |
{ |
{ |
int ret; |
|
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
ret = 1; |
/* Add missing prologue data. */ |
|
|
/* Check that we have a finished prologue. */ |
|
|
|
if ( ! (MDOC_PBODY & mdoc->flags)) { |
if ( ! (MDOC_PBODY & mdoc->flags)) { |
ret = 0; |
mandoc_msg(MANDOCERR_PROLOG_BAD, mdoc->parse, 0, 0, "EOF"); |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG); |
if (mdoc->meta.date == NULL) |
|
mdoc->meta.date = mdoc->quick ? |
|
mandoc_strdup("") : |
|
mandoc_normdate(mdoc->parse, NULL, 0, 0); |
|
if (mdoc->meta.title == NULL) |
|
mdoc->meta.title = mandoc_strdup("UNKNOWN"); |
|
if (mdoc->meta.vol == NULL) |
|
mdoc->meta.vol = mandoc_strdup("LOCAL"); |
|
if (mdoc->meta.arch == NULL) |
|
mdoc->meta.msec = mandoc_strdup("1"); |
|
if (mdoc->meta.os == NULL) |
|
mdoc->meta.os = mandoc_strdup("UNKNOWN"); |
} |
} |
|
|
n = mdoc->first; |
n = mdoc->first; |
Line 1709 post_root(POST_ARGS) |
|
Line 1665 post_root(POST_ARGS) |
|
/* Check that we begin with a proper `Sh'. */ |
/* Check that we begin with a proper `Sh'. */ |
|
|
if (NULL == n->child) |
if (NULL == n->child) |
mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY); |
mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, |
|
n->line, n->pos, NULL); |
else if (MDOC_Sh != n->child->tok) |
else if (MDOC_Sh != n->child->tok) |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
n->child->line, n->child->pos, |
n->child->line, n->child->pos, |
mdoc_macronames[n->child->tok]); |
mdoc_macronames[n->child->tok]); |
|
|
return(ret); |
return(1); |
} |
} |
|
|
static int |
static int |
Line 1737 post_st(POST_ARGS) |
|
Line 1694 post_st(POST_ARGS) |
|
assert(MDOC_TEXT == nch->type); |
assert(MDOC_TEXT == nch->type); |
|
|
if (NULL == (p = mdoc_a2st(nch->string))) { |
if (NULL == (p = mdoc_a2st(nch->string))) { |
mandoc_msg(MANDOCERR_ST_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
nch->line, nch->pos, nch->string); |
nch->line, nch->pos, "St %s", nch->string); |
mdoc_node_delete(mdoc, n); |
mdoc_node_delete(mdoc, n); |
} else { |
} else { |
free(nch->string); |
free(nch->string); |
Line 1768 post_rs(POST_ARGS) |
|
Line 1725 post_rs(POST_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Make sure only certain types of nodes are allowed within the |
|
* the `Rs' body. Delete offending nodes and raise a warning. |
|
* Do this before re-ordering for the sake of clarity. |
|
*/ |
|
|
|
next = NULL; |
|
for (nn = mdoc->last->child; nn; nn = next) { |
|
for (i = 0; i < RSORD_MAX; i++) |
|
if (nn->tok == rsord[i]) |
|
break; |
|
|
|
if (i < RSORD_MAX) { |
|
if (MDOC__J == rsord[i] || MDOC__B == rsord[i]) |
|
mdoc->last->norm->Rs.quote_T++; |
|
next = nn->next; |
|
continue; |
|
} |
|
|
|
next = nn->next; |
|
mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse, |
|
nn->line, nn->pos, mdoc_macronames[nn->tok]); |
|
mdoc_node_delete(mdoc, nn); |
|
} |
|
|
|
/* |
|
* Nothing to sort if only invalid nodes were found |
|
* inside the `Rs' body. |
|
*/ |
|
|
|
if (NULL == mdoc->last->child) |
|
return(1); |
|
|
|
/* |
|
* The full `Rs' block needs special handling to order the |
* The full `Rs' block needs special handling to order the |
* sub-elements according to `rsord'. Pick through each element |
* sub-elements according to `rsord'. Pick through each element |
* and correctly order it. This is a insertion sort. |
* and correctly order it. This is an insertion sort. |
*/ |
*/ |
|
|
next = NULL; |
next = NULL; |
Line 1813 post_rs(POST_ARGS) |
|
Line 1737 post_rs(POST_ARGS) |
|
if (rsord[i] == nn->tok) |
if (rsord[i] == nn->tok) |
break; |
break; |
|
|
|
if (i == RSORD_MAX) { |
|
mandoc_msg(MANDOCERR_RS_BAD, |
|
mdoc->parse, nn->line, nn->pos, |
|
mdoc_macronames[nn->tok]); |
|
i = -1; |
|
} else if (MDOC__J == nn->tok || MDOC__B == nn->tok) |
|
mdoc->last->norm->Rs.quote_T++; |
|
|
/* |
/* |
* Remove `nn' from the chain. This somewhat |
* Remove `nn' from the chain. This somewhat |
* repeats mdoc_node_unlink(), but since we're |
* repeats mdoc_node_unlink(), but since we're |
Line 1838 post_rs(POST_ARGS) |
|
Line 1770 post_rs(POST_ARGS) |
|
for (j = 0; j < RSORD_MAX; j++) |
for (j = 0; j < RSORD_MAX; j++) |
if (rsord[j] == prev->tok) |
if (rsord[j] == prev->tok) |
break; |
break; |
|
if (j == RSORD_MAX) |
|
j = -1; |
|
|
if (j <= i) |
if (j <= i) |
break; |
break; |
Line 1911 post_ns(POST_ARGS) |
|
Line 1845 post_ns(POST_ARGS) |
|
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (MDOC_LINE & mdoc->last->flags) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP); |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, NULL); |
return(1); |
return(1); |
} |
} |
|
|
Line 1988 post_sh_head(POST_ARGS) |
|
Line 1923 post_sh_head(POST_ARGS) |
|
/* The NAME should be first. */ |
/* The NAME should be first. */ |
|
|
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, secname); |
mdoc->last->line, mdoc->last->pos, |
|
"Sh %s", secname); |
|
|
/* The SYNOPSIS gets special attention in other areas. */ |
/* The SYNOPSIS gets special attention in other areas. */ |
|
|
Line 2032 post_sh_head(POST_ARGS) |
|
Line 1968 post_sh_head(POST_ARGS) |
|
*/ |
*/ |
|
|
if (sec == mdoc->lastnamed) |
if (sec == mdoc->lastnamed) |
mandoc_msg(MANDOCERR_SEC_REP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, secname); |
mdoc->last->line, mdoc->last->pos, |
|
"Sh %s", secname); |
|
|
if (sec < mdoc->lastnamed) |
if (sec < mdoc->lastnamed) |
mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->parse, |
mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, secname); |
mdoc->last->line, mdoc->last->pos, |
|
"Sh %s", secname); |
|
|
/* Mark the last named section. */ |
/* Mark the last named section. */ |
|
|
Line 2071 post_sh_head(POST_ARGS) |
|
Line 2009 post_sh_head(POST_ARGS) |
|
goodsec = "9"; |
goodsec = "9"; |
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->line, mdoc->last->pos, |
"%s for %s only", secname, goodsec); |
"Sh %s for %s only", secname, goodsec); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 2253 post_dt(POST_ARGS) |
|
Line 2191 post_dt(POST_ARGS) |
|
for (p = nn->string; *p; p++) { |
for (p = nn->string; *p; p++) { |
if (toupper((unsigned char)*p) == *p) |
if (toupper((unsigned char)*p) == *p) |
continue; |
continue; |
mandoc_msg(MANDOCERR_TITLE_CASE, |
mandoc_vmsg(MANDOCERR_TITLE_CASE, |
mdoc->parse, nn->line, |
mdoc->parse, nn->line, |
nn->pos + (p - nn->string), |
nn->pos + (p - nn->string), |
nn->string); |
"Dt %s", nn->string); |
break; |
break; |
} |
} |
|
|
Line 2300 post_dt(POST_ARGS) |
|
Line 2238 post_dt(POST_ARGS) |
|
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.vol = mandoc_strdup(cp); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
} else { |
} else { |
mandoc_msg(MANDOCERR_MSEC_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse, |
nn->line, nn->pos, nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
} |
} |
Line 2323 post_dt(POST_ARGS) |
|
Line 2261 post_dt(POST_ARGS) |
|
} else { |
} else { |
cp = mdoc_a2arch(nn->string); |
cp = mdoc_a2arch(nn->string); |
if (NULL == cp) { |
if (NULL == cp) { |
mandoc_msg(MANDOCERR_ARCH_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ARCH_BAD, mdoc->parse, |
nn->line, nn->pos, nn->string); |
nn->line, nn->pos, "Dt ... %s", nn->string); |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
} else |
} else |
Line 2407 post_os(POST_ARGS) |
|
Line 2345 post_os(POST_ARGS) |
|
#else /*!OSNAME */ |
#else /*!OSNAME */ |
if (NULL == defbuf) { |
if (NULL == defbuf) { |
if (-1 == uname(&utsname)) { |
if (-1 == uname(&utsname)) { |
mdoc_nmsg(mdoc, n, MANDOCERR_UNAME); |
mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse, |
|
n->line, n->pos, "Os"); |
defbuf = mandoc_strdup("UNKNOWN"); |
defbuf = mandoc_strdup("UNKNOWN"); |
} else |
} else |
mandoc_asprintf(&defbuf, "%s %s", |
mandoc_asprintf(&defbuf, "%s %s", |
Line 2418 post_os(POST_ARGS) |
|
Line 2357 post_os(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* If no argument is provided, |
|
* fill in the name of the current manual page. |
|
*/ |
static int |
static int |
post_std(POST_ARGS) |
post_ex(POST_ARGS) |
{ |
{ |
struct mdoc_node *nn, *n; |
struct mdoc_node *n; |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
/* |
|
* Macros accepting `-std' as an argument have the name of the |
|
* current document (`Nm') filled in as the argument if it's not |
|
* provided. |
|
*/ |
|
|
|
if (n->child) |
if (n->child) |
return(1); |
return(1); |
|
|
if (NULL == mdoc->meta.name) |
if (mdoc->meta.name == NULL) { |
|
mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse, |
|
n->line, n->pos, "Ex"); |
return(1); |
return(1); |
|
} |
|
|
nn = n; |
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name)) |
if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name)) |
return(0); |
return(0); |
|
|
mdoc->last = nn; |
mdoc->last = n; |
return(1); |
return(1); |
} |
} |
|
|