version 1.254, 2014/10/30 20:10:02 |
version 1.272, 2015/02/06 01:07:22 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 48 enum check_ineq { |
|
Line 48 enum check_ineq { |
|
CHECK_EQ |
CHECK_EQ |
}; |
}; |
|
|
enum check_lvl { |
typedef void (*v_pre)(PRE_ARGS); |
CHECK_WARN, |
typedef void (*v_post)(POST_ARGS); |
CHECK_ERROR, |
|
}; |
|
|
|
typedef int (*v_pre)(PRE_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 void check_count(struct mdoc *, enum mdoc_type, |
enum check_lvl, enum check_ineq, int); |
enum check_ineq, int); |
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 72 static enum mdoc_sec a2sec(const char *); |
|
Line 67 static enum mdoc_sec a2sec(const char *); |
|
static size_t macro2len(enum mdoct); |
static size_t macro2len(enum mdoct); |
static void rewrite_macro2len(char **); |
static void rewrite_macro2len(char **); |
|
|
static int ebool(POST_ARGS); |
static void bwarn_ge1(POST_ARGS); |
static int berr_ge1(POST_ARGS); |
static void ewarn_eq1(POST_ARGS); |
static int bwarn_ge1(POST_ARGS); |
static void ewarn_ge1(POST_ARGS); |
static int ewarn_eq0(POST_ARGS); |
|
static int ewarn_eq1(POST_ARGS); |
|
static int ewarn_ge1(POST_ARGS); |
|
static int ewarn_le1(POST_ARGS); |
|
static int hwarn_eq0(POST_ARGS); |
|
static int hwarn_eq1(POST_ARGS); |
|
static int hwarn_ge1(POST_ARGS); |
|
|
|
static int post_an(POST_ARGS); |
static void post_an(POST_ARGS); |
static int post_at(POST_ARGS); |
static void post_at(POST_ARGS); |
static int post_bf(POST_ARGS); |
static void post_bf(POST_ARGS); |
static int post_bk(POST_ARGS); |
static void post_bk(POST_ARGS); |
static int post_bl(POST_ARGS); |
static void post_bl(POST_ARGS); |
static int post_bl_block(POST_ARGS); |
static void post_bl_block(POST_ARGS); |
static int post_bl_block_tag(POST_ARGS); |
static void post_bl_block_tag(POST_ARGS); |
static int post_bl_head(POST_ARGS); |
static void post_bl_head(POST_ARGS); |
static int post_bx(POST_ARGS); |
static void post_bx(POST_ARGS); |
static int post_d1(POST_ARGS); |
static void post_d1(POST_ARGS); |
static int post_defaults(POST_ARGS); |
static void post_defaults(POST_ARGS); |
static int post_dd(POST_ARGS); |
static void post_dd(POST_ARGS); |
static int post_dt(POST_ARGS); |
static void post_dt(POST_ARGS); |
static int post_en(POST_ARGS); |
static void post_en(POST_ARGS); |
static int post_es(POST_ARGS); |
static void post_es(POST_ARGS); |
static int post_eoln(POST_ARGS); |
static void post_eoln(POST_ARGS); |
static int post_ex(POST_ARGS); |
static void post_ex(POST_ARGS); |
static int post_fa(POST_ARGS); |
static void post_fa(POST_ARGS); |
static int post_fn(POST_ARGS); |
static void post_fn(POST_ARGS); |
static int post_fname(POST_ARGS); |
static void post_fname(POST_ARGS); |
static int post_fo(POST_ARGS); |
static void post_fo(POST_ARGS); |
static int post_hyph(POST_ARGS); |
static void post_hyph(POST_ARGS); |
static int post_hyphtext(POST_ARGS); |
static void post_hyphtext(POST_ARGS); |
static int post_ignpar(POST_ARGS); |
static void post_ignpar(POST_ARGS); |
static int post_it(POST_ARGS); |
static void post_it(POST_ARGS); |
static int post_lb(POST_ARGS); |
static void post_lb(POST_ARGS); |
static int post_literal(POST_ARGS); |
static void post_literal(POST_ARGS); |
static int post_nd(POST_ARGS); |
static void post_nd(POST_ARGS); |
static int post_nm(POST_ARGS); |
static void post_nm(POST_ARGS); |
static int post_ns(POST_ARGS); |
static void post_ns(POST_ARGS); |
static int post_os(POST_ARGS); |
static void post_os(POST_ARGS); |
static int post_par(POST_ARGS); |
static void post_par(POST_ARGS); |
static int post_root(POST_ARGS); |
static void post_root(POST_ARGS); |
static int post_rs(POST_ARGS); |
static void post_rs(POST_ARGS); |
static int post_sh(POST_ARGS); |
static void post_sh(POST_ARGS); |
static int post_sh_head(POST_ARGS); |
static void post_sh_head(POST_ARGS); |
static int post_sh_name(POST_ARGS); |
static void post_sh_name(POST_ARGS); |
static int post_sh_see_also(POST_ARGS); |
static void post_sh_see_also(POST_ARGS); |
static int post_sh_authors(POST_ARGS); |
static void post_sh_authors(POST_ARGS); |
static int post_st(POST_ARGS); |
static void post_sm(POST_ARGS); |
static int post_vt(POST_ARGS); |
static void post_st(POST_ARGS); |
static int pre_an(PRE_ARGS); |
static void post_vt(POST_ARGS); |
static int pre_bd(PRE_ARGS); |
|
static int pre_bl(PRE_ARGS); |
|
static int pre_dd(PRE_ARGS); |
|
static int pre_display(PRE_ARGS); |
|
static int pre_dt(PRE_ARGS); |
|
static int pre_literal(PRE_ARGS); |
|
static int pre_obsolete(PRE_ARGS); |
|
static int pre_os(PRE_ARGS); |
|
static int pre_par(PRE_ARGS); |
|
static int pre_std(PRE_ARGS); |
|
|
|
|
static void pre_an(PRE_ARGS); |
|
static void pre_bd(PRE_ARGS); |
|
static void pre_bl(PRE_ARGS); |
|
static void pre_dd(PRE_ARGS); |
|
static void pre_display(PRE_ARGS); |
|
static void pre_dt(PRE_ARGS); |
|
static void pre_literal(PRE_ARGS); |
|
static void pre_obsolete(PRE_ARGS); |
|
static void pre_os(PRE_ARGS); |
|
static void pre_par(PRE_ARGS); |
|
static void pre_std(PRE_ARGS); |
|
|
static const struct valids mdoc_valids[MDOC_MAX] = { |
static const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ pre_dd, post_dd }, /* Dd */ |
{ pre_dd, post_dd }, /* Dd */ |
Line 166 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 156 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, post_fn }, /* Fn */ |
{ NULL, post_fn }, /* Fn */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, NULL }, /* Ic */ |
{ NULL, NULL }, /* Ic */ |
{ NULL, ewarn_eq1 }, /* In */ |
{ NULL, NULL }, /* In */ |
{ NULL, post_defaults }, /* Li */ |
{ NULL, post_defaults }, /* Li */ |
{ NULL, post_nd }, /* Nd */ |
{ NULL, post_nd }, /* Nd */ |
{ NULL, post_nm }, /* Nm */ |
{ NULL, post_nm }, /* Nm */ |
Line 177 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 167 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, post_st }, /* St */ |
{ NULL, post_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, post_vt }, /* Vt */ |
{ NULL, post_vt }, /* Vt */ |
{ NULL, ewarn_ge1 }, /* Xr */ |
{ NULL, NULL }, /* Xr */ |
{ NULL, ewarn_ge1 }, /* %A */ |
{ NULL, ewarn_ge1 }, /* %A */ |
{ NULL, post_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, post_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, ewarn_ge1 }, /* %D */ |
{ NULL, ewarn_ge1 }, /* %D */ |
Line 199 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 189 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bq */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, NULL }, /* Bsx */ |
{ NULL, post_bx }, /* Bx */ |
{ NULL, post_bx }, /* Bx */ |
{ NULL, ebool }, /* Db */ |
{ pre_obsolete, NULL }, /* Db */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Dc */ |
{ NULL, NULL }, /* Do */ |
{ NULL, NULL }, /* Do */ |
{ NULL, NULL }, /* Dq */ |
{ NULL, NULL }, /* Dq */ |
Line 209 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 199 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Eo */ |
{ NULL, NULL }, /* Fx */ |
{ NULL, NULL }, /* Fx */ |
{ NULL, NULL }, /* Ms */ |
{ NULL, NULL }, /* Ms */ |
{ NULL, ewarn_eq0 }, /* No */ |
{ NULL, NULL }, /* No */ |
{ NULL, post_ns }, /* Ns */ |
{ NULL, post_ns }, /* Ns */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Nx */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, ewarn_eq1 }, /* Pf */ |
{ NULL, NULL }, /* Pf */ |
{ NULL, NULL }, /* Po */ |
{ NULL, NULL }, /* Po */ |
{ NULL, NULL }, /* Pq */ |
{ NULL, NULL }, /* Pq */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, NULL }, /* Qc */ |
Line 226 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 216 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* Sc */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* So */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, NULL }, /* Sq */ |
{ NULL, ebool }, /* Sm */ |
{ NULL, post_sm }, /* Sm */ |
{ NULL, post_hyph }, /* Sx */ |
{ NULL, post_hyph }, /* Sx */ |
{ NULL, NULL }, /* Sy */ |
{ NULL, NULL }, /* Sy */ |
{ NULL, NULL }, /* Tn */ |
{ NULL, NULL }, /* Tn */ |
Line 308 static const char * const secnames[SEC__MAX] = { |
|
Line 298 static const char * const secnames[SEC__MAX] = { |
|
}; |
}; |
|
|
|
|
int |
void |
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; |
Line 322 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
Line 312 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
case MDOC_EQN: |
case MDOC_EQN: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_ROOT: |
case MDOC_ROOT: |
return(1); |
return; |
default: |
default: |
break; |
break; |
} |
} |
|
|
check_args(mdoc, n); |
check_args(mdoc, n); |
p = mdoc_valids[n->tok].pre; |
p = mdoc_valids[n->tok].pre; |
return(*p ? (*p)(mdoc, n) : 1); |
if (*p) |
|
(*p)(mdoc, n); |
} |
} |
|
|
int |
void |
mdoc_valid_post(struct mdoc *mdoc) |
mdoc_valid_post(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 340 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 331 mdoc_valid_post(struct mdoc *mdoc) |
|
|
|
n = mdoc->last; |
n = mdoc->last; |
if (n->flags & MDOC_VALID) |
if (n->flags & MDOC_VALID) |
return(1); |
return; |
n->flags |= MDOC_VALID; |
n->flags |= MDOC_VALID; |
|
|
switch (n->type) { |
switch (n->type) { |
Line 349 mdoc_valid_post(struct mdoc *mdoc) |
|
Line 340 mdoc_valid_post(struct mdoc *mdoc) |
|
case MDOC_EQN: |
case MDOC_EQN: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_TBL: |
case MDOC_TBL: |
return(1); |
break; |
case MDOC_ROOT: |
case MDOC_ROOT: |
return(post_root(mdoc)); |
post_root(mdoc); |
|
break; |
default: |
default: |
|
|
|
/* |
|
* Closing delimiters are not special at the |
|
* beginning of a block, opening delimiters |
|
* are not special at the end. |
|
*/ |
|
|
|
if (n->child != NULL) |
|
n->child->flags &= ~MDOC_DELIMC; |
|
if (n->last != NULL) |
|
n->last->flags &= ~MDOC_DELIMO; |
|
|
|
/* Call the macro's postprocessor. */ |
|
|
p = mdoc_valids[n->tok].post; |
p = mdoc_valids[n->tok].post; |
return(*p ? (*p)(mdoc) : 1); |
if (*p) |
|
(*p)(mdoc); |
|
break; |
} |
} |
} |
} |
|
|
static int |
static void |
check_count(struct mdoc *mdoc, enum mdoc_type type, |
check_count(struct mdoc *mdoc, enum mdoc_type type, |
enum check_lvl lvl, enum check_ineq ineq, int val) |
enum check_ineq ineq, int val) |
{ |
{ |
const char *p; |
const char *p; |
enum mandocerr t; |
|
|
|
if (mdoc->last->type != type) |
if (mdoc->last->type != type) |
return(1); |
return; |
|
|
switch (ineq) { |
switch (ineq) { |
case CHECK_LT: |
case CHECK_LT: |
p = "less than "; |
p = "less than "; |
if (mdoc->last->nchild < val) |
if (mdoc->last->nchild < val) |
return(1); |
return; |
break; |
break; |
case CHECK_GT: |
case CHECK_GT: |
p = "more than "; |
p = "more than "; |
if (mdoc->last->nchild > val) |
if (mdoc->last->nchild > val) |
return(1); |
return; |
break; |
break; |
case CHECK_EQ: |
case CHECK_EQ: |
p = ""; |
p = ""; |
if (val == mdoc->last->nchild) |
if (val == mdoc->last->nchild) |
return(1); |
return; |
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT; |
mandoc_vmsg(MANDOCERR_ARGCWARN, mdoc->parse, mdoc->last->line, |
mandoc_vmsg(t, mdoc->parse, mdoc->last->line, |
|
mdoc->last->pos, "want %s%d children (have %d)", |
mdoc->last->pos, "want %s%d children (have %d)", |
p, val, mdoc->last->nchild); |
p, val, mdoc->last->nchild); |
return(1); |
|
} |
} |
|
|
static int |
static void |
berr_ge1(POST_ARGS) |
|
{ |
|
|
|
return(check_count(mdoc, MDOC_BODY, CHECK_ERROR, CHECK_GT, 0)); |
|
} |
|
|
|
static int |
|
bwarn_ge1(POST_ARGS) |
bwarn_ge1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0)); |
check_count(mdoc, MDOC_BODY, CHECK_GT, 0); |
} |
} |
|
|
static int |
static void |
ewarn_eq0(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0)); |
|
} |
|
|
|
static int |
|
ewarn_eq1(POST_ARGS) |
ewarn_eq1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1)); |
check_count(mdoc, MDOC_ELEM, CHECK_EQ, 1); |
} |
} |
|
|
static int |
static void |
ewarn_ge1(POST_ARGS) |
ewarn_ge1(POST_ARGS) |
{ |
{ |
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0)); |
check_count(mdoc, MDOC_ELEM, CHECK_GT, 0); |
} |
} |
|
|
static int |
|
ewarn_le1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2)); |
|
} |
|
|
|
static int |
|
hwarn_eq0(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0)); |
|
} |
|
|
|
static int |
|
hwarn_eq1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 1)); |
|
} |
|
|
|
static int |
|
hwarn_ge1(POST_ARGS) |
|
{ |
|
return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0)); |
|
} |
|
|
|
static void |
static void |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
Line 486 check_text(struct mdoc *mdoc, int ln, int pos, char *p |
|
Line 454 check_text(struct mdoc *mdoc, int ln, int pos, char *p |
|
ln, pos + (int)(p - cp), NULL); |
ln, pos + (int)(p - cp), NULL); |
} |
} |
|
|
static int |
static void |
pre_display(PRE_ARGS) |
pre_display(PRE_ARGS) |
{ |
{ |
struct mdoc_node *node; |
struct mdoc_node *node; |
|
|
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK != n->type) |
return(1); |
return; |
|
|
for (node = mdoc->last->parent; node; node = node->parent) |
for (node = mdoc->last->parent; node; node = node->parent) |
if (MDOC_BLOCK == node->type) |
if (MDOC_BLOCK == node->type) |
Line 503 pre_display(PRE_ARGS) |
|
Line 471 pre_display(PRE_ARGS) |
|
mandoc_vmsg(MANDOCERR_BD_NEST, |
mandoc_vmsg(MANDOCERR_BD_NEST, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"%s in Bd", mdoc_macronames[n->tok]); |
"%s in Bd", mdoc_macronames[n->tok]); |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
Line 526 pre_bl(PRE_ARGS) |
|
Line 492 pre_bl(PRE_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_Bl == np->tok); |
assert(MDOC_Bl == np->tok); |
return(1); |
return; |
} |
} |
|
|
/* |
/* |
Line 697 pre_bl(PRE_ARGS) |
|
Line 663 pre_bl(PRE_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
|
pre_par(mdoc, n); |
return(pre_par(mdoc, n)); |
|
} |
} |
|
|
static int |
static void |
pre_bd(PRE_ARGS) |
pre_bd(PRE_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
Line 721 pre_bd(PRE_ARGS) |
|
Line 686 pre_bd(PRE_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_BLOCK == np->type); |
assert(MDOC_Bd == np->tok); |
assert(MDOC_Bd == np->tok); |
return(1); |
return; |
} |
} |
|
|
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
Line 747 pre_bd(PRE_ARGS) |
|
Line 712 pre_bd(PRE_ARGS) |
|
case MDOC_File: |
case MDOC_File: |
mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse, |
mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse, |
n->line, n->pos, NULL); |
n->line, n->pos, NULL); |
return(0); |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
Line 790 pre_bd(PRE_ARGS) |
|
Line 755 pre_bd(PRE_ARGS) |
|
n->line, n->pos, "Bd"); |
n->line, n->pos, "Bd"); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
pre_par(mdoc, n); |
return(pre_par(mdoc, n)); |
|
} |
} |
|
|
static int |
static void |
pre_an(PRE_ARGS) |
pre_an(PRE_ARGS) |
{ |
{ |
struct mdoc_argv *argv; |
struct mdoc_argv *argv; |
size_t i; |
size_t i; |
|
|
if (n->args == NULL) |
if (n->args == NULL) |
return(1); |
return; |
|
|
for (i = 1; i < n->args->argc; i++) { |
for (i = 1; i < n->args->argc; i++) { |
argv = n->args->argv + i; |
argv = n->args->argv + i; |
Line 817 pre_an(PRE_ARGS) |
|
Line 781 pre_an(PRE_ARGS) |
|
n->norm->An.auth = AUTH_nosplit; |
n->norm->An.auth = AUTH_nosplit; |
else |
else |
abort(); |
abort(); |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_std(PRE_ARGS) |
pre_std(PRE_ARGS) |
{ |
{ |
|
|
if (n->args && 1 == n->args->argc) |
if (n->args && 1 == n->args->argc) |
if (MDOC_Std == n->args->argv[0].arg) |
if (MDOC_Std == n->args->argv[0].arg) |
return(1); |
return; |
|
|
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse, |
n->line, n->pos, mdoc_macronames[n->tok]); |
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_obsolete(PRE_ARGS) |
pre_obsolete(PRE_ARGS) |
{ |
{ |
|
|
if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type) |
if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type) |
mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse, |
n->line, n->pos, mdoc_macronames[n->tok]); |
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_dt(PRE_ARGS) |
pre_dt(PRE_ARGS) |
{ |
{ |
|
|
Line 854 pre_dt(PRE_ARGS) |
|
Line 814 pre_dt(PRE_ARGS) |
|
else if (mdoc->meta.os != NULL) |
else if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
n->line, n->pos, "Dt after Os"); |
n->line, n->pos, "Dt after Os"); |
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_os(PRE_ARGS) |
pre_os(PRE_ARGS) |
{ |
{ |
|
|
Line 867 pre_os(PRE_ARGS) |
|
Line 826 pre_os(PRE_ARGS) |
|
else if (mdoc->flags & MDOC_PBODY) |
else if (mdoc->flags & MDOC_PBODY) |
mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse, |
n->line, n->pos, "Os"); |
n->line, n->pos, "Os"); |
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_dd(PRE_ARGS) |
pre_dd(PRE_ARGS) |
{ |
{ |
|
|
Line 886 pre_dd(PRE_ARGS) |
|
Line 844 pre_dd(PRE_ARGS) |
|
else if (mdoc->meta.os != NULL) |
else if (mdoc->meta.os != NULL) |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
n->line, n->pos, "Dd after Os"); |
n->line, n->pos, "Dd after Os"); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_bf(POST_ARGS) |
post_bf(POST_ARGS) |
{ |
{ |
struct mdoc_node *np, *nch; |
struct mdoc_node *np, *nch; |
Line 912 post_bf(POST_ARGS) |
|
Line 869 post_bf(POST_ARGS) |
|
assert(np); |
assert(np); |
assert(MDOC_HEAD == np->type); |
assert(MDOC_HEAD == np->type); |
assert(MDOC_Bf == np->tok); |
assert(MDOC_Bf == np->tok); |
return(1); |
return; |
} |
} |
|
|
np = mdoc->last; |
np = mdoc->last; |
Line 926 post_bf(POST_ARGS) |
|
Line 883 post_bf(POST_ARGS) |
|
if (NULL == nch) { |
if (NULL == nch) { |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
np->line, np->pos, "Bf"); |
np->line, np->pos, "Bf"); |
return(1); |
return; |
} |
} |
nch = nch->next; |
nch = nch->next; |
} |
} |
Line 946 post_bf(POST_ARGS) |
|
Line 903 post_bf(POST_ARGS) |
|
np->norm->Bf.font = FONT_Sy; |
np->norm->Bf.font = FONT_Sy; |
else |
else |
abort(); |
abort(); |
return(1); |
return; |
} |
} |
|
|
/* Extract parameter into data. */ |
/* Extract parameter into data. */ |
Line 961 post_bf(POST_ARGS) |
|
Line 918 post_bf(POST_ARGS) |
|
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse, |
np->child->line, np->child->pos, |
np->child->line, np->child->pos, |
"Bf %s", np->child->string); |
"Bf %s", np->child->string); |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_lb(POST_ARGS) |
post_lb(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
const char *stdlibname; |
const char *stdlibname; |
char *libname; |
char *libname; |
|
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1); |
check_count(mdoc, MDOC_ELEM, CHECK_EQ, 1); |
|
|
n = mdoc->last->child; |
n = mdoc->last->child; |
|
|
assert(n); |
|
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
|
|
if (NULL == (stdlibname = mdoc_a2lib(n->string))) |
if (NULL == (stdlibname = mdoc_a2lib(n->string))) |
Line 987 post_lb(POST_ARGS) |
|
Line 939 post_lb(POST_ARGS) |
|
|
|
free(n->string); |
free(n->string); |
n->string = libname; |
n->string = libname; |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_eoln(POST_ARGS) |
post_eoln(POST_ARGS) |
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
Line 1001 post_eoln(POST_ARGS) |
|
Line 952 post_eoln(POST_ARGS) |
|
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
"%s %s", mdoc_macronames[n->tok], |
"%s %s", mdoc_macronames[n->tok], |
n->child->string); |
n->child->string); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_fname(POST_ARGS) |
post_fname(POST_ARGS) |
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
Line 1017 post_fname(POST_ARGS) |
|
Line 967 post_fname(POST_ARGS) |
|
if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*'))) |
if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*'))) |
mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse, |
mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse, |
n->line, n->pos + pos, n->string); |
n->line, n->pos + pos, n->string); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_fn(POST_ARGS) |
post_fn(POST_ARGS) |
{ |
{ |
|
|
post_fname(mdoc); |
post_fname(mdoc); |
post_fa(mdoc); |
post_fa(mdoc); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_fo(POST_ARGS) |
post_fo(POST_ARGS) |
{ |
{ |
|
|
hwarn_eq1(mdoc); |
check_count(mdoc, MDOC_HEAD, CHECK_EQ, 1); |
bwarn_ge1(mdoc); |
bwarn_ge1(mdoc); |
if (mdoc->last->type == MDOC_HEAD && mdoc->last->nchild) |
if (mdoc->last->type == MDOC_HEAD && mdoc->last->nchild) |
post_fname(mdoc); |
post_fname(mdoc); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_fa(POST_ARGS) |
post_fa(POST_ARGS) |
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
Line 1059 post_fa(POST_ARGS) |
|
Line 1006 post_fa(POST_ARGS) |
|
break; |
break; |
} |
} |
} |
} |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_vt(POST_ARGS) |
post_vt(POST_ARGS) |
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
Line 1076 post_vt(POST_ARGS) |
|
Line 1022 post_vt(POST_ARGS) |
|
*/ |
*/ |
|
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return; |
|
|
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) |
mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse, |
mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse, |
n->line, n->pos, mdoc_macronames[n->tok]); |
n->line, n->pos, mdoc_macronames[n->tok]); |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_nm(POST_ARGS) |
post_nm(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
|
n = mdoc->last; |
|
|
|
if (n->last != NULL && |
|
(n->last->tok == MDOC_Pp || |
|
n->last->tok == MDOC_Lp)) |
|
mdoc_node_relink(mdoc, n->last); |
|
|
if (NULL != mdoc->meta.name) |
if (NULL != mdoc->meta.name) |
return(1); |
return; |
|
|
mdoc_deroff(&mdoc->meta.name, mdoc->last); |
mdoc_deroff(&mdoc->meta.name, n); |
|
|
if (NULL == mdoc->meta.name) |
if (NULL == mdoc->meta.name) |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, "Nm"); |
n->line, n->pos, "Nm"); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_nd(POST_ARGS) |
post_nd(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
berr_ge1(mdoc); |
n = mdoc->last; |
return(post_hyph(mdoc)); |
|
|
if (n->type != MDOC_BODY) |
|
return; |
|
|
|
if (n->child == NULL) |
|
mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse, |
|
n->line, n->pos, "Nd"); |
|
|
|
post_hyph(mdoc); |
} |
} |
|
|
static int |
static void |
post_d1(POST_ARGS) |
post_d1(POST_ARGS) |
{ |
{ |
|
|
bwarn_ge1(mdoc); |
bwarn_ge1(mdoc); |
return(post_hyph(mdoc)); |
post_hyph(mdoc); |
} |
} |
|
|
static int |
static void |
post_literal(POST_ARGS) |
post_literal(POST_ARGS) |
{ |
{ |
|
|
if (mdoc->last->tok == MDOC_Bd) |
|
hwarn_eq0(mdoc); |
|
bwarn_ge1(mdoc); |
bwarn_ge1(mdoc); |
|
|
/* |
/* |
Line 1134 post_literal(POST_ARGS) |
|
Line 1092 post_literal(POST_ARGS) |
|
|
|
if (MDOC_BODY == mdoc->last->type) |
if (MDOC_BODY == mdoc->last->type) |
mdoc->flags &= ~MDOC_LITERAL; |
mdoc->flags &= ~MDOC_LITERAL; |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_defaults(POST_ARGS) |
post_defaults(POST_ARGS) |
{ |
{ |
struct mdoc_node *nn; |
struct mdoc_node *nn; |
Line 1150 post_defaults(POST_ARGS) |
|
Line 1106 post_defaults(POST_ARGS) |
|
*/ |
*/ |
|
|
if (mdoc->last->child) |
if (mdoc->last->child) |
return(1); |
return; |
|
|
nn = mdoc->last; |
nn = mdoc->last; |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
|
switch (nn->tok) { |
switch (nn->tok) { |
case MDOC_Ar: |
case MDOC_Ar: |
if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "file")) |
mdoc_word_alloc(mdoc, nn->line, nn->pos, "file"); |
return(0); |
mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."); |
if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "...")) |
|
return(0); |
|
break; |
break; |
case MDOC_Li: |
|
if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "")) |
|
return(0); |
|
break; |
|
case MDOC_Pa: |
case MDOC_Pa: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Mt: |
case MDOC_Mt: |
if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~")) |
mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"); |
return(0); |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
mdoc->last = nn; |
mdoc->last = nn; |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_at(POST_ARGS) |
post_at(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 1191 post_at(POST_ARGS) |
|
Line 1138 post_at(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
if (n->child == NULL) { |
if (n->child == NULL) { |
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX")) |
mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX"); |
return(0); |
|
mdoc->last = n; |
mdoc->last = n; |
return(1); |
return; |
} |
} |
|
|
/* |
/* |
Line 1214 post_at(POST_ARGS) |
|
Line 1160 post_at(POST_ARGS) |
|
|
|
free(n->string); |
free(n->string); |
n->string = att; |
n->string = att; |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_an(POST_ARGS) |
post_an(POST_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np, *nch; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE == np->norm->An.auth) { |
nch = np->child; |
if (0 == np->child) |
if (np->norm->An.auth == AUTH__NONE) { |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0); |
if (nch == NULL) |
} else if (np->child) |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0); |
np->line, np->pos, "An"); |
|
} else if (nch != NULL) |
return(1); |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
|
nch->line, nch->pos, "An ... %s", nch->string); |
} |
} |
|
|
static int |
static void |
post_en(POST_ARGS) |
post_en(POST_ARGS) |
{ |
{ |
|
|
if (MDOC_BLOCK == mdoc->last->type) |
if (MDOC_BLOCK == mdoc->last->type) |
mdoc->last->norm->Es = mdoc->last_es; |
mdoc->last->norm->Es = mdoc->last_es; |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_es(POST_ARGS) |
post_es(POST_ARGS) |
{ |
{ |
|
|
mdoc->last_es = mdoc->last; |
mdoc->last_es = mdoc->last; |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_it(POST_ARGS) |
post_it(POST_ARGS) |
{ |
{ |
int i, cols; |
int i, cols; |
Line 1257 post_it(POST_ARGS) |
|
Line 1201 post_it(POST_ARGS) |
|
struct mdoc_node *nbl, *nit, *nch; |
struct mdoc_node *nbl, *nit, *nch; |
|
|
nit = mdoc->last; |
nit = mdoc->last; |
if (MDOC_BLOCK != nit->type) |
if (nit->type != MDOC_BLOCK) |
return(1); |
return; |
|
|
nbl = nit->parent->parent; |
nbl = nit->parent->parent; |
lt = nbl->norm->Bl.type; |
lt = nbl->norm->Bl.type; |
Line 1273 post_it(POST_ARGS) |
|
Line 1217 post_it(POST_ARGS) |
|
case LIST_inset: |
case LIST_inset: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_diag: |
case LIST_diag: |
if (NULL == nit->head->child) |
if (nit->head->child == NULL) |
mandoc_vmsg(MANDOCERR_IT_NOHEAD, |
mandoc_vmsg(MANDOCERR_IT_NOHEAD, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
"Bl -%s It", |
"Bl -%s It", |
Line 1286 post_it(POST_ARGS) |
|
Line 1230 post_it(POST_ARGS) |
|
case LIST_enum: |
case LIST_enum: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
if (NULL == nit->body->child) |
if (nit->body == NULL || nit->body->child == NULL) |
mandoc_vmsg(MANDOCERR_IT_NOBODY, |
mandoc_vmsg(MANDOCERR_IT_NOBODY, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
"Bl -%s It", |
"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: |
if (NULL != nit->head->child) |
if (nit->head->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
"It %s", nit->head->child->string); |
"It %s", nit->head->child->string); |
Line 1301 post_it(POST_ARGS) |
|
Line 1245 post_it(POST_ARGS) |
|
case LIST_column: |
case LIST_column: |
cols = (int)nbl->norm->Bl.ncols; |
cols = (int)nbl->norm->Bl.ncols; |
|
|
assert(NULL == nit->head->child); |
assert(nit->head->child == NULL); |
|
|
for (i = 0, nch = nit->child; nch; nch = nch->next) |
for (i = 0, nch = nit->child; nch; nch = nch->next) |
if (MDOC_BODY == nch->type) |
if (nch->type == MDOC_BODY) |
i++; |
i++; |
|
|
if (i < cols || i > cols + 1) |
if (i < cols || i > cols + 1) |
Line 1315 post_it(POST_ARGS) |
|
Line 1259 post_it(POST_ARGS) |
|
default: |
default: |
abort(); |
abort(); |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_bl_block(POST_ARGS) |
post_bl_block(POST_ARGS) |
{ |
{ |
struct mdoc_node *n, *ni, *nc; |
struct mdoc_node *n, *ni, *nc; |
Line 1336 post_bl_block(POST_ARGS) |
|
Line 1278 post_bl_block(POST_ARGS) |
|
|
|
if (LIST_tag == n->norm->Bl.type && |
if (LIST_tag == n->norm->Bl.type && |
NULL == n->norm->Bl.width) { |
NULL == n->norm->Bl.width) { |
if ( ! post_bl_block_tag(mdoc)) |
post_bl_block_tag(mdoc); |
return(0); |
|
assert(n->norm->Bl.width); |
assert(n->norm->Bl.width); |
} |
} |
|
|
Line 1361 post_bl_block(POST_ARGS) |
|
Line 1302 post_bl_block(POST_ARGS) |
|
mandoc_msg(MANDOCERR_PAR_MOVE, |
mandoc_msg(MANDOCERR_PAR_MOVE, |
mdoc->parse, nc->line, nc->pos, |
mdoc->parse, nc->line, nc->pos, |
mdoc_macronames[nc->tok]); |
mdoc_macronames[nc->tok]); |
if ( ! mdoc_node_relink(mdoc, nc)) |
mdoc_node_relink(mdoc, nc); |
return(0); |
|
} else if (0 == n->norm->Bl.comp && |
} else if (0 == n->norm->Bl.comp && |
LIST_column != n->norm->Bl.type) { |
LIST_column != n->norm->Bl.type) { |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, |
Line 1375 post_bl_block(POST_ARGS) |
|
Line 1315 post_bl_block(POST_ARGS) |
|
nc = ni->body->last; |
nc = ni->body->last; |
} |
} |
} |
} |
return(1); |
|
} |
} |
|
|
/* |
/* |
Line 1401 rewrite_macro2len(char **arg) |
|
Line 1340 rewrite_macro2len(char **arg) |
|
mandoc_asprintf(arg, "%zun", width); |
mandoc_asprintf(arg, "%zun", width); |
} |
} |
|
|
static int |
static void |
post_bl_block_tag(POST_ARGS) |
post_bl_block_tag(POST_ARGS) |
{ |
{ |
struct mdoc_node *n, *nn; |
struct mdoc_node *n, *nn; |
Line 1464 post_bl_block_tag(POST_ARGS) |
|
Line 1403 post_bl_block_tag(POST_ARGS) |
|
|
|
/* Set our width! */ |
/* Set our width! */ |
n->norm->Bl.width = n->args->argv[i].value[0]; |
n->norm->Bl.width = n->args->argv[i].value[0]; |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_bl_head(POST_ARGS) |
post_bl_head(POST_ARGS) |
{ |
{ |
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *nbl, *nh, *nch, *nnext; |
struct mdoc_argv *argv; |
struct mdoc_argv *argv; |
int i, j; |
int i, j; |
|
|
if (LIST_column != mdoc->last->norm->Bl.type) |
nh = mdoc->last; |
/* FIXME: this should be ERROR class... */ |
|
return(hwarn_eq0(mdoc)); |
|
|
|
|
if (nh->norm->Bl.type != LIST_column) { |
|
if ((nch = nh->child) == NULL) |
|
return; |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
|
nch->line, nch->pos, "Bl ... %s", nch->string); |
|
while (nch != NULL) { |
|
mdoc_node_delete(mdoc, nch); |
|
nch = nh->child; |
|
} |
|
return; |
|
} |
|
|
/* |
/* |
* Append 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. |
*/ |
*/ |
|
|
if (mdoc->last->child == NULL) |
if (nh->child == NULL) |
return(1); |
return; |
|
|
np = mdoc->last->parent; |
nbl = nh->parent; |
assert(np->args); |
for (j = 0; j < (int)nbl->args->argc; j++) |
|
if (nbl->args->argv[j].arg == MDOC_Column) |
for (j = 0; j < (int)np->args->argc; j++) |
|
if (MDOC_Column == np->args->argv[j].arg) |
|
break; |
break; |
|
|
assert(j < (int)np->args->argc); |
assert(j < (int)nbl->args->argc); |
|
|
/* |
/* |
* Accommodate for new-style groff column syntax. Shuffle the |
* Accommodate for new-style groff column syntax. Shuffle the |
Line 1502 post_bl_head(POST_ARGS) |
|
Line 1448 post_bl_head(POST_ARGS) |
|
* column field. Then, delete the head children. |
* column field. Then, delete the head children. |
*/ |
*/ |
|
|
argv = np->args->argv + j; |
argv = nbl->args->argv + j; |
i = argv->sz; |
i = argv->sz; |
argv->sz += mdoc->last->nchild; |
argv->sz += nh->nchild; |
argv->value = mandoc_reallocarray(argv->value, |
argv->value = mandoc_reallocarray(argv->value, |
argv->sz, sizeof(char *)); |
argv->sz, sizeof(char *)); |
|
|
mdoc->last->norm->Bl.ncols = argv->sz; |
nh->norm->Bl.ncols = argv->sz; |
mdoc->last->norm->Bl.cols = (void *)argv->value; |
nh->norm->Bl.cols = (void *)argv->value; |
|
|
for (nn = mdoc->last->child; nn; i++) { |
for (nch = nh->child; nch != NULL; nch = nnext) { |
argv->value[i] = nn->string; |
argv->value[i++] = nch->string; |
nn->string = NULL; |
nch->string = NULL; |
nnp = nn; |
nnext = nch->next; |
nn = nn->next; |
mdoc_node_delete(NULL, nch); |
mdoc_node_delete(NULL, nnp); |
|
} |
} |
|
nh->nchild = 0; |
mdoc->last->nchild = 0; |
nh->child = NULL; |
mdoc->last->child = NULL; |
|
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_bl(POST_ARGS) |
post_bl(POST_ARGS) |
{ |
{ |
struct mdoc_node *nparent, *nprev; /* of the Bl block */ |
struct mdoc_node *nparent, *nprev; /* of the Bl block */ |
Line 1535 post_bl(POST_ARGS) |
|
Line 1477 post_bl(POST_ARGS) |
|
nbody = mdoc->last; |
nbody = mdoc->last; |
switch (nbody->type) { |
switch (nbody->type) { |
case MDOC_BLOCK: |
case MDOC_BLOCK: |
return(post_bl_block(mdoc)); |
post_bl_block(mdoc); |
|
return; |
case MDOC_HEAD: |
case MDOC_HEAD: |
return(post_bl_head(mdoc)); |
post_bl_head(mdoc); |
|
return; |
case MDOC_BODY: |
case MDOC_BODY: |
break; |
break; |
default: |
default: |
return(1); |
return; |
} |
} |
|
|
bwarn_ge1(mdoc); |
bwarn_ge1(mdoc); |
|
|
nchild = nbody->child; |
nchild = nbody->child; |
while (NULL != nchild) { |
while (NULL != nchild) { |
if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) { |
if (nchild->tok == MDOC_It || |
|
(nchild->tok == MDOC_Sm && |
|
nchild->next != NULL && |
|
nchild->next->tok == MDOC_It)) { |
nchild = nchild->next; |
nchild = nchild->next; |
continue; |
continue; |
} |
} |
Line 1598 post_bl(POST_ARGS) |
|
Line 1545 post_bl(POST_ARGS) |
|
|
|
nchild = nnext; |
nchild = nnext; |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_bk(POST_ARGS) |
post_bk(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
hwarn_eq0(mdoc); |
n = mdoc->last; |
bwarn_ge1(mdoc); |
|
return(1); |
if (n->type == MDOC_BLOCK && n->body->child == NULL) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
|
mdoc->parse, n->line, n->pos, "Bk"); |
|
mdoc_node_delete(mdoc, n); |
|
} |
} |
} |
|
|
static int |
static void |
ebool(struct mdoc *mdoc) |
post_sm(struct mdoc *mdoc) |
{ |
{ |
struct mdoc_node *nch; |
struct mdoc_node *nch; |
enum mdoct tok; |
|
|
|
tok = mdoc->last->tok; |
|
nch = mdoc->last->child; |
nch = mdoc->last->child; |
|
|
if (NULL == nch) { |
if (nch == NULL) { |
if (MDOC_Sm == tok) |
mdoc->flags ^= MDOC_SMOFF; |
mdoc->flags ^= MDOC_SMOFF; |
return; |
return(1); |
|
} |
} |
|
|
check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2); |
assert(nch->type == MDOC_TEXT); |
|
|
assert(MDOC_TEXT == nch->type); |
if ( ! strcmp(nch->string, "on")) { |
|
mdoc->flags &= ~MDOC_SMOFF; |
if (0 == strcmp(nch->string, "on")) { |
return; |
if (MDOC_Sm == tok) |
|
mdoc->flags &= ~MDOC_SMOFF; |
|
return(1); |
|
} |
} |
if (0 == strcmp(nch->string, "off")) { |
if ( ! strcmp(nch->string, "off")) { |
if (MDOC_Sm == tok) |
mdoc->flags |= MDOC_SMOFF; |
mdoc->flags |= MDOC_SMOFF; |
return; |
return(1); |
|
} |
} |
|
|
mandoc_vmsg(MANDOCERR_SM_BAD, |
mandoc_vmsg(MANDOCERR_SM_BAD, |
mdoc->parse, nch->line, nch->pos, |
mdoc->parse, nch->line, nch->pos, |
"%s %s", mdoc_macronames[tok], nch->string); |
"%s %s", mdoc_macronames[mdoc->last->tok], nch->string); |
return(mdoc_node_relink(mdoc, nch)); |
mdoc_node_relink(mdoc, nch); |
|
return; |
} |
} |
|
|
static int |
static void |
post_root(POST_ARGS) |
post_root(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 1685 post_root(POST_ARGS) |
|
Line 1629 post_root(POST_ARGS) |
|
else if (n->tok != MDOC_Sh) |
else if (n->tok != MDOC_Sh) |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
n->line, n->pos, mdoc_macronames[n->tok]); |
n->line, n->pos, mdoc_macronames[n->tok]); |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_st(POST_ARGS) |
post_st(POST_ARGS) |
{ |
{ |
struct mdoc_node *n, *nch; |
struct mdoc_node *n, *nch; |
Line 1698 post_st(POST_ARGS) |
|
Line 1640 post_st(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
nch = n->child; |
nch = n->child; |
|
|
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); |
|
} |
|
|
|
assert(MDOC_TEXT == nch->type); |
assert(MDOC_TEXT == nch->type); |
|
|
if (NULL == (p = mdoc_a2st(nch->string))) { |
if (NULL == (p = mdoc_a2st(nch->string))) { |
Line 1715 post_st(POST_ARGS) |
|
Line 1650 post_st(POST_ARGS) |
|
free(nch->string); |
free(nch->string); |
nch->string = mandoc_strdup(p); |
nch->string = mandoc_strdup(p); |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_rs(POST_ARGS) |
post_rs(POST_ARGS) |
{ |
{ |
struct mdoc_node *nn, *next, *prev; |
struct mdoc_node *np, *nch, *next, *prev; |
int i, j; |
int i, j; |
|
|
switch (mdoc->last->type) { |
np = mdoc->last; |
case MDOC_HEAD: |
|
check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0); |
if (np->type != MDOC_BODY) |
return(1); |
return; |
case MDOC_BODY: |
|
if (mdoc->last->child) |
if (np->child == NULL) { |
break; |
mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse, |
check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0); |
np->line, np->pos, "Rs"); |
return(1); |
return; |
default: |
|
return(1); |
|
} |
} |
|
|
/* |
/* |
Line 1745 post_rs(POST_ARGS) |
|
Line 1676 post_rs(POST_ARGS) |
|
*/ |
*/ |
|
|
next = NULL; |
next = NULL; |
for (nn = mdoc->last->child->next; nn; nn = next) { |
for (nch = np->child->next; nch != NULL; nch = next) { |
/* Determine order of `nn'. */ |
/* Determine order number of this child. */ |
for (i = 0; i < RSORD_MAX; i++) |
for (i = 0; i < RSORD_MAX; i++) |
if (rsord[i] == nn->tok) |
if (rsord[i] == nch->tok) |
break; |
break; |
|
|
if (i == RSORD_MAX) { |
if (i == RSORD_MAX) { |
mandoc_msg(MANDOCERR_RS_BAD, |
mandoc_msg(MANDOCERR_RS_BAD, |
mdoc->parse, nn->line, nn->pos, |
mdoc->parse, nch->line, nch->pos, |
mdoc_macronames[nn->tok]); |
mdoc_macronames[nch->tok]); |
i = -1; |
i = -1; |
} else if (MDOC__J == nn->tok || MDOC__B == nn->tok) |
} else if (nch->tok == MDOC__J || nch->tok == MDOC__B) |
mdoc->last->norm->Rs.quote_T++; |
np->norm->Rs.quote_T++; |
|
|
/* |
/* |
* Remove `nn' from the chain. This somewhat |
* Remove this child from the chain. This somewhat |
* repeats mdoc_node_unlink(), but since we're |
* repeats mdoc_node_unlink(), but since we're |
* just re-ordering, there's no need for the |
* just re-ordering, there's no need for the |
* full unlink process. |
* full unlink process. |
*/ |
*/ |
|
|
if (NULL != (next = nn->next)) |
if ((next = nch->next) != NULL) |
next->prev = nn->prev; |
next->prev = nch->prev; |
|
|
if (NULL != (prev = nn->prev)) |
if ((prev = nch->prev) != NULL) |
prev->next = nn->next; |
prev->next = nch->next; |
|
|
nn->prev = nn->next = NULL; |
nch->prev = nch->next = NULL; |
|
|
/* |
/* |
* Scan back until we reach a node that's |
* Scan back until we reach a node that's |
* ordered before `nn'. |
* to be ordered before this child. |
*/ |
*/ |
|
|
for ( ; prev ; prev = prev->prev) { |
for ( ; prev ; prev = prev->prev) { |
Line 1792 post_rs(POST_ARGS) |
|
Line 1723 post_rs(POST_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Set `nn' back into its correct place in front |
* Set this child back into its correct place |
* of the `prev' node. |
* in front of the `prev' node. |
*/ |
*/ |
|
|
nn->prev = prev; |
nch->prev = prev; |
|
|
if (prev) { |
if (prev == NULL) { |
if (prev->next) |
np->child->prev = nch; |
prev->next->prev = nn; |
nch->next = np->child; |
nn->next = prev->next; |
np->child = nch; |
prev->next = nn; |
|
} else { |
} else { |
mdoc->last->child->prev = nn; |
if (prev->next) |
nn->next = mdoc->last->child; |
prev->next->prev = nch; |
mdoc->last->child = nn; |
nch->next = prev->next; |
|
prev->next = nch; |
} |
} |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
/* |
/* |
* For some arguments of some macros, |
* For some arguments of some macros, |
* convert all breakable hyphens into ASCII_HYPH. |
* convert all breakable hyphens into ASCII_HYPH. |
*/ |
*/ |
static int |
static void |
post_hyph(POST_ARGS) |
post_hyph(POST_ARGS) |
{ |
{ |
struct mdoc_node *n, *nch; |
struct mdoc_node *n, *nch; |
Line 1828 post_hyph(POST_ARGS) |
|
Line 1757 post_hyph(POST_ARGS) |
|
case MDOC_HEAD: |
case MDOC_HEAD: |
if (MDOC_Sh == n->tok || MDOC_Ss == n->tok) |
if (MDOC_Sh == n->tok || MDOC_Ss == n->tok) |
break; |
break; |
return(1); |
return; |
case MDOC_BODY: |
case MDOC_BODY: |
if (MDOC_D1 == n->tok || MDOC_Nd == n->tok) |
if (MDOC_D1 == n->tok || MDOC_Nd == n->tok) |
break; |
break; |
return(1); |
return; |
case MDOC_ELEM: |
case MDOC_ELEM: |
break; |
break; |
default: |
default: |
return(1); |
return; |
} |
} |
|
|
for (nch = n->child; nch; nch = nch->next) { |
for (nch = n->child; nch; nch = nch->next) { |
Line 1851 post_hyph(POST_ARGS) |
|
Line 1780 post_hyph(POST_ARGS) |
|
isalpha((unsigned char)cp[1])) |
isalpha((unsigned char)cp[1])) |
*cp = ASCII_HYPH; |
*cp = ASCII_HYPH; |
} |
} |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_hyphtext(POST_ARGS) |
post_hyphtext(POST_ARGS) |
{ |
{ |
|
|
ewarn_ge1(mdoc); |
ewarn_ge1(mdoc); |
return(post_hyph(mdoc)); |
post_hyph(mdoc); |
} |
} |
|
|
static int |
static void |
post_ns(POST_ARGS) |
post_ns(POST_ARGS) |
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (MDOC_LINE & mdoc->last->flags) |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_sh(POST_ARGS) |
post_sh(POST_ARGS) |
{ |
{ |
|
|
Line 1880 post_sh(POST_ARGS) |
|
Line 1807 post_sh(POST_ARGS) |
|
|
|
switch (mdoc->last->type) { |
switch (mdoc->last->type) { |
case MDOC_HEAD: |
case MDOC_HEAD: |
return(post_sh_head(mdoc)); |
post_sh_head(mdoc); |
|
break; |
case MDOC_BODY: |
case MDOC_BODY: |
switch (mdoc->lastsec) { |
switch (mdoc->lastsec) { |
case SEC_NAME: |
case SEC_NAME: |
return(post_sh_name(mdoc)); |
post_sh_name(mdoc); |
|
break; |
case SEC_SEE_ALSO: |
case SEC_SEE_ALSO: |
return(post_sh_see_also(mdoc)); |
post_sh_see_also(mdoc); |
|
break; |
case SEC_AUTHORS: |
case SEC_AUTHORS: |
return(post_sh_authors(mdoc)); |
post_sh_authors(mdoc); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
Line 1896 post_sh(POST_ARGS) |
|
Line 1827 post_sh(POST_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_sh_name(POST_ARGS) |
post_sh_name(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 1914 post_sh_name(POST_ARGS) |
|
Line 1843 post_sh_name(POST_ARGS) |
|
if (NULL == (n = mdoc->last->child)) { |
if (NULL == (n = mdoc->last->child)) { |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, "empty"); |
mdoc->last->line, mdoc->last->pos, "empty"); |
return(1); |
return; |
} |
} |
|
|
for ( ; n && n->next; n = n->next) { |
for ( ; n && n->next; n = n->next) { |
Line 1928 post_sh_name(POST_ARGS) |
|
Line 1857 post_sh_name(POST_ARGS) |
|
|
|
assert(n); |
assert(n); |
if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok) |
if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok) |
return(1); |
return; |
|
|
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
n->line, n->pos, mdoc_macronames[n->tok]); |
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_sh_see_also(POST_ARGS) |
post_sh_see_also(POST_ARGS) |
{ |
{ |
const struct mdoc_node *n; |
const struct mdoc_node *n; |
Line 1987 post_sh_see_also(POST_ARGS) |
|
Line 1915 post_sh_see_also(POST_ARGS) |
|
break; |
break; |
for (name = n->string; *name != '\0'; name++) |
for (name = n->string; *name != '\0'; name++) |
if (isalpha((const unsigned char)*name)) |
if (isalpha((const unsigned char)*name)) |
return(1); |
return; |
lastpunct = n->string; |
lastpunct = n->string; |
if (n->next == NULL) |
if (n->next == NULL) |
mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse, |
mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse, |
Line 1995 post_sh_see_also(POST_ARGS) |
|
Line 1923 post_sh_see_also(POST_ARGS) |
|
lastpunct, lastname, lastsec); |
lastpunct, lastname, lastsec); |
n = n->next; |
n = n->next; |
} |
} |
return(1); |
|
} |
} |
|
|
static int |
static int |
Line 2008 child_an(const struct mdoc_node *n) |
|
Line 1935 child_an(const struct mdoc_node *n) |
|
return(0); |
return(0); |
} |
} |
|
|
static int |
static void |
post_sh_authors(POST_ARGS) |
post_sh_authors(POST_ARGS) |
{ |
{ |
|
|
if ( ! child_an(mdoc->last)) |
if ( ! child_an(mdoc->last)) |
mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse, |
mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, NULL); |
mdoc->last->line, mdoc->last->pos, NULL); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_sh_head(POST_ARGS) |
post_sh_head(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 2077 post_sh_head(POST_ARGS) |
|
Line 2003 post_sh_head(POST_ARGS) |
|
|
|
if (SEC_CUSTOM == sec) { |
if (SEC_CUSTOM == sec) { |
free(secname); |
free(secname); |
return(1); |
return; |
} |
} |
|
|
/* |
/* |
Line 2103 post_sh_head(POST_ARGS) |
|
Line 2029 post_sh_head(POST_ARGS) |
|
|
|
if (mdoc->meta.msec == NULL) { |
if (mdoc->meta.msec == NULL) { |
free(secname); |
free(secname); |
return(1); |
return; |
} |
} |
|
|
goodsec = NULL; |
goodsec = NULL; |
Line 2135 post_sh_head(POST_ARGS) |
|
Line 2061 post_sh_head(POST_ARGS) |
|
default: |
default: |
break; |
break; |
} |
} |
|
|
free(secname); |
free(secname); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_ignpar(POST_ARGS) |
post_ignpar(POST_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
hwarn_ge1(mdoc); |
|
post_hyph(mdoc); |
post_hyph(mdoc); |
|
|
if (MDOC_BODY != mdoc->last->type) |
if (MDOC_BODY != mdoc->last->type) |
return(1); |
return; |
|
|
if (NULL != (np = mdoc->last->child)) |
if (NULL != (np = mdoc->last->child)) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
Line 2168 post_ignpar(POST_ARGS) |
|
Line 2091 post_ignpar(POST_ARGS) |
|
mdoc_macronames[mdoc->last->tok]); |
mdoc_macronames[mdoc->last->tok]); |
mdoc_node_delete(mdoc, np); |
mdoc_node_delete(mdoc, np); |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_par(PRE_ARGS) |
pre_par(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->last) |
if (NULL == mdoc->last) |
return(1); |
return; |
if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type) |
if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type) |
return(1); |
return; |
|
|
/* |
/* |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
* Don't allow prior `Lp' or `Pp' prior to a paragraph-type |
Line 2189 pre_par(PRE_ARGS) |
|
Line 2110 pre_par(PRE_ARGS) |
|
if (MDOC_Pp != mdoc->last->tok && |
if (MDOC_Pp != mdoc->last->tok && |
MDOC_Lp != mdoc->last->tok && |
MDOC_Lp != mdoc->last->tok && |
MDOC_br != mdoc->last->tok) |
MDOC_br != mdoc->last->tok) |
return(1); |
return; |
if (MDOC_Bl == n->tok && n->norm->Bl.comp) |
if (MDOC_Bl == n->tok && n->norm->Bl.comp) |
return(1); |
return; |
if (MDOC_Bd == n->tok && n->norm->Bd.comp) |
if (MDOC_Bd == n->tok && n->norm->Bd.comp) |
return(1); |
return; |
if (MDOC_It == n->tok && n->parent->norm->Bl.comp) |
if (MDOC_It == n->tok && n->parent->norm->Bl.comp) |
return(1); |
return; |
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->line, mdoc->last->pos, |
"%s before %s", mdoc_macronames[mdoc->last->tok], |
"%s before %s", mdoc_macronames[mdoc->last->tok], |
mdoc_macronames[n->tok]); |
mdoc_macronames[n->tok]); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_par(POST_ARGS) |
post_par(POST_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
if (mdoc->last->tok == MDOC_sp) |
np = mdoc->last; |
ewarn_le1(mdoc); |
|
else |
|
ewarn_eq0(mdoc); |
|
|
|
if (MDOC_ELEM != mdoc->last->type && |
if (np->tok == MDOC_sp) { |
MDOC_BLOCK != mdoc->last->type) |
if (np->nchild > 1) |
return(1); |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
|
np->child->next->line, np->child->next->pos, |
|
"sp ... %s", np->child->next->string); |
|
} else if (np->child != NULL) |
|
mandoc_vmsg(MANDOCERR_ARG_SKIP, |
|
mdoc->parse, np->line, np->pos, "%s %s", |
|
mdoc_macronames[np->tok], np->child->string); |
|
|
if (NULL == (np = mdoc->last->prev)) { |
if (NULL == (np = mdoc->last->prev)) { |
np = mdoc->last->parent; |
np = mdoc->last->parent; |
if (MDOC_Sh != np->tok && MDOC_Ss != np->tok) |
if (MDOC_Sh != np->tok && MDOC_Ss != np->tok) |
return(1); |
return; |
} else { |
} else if (MDOC_Pp != np->tok && MDOC_Lp != np->tok && |
if (MDOC_Pp != np->tok && MDOC_Lp != np->tok && |
(MDOC_br != mdoc->last->tok || |
(MDOC_br != mdoc->last->tok || |
(MDOC_sp != np->tok && MDOC_br != np->tok))) |
(MDOC_sp != np->tok && MDOC_br != np->tok))) |
return; |
return(1); |
|
} |
|
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->line, mdoc->last->pos, |
"%s after %s", mdoc_macronames[mdoc->last->tok], |
"%s after %s", mdoc_macronames[mdoc->last->tok], |
mdoc_macronames[np->tok]); |
mdoc_macronames[np->tok]); |
mdoc_node_delete(mdoc, mdoc->last); |
mdoc_node_delete(mdoc, mdoc->last); |
return(1); |
|
} |
} |
|
|
static int |
static void |
pre_literal(PRE_ARGS) |
pre_literal(PRE_ARGS) |
{ |
{ |
|
|
pre_display(mdoc, n); |
pre_display(mdoc, n); |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return(1); |
return; |
|
|
/* |
/* |
* The `Dl' (note "el" not "one") and `Bd -literal' and `Bd |
* The `Dl' (note "el" not "one") and `Bd -literal' and `Bd |
Line 2266 pre_literal(PRE_ARGS) |
|
Line 2186 pre_literal(PRE_ARGS) |
|
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_dd(POST_ARGS) |
post_dd(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 2297 post_dd(POST_ARGS) |
|
Line 2215 post_dd(POST_ARGS) |
|
} |
} |
out: |
out: |
mdoc_node_delete(mdoc, n); |
mdoc_node_delete(mdoc, n); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_dt(POST_ARGS) |
post_dt(POST_ARGS) |
{ |
{ |
struct mdoc_node *nn, *n; |
struct mdoc_node *nn, *n; |
Line 2373 post_dt(POST_ARGS) |
|
Line 2290 post_dt(POST_ARGS) |
|
mdoc->meta.msec = mandoc_strdup(nn->string); |
mdoc->meta.msec = mandoc_strdup(nn->string); |
} |
} |
|
|
if (NULL == (nn = nn->next)) |
/* Handle an optional architecture */ |
goto out; |
|
|
|
/* Handles: `.Dt TITLE SEC VOL' |
if ((nn = nn->next) != NULL) { |
* title = TITLE, |
for (p = nn->string; *p; p++) |
* volume = VOL is vol ? format(VOL) : |
*p = tolower((unsigned char)*p); |
* VOL is arch ? format(arch) : |
mdoc->meta.arch = mandoc_strdup(nn->string); |
* VOL |
|
*/ |
|
|
|
cp = mdoc_a2vol(nn->string); |
|
if (cp) { |
|
free(mdoc->meta.vol); |
|
mdoc->meta.vol = mandoc_strdup(cp); |
|
} else { |
|
cp = mdoc_a2arch(nn->string); |
|
if (NULL == cp) { |
|
mandoc_vmsg(MANDOCERR_ARCH_BAD, mdoc->parse, |
|
nn->line, nn->pos, "Dt ... %s", nn->string); |
|
free(mdoc->meta.vol); |
|
mdoc->meta.vol = mandoc_strdup(nn->string); |
|
} else |
|
mdoc->meta.arch = mandoc_strdup(cp); |
|
} |
} |
|
|
/* Ignore any subsequent parameters... */ |
/* Ignore any subsequent parameters... */ |
/* FIXME: warn about subsequent parameters. */ |
/* FIXME: warn about subsequent parameters. */ |
out: |
out: |
mdoc_node_delete(mdoc, n); |
mdoc_node_delete(mdoc, n); |
return(1); |
|
} |
} |
|
|
static int |
static void |
post_bx(POST_ARGS) |
post_bx(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 2419 post_bx(POST_ARGS) |
|
Line 2318 post_bx(POST_ARGS) |
|
n = mdoc->last->child; |
n = mdoc->last->child; |
if (n && NULL != (n = n->next)) |
if (n && NULL != (n = n->next)) |
*n->string = (char)toupper((unsigned char)*n->string); |
*n->string = (char)toupper((unsigned char)*n->string); |
|
|
return(1); |
|
} |
} |
|
|
static int |
static void |
post_os(POST_ARGS) |
post_os(POST_ARGS) |
{ |
{ |
#ifndef OSNAME |
#ifndef OSNAME |
Line 2471 post_os(POST_ARGS) |
|
Line 2368 post_os(POST_ARGS) |
|
|
|
out: |
out: |
mdoc_node_delete(mdoc, n); |
mdoc_node_delete(mdoc, n); |
return(1); |
|
} |
} |
|
|
/* |
/* |
* If no argument is provided, |
* If no argument is provided, |
* fill in the name of the current manual page. |
* fill in the name of the current manual page. |
*/ |
*/ |
static int |
static void |
post_ex(POST_ARGS) |
post_ex(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 2486 post_ex(POST_ARGS) |
|
Line 2382 post_ex(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
|
|
if (n->child) |
if (n->child) |
return(1); |
return; |
|
|
if (mdoc->meta.name == NULL) { |
if (mdoc->meta.name == NULL) { |
mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse, |
n->line, n->pos, "Ex"); |
n->line, n->pos, "Ex"); |
return(1); |
return; |
} |
} |
|
|
mdoc->next = MDOC_NEXT_CHILD; |
mdoc->next = MDOC_NEXT_CHILD; |
|
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); |
|
|
|
mdoc->last = n; |
mdoc->last = n; |
return(1); |
|
} |
} |
|
|
static enum mdoc_sec |
static enum mdoc_sec |