version 1.219, 2014/07/02 05:52:25 |
version 1.241, 2014/08/01 22:22:11 |
Line 60 typedef int (*v_pre)(PRE_ARGS); |
|
Line 60 typedef int (*v_pre)(PRE_ARGS); |
|
typedef int (*v_post)(POST_ARGS); |
typedef int (*v_post)(POST_ARGS); |
|
|
struct valids { |
struct valids { |
v_pre *pre; |
v_pre pre; |
v_post *post; |
v_post *post; |
}; |
}; |
|
|
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 84 static int ewarn_le1(POST_ARGS); |
|
Line 83 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 101 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 117 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 125 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 }; |
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 150 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 166 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 }; |
static v_pre pres_an[] = { pre_an, NULL }; |
|
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
|
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
|
static v_pre pres_d1[] = { 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_dt[] = { pre_dt, NULL }; |
|
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
|
static v_pre pres_obsolete[] = { pre_obsolete, NULL }; |
|
static v_pre pres_os[] = { pre_os, 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 const struct valids mdoc_valids[MDOC_MAX] = { |
static const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ pres_dd, posts_dd }, /* Dd */ |
{ pre_dd, posts_dd }, /* Dd */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pre_dt, posts_dt }, /* Dt */ |
{ pres_os, posts_os }, /* Os */ |
{ pre_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 */ |
{ pre_par, posts_pp }, /* Pp */ |
{ pres_d1, posts_d1 }, /* D1 */ |
{ pre_display, posts_d1 }, /* D1 */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pre_literal, posts_dl }, /* Dl */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ pre_bd, posts_bd }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ pre_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ pres_it, posts_it }, /* It */ |
{ pre_par, posts_it }, /* It */ |
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ pres_an, posts_an }, /* An */ |
{ pre_an, posts_an }, /* An */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_std, posts_std }, /* Ex */ |
{ pre_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 220 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 201 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nd }, /* Nd */ |
{ NULL, posts_nm }, /* Nm */ |
{ NULL, posts_nm }, /* Nm */ |
{ NULL, NULL }, /* Op */ |
{ NULL, NULL }, /* Op */ |
{ pres_obsolete, NULL }, /* Ot */ |
{ pre_obsolete, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_std, posts_std }, /* Rv */ |
{ pre_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 290 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 271 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ek */ |
{ NULL, NULL }, /* Ek */ |
{ NULL, posts_eoln }, /* Bt */ |
{ NULL, posts_eoln }, /* Bt */ |
{ NULL, NULL }, /* Hf */ |
{ NULL, NULL }, /* Hf */ |
{ pres_obsolete, NULL }, /* Fr */ |
{ pre_obsolete, NULL }, /* Fr */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_lb }, /* Lb */ |
{ pres_pp, posts_pp }, /* Lp */ |
{ pre_par, posts_pp }, /* Lp */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, posts_text }, /* %C */ |
{ NULL, posts_text }, /* %C */ |
{ pres_obsolete, posts_es }, /* Es */ |
{ pre_obsolete, posts_es }, /* Es */ |
{ pres_obsolete, posts_en }, /* En */ |
{ pre_obsolete, posts_en }, /* En */ |
{ NULL, NULL }, /* Dx */ |
{ NULL, NULL }, /* Dx */ |
{ NULL, posts_text }, /* %Q */ |
{ NULL, posts_text }, /* %Q */ |
{ NULL, posts_pp }, /* br */ |
{ NULL, posts_pp }, /* br */ |
Line 360 static const char * const secnames[SEC__MAX] = { |
|
Line 341 static const char * const secnames[SEC__MAX] = { |
|
int |
int |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
v_pre *p; |
v_pre p; |
int line, pos; |
|
char *tp; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case MDOC_TEXT: |
case MDOC_TEXT: |
tp = n->string; |
check_text(mdoc, n->line, n->pos, n->string); |
line = n->line; |
|
pos = n->pos; |
|
check_text(mdoc, line, pos, tp); |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_TBL: |
case MDOC_TBL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 382 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
Line 358 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
} |
} |
|
|
check_args(mdoc, n); |
check_args(mdoc, n); |
|
p = mdoc_valids[n->tok].pre; |
if (NULL == mdoc_valids[n->tok].pre) |
return(*p ? (*p)(mdoc, n) : 1); |
return(1); |
|
for (p = mdoc_valids[n->tok].pre; *p; p++) |
|
if ( ! (*p)(mdoc, n)) |
|
return(0); |
|
return(1); |
|
} |
} |
|
|
int |
int |
Line 515 hwarn_ge1(POST_ARGS) |
|
Line 486 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 541 check_argv(struct mdoc *mdoc, struct mdoc_node *n, str |
|
Line 506 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 558 check_text(struct mdoc *mdoc, int ln, int pos, char *p |
|
Line 517 check_text(struct mdoc *mdoc, int ln, int pos, char *p |
|
return; |
return; |
|
|
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
for (cp = p; NULL != (p = strchr(p, '\t')); p++) |
mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB); |
mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse, |
|
ln, pos + (int)(p - cp), NULL); |
} |
} |
|
|
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; |
Line 591 pre_display(PRE_ARGS) |
|
Line 535 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 545 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, *wa; |
|
int i; |
|
enum mdocargt mdoclt; |
|
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 623 pre_bl(PRE_ARGS) |
|
Line 570 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; |
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 612 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! */ |
wa = argv; |
if (n->args->argv[i].sz) { |
if (0 == argv->sz) { |
width = n->args->argv[i].value[0]; |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
dup = (NULL != n->norm->Bl.width); |
mdoc->parse, argv->line, |
|
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; |
|
mdoclt = argv->arg; |
|
|
/* 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_vmsg(MANDOCERR_BL_REP, |
|
mdoc->parse, n->line, n->pos, |
/* Assign list type. */ |
"Bl -%s", 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_vmsg(MANDOCERR_BL_LATETYPE, |
mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST); |
mdoc->parse, n->line, n->pos, "Bl -%s", |
|
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); |
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 747 pre_bl(PRE_ARGS) |
|
Line 698 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); |
mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse, |
|
n->line, n->pos, "Bl -tag"); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 759 pre_bl(PRE_ARGS) |
|
Line 711 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 777 pre_bl(PRE_ARGS) |
|
Line 731 pre_bl(PRE_ARGS) |
|
break; |
break; |
} |
} |
|
|
return(1); |
return(pre_par(mdoc, n)); |
} |
} |
|
|
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; |
|
|
|
pre_literal(mdoc, n); |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
if (ENDBODY_NOT != n->end) { |
if (ENDBODY_NOT != n->end) { |
assert(n->pending); |
assert(n->pending); |
Line 802 pre_bd(PRE_ARGS) |
|
Line 758 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_centered; |
break; |
break; |
case MDOC_Ragged: |
case MDOC_Ragged: |
dt = DISP_ragged; |
dt = DISP_ragged; |
Line 823 pre_bd(PRE_ARGS) |
|
Line 778 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: |
/* 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_vmsg(MANDOCERR_BD_REP, |
|
mdoc->parse, n->line, n->pos, |
|
"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_DISPTYPE); |
mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse, |
|
n->line, n->pos, "Bd"); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
return(1); |
return(pre_par(mdoc, n)); |
} |
} |
|
|
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 932 pre_std(PRE_ARGS) |
|
Line 861 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 924 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 951 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) { |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE); |
np->line, np->pos, "Bf"); |
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 990 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 1025 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 1054 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 1129 post_nm(POST_ARGS) |
|
Line 1069 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 1220 post_at(POST_ARGS) |
|
Line 1159 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_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
|
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 1267 post_it(POST_ARGS) |
|
Line 1207 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; |
|
|
|
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 1226 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_vmsg(MANDOCERR_IT_NOHEAD, |
|
mdoc->parse, nit->line, nit->pos, |
|
"Bl -%s It", |
|
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 1305 post_it(POST_ARGS) |
|
Line 1239 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_vmsg(MANDOCERR_IT_NOBODY, |
|
mdoc->parse, nit->line, nit->pos, |
|
"Bl -%s It", |
|
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 || 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 |
|
er = MANDOCERR_SYNTARGCOUNT; |
|
|
|
mandoc_vmsg(er, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, |
|
"columns == %d (have %d)", cols, i); |
|
return(MANDOCERR_ARGCOUNT == er); |
|
default: |
|
break; |
break; |
|
default: |
|
abort(); |
} |
} |
|
|
return(1); |
return(1); |
Line 1429 post_bl_block_width(POST_ARGS) |
|
Line 1359 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. */ |
|
|
|
|
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 1530 post_bl_head(POST_ARGS) |
|
Line 1459 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 1556 post_bl_head(POST_ARGS) |
|
Line 1475 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 1564 post_bl_head(POST_ARGS) |
|
Line 1482 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 1611 post_bl(POST_ARGS) |
|
Line 1531 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 1583 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 |
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 1707 post_root(POST_ARGS) |
|
Line 1645 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 |
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_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
mdoc_node_delete(mdoc, mdoc->last); |
nch->line, nch->pos, "St %s", 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 1761 post_rs(POST_ARGS) |
|
Line 1705 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; |
|
mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD); |
|
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 1805 post_rs(POST_ARGS) |
|
Line 1717 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 1830 post_rs(POST_ARGS) |
|
Line 1750 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 1903 post_ns(POST_ARGS) |
|
Line 1825 post_ns(POST_ARGS) |
|
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (MDOC_LINE & mdoc->last->flags) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNNS); |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, NULL); |
return(1); |
return(1); |
} |
} |
|
|
Line 1980 post_sh_head(POST_ARGS) |
|
Line 1903 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 2024 post_sh_head(POST_ARGS) |
|
Line 1948 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 2063 post_sh_head(POST_ARGS) |
|
Line 1989 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; |
|
|
pre_literal(PRE_ARGS) |
pre_literal(PRE_ARGS) |
{ |
{ |
|
|
|
pre_display(mdoc, n); |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
Line 2245 post_dt(POST_ARGS) |
|
Line 2173 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 2292 post_dt(POST_ARGS) |
|
Line 2220 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 2315 post_dt(POST_ARGS) |
|
Line 2243 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 2399 post_os(POST_ARGS) |
|
Line 2327 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 2410 post_os(POST_ARGS) |
|
Line 2339 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); |
} |
} |
|
|