version 1.236, 2014/07/30 23:38:52 |
version 1.241, 2014/08/01 22:22:11 |
Line 60 typedef int (*v_pre)(PRE_ARGS); |
|
Line 60 typedef int (*v_pre)(PRE_ARGS); |
|
typedef int (*v_post)(POST_ARGS); |
typedef int (*v_post)(POST_ARGS); |
|
|
struct valids { |
struct valids { |
v_pre *pre; |
v_pre pre; |
v_post *post; |
v_post *post; |
}; |
}; |
|
|
Line 165 static v_post posts_st[] = { post_st, NULL }; |
|
Line 165 static v_post posts_st[] = { post_st, NULL }; |
|
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text[] = { ewarn_ge1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_text1[] = { ewarn_eq1, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_post posts_vt[] = { post_vt, NULL }; |
static v_pre pres_an[] = { pre_an, NULL }; |
|
static v_pre pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL }; |
|
static v_pre pres_bl[] = { pre_bl, pre_par, NULL }; |
|
static v_pre pres_d1[] = { pre_display, NULL }; |
|
static v_pre pres_dl[] = { pre_literal, pre_display, NULL }; |
|
static v_pre pres_dd[] = { pre_dd, NULL }; |
|
static v_pre pres_dt[] = { pre_dt, NULL }; |
|
static v_pre pres_it[] = { pre_par, NULL }; |
|
static v_pre pres_obsolete[] = { pre_obsolete, NULL }; |
|
static v_pre pres_os[] = { pre_os, NULL }; |
|
static v_pre pres_pp[] = { pre_par, NULL }; |
|
static v_pre pres_std[] = { pre_std, NULL }; |
|
|
|
static const struct valids mdoc_valids[MDOC_MAX] = { |
static const struct valids mdoc_valids[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
{ pres_dd, posts_dd }, /* Dd */ |
{ pre_dd, posts_dd }, /* Dd */ |
{ pres_dt, posts_dt }, /* Dt */ |
{ pre_dt, posts_dt }, /* Dt */ |
{ pres_os, posts_os }, /* Os */ |
{ pre_os, posts_os }, /* Os */ |
{ NULL, posts_sh }, /* Sh */ |
{ NULL, posts_sh }, /* Sh */ |
{ NULL, posts_ss }, /* Ss */ |
{ NULL, posts_ss }, /* Ss */ |
{ pres_pp, posts_pp }, /* Pp */ |
{ pre_par, posts_pp }, /* Pp */ |
{ pres_d1, posts_d1 }, /* D1 */ |
{ pre_display, posts_d1 }, /* D1 */ |
{ pres_dl, posts_dl }, /* Dl */ |
{ pre_literal, posts_dl }, /* Dl */ |
{ pres_bd, posts_bd }, /* Bd */ |
{ pre_bd, posts_bd }, /* Bd */ |
{ NULL, NULL }, /* Ed */ |
{ NULL, NULL }, /* Ed */ |
{ pres_bl, posts_bl }, /* Bl */ |
{ pre_bl, posts_bl }, /* Bl */ |
{ NULL, NULL }, /* El */ |
{ NULL, NULL }, /* El */ |
{ pres_it, posts_it }, /* It */ |
{ pre_par, posts_it }, /* It */ |
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ pres_an, posts_an }, /* An */ |
{ pre_an, posts_an }, /* An */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, posts_defaults }, /* Ar */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Ev */ |
{ NULL, NULL }, /* Ev */ |
{ pres_std, posts_ex }, /* Ex */ |
{ pre_std, posts_ex }, /* Ex */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, NULL }, /* Fa */ |
{ NULL, posts_text }, /* Fd */ |
{ NULL, posts_text }, /* Fd */ |
{ NULL, NULL }, /* Fl */ |
{ NULL, NULL }, /* Fl */ |
Line 213 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 201 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 */ |
{ pres_obsolete, NULL }, /* Ot */ |
{ pre_obsolete, NULL }, /* Ot */ |
{ NULL, posts_defaults }, /* Pa */ |
{ NULL, posts_defaults }, /* Pa */ |
{ pres_std, NULL }, /* Rv */ |
{ pre_std, NULL }, /* Rv */ |
{ NULL, posts_st }, /* St */ |
{ NULL, posts_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, posts_vt }, /* Vt */ |
{ NULL, posts_vt }, /* Vt */ |
Line 283 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 271 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 */ |
{ pres_obsolete, NULL }, /* Fr */ |
{ pre_obsolete, NULL }, /* Fr */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_eoln }, /* Ud */ |
{ NULL, posts_lb }, /* Lb */ |
{ NULL, posts_lb }, /* Lb */ |
{ pres_pp, posts_pp }, /* Lp */ |
{ pre_par, posts_pp }, /* Lp */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, NULL }, /* Lk */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, posts_defaults }, /* Mt */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Brq */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Bro */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, NULL }, /* Brc */ |
{ NULL, posts_text }, /* %C */ |
{ NULL, posts_text }, /* %C */ |
{ pres_obsolete, posts_es }, /* Es */ |
{ pre_obsolete, posts_es }, /* Es */ |
{ pres_obsolete, posts_en }, /* En */ |
{ pre_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 353 static const char * const secnames[SEC__MAX] = { |
|
Line 341 static const char * const secnames[SEC__MAX] = { |
|
int |
int |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
v_pre *p; |
v_pre p; |
int line, pos; |
|
char *tp; |
|
|
|
switch (n->type) { |
switch (n->type) { |
case MDOC_TEXT: |
case MDOC_TEXT: |
tp = n->string; |
check_text(mdoc, n->line, n->pos, n->string); |
line = n->line; |
|
pos = n->pos; |
|
check_text(mdoc, line, pos, tp); |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_TBL: |
case MDOC_TBL: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 375 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
Line 358 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n) |
|
} |
} |
|
|
check_args(mdoc, n); |
check_args(mdoc, n); |
|
p = mdoc_valids[n->tok].pre; |
if (NULL == mdoc_valids[n->tok].pre) |
return(*p ? (*p)(mdoc, n) : 1); |
return(1); |
|
for (p = mdoc_valids[n->tok].pre; *p; p++) |
|
if ( ! (*p)(mdoc, n)) |
|
return(0); |
|
return(1); |
|
} |
} |
|
|
int |
int |
|
|
pre_bl(PRE_ARGS) |
pre_bl(PRE_ARGS) |
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
struct mdoc_argv *argv; |
struct mdoc_argv *argv, *wa; |
int i; |
int i; |
|
enum mdocargt mdoclt; |
enum mdoc_list lt; |
enum mdoc_list lt; |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
Line 591 pre_bl(PRE_ARGS) |
|
Line 570 pre_bl(PRE_ARGS) |
|
* ones. If we find no list type, we default to LIST_item. |
* ones. If we find no list type, we default to LIST_item. |
*/ |
*/ |
|
|
|
wa = n->args->argv; |
|
mdoclt = MDOC_ARG_MAX; |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
for (i = 0; n->args && i < (int)n->args->argc; i++) { |
argv = n->args->argv + i; |
argv = n->args->argv + i; |
lt = LIST__NONE; |
lt = LIST__NONE; |
Line 638 pre_bl(PRE_ARGS) |
|
Line 619 pre_bl(PRE_ARGS) |
|
n->norm->Bl.comp = 1; |
n->norm->Bl.comp = 1; |
break; |
break; |
case MDOC_Width: |
case MDOC_Width: |
|
wa = argv; |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mandoc_msg(MANDOCERR_ARG_EMPTY, |
mdoc->parse, argv->line, |
mdoc->parse, argv->line, |
Line 671 pre_bl(PRE_ARGS) |
|
Line 653 pre_bl(PRE_ARGS) |
|
} |
} |
if (LIST__NONE == lt) |
if (LIST__NONE == lt) |
continue; |
continue; |
|
mdoclt = argv->arg; |
|
|
/* Check: multiple list types. */ |
/* Check: multiple list types. */ |
|
|
if (LIST__NONE != n->norm->Bl.type) { |
if (LIST__NONE != n->norm->Bl.type) { |
mandoc_msg(MANDOCERR_BL_REP, |
mandoc_vmsg(MANDOCERR_BL_REP, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
mdoc_argnames[argv->arg]); |
"Bl -%s", mdoc_argnames[argv->arg]); |
continue; |
continue; |
} |
} |
|
|
Line 686 pre_bl(PRE_ARGS) |
|
Line 669 pre_bl(PRE_ARGS) |
|
if (n->norm->Bl.width || |
if (n->norm->Bl.width || |
n->norm->Bl.offs || |
n->norm->Bl.offs || |
n->norm->Bl.comp) |
n->norm->Bl.comp) |
mandoc_msg(MANDOCERR_BL_LATETYPE, |
mandoc_vmsg(MANDOCERR_BL_LATETYPE, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, "Bl -%s", |
mdoc_argnames[n->args->argv[0].arg]); |
mdoc_argnames[n->args->argv[0].arg]); |
|
|
n->norm->Bl.type = lt; |
n->norm->Bl.type = lt; |
Line 700 pre_bl(PRE_ARGS) |
|
Line 683 pre_bl(PRE_ARGS) |
|
/* Allow lists to default to LIST_item. */ |
/* Allow lists to default to LIST_item. */ |
|
|
if (LIST__NONE == n->norm->Bl.type) { |
if (LIST__NONE == n->norm->Bl.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOTYPE); |
mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse, |
|
n->line, n->pos, "Bl"); |
n->norm->Bl.type = LIST_item; |
n->norm->Bl.type = LIST_item; |
} |
} |
|
|
Line 714 pre_bl(PRE_ARGS) |
|
Line 698 pre_bl(PRE_ARGS) |
|
switch (n->norm->Bl.type) { |
switch (n->norm->Bl.type) { |
case LIST_tag: |
case LIST_tag: |
if (NULL == n->norm->Bl.width) |
if (NULL == n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_BL_NOWIDTH); |
mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse, |
|
n->line, n->pos, "Bl -tag"); |
break; |
break; |
case LIST_column: |
case LIST_column: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 726 pre_bl(PRE_ARGS) |
|
Line 711 pre_bl(PRE_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
if (n->norm->Bl.width) |
if (n->norm->Bl.width) |
mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV); |
mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse, |
|
wa->line, wa->pos, "Bl -%s", |
|
mdoc_argnames[mdoclt]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
Line 744 pre_bl(PRE_ARGS) |
|
Line 731 pre_bl(PRE_ARGS) |
|
break; |
break; |
} |
} |
|
|
return(1); |
return(pre_par(mdoc, n)); |
} |
} |
|
|
static int |
static int |
Line 755 pre_bd(PRE_ARGS) |
|
Line 742 pre_bd(PRE_ARGS) |
|
int i; |
int i; |
enum mdoc_disp dt; |
enum mdoc_disp dt; |
|
|
|
pre_literal(mdoc, n); |
|
|
if (MDOC_BLOCK != n->type) { |
if (MDOC_BLOCK != n->type) { |
if (ENDBODY_NOT != n->end) { |
if (ENDBODY_NOT != n->end) { |
assert(n->pending); |
assert(n->pending); |
Line 789 pre_bd(PRE_ARGS) |
|
Line 778 pre_bd(PRE_ARGS) |
|
dt = DISP_literal; |
dt = DISP_literal; |
break; |
break; |
case MDOC_File: |
case MDOC_File: |
mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP); |
mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse, |
|
n->line, n->pos, NULL); |
return(0); |
return(0); |
case MDOC_Offset: |
case MDOC_Offset: |
if (0 == argv->sz) { |
if (0 == argv->sz) { |
Line 822 pre_bd(PRE_ARGS) |
|
Line 812 pre_bd(PRE_ARGS) |
|
if (DISP__NONE == n->norm->Bd.type) |
if (DISP__NONE == n->norm->Bd.type) |
n->norm->Bd.type = dt; |
n->norm->Bd.type = dt; |
else |
else |
mandoc_msg(MANDOCERR_BD_REP, |
mandoc_vmsg(MANDOCERR_BD_REP, |
mdoc->parse, n->line, n->pos, |
mdoc->parse, n->line, n->pos, |
mdoc_argnames[argv->arg]); |
"Bd -%s", mdoc_argnames[argv->arg]); |
} |
} |
|
|
if (DISP__NONE == n->norm->Bd.type) { |
if (DISP__NONE == n->norm->Bd.type) { |
mdoc_nmsg(mdoc, n, MANDOCERR_BD_NOTYPE); |
mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse, |
|
n->line, n->pos, "Bd"); |
n->norm->Bd.type = DISP_ragged; |
n->norm->Bd.type = DISP_ragged; |
} |
} |
|
|
return(1); |
return(pre_par(mdoc, n)); |
} |
} |
|
|
static int |
static int |
pre_an(PRE_ARGS) |
pre_an(PRE_ARGS) |
{ |
{ |
int i; |
struct mdoc_argv *argv; |
|
size_t i; |
|
|
if (NULL == n->args) |
if (n->args == NULL) |
return(1); |
return(1); |
|
|
for (i = 1; i < (int)n->args->argc; i++) |
for (i = 1; i < n->args->argc; i++) { |
mdoc_pmsg(mdoc, n->args->argv[i].line, |
argv = n->args->argv + i; |
n->args->argv[i].pos, MANDOCERR_IGNARGV); |
mandoc_vmsg(MANDOCERR_AN_REP, |
|
mdoc->parse, argv->line, argv->pos, |
|
"An -%s", mdoc_argnames[argv->arg]); |
|
} |
|
|
if (MDOC_Split == n->args->argv[0].arg) |
argv = n->args->argv; |
|
if (argv->arg == MDOC_Split) |
n->norm->An.auth = AUTH_split; |
n->norm->An.auth = AUTH_split; |
else if (MDOC_Nosplit == n->args->argv[0].arg) |
else if (argv->arg == MDOC_Nosplit) |
n->norm->An.auth = AUTH_nosplit; |
n->norm->An.auth = AUTH_nosplit; |
else |
else |
abort(); |
abort(); |
Line 960 post_bf(POST_ARGS) |
|
Line 956 post_bf(POST_ARGS) |
|
nch = np->child; |
nch = np->child; |
if (NULL == np->parent->args) { |
if (NULL == np->parent->args) { |
if (NULL == nch) { |
if (NULL == nch) { |
mdoc_nmsg(mdoc, np, MANDOCERR_BF_NOFONT); |
mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse, |
|
np->line, np->pos, "Bf"); |
return(1); |
return(1); |
} |
} |
nch = nch->next; |
nch = nch->next; |
Line 1073 post_nm(POST_ARGS) |
|
Line 1070 post_nm(POST_ARGS) |
|
mdoc_deroff(&mdoc->meta.name, mdoc->last); |
mdoc_deroff(&mdoc->meta.name, mdoc->last); |
|
|
if (NULL == mdoc->meta.name) |
if (NULL == mdoc->meta.name) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NM_NONAME); |
mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, "Nm"); |
return(1); |
return(1); |
} |
} |
|
|
Line 1161 post_at(POST_ARGS) |
|
Line 1159 post_at(POST_ARGS) |
|
|
|
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
if (NULL == (std_att = mdoc_a2att(n->string))) { |
if (NULL == (std_att = mdoc_a2att(n->string))) { |
mandoc_msg(MANDOCERR_AT_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse, |
n->line, n->pos, n->string); |
n->line, n->pos, "At %s", n->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
mandoc_asprintf(&att, "AT&T UNIX %s", n->string); |
} else |
} else |
att = mandoc_strdup(std_att); |
att = mandoc_strdup(std_att); |
Line 1229 post_it(POST_ARGS) |
|
Line 1227 post_it(POST_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_diag: |
case LIST_diag: |
if (NULL == nit->head->child) |
if (NULL == nit->head->child) |
mandoc_msg(MANDOCERR_IT_NOHEAD, |
mandoc_vmsg(MANDOCERR_IT_NOHEAD, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
|
"Bl -%s It", |
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
break; |
break; |
case LIST_bullet: |
case LIST_bullet: |
Line 1241 post_it(POST_ARGS) |
|
Line 1240 post_it(POST_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_hyphen: |
case LIST_hyphen: |
if (NULL == nit->body->child) |
if (NULL == nit->body->child) |
mandoc_msg(MANDOCERR_IT_NOBODY, |
mandoc_vmsg(MANDOCERR_IT_NOBODY, |
mdoc->parse, nit->line, nit->pos, |
mdoc->parse, nit->line, nit->pos, |
|
"Bl -%s It", |
mdoc_argnames[nbl->args->argv[0].arg]); |
mdoc_argnames[nbl->args->argv[0].arg]); |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case LIST_item: |
case LIST_item: |
|
|
post_bl_head(POST_ARGS) |
post_bl_head(POST_ARGS) |
{ |
{ |
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *np, *nn, *nnp; |
|
struct mdoc_argv *argv; |
int i, j; |
int i, j; |
|
|
if (LIST_column != mdoc->last->norm->Bl.type) |
if (LIST_column != mdoc->last->norm->Bl.type) |
Line 1458 post_bl_head(POST_ARGS) |
|
Line 1459 post_bl_head(POST_ARGS) |
|
return(hwarn_eq0(mdoc)); |
return(hwarn_eq0(mdoc)); |
|
|
/* |
/* |
* Convert old-style lists, where the column width specifiers |
* Append old-style lists, where the column width specifiers |
* trail as macro parameters, to the new-style ("normal-form") |
* trail as macro parameters, to the new-style ("normal-form") |
* lists where they're argument values following -column. |
* lists where they're argument values following -column. |
*/ |
*/ |
|
|
/* First, disallow both types and allow normal-form. */ |
if (mdoc->last->child == NULL) |
|
|
/* |
|
* TODO: technically, we can accept both and just merge the two |
|
* lists, but I'll leave that for another day. |
|
*/ |
|
|
|
if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) { |
|
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS); |
|
return(0); |
|
} else if (NULL == mdoc->last->child) |
|
return(1); |
return(1); |
|
|
np = mdoc->last->parent; |
np = mdoc->last->parent; |
Line 1484 post_bl_head(POST_ARGS) |
|
Line 1475 post_bl_head(POST_ARGS) |
|
break; |
break; |
|
|
assert(j < (int)np->args->argc); |
assert(j < (int)np->args->argc); |
assert(0 == np->args->argv[j].sz); |
|
|
|
/* |
/* |
* Accommodate for new-style groff column syntax. Shuffle the |
* Accommodate for new-style groff column syntax. Shuffle the |
Line 1492 post_bl_head(POST_ARGS) |
|
Line 1482 post_bl_head(POST_ARGS) |
|
* column field. Then, delete the head children. |
* column field. Then, delete the head children. |
*/ |
*/ |
|
|
np->args->argv[j].sz = (size_t)mdoc->last->nchild; |
argv = np->args->argv + j; |
np->args->argv[j].value = mandoc_reallocarray(NULL, |
i = argv->sz; |
(size_t)mdoc->last->nchild, sizeof(char *)); |
argv->sz += mdoc->last->nchild; |
|
argv->value = mandoc_reallocarray(argv->value, |
|
argv->sz, sizeof(char *)); |
|
|
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.ncols = argv->sz; |
mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; |
mdoc->last->norm->Bl.cols = (void *)argv->value; |
|
|
for (i = 0, nn = mdoc->last->child; nn; i++) { |
for (nn = mdoc->last->child; nn; i++) { |
np->args->argv[j].value[i] = nn->string; |
argv->value[i] = nn->string; |
nn->string = NULL; |
nn->string = NULL; |
nnp = nn; |
nnp = nn; |
nn = nn->next; |
nn = nn->next; |
Line 1653 post_root(POST_ARGS) |
|
Line 1645 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) |
mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY); |
mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, |
|
n->line, n->pos, NULL); |
else if (MDOC_Sh != n->child->tok) |
else if (MDOC_Sh != n->child->tok) |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse, |
n->child->line, n->child->pos, |
n->child->line, n->child->pos, |
Line 1681 post_st(POST_ARGS) |
|
Line 1674 post_st(POST_ARGS) |
|
assert(MDOC_TEXT == nch->type); |
assert(MDOC_TEXT == nch->type); |
|
|
if (NULL == (p = mdoc_a2st(nch->string))) { |
if (NULL == (p = mdoc_a2st(nch->string))) { |
mandoc_msg(MANDOCERR_ST_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse, |
nch->line, nch->pos, nch->string); |
nch->line, nch->pos, "St %s", nch->string); |
mdoc_node_delete(mdoc, n); |
mdoc_node_delete(mdoc, n); |
} else { |
} else { |
free(nch->string); |
free(nch->string); |
Line 1832 post_ns(POST_ARGS) |
|
Line 1825 post_ns(POST_ARGS) |
|
{ |
{ |
|
|
if (MDOC_LINE & mdoc->last->flags) |
if (MDOC_LINE & mdoc->last->flags) |
mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP); |
mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse, |
|
mdoc->last->line, mdoc->last->pos, NULL); |
return(1); |
return(1); |
} |
} |
|
|
Line 1909 post_sh_head(POST_ARGS) |
|
Line 1903 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) |
mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, secname); |
mdoc->last->line, mdoc->last->pos, |
|
"Sh %s", secname); |
|
|
/* The SYNOPSIS gets special attention in other areas. */ |
/* The SYNOPSIS gets special attention in other areas. */ |
|
|
Line 1953 post_sh_head(POST_ARGS) |
|
Line 1948 post_sh_head(POST_ARGS) |
|
*/ |
*/ |
|
|
if (sec == mdoc->lastnamed) |
if (sec == mdoc->lastnamed) |
mandoc_msg(MANDOCERR_SEC_REP, mdoc->parse, |
mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, secname); |
mdoc->last->line, mdoc->last->pos, |
|
"Sh %s", secname); |
|
|
if (sec < mdoc->lastnamed) |
if (sec < mdoc->lastnamed) |
mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->parse, |
mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, secname); |
mdoc->last->line, mdoc->last->pos, |
|
"Sh %s", secname); |
|
|
/* Mark the last named section. */ |
/* Mark the last named section. */ |
|
|
Line 1992 post_sh_head(POST_ARGS) |
|
Line 1989 post_sh_head(POST_ARGS) |
|
goodsec = "9"; |
goodsec = "9"; |
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse, |
mdoc->last->line, mdoc->last->pos, |
mdoc->last->line, mdoc->last->pos, |
"%s for %s only", secname, goodsec); |
"Sh %s for %s only", secname, goodsec); |
break; |
break; |
default: |
default: |
break; |
break; |
|
|
pre_literal(PRE_ARGS) |
pre_literal(PRE_ARGS) |
{ |
{ |
|
|
|
pre_display(mdoc, n); |
|
|
if (MDOC_BODY != n->type) |
if (MDOC_BODY != n->type) |
return(1); |
return(1); |
|
|
Line 2174 post_dt(POST_ARGS) |
|
Line 2173 post_dt(POST_ARGS) |
|
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, |
mandoc_vmsg(MANDOCERR_TITLE_CASE, |
mdoc->parse, nn->line, |
mdoc->parse, nn->line, |
nn->pos + (p - nn->string), |
nn->pos + (p - nn->string), |
nn->string); |
"Dt %s", nn->string); |
break; |
break; |
} |
} |
|
|
Line 2221 post_dt(POST_ARGS) |
|
Line 2220 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 { |
mandoc_msg(MANDOCERR_MSEC_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse, |
nn->line, nn->pos, nn->string); |
nn->line, nn->pos, "Dt ... %s", 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 2244 post_dt(POST_ARGS) |
|
Line 2243 post_dt(POST_ARGS) |
|
} else { |
} else { |
cp = mdoc_a2arch(nn->string); |
cp = mdoc_a2arch(nn->string); |
if (NULL == cp) { |
if (NULL == cp) { |
mandoc_msg(MANDOCERR_ARCH_BAD, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ARCH_BAD, mdoc->parse, |
nn->line, nn->pos, nn->string); |
nn->line, nn->pos, "Dt ... %s", 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 |
Line 2355 post_ex(POST_ARGS) |
|
Line 2354 post_ex(POST_ARGS) |
|
return(1); |
return(1); |
|
|
if (mdoc->meta.name == NULL) { |
if (mdoc->meta.name == NULL) { |
mdoc_nmsg(mdoc, n, MANDOCERR_EX_NONAME); |
mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse, |
|
n->line, n->pos, "Ex"); |
return(1); |
return(1); |
} |
} |
|
|