version 1.212, 2014/04/20 20:48:53 |
version 1.216, 2014/06/20 23:02:31 |
Line 935 pre_dt(PRE_ARGS) |
|
Line 935 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); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOG_ORDER); |
|
|
if (mdoc->meta.title) |
if (mdoc->meta.title) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOG_REP); |
|
|
return(1); |
return(1); |
} |
} |
Line 948 pre_os(PRE_ARGS) |
|
Line 948 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); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOG_ORDER); |
|
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOG_REP); |
|
|
return(1); |
return(1); |
} |
} |
Line 961 pre_dd(PRE_ARGS) |
|
Line 961 pre_dd(PRE_ARGS) |
|
{ |
{ |
|
|
if (mdoc->meta.title || mdoc->meta.os) |
if (mdoc->meta.title || mdoc->meta.os) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOG_ORDER); |
|
|
if (mdoc->meta.date) |
if (mdoc->meta.date) |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP); |
mdoc_nmsg(mdoc, n, MANDOCERR_PROLOG_REP); |
|
|
return(1); |
return(1); |
} |
} |
Line 1183 post_defaults(POST_ARGS) |
|
Line 1183 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 1193 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 1469 post_bl_block_tag(POST_ARGS) |
|
Line 1460 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 1521 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 1645 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 1662 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_BLOCK != n->child->type || |
} else if (MDOC_BLOCK != n->child->type || |
MDOC_Sh != n->child->tok) |
MDOC_Sh != n->child->tok) { |
mdoc_nmsg(mdoc, n->child, MANDOCERR_SEC_BEFORE); |
erc++; |
|
/* 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 2193 post_dt(POST_ARGS) |
|
Line 2180 post_dt(POST_ARGS) |
|
* FIXME: don't be lazy: have this make all |
* FIXME: don't be lazy: have this make all |
* characters be uppercase and just warn once. |
* characters be uppercase and just warn once. |
*/ |
*/ |
mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE); |
mdoc_nmsg(mdoc, nn, MANDOCERR_TITLE_CASE); |
break; |
break; |
} |
} |
|
|
Line 2237 post_dt(POST_ARGS) |
|
Line 2224 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); |
mdoc_nmsg(mdoc, n, MANDOCERR_MSEC_BAD); |
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 2246 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); |
mdoc_nmsg(mdoc, nn, MANDOCERR_ARCH_BAD); |
free(mdoc->meta.vol); |
free(mdoc->meta.vol); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
mdoc->meta.vol = mandoc_strdup(nn->string); |
} else |
} else |