version 1.269, 2015/02/04 19:20:12 |
version 1.273, 2015/02/06 02:04:54 |
Line 70 static void rewrite_macro2len(char **); |
|
Line 70 static void rewrite_macro2len(char **); |
|
static void bwarn_ge1(POST_ARGS); |
static void bwarn_ge1(POST_ARGS); |
static void ewarn_eq1(POST_ARGS); |
static void ewarn_eq1(POST_ARGS); |
static void ewarn_ge1(POST_ARGS); |
static void ewarn_ge1(POST_ARGS); |
static void hwarn_eq0(POST_ARGS); |
|
|
|
static void post_an(POST_ARGS); |
static void post_an(POST_ARGS); |
static void post_at(POST_ARGS); |
static void post_at(POST_ARGS); |
Line 157 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 156 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, post_fn }, /* Fn */ |
{ NULL, post_fn }, /* Fn */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, NULL }, /* Ft */ |
{ NULL, NULL }, /* Ic */ |
{ NULL, NULL }, /* Ic */ |
{ NULL, ewarn_eq1 }, /* In */ |
{ NULL, NULL }, /* In */ |
{ NULL, post_defaults }, /* Li */ |
{ NULL, post_defaults }, /* Li */ |
{ NULL, post_nd }, /* Nd */ |
{ NULL, post_nd }, /* Nd */ |
{ NULL, post_nm }, /* Nm */ |
{ NULL, post_nm }, /* Nm */ |
Line 168 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
Line 167 static const struct valids mdoc_valids[MDOC_MAX] = { |
|
{ NULL, post_st }, /* St */ |
{ NULL, post_st }, /* St */ |
{ NULL, NULL }, /* Va */ |
{ NULL, NULL }, /* Va */ |
{ NULL, post_vt }, /* Vt */ |
{ NULL, post_vt }, /* Vt */ |
{ NULL, ewarn_ge1 }, /* Xr */ |
{ NULL, NULL }, /* Xr */ |
{ NULL, ewarn_ge1 }, /* %A */ |
{ NULL, ewarn_ge1 }, /* %A */ |
{ NULL, post_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, post_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */ |
{ NULL, ewarn_ge1 }, /* %D */ |
{ NULL, ewarn_ge1 }, /* %D */ |
Line 421 ewarn_ge1(POST_ARGS) |
|
Line 420 ewarn_ge1(POST_ARGS) |
|
} |
} |
|
|
static void |
static void |
hwarn_eq0(POST_ARGS) |
|
{ |
|
check_count(mdoc, MDOC_HEAD, CHECK_EQ, 0); |
|
} |
|
|
|
static void |
|
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
check_args(struct mdoc *mdoc, struct mdoc_node *n) |
{ |
{ |
int i; |
int i; |
Line 1079 post_nd(POST_ARGS) |
|
Line 1072 post_nd(POST_ARGS) |
|
static void |
static void |
post_d1(POST_ARGS) |
post_d1(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
bwarn_ge1(mdoc); |
n = mdoc->last; |
|
|
|
if (n->type != MDOC_BODY) |
|
return; |
|
|
|
if (n->child == NULL) |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
n->line, n->pos, "D1"); |
|
|
post_hyph(mdoc); |
post_hyph(mdoc); |
} |
} |
|
|
static void |
static void |
post_literal(POST_ARGS) |
post_literal(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
if (mdoc->last->tok == MDOC_Bd) |
n = mdoc->last; |
hwarn_eq0(mdoc); |
|
bwarn_ge1(mdoc); |
|
|
|
/* |
if (n->type != MDOC_BODY) |
* The `Dl' (note "el" not "one") and `Bd' macros unset the |
return; |
* MDOC_LITERAL flag as they leave. Note that `Bd' only sets |
|
* this in literal mode, but it doesn't hurt to just switch it |
|
* off in general since displays can't be nested. |
|
*/ |
|
|
|
if (MDOC_BODY == mdoc->last->type) |
if (n->child == NULL) |
mdoc->flags &= ~MDOC_LITERAL; |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
|
|
if (n->tok == MDOC_Bd && |
|
n->norm->Bd.type != DISP_literal && |
|
n->norm->Bd.type != DISP_unfilled) |
|
return; |
|
|
|
mdoc->flags &= ~MDOC_LITERAL; |
} |
} |
|
|
static void |
static void |
Line 1177 post_an(POST_ARGS) |
|
Line 1182 post_an(POST_ARGS) |
|
struct mdoc_node *np, *nch; |
struct mdoc_node *np, *nch; |
|
|
np = mdoc->last; |
np = mdoc->last; |
if (AUTH__NONE == np->norm->An.auth) { |
nch = np->child; |
if (0 == np->child) |
if (np->norm->An.auth == AUTH__NONE) { |
check_count(mdoc, MDOC_ELEM, CHECK_GT, 0); |
if (nch == NULL) |
} else if ((nch = np->child) != NULL) |
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
np->line, np->pos, "An"); |
|
} else if (nch != NULL) |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
nch->line, nch->pos, "An ... %s", nch->string); |
nch->line, nch->pos, "An ... %s", nch->string); |
} |
} |
Line 1415 post_bl_block_tag(POST_ARGS) |
|
Line 1422 post_bl_block_tag(POST_ARGS) |
|
static void |
static void |
post_bl_head(POST_ARGS) |
post_bl_head(POST_ARGS) |
{ |
{ |
struct mdoc_node *np, *nn, *nnp; |
struct mdoc_node *nbl, *nh, *nch, *nnext; |
struct mdoc_argv *argv; |
struct mdoc_argv *argv; |
int i, j; |
int i, j; |
|
|
if (LIST_column != mdoc->last->norm->Bl.type) { |
nh = mdoc->last; |
/* FIXME: this should be ERROR class... */ |
|
hwarn_eq0(mdoc); |
if (nh->norm->Bl.type != LIST_column) { |
|
if ((nch = nh->child) == NULL) |
|
return; |
|
mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse, |
|
nch->line, nch->pos, "Bl ... %s", nch->string); |
|
while (nch != NULL) { |
|
mdoc_node_delete(mdoc, nch); |
|
nch = nh->child; |
|
} |
return; |
return; |
} |
} |
|
|
Line 1431 post_bl_head(POST_ARGS) |
|
Line 1446 post_bl_head(POST_ARGS) |
|
* lists where they're argument values following -column. |
* lists where they're argument values following -column. |
*/ |
*/ |
|
|
if (mdoc->last->child == NULL) |
if (nh->child == NULL) |
return; |
return; |
|
|
np = mdoc->last->parent; |
nbl = nh->parent; |
assert(np->args); |
for (j = 0; j < (int)nbl->args->argc; j++) |
|
if (nbl->args->argv[j].arg == MDOC_Column) |
for (j = 0; j < (int)np->args->argc; j++) |
|
if (MDOC_Column == np->args->argv[j].arg) |
|
break; |
break; |
|
|
assert(j < (int)np->args->argc); |
assert(j < (int)nbl->args->argc); |
|
|
/* |
/* |
* Accommodate for new-style groff column syntax. Shuffle the |
* Accommodate for new-style groff column syntax. Shuffle the |
Line 1449 post_bl_head(POST_ARGS) |
|
Line 1462 post_bl_head(POST_ARGS) |
|
* column field. Then, delete the head children. |
* column field. Then, delete the head children. |
*/ |
*/ |
|
|
argv = np->args->argv + j; |
argv = nbl->args->argv + j; |
i = argv->sz; |
i = argv->sz; |
argv->sz += mdoc->last->nchild; |
argv->sz += nh->nchild; |
argv->value = mandoc_reallocarray(argv->value, |
argv->value = mandoc_reallocarray(argv->value, |
argv->sz, sizeof(char *)); |
argv->sz, sizeof(char *)); |
|
|
mdoc->last->norm->Bl.ncols = argv->sz; |
nh->norm->Bl.ncols = argv->sz; |
mdoc->last->norm->Bl.cols = (void *)argv->value; |
nh->norm->Bl.cols = (void *)argv->value; |
|
|
for (nn = mdoc->last->child; nn; i++) { |
for (nch = nh->child; nch != NULL; nch = nnext) { |
argv->value[i] = nn->string; |
argv->value[i++] = nch->string; |
nn->string = NULL; |
nch->string = NULL; |
nnp = nn; |
nnext = nch->next; |
nn = nn->next; |
mdoc_node_delete(NULL, nch); |
mdoc_node_delete(NULL, nnp); |
|
} |
} |
|
nh->nchild = 0; |
mdoc->last->nchild = 0; |
nh->child = NULL; |
mdoc->last->child = NULL; |
|
} |
} |
|
|
static void |
static void |
Line 1491 post_bl(POST_ARGS) |
|
Line 1502 post_bl(POST_ARGS) |
|
return; |
return; |
} |
} |
|
|
bwarn_ge1(mdoc); |
|
|
|
nchild = nbody->child; |
nchild = nbody->child; |
while (NULL != nchild) { |
if (nchild == NULL) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
nbody->line, nbody->pos, "Bl"); |
|
return; |
|
} |
|
while (nchild != NULL) { |
if (nchild->tok == MDOC_It || |
if (nchild->tok == MDOC_It || |
(nchild->tok == MDOC_Sm && |
(nchild->tok == MDOC_Sm && |
nchild->next != NULL && |
nchild->next != NULL && |
Line 1553 post_bl(POST_ARGS) |
|
Line 1567 post_bl(POST_ARGS) |
|
static void |
static void |
post_bk(POST_ARGS) |
post_bk(POST_ARGS) |
{ |
{ |
|
struct mdoc_node *n; |
|
|
hwarn_eq0(mdoc); |
n = mdoc->last; |
bwarn_ge1(mdoc); |
|
|
if (n->type == MDOC_BLOCK && n->body->child == NULL) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, |
|
mdoc->parse, n->line, n->pos, "Bk"); |
|
mdoc_node_delete(mdoc, n); |
|
} |
} |
} |
|
|
static void |
static void |
Line 1637 post_st(POST_ARGS) |
|
Line 1657 post_st(POST_ARGS) |
|
n = mdoc->last; |
n = mdoc->last; |
nch = n->child; |
nch = n->child; |
|
|
if (NULL == nch) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
n->line, n->pos, mdoc_macronames[n->tok]); |
|
mdoc_node_delete(mdoc, n); |
|
return; |
|
} |
|
|
|
assert(MDOC_TEXT == nch->type); |
assert(MDOC_TEXT == nch->type); |
|
|
if (NULL == (p = mdoc_a2st(nch->string))) { |
if (NULL == (p = mdoc_a2st(nch->string))) { |
Line 1753 post_rs(POST_ARGS) |
|
Line 1766 post_rs(POST_ARGS) |
|
static void |
static void |
post_hyph(POST_ARGS) |
post_hyph(POST_ARGS) |
{ |
{ |
struct mdoc_node *n, *nch; |
struct mdoc_node *nch; |
char *cp; |
char *cp; |
|
|
n = mdoc->last; |
for (nch = mdoc->last->child; nch != NULL; nch = nch->next) { |
switch (n->type) { |
if (nch->type != MDOC_TEXT) |
case MDOC_HEAD: |
|
if (MDOC_Sh == n->tok || MDOC_Ss == n->tok) |
|
break; |
|
return; |
|
case MDOC_BODY: |
|
if (MDOC_D1 == n->tok || MDOC_Nd == n->tok) |
|
break; |
|
return; |
|
case MDOC_ELEM: |
|
break; |
|
default: |
|
return; |
|
} |
|
|
|
for (nch = n->child; nch; nch = nch->next) { |
|
if (MDOC_TEXT != nch->type) |
|
continue; |
continue; |
cp = nch->string; |
cp = nch->string; |
if ('\0' == *cp) |
if (*cp == '\0') |
continue; |
continue; |
while ('\0' != *(++cp)) |
while (*(++cp) != '\0') |
if ('-' == *cp && |
if (*cp == '-' && |
isalpha((unsigned char)cp[-1]) && |
isalpha((unsigned char)cp[-1]) && |
isalpha((unsigned char)cp[1])) |
isalpha((unsigned char)cp[1])) |
*cp = ASCII_HYPH; |
*cp = ASCII_HYPH; |
Line 2073 post_ignpar(POST_ARGS) |
|
Line 2070 post_ignpar(POST_ARGS) |
|
{ |
{ |
struct mdoc_node *np; |
struct mdoc_node *np; |
|
|
check_count(mdoc, MDOC_HEAD, CHECK_GT, 0); |
switch (mdoc->last->type) { |
post_hyph(mdoc); |
case MDOC_HEAD: |
|
post_hyph(mdoc); |
if (MDOC_BODY != mdoc->last->type) |
|
return; |
return; |
|
case MDOC_BODY: |
|
break; |
|
default: |
|
return; |
|
} |
|
|
if (NULL != (np = mdoc->last->child)) |
if (NULL != (np = mdoc->last->child)) |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |
if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) { |