version 1.320, 2017/04/24 23:06:18 |
version 1.332, 2017/06/08 00:23:30 |
Line 53 typedef void (*v_post)(POST_ARGS); |
|
Line 53 typedef void (*v_post)(POST_ARGS); |
|
|
|
static int build_list(struct roff_man *, int); |
static int build_list(struct roff_man *, int); |
static void check_text(struct roff_man *, int, int, char *); |
static void check_text(struct roff_man *, int, int, char *); |
|
static void check_bsd(struct roff_man *, int, int, char *); |
static void check_argv(struct roff_man *, |
static void check_argv(struct roff_man *, |
struct roff_node *, struct mdoc_argv *); |
struct roff_node *, struct mdoc_argv *); |
static void check_args(struct roff_man *, struct roff_node *); |
static void check_args(struct roff_man *, struct roff_node *); |
static int child_an(const struct roff_node *); |
static int child_an(const struct roff_node *); |
static size_t macro2len(enum roff_tok); |
static size_t macro2len(enum roff_tok); |
static void rewrite_macro2len(char **); |
static void rewrite_macro2len(struct roff_man *, char **); |
|
|
static void post_an(POST_ARGS); |
static void post_an(POST_ARGS); |
static void post_an_norm(POST_ARGS); |
static void post_an_norm(POST_ARGS); |
Line 105 static void post_sh_authors(POST_ARGS); |
|
Line 106 static void post_sh_authors(POST_ARGS); |
|
static void post_sm(POST_ARGS); |
static void post_sm(POST_ARGS); |
static void post_st(POST_ARGS); |
static void post_st(POST_ARGS); |
static void post_std(POST_ARGS); |
static void post_std(POST_ARGS); |
|
static void post_useless(POST_ARGS); |
static void post_xr(POST_ARGS); |
static void post_xr(POST_ARGS); |
static void post_xx(POST_ARGS); |
static void post_xx(POST_ARGS); |
|
|
Line 201 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 203 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
post_sm, /* Sm */ |
post_sm, /* Sm */ |
post_hyph, /* Sx */ |
post_hyph, /* Sx */ |
NULL, /* Sy */ |
NULL, /* Sy */ |
NULL, /* Tn */ |
post_useless, /* Tn */ |
post_xx, /* Ux */ |
post_xx, /* Ux */ |
NULL, /* Xc */ |
NULL, /* Xc */ |
NULL, /* Xo */ |
NULL, /* Xo */ |
Line 227 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
Line 229 static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] |
|
post_en, /* En */ |
post_en, /* En */ |
post_xx, /* Dx */ |
post_xx, /* Dx */ |
NULL, /* %Q */ |
NULL, /* %Q */ |
post_par, /* br */ |
|
post_par, /* sp */ |
|
NULL, /* %U */ |
NULL, /* %U */ |
NULL, /* Ta */ |
NULL, /* Ta */ |
NULL, /* ll */ |
|
}; |
}; |
static const v_post *const mdoc_valids = __mdoc_valids - MDOC_Dd; |
static const v_post *const mdoc_valids = __mdoc_valids - MDOC_Dd; |
|
|
Line 304 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 303 mdoc_node_validate(struct roff_man *mdoc) |
|
if (n->sec != SEC_SYNOPSIS || |
if (n->sec != SEC_SYNOPSIS || |
(n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd)) |
(n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd)) |
check_text(mdoc, n->line, n->pos, n->string); |
check_text(mdoc, n->line, n->pos, n->string); |
|
if (n->parent->tok == MDOC_Sh || |
|
n->parent->tok == MDOC_Ss || |
|
n->parent->tok == MDOC_It) |
|
check_bsd(mdoc, n->line, n->pos, n->string); |
break; |
break; |
case ROFFT_EQN: |
case ROFFT_EQN: |
case ROFFT_TBL: |
case ROFFT_TBL: |
Line 327 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 330 mdoc_node_validate(struct roff_man *mdoc) |
|
|
|
/* Call the macro's postprocessor. */ |
/* Call the macro's postprocessor. */ |
|
|
|
if (n->tok < ROFF_MAX) { |
|
switch(n->tok) { |
|
case ROFF_br: |
|
case ROFF_sp: |
|
post_par(mdoc); |
|
break; |
|
default: |
|
roff_validate(mdoc); |
|
break; |
|
} |
|
break; |
|
} |
|
|
|
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
p = mdoc_valids + n->tok; |
p = mdoc_valids + n->tok; |
if (*p) |
if (*p) |
(*p)(mdoc); |
(*p)(mdoc); |
Line 372 check_text(struct roff_man *mdoc, int ln, int pos, cha |
|
Line 389 check_text(struct roff_man *mdoc, int ln, int pos, cha |
|
} |
} |
|
|
static void |
static void |
|
check_bsd(struct roff_man *mdoc, int ln, int pos, char *p) |
|
{ |
|
const char *cp; |
|
|
|
if ((cp = strstr(p, "OpenBSD")) != NULL) |
|
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
|
ln, pos + (cp - p), "Ox"); |
|
if ((cp = strstr(p, "NetBSD")) != NULL) |
|
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
|
ln, pos + (cp - p), "Nx"); |
|
if ((cp = strstr(p, "FreeBSD")) != NULL) |
|
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
|
ln, pos + (cp - p), "Fx"); |
|
if ((cp = strstr(p, "DragonFly")) != NULL) |
|
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
|
ln, pos + (cp - p), "Dx"); |
|
} |
|
|
|
static void |
post_bl_norm(POST_ARGS) |
post_bl_norm(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
Line 451 post_bl_norm(POST_ARGS) |
|
Line 487 post_bl_norm(POST_ARGS) |
|
mdoc->parse, argv->line, |
mdoc->parse, argv->line, |
argv->pos, "Bl -width %s", |
argv->pos, "Bl -width %s", |
argv->value[0]); |
argv->value[0]); |
rewrite_macro2len(argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bl.width = argv->value[0]; |
n->norm->Bl.width = argv->value[0]; |
break; |
break; |
case MDOC_Offset: |
case MDOC_Offset: |
Line 466 post_bl_norm(POST_ARGS) |
|
Line 502 post_bl_norm(POST_ARGS) |
|
mdoc->parse, argv->line, |
mdoc->parse, argv->line, |
argv->pos, "Bl -offset %s", |
argv->pos, "Bl -offset %s", |
argv->value[0]); |
argv->value[0]); |
rewrite_macro2len(argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bl.offs = argv->value[0]; |
n->norm->Bl.offs = argv->value[0]; |
break; |
break; |
default: |
default: |
Line 593 post_bd(POST_ARGS) |
|
Line 629 post_bd(POST_ARGS) |
|
mdoc->parse, argv->line, |
mdoc->parse, argv->line, |
argv->pos, "Bd -offset %s", |
argv->pos, "Bd -offset %s", |
argv->value[0]); |
argv->value[0]); |
rewrite_macro2len(argv->value); |
rewrite_macro2len(mdoc, argv->value); |
n->norm->Bd.offs = argv->value[0]; |
n->norm->Bd.offs = argv->value[0]; |
break; |
break; |
case MDOC_Compact: |
case MDOC_Compact: |
Line 660 post_eoln(POST_ARGS) |
|
Line 696 post_eoln(POST_ARGS) |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
|
|
post_useless(mdoc); |
n = mdoc->last; |
n = mdoc->last; |
if (n->child != NULL) |
if (n->child != NULL) |
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line, |
mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line, |
Line 757 post_lb(POST_ARGS) |
|
Line 794 post_lb(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
|
mandoc_vmsg(MANDOCERR_LB_BAD, mdoc->parse, n->child->line, |
|
n->child->pos, "Lb %s", n->child->string); |
|
|
roff_word_alloc(mdoc, n->line, n->pos, "library"); |
roff_word_alloc(mdoc, n->line, n->pos, "library"); |
mdoc->last->flags = NODE_NOSRC; |
mdoc->last->flags = NODE_NOSRC; |
roff_word_alloc(mdoc, n->line, n->pos, "\\(Lq"); |
roff_word_alloc(mdoc, n->line, n->pos, "\\(Lq"); |
Line 855 post_obsolete(POST_ARGS) |
|
Line 895 post_obsolete(POST_ARGS) |
|
n->line, n->pos, roff_name[n->tok]); |
n->line, n->pos, roff_name[n->tok]); |
} |
} |
|
|
|
static void |
|
post_useless(POST_ARGS) |
|
{ |
|
struct roff_node *n; |
|
|
|
n = mdoc->last; |
|
mandoc_msg(MANDOCERR_MACRO_USELESS, mdoc->parse, |
|
n->line, n->pos, roff_name[n->tok]); |
|
} |
|
|
/* |
/* |
* Block macros. |
* Block macros. |
*/ |
*/ |
|
|
post_nd(POST_ARGS) |
post_nd(POST_ARGS) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
size_t sz; |
|
|
n = mdoc->last; |
n = mdoc->last; |
|
|
Line 1042 post_nd(POST_ARGS) |
|
Line 1093 post_nd(POST_ARGS) |
|
if (n->child == NULL) |
if (n->child == NULL) |
mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse, |
mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse, |
n->line, n->pos, "Nd"); |
n->line, n->pos, "Nd"); |
|
else if (n->last->type == ROFFT_TEXT && |
|
(sz = strlen(n->last->string)) != 0 && |
|
n->last->string[sz - 1] == '.') |
|
mandoc_msg(MANDOCERR_ND_DOT, mdoc->parse, |
|
n->last->line, n->last->pos + sz - 1, NULL); |
|
|
post_hyph(mdoc); |
post_hyph(mdoc); |
} |
} |
Line 1310 post_bl_block(POST_ARGS) |
|
Line 1366 post_bl_block(POST_ARGS) |
|
switch (nc->tok) { |
switch (nc->tok) { |
case MDOC_Pp: |
case MDOC_Pp: |
case MDOC_Lp: |
case MDOC_Lp: |
case MDOC_br: |
case ROFF_br: |
break; |
break; |
default: |
default: |
nc = NULL; |
nc = NULL; |
Line 1338 post_bl_block(POST_ARGS) |
|
Line 1394 post_bl_block(POST_ARGS) |
|
* If the argument of -offset or -width is a macro, |
* If the argument of -offset or -width is a macro, |
* replace it with the associated default width. |
* replace it with the associated default width. |
*/ |
*/ |
void |
static void |
rewrite_macro2len(char **arg) |
rewrite_macro2len(struct roff_man *mdoc, char **arg) |
{ |
{ |
size_t width; |
size_t width; |
enum roff_tok tok; |
enum roff_tok tok; |
Line 1348 rewrite_macro2len(char **arg) |
|
Line 1404 rewrite_macro2len(char **arg) |
|
return; |
return; |
else if ( ! strcmp(*arg, "Ds")) |
else if ( ! strcmp(*arg, "Ds")) |
width = 6; |
width = 6; |
else if ((tok = mdoc_hash_find(*arg)) == TOKEN_NONE) |
else if ((tok = roffhash_find(mdoc->mdocmac, *arg, 0)) == TOKEN_NONE) |
return; |
return; |
else |
else |
width = macro2len(tok); |
width = macro2len(tok); |
Line 1426 post_bl(POST_ARGS) |
|
Line 1482 post_bl(POST_ARGS) |
|
struct roff_node *nparent, *nprev; /* of the Bl block */ |
struct roff_node *nparent, *nprev; /* of the Bl block */ |
struct roff_node *nblock, *nbody; /* of the Bl */ |
struct roff_node *nblock, *nbody; /* of the Bl */ |
struct roff_node *nchild, *nnext; /* of the Bl body */ |
struct roff_node *nchild, *nnext; /* of the Bl body */ |
|
const char *prev_Er; |
|
int order; |
|
|
nbody = mdoc->last; |
nbody = mdoc->last; |
switch (nbody->type) { |
switch (nbody->type) { |
Line 1526 post_bl(POST_ARGS) |
|
Line 1584 post_bl(POST_ARGS) |
|
|
|
nchild = nnext; |
nchild = nnext; |
} |
} |
|
|
|
if (mdoc->meta.os_e != MDOC_OS_NETBSD) |
|
return; |
|
|
|
prev_Er = NULL; |
|
for (nchild = nbody->child; nchild != NULL; nchild = nchild->next) { |
|
if (nchild->tok != MDOC_It) |
|
continue; |
|
if ((nnext = nchild->head->child) == NULL) |
|
continue; |
|
if (nnext->type == ROFFT_BLOCK) |
|
nnext = nnext->body->child; |
|
if (nnext == NULL || nnext->tok != MDOC_Er) |
|
continue; |
|
nnext = nnext->child; |
|
if (prev_Er != NULL) { |
|
order = strcmp(prev_Er, nnext->string); |
|
if (order > 0) |
|
mandoc_vmsg(MANDOCERR_ER_ORDER, |
|
mdoc->parse, nnext->line, nnext->pos, |
|
"Er %s %s", prev_Er, nnext->string); |
|
else if (order == 0) |
|
mandoc_vmsg(MANDOCERR_ER_REP, |
|
mdoc->parse, nnext->line, nnext->pos, |
|
"Er %s", prev_Er); |
|
} |
|
prev_Er = nnext->string; |
|
} |
} |
} |
|
|
static void |
static void |
Line 1868 post_sh_see_also(POST_ARGS) |
|
Line 1954 post_sh_see_also(POST_ARGS) |
|
if (isalpha((const unsigned char)*name)) |
if (isalpha((const unsigned char)*name)) |
return; |
return; |
lastpunct = n->string; |
lastpunct = n->string; |
if (n->next == NULL) |
if (n->next == NULL || n->next->tok == MDOC_Rs) |
mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse, |
mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse, |
n->line, n->pos, "%s after %s(%s)", |
n->line, n->pos, "%s after %s(%s)", |
lastpunct, lastname, lastsec); |
lastpunct, lastname, lastsec); |
Line 2015 post_ignpar(POST_ARGS) |
|
Line 2101 post_ignpar(POST_ARGS) |
|
struct roff_node *np; |
struct roff_node *np; |
|
|
switch (mdoc->last->type) { |
switch (mdoc->last->type) { |
|
case ROFFT_BLOCK: |
|
post_prevpar(mdoc); |
|
return; |
case ROFFT_HEAD: |
case ROFFT_HEAD: |
post_hyph(mdoc); |
post_hyph(mdoc); |
return; |
return; |
Line 2061 post_prevpar(POST_ARGS) |
|
Line 2150 post_prevpar(POST_ARGS) |
|
|
|
if (n->prev->tok != MDOC_Pp && |
if (n->prev->tok != MDOC_Pp && |
n->prev->tok != MDOC_Lp && |
n->prev->tok != MDOC_Lp && |
n->prev->tok != MDOC_br) |
n->prev->tok != ROFF_br) |
return; |
return; |
if (n->tok == MDOC_Bl && n->norm->Bl.comp) |
if (n->tok == MDOC_Bl && n->norm->Bl.comp) |
return; |
return; |
Line 2082 post_par(POST_ARGS) |
|
Line 2171 post_par(POST_ARGS) |
|
struct roff_node *np; |
struct roff_node *np; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (np->tok != MDOC_br && np->tok != MDOC_sp) |
if (np->tok != ROFF_br && np->tok != ROFF_sp) |
post_prevpar(mdoc); |
post_prevpar(mdoc); |
|
|
if (np->tok == MDOC_sp) { |
if (np->tok == ROFF_sp) { |
if (np->child != NULL && np->child->next != NULL) |
if (np->child != NULL && np->child->next != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
np->child->next->line, np->child->next->pos, |
np->child->next->line, np->child->next->pos, |
Line 2100 post_par(POST_ARGS) |
|
Line 2189 post_par(POST_ARGS) |
|
if (np->tok != MDOC_Sh && np->tok != MDOC_Ss) |
if (np->tok != MDOC_Sh && np->tok != MDOC_Ss) |
return; |
return; |
} else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp && |
} else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp && |
(mdoc->last->tok != MDOC_br || |
(mdoc->last->tok != ROFF_br || |
(np->tok != MDOC_sp && np->tok != MDOC_br))) |
(np->tok != ROFF_sp && np->tok != ROFF_br))) |
return; |
return; |
|
|
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse, |
|
|
post_bx(POST_ARGS) |
post_bx(POST_ARGS) |
{ |
{ |
struct roff_node *n, *nch; |
struct roff_node *n, *nch; |
|
const char *macro; |
|
|
n = mdoc->last; |
n = mdoc->last; |
nch = n->child; |
nch = n->child; |
|
|
if (nch != NULL) { |
if (nch != NULL) { |
|
macro = !strcmp(nch->string, "Open") ? "Ox" : |
|
!strcmp(nch->string, "Net") ? "Nx" : |
|
!strcmp(nch->string, "Free") ? "Fx" : |
|
!strcmp(nch->string, "DragonFly") ? "Dx" : NULL; |
|
if (macro != NULL) |
|
mandoc_msg(MANDOCERR_BX, mdoc->parse, |
|
n->line, n->pos, macro); |
mdoc->last = nch; |
mdoc->last = nch; |
nch = nch->next; |
nch = nch->next; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
Line 2321 post_os(POST_ARGS) |
|
Line 2418 post_os(POST_ARGS) |
|
mdoc->meta.os = NULL; |
mdoc->meta.os = NULL; |
deroff(&mdoc->meta.os, n); |
deroff(&mdoc->meta.os, n); |
if (mdoc->meta.os) |
if (mdoc->meta.os) |
return; |
goto out; |
|
|
if (mdoc->defos) { |
if (mdoc->defos) { |
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
mdoc->meta.os = mandoc_strdup(mdoc->defos); |
return; |
goto out; |
} |
} |
|
|
#ifdef OSNAME |
#ifdef OSNAME |
Line 2342 post_os(POST_ARGS) |
|
Line 2439 post_os(POST_ARGS) |
|
} |
} |
mdoc->meta.os = mandoc_strdup(defbuf); |
mdoc->meta.os = mandoc_strdup(defbuf); |
#endif /*!OSNAME*/ |
#endif /*!OSNAME*/ |
|
|
|
out: mdoc->meta.os_e = strstr(mdoc->meta.os, "OpenBSD") != NULL ? |
|
MDOC_OS_OPENBSD : strstr(mdoc->meta.os, "NetBSD") != NULL ? |
|
MDOC_OS_NETBSD : MDOC_OS_OTHER; |
} |
} |
|
|
enum roff_sec |
enum roff_sec |