version 1.212, 2014/04/20 20:48:53 |
version 1.218, 2014/07/02 03:48:07 |
Line 98 static int post_bx(POST_ARGS); |
|
Line 98 static int post_bx(POST_ARGS); |
|
static int post_defaults(POST_ARGS); |
static int post_defaults(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dd(POST_ARGS); |
static int post_dt(POST_ARGS); |
static int post_dt(POST_ARGS); |
|
static int post_en(POST_ARGS); |
|
static int post_es(POST_ARGS); |
static int post_eoln(POST_ARGS); |
static int post_eoln(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); |
Line 125 static int pre_display(PRE_ARGS); |
|
Line 127 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_it(PRE_ARGS); |
static int pre_literal(PRE_ARGS); |
static int pre_literal(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_sh(PRE_ARGS); |
Line 145 static v_post posts_d1[] = { bwarn_ge1, post_hyph, NU |
|
Line 148 static v_post posts_d1[] = { bwarn_ge1, post_hyph, NU |
|
static v_post posts_dd[] = { post_dd, post_prol, NULL }; |
static v_post posts_dd[] = { post_dd, post_prol, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
static v_post posts_dl[] = { post_literal, bwarn_ge1, NULL }; |
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_es[] = { post_es, 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 173 static v_pre pres_dl[] = { pre_literal, pre_display, |
|
Line 178 static v_pre pres_dl[] = { pre_literal, pre_display, |
|
static v_pre pres_dd[] = { pre_dd, NULL }; |
static v_pre pres_dd[] = { pre_dd, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_dt[] = { pre_dt, NULL }; |
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
static v_pre pres_it[] = { pre_it, pre_par, NULL }; |
|
static v_pre pres_obsolete[] = { pre_obsolete, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_os[] = { pre_os, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_pp[] = { pre_par, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
static v_pre pres_sh[] = { pre_sh, NULL }; |
Line 214 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 220 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 */ |
{ NULL, NULL }, /* Ot */ |
{ pres_obsolete, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_std, posts_std }, /* Rv */ |
{ pres_std, posts_std }, /* Rv */ |
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
Line 284 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 290 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 */ |
{ NULL, NULL }, /* Fr */ |
{ pres_obsolete, NULL }, /* Fr */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_lb }, /* Lb */ |
{ pres_pp, posts_pp }, /* Lp */ |
{ pres_pp, posts_pp }, /* Lp */ |
Line 294 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 300 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, posts_text }, /* %C */ |
{ NULL, posts_text }, /* %C */ |
{ NULL, NULL }, /* Es */ |
{ pres_obsolete, posts_es }, /* Es */ |
{ NULL, NULL }, /* En */ |
{ pres_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 931 pre_std(PRE_ARGS) |
|
Line 937 pre_std(PRE_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
pre_obsolete(PRE_ARGS) |
|
{ |
|
|
|
if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type) |
|
mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
return(1); |
|
} |
|
|
|
static int |
pre_dt(PRE_ARGS) |
pre_dt(PRE_ARGS) |
{ |
{ |
|
|
if (NULL == mdoc->meta.date || mdoc->meta.os) |
if (NULL == mdoc->meta.date || mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
|
n->line, n->pos, "Dt"); |
|
|
if (mdoc->meta.title) |
if (mdoc->meta.title) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
|
n->line, n->pos, "Dt"); |
|
|
return(1); |
return(1); |
} |
} |
Line 948 pre_os(PRE_ARGS) |
|
Line 966 pre_os(PRE_ARGS) |
|
{ |
{ |
|
|
if (NULL == mdoc->meta.title || NULL == mdoc->meta.date) |
if (NULL == mdoc->meta.title || NULL == mdoc->meta.date) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
|
n->line, n->pos, "Os"); |
|
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
|
n->line, n->pos, "Os"); |
|
|
return(1); |
return(1); |
} |
} |
Line 961 pre_dd(PRE_ARGS) |
|
Line 981 pre_dd(PRE_ARGS) |
|
{ |
{ |
|
|
if (mdoc->meta.title || mdoc->meta.os) |
if (mdoc->meta.title || mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse, |
|
n->line, n->pos, "Dd"); |
|
|
if (mdoc->meta.date) |
if (mdoc->meta.date) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse, |
|
n->line, n->pos, "Dd"); |
|
|
return(1); |
return(1); |
} |
} |
Line 1183 post_defaults(POST_ARGS) |
|
Line 1205 post_defaults(POST_ARGS) |
|
static int |
static int |
post_at(POST_ARGS) |
post_at(POST_ARGS) |
{ |
{ |
const char *p, *q; |
struct mdoc_node *n; |
char *buf; |
const char *std_att; |
size_t sz; |
char *att; |
|
|
/* |
/* |
* If we have a child, look it up in the standard keys. If a |
* If we have a child, look it up in the standard keys. If a |
Line 1193 post_at(POST_ARGS) |
|
Line 1215 post_at(POST_ARGS) |
|
* prefix "AT&T UNIX " to the existing data. |
* prefix "AT&T UNIX " to the existing data. |
*/ |
*/ |
|
|
if (NULL == mdoc->last->child) |
if (NULL == (n = mdoc->last->child)) |
return(1); |
return(1); |
|
|
assert(MDOC_TEXT == mdoc->last->child->type); |
assert(MDOC_TEXT == n->type); |
p = mdoc_a2att(mdoc->last->child->string); |
if (NULL == (std_att = mdoc_a2att(n->string))) { |
|
|
if (p) { |
|
free(mdoc->last->child->string); |
|
mdoc->last->child->string = mandoc_strdup(p); |
|
} else { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT); |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT); |
p = "AT&T UNIX "; |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
q = mdoc->last->child->string; |
} else |
sz = strlen(p) + strlen(q) + 1; |
att = mandoc_strdup(std_att); |
buf = mandoc_malloc(sz); |
|
strlcpy(buf, p, sz); |
|
strlcat(buf, q, sz); |
|
free(mdoc->last->child->string); |
|
mdoc->last->child->string = buf; |
|
} |
|
|
|
|
free(n->string); |
|
n->string = att; |
return(1); |
return(1); |
} |
} |
|
|
Line 1233 post_an(POST_ARGS) |
|
Line 1246 post_an(POST_ARGS) |
|
} |
} |
|
|
static int |
static int |
|
post_en(POST_ARGS) |
|
{ |
|
|
|
if (MDOC_BLOCK == mdoc->last->type) |
|
mdoc->last->norm->Es = mdoc->last_es; |
|
return(1); |
|
} |
|
|
|
static int |
|
post_es(POST_ARGS) |
|
{ |
|
|
|
mdoc->last_es = mdoc->last; |
|
return(1); |
|
} |
|
|
|
static int |
post_it(POST_ARGS) |
post_it(POST_ARGS) |
{ |
{ |
int i, cols; |
int i, cols; |
Line 1469 post_bl_block_tag(POST_ARGS) |
|
Line 1499 post_bl_block_tag(POST_ARGS) |
|
assert(n->args); |
assert(n->args); |
i = (int)(n->args->argc)++; |
i = (int)(n->args->argc)++; |
|
|
n->args->argv = mandoc_realloc(n->args->argv, |
n->args->argv = mandoc_reallocarray(n->args->argv, |
n->args->argc * sizeof(struct mdoc_argv)); |
n->args->argc, sizeof(struct mdoc_argv)); |
|
|
n->args->argv[i].arg = MDOC_Width; |
n->args->argv[i].arg = MDOC_Width; |
n->args->argv[i].line = n->line; |
n->args->argv[i].line = n->line; |
Line 1530 post_bl_head(POST_ARGS) |
|
Line 1560 post_bl_head(POST_ARGS) |
|
*/ |
*/ |
|
|
np->args->argv[j].sz = (size_t)mdoc->last->nchild; |
np->args->argv[j].sz = (size_t)mdoc->last->nchild; |
np->args->argv[j].value = mandoc_malloc( |
np->args->argv[j].value = mandoc_reallocarray(NULL, |
(size_t)mdoc->last->nchild * sizeof(char *)); |
(size_t)mdoc->last->nchild, sizeof(char *)); |
|
|
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; |
mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; |
Line 1654 ebool(struct mdoc *mdoc) |
|
Line 1684 ebool(struct mdoc *mdoc) |
|
static int |
static int |
post_root(POST_ARGS) |
post_root(POST_ARGS) |
{ |
{ |
int erc; |
int ret; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
|
erc = 0; |
ret = 1; |
|
|
/* Check that we have a finished prologue. */ |
/* Check that we have a finished prologue. */ |
|
|
if ( ! (MDOC_PBODY & mdoc->flags)) { |
if ( ! (MDOC_PBODY & mdoc->flags)) { |
erc++; |
ret = 0; |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG); |
mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG); |
} |
} |
|
|
Line 1671 post_root(POST_ARGS) |
|
Line 1701 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) |
erc++; |
mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY); |
mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY); |
else if (MDOC_Sh != n->child->tok) |
} else if (MDOC_BLOCK != n->child->type || |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
MDOC_Sh != n->child->tok) { |
n->child->line, n->child->pos, |
erc++; |
mdoc_macronames[n->child->tok]); |
/* Can this be lifted? See rxdebug.1 for example. */ |
|
mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY); |
|
} |
|
|
|
return(erc ? 0 : 1); |
return(ret); |
} |
} |
|
|
static int |
static int |
Line 1902 post_sh_body(POST_ARGS) |
|
Line 1929 post_sh_body(POST_ARGS) |
|
*/ |
*/ |
|
|
if (NULL == (n = mdoc->last->child)) { |
if (NULL == (n = mdoc->last->child)) { |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC); |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, "empty"); |
return(1); |
return(1); |
} |
} |
|
|
Line 1911 post_sh_body(POST_ARGS) |
|
Line 1939 post_sh_body(POST_ARGS) |
|
continue; |
continue; |
if (MDOC_TEXT == n->type) |
if (MDOC_TEXT == n->type) |
continue; |
continue; |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC); |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
} |
} |
|
|
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(1); |
|
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC); |
mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
return(1); |
return(1); |
} |
} |
|
|
|
|
post_sh_head(POST_ARGS) |
post_sh_head(POST_ARGS) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
const char *goodsec; |
char *secname; |
char *secname; |
enum mdoc_sec sec; |
enum mdoc_sec sec; |
|
|
Line 1944 post_sh_head(POST_ARGS) |
|
Line 1975 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) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST); |
mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, secname); |
|
|
/* The SYNOPSIS gets special attention in other areas. */ |
/* The SYNOPSIS gets special attention in other areas. */ |
|
|
Line 1987 post_sh_head(POST_ARGS) |
|
Line 2019 post_sh_head(POST_ARGS) |
|
*/ |
*/ |
|
|
if (sec == mdoc->lastnamed) |
if (sec == mdoc->lastnamed) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP); |
mandoc_msg(MANDOCERR_SEC_REP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, secname); |
|
|
if (sec < mdoc->lastnamed) |
if (sec < mdoc->lastnamed) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO); |
mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, secname); |
|
|
/* Mark the last named section. */ |
/* Mark the last named section. */ |
|
|
Line 2000 post_sh_head(POST_ARGS) |
|
Line 2034 post_sh_head(POST_ARGS) |
|
|
|
assert(mdoc->meta.msec); |
assert(mdoc->meta.msec); |
|
|
|
goodsec = NULL; |
switch (sec) { |
switch (sec) { |
case SEC_ERRORS: |
case SEC_ERRORS: |
if (*mdoc->meta.msec == '4') |
if (*mdoc->meta.msec == '4') |
break; |
break; |
|
goodsec = "2, 3, 4, 9"; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case SEC_RETURN_VALUES: |
case SEC_RETURN_VALUES: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 2012 post_sh_head(POST_ARGS) |
|
Line 2048 post_sh_head(POST_ARGS) |
|
break; |
break; |
if (*mdoc->meta.msec == '3') |
if (*mdoc->meta.msec == '3') |
break; |
break; |
|
if (NULL == goodsec) |
|
goodsec = "2, 3, 9"; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case SEC_CONTEXT: |
case SEC_CONTEXT: |
if (*mdoc->meta.msec == '9') |
if (*mdoc->meta.msec == '9') |
break; |
break; |
mandoc_msg(MANDOCERR_SECMSEC, mdoc->parse, |
if (NULL == goodsec) |
mdoc->last->line, mdoc->last->pos, secname); |
goodsec = "9"; |
|
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, |
|
"%s for %s only", secname, goodsec); |
break; |
break; |
default: |
default: |
break; |
break; |
Line 2182 post_dt(POST_ARGS) |
|
Line 2223 post_dt(POST_ARGS) |
|
|
|
mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL; |
mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL; |
|
|
/* First make all characters uppercase. */ |
/* First check that all characters are uppercase. */ |
|
|
if (NULL != (nn = n->child)) |
if (NULL != (nn = n->child)) |
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, |
/* |
mdoc->parse, nn->line, |
* FIXME: don't be lazy: have this make all |
nn->pos + (p - nn->string), |
* characters be uppercase and just warn once. |
nn->string); |
*/ |
|
mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE); |
|
break; |
break; |
} |
} |
|
|
Line 2237 post_dt(POST_ARGS) |
|
Line 2276 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 { |
mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC); |
mandoc_msg(MANDOCERR_MSEC_BAD, mdoc->parse, |
|
nn->line, nn->pos, 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 2259 post_dt(POST_ARGS) |
|
Line 2299 post_dt(POST_ARGS) |
|
} else { |
} else { |
cp = mdoc_a2arch(nn->string); |
cp = mdoc_a2arch(nn->string); |
if (NULL == cp) { |
if (NULL == cp) { |
mdoc_nmsg(mdoc, nn, MANDOCERR_BADVOLARCH); |
mandoc_msg(MANDOCERR_ARCH_BAD, mdoc->parse, |
|
nn->line, nn->pos, 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 |