version 1.213, 2014/04/23 16:08:33 |
version 1.215, 2014/06/20 17:24:00 |
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 1460 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 1521 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 2184 post_dt(POST_ARGS) |
|
Line 2184 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 2228 post_dt(POST_ARGS) |
|
Line 2228 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 2250 post_dt(POST_ARGS) |
|
Line 2250 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 |