version 1.93, 2010/07/18 17:00:26 |
version 1.96, 2010/11/29 13:02:47 |
Line 138 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 138 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_IGNDELIM }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
{ blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ |
Line 207 mdoc_macroend(struct mdoc *m) |
|
Line 207 mdoc_macroend(struct mdoc *m) |
|
|
|
n = MDOC_VALID & m->last->flags ? m->last->parent : m->last; |
n = MDOC_VALID & m->last->flags ? m->last->parent : m->last; |
|
|
for ( ; n; n = n->parent) { |
for ( ; n; n = n->parent) |
if (MDOC_BLOCK != n->type) |
if (MDOC_BLOCK == n->type && |
continue; |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags) |
if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) |
mdoc_nmsg(m, n, MANDOCERR_SCOPEEXIT); |
continue; |
|
mdoc_nmsg(m, n, MANDOCERR_SYNTSCOPE); |
|
return(0); |
|
} |
|
|
|
/* Rewind to the first. */ |
/* Rewind to the first. */ |
|
|
Line 794 in_line(MACRO_PROT_ARGS) |
|
Line 790 in_line(MACRO_PROT_ARGS) |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Fl): |
case (MDOC_Fl): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Lk): |
case (MDOC_Mt): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Nm): |
case (MDOC_Nm): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |