version 1.309, 2016/10/09 18:16:56 |
version 1.312, 2017/01/08 02:01:17 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2016 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2017 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 103 static void post_sh_authors(POST_ARGS); |
|
Line 103 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_xr(POST_ARGS); |
|
|
static v_post mdoc_valids[MDOC_MAX] = { |
static v_post mdoc_valids[MDOC_MAX] = { |
NULL, /* Ap */ |
NULL, /* Ap */ |
Line 145 static v_post mdoc_valids[MDOC_MAX] = { |
|
Line 146 static v_post mdoc_valids[MDOC_MAX] = { |
|
post_st, /* St */ |
post_st, /* St */ |
NULL, /* Va */ |
NULL, /* Va */ |
NULL, /* Vt */ |
NULL, /* Vt */ |
NULL, /* Xr */ |
post_xr, /* Xr */ |
NULL, /* %A */ |
NULL, /* %A */ |
post_hyph, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
post_hyph, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
NULL, /* %D */ |
NULL, /* %D */ |
Line 296 mdoc_node_validate(struct roff_man *mdoc) |
|
Line 297 mdoc_node_validate(struct roff_man *mdoc) |
|
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
switch (n->type) { |
switch (n->type) { |
case ROFFT_TEXT: |
case ROFFT_TEXT: |
if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd) |
if (n->sec != SEC_SYNOPSIS || |
|
(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); |
break; |
break; |
case ROFFT_EQN: |
case ROFFT_EQN: |
Line 850 post_nm(POST_ARGS) |
|
Line 852 post_nm(POST_ARGS) |
|
n->last->tok == MDOC_Lp)) |
n->last->tok == MDOC_Lp)) |
mdoc_node_relink(mdoc, n->last); |
mdoc_node_relink(mdoc, n->last); |
|
|
if (mdoc->meta.name != NULL) |
|
return; |
|
|
|
deroff(&mdoc->meta.name, n); |
|
|
|
if (mdoc->meta.name == NULL) |
if (mdoc->meta.name == NULL) |
|
deroff(&mdoc->meta.name, n); |
|
|
|
if (mdoc->meta.name == NULL || |
|
(mdoc->lastsec == SEC_NAME && n->child == NULL)) |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
n->line, n->pos, "Nm"); |
n->line, n->pos, "Nm"); |
} |
} |
Line 1597 post_sh_name(POST_ARGS) |
|
Line 1598 post_sh_name(POST_ARGS) |
|
for (n = mdoc->last->child; n != NULL; n = n->next) { |
for (n = mdoc->last->child; n != NULL; n = n->next) { |
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Nm: |
case MDOC_Nm: |
|
if (hasnm && n->child != NULL) |
|
mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT, |
|
mdoc->parse, n->line, n->pos, |
|
"Nm %s", n->child->string); |
hasnm = 1; |
hasnm = 1; |
break; |
continue; |
case MDOC_Nd: |
case MDOC_Nd: |
hasnd = 1; |
hasnd = 1; |
if (n->next != NULL) |
if (n->next != NULL) |
Line 1606 post_sh_name(POST_ARGS) |
|
Line 1611 post_sh_name(POST_ARGS) |
|
mdoc->parse, n->line, n->pos, NULL); |
mdoc->parse, n->line, n->pos, NULL); |
break; |
break; |
case TOKEN_NONE: |
case TOKEN_NONE: |
if (hasnm) |
if (n->type == ROFFT_TEXT && |
break; |
n->string[0] == ',' && n->string[1] == '\0' && |
|
n->next != NULL && n->next->tok == MDOC_Nm) { |
|
n = n->next; |
|
continue; |
|
} |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
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]); |
break; |
continue; |
} |
} |
|
break; |
} |
} |
|
|
if ( ! hasnm) |
if ( ! hasnm) |
Line 1807 post_sh_head(POST_ARGS) |
|
Line 1817 post_sh_head(POST_ARGS) |
|
} |
} |
|
|
static void |
static void |
|
post_xr(POST_ARGS) |
|
{ |
|
struct roff_node *n, *nch; |
|
|
|
n = mdoc->last; |
|
nch = n->child; |
|
if (nch->next == NULL) { |
|
mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse, |
|
n->line, n->pos, "Xr %s", nch->string); |
|
return; |
|
} |
|
assert(nch->next == n->last); |
|
} |
|
|
|
static void |
post_ignpar(POST_ARGS) |
post_ignpar(POST_ARGS) |
{ |
{ |
struct roff_node *np; |
struct roff_node *np; |
Line 2002 post_dt(POST_ARGS) |
|
Line 2027 post_dt(POST_ARGS) |
|
} |
} |
} |
} |
|
|
/* Mandatory second argument: section. */ |
/* Mandatory second argument: section. */ |
|
|
if (nn != NULL) |
if (nn != NULL) |
nn = nn->next; |
nn = nn->next; |