version 1.93, 2010/07/18 17:00:26 |
version 1.97, 2010/11/30 13:04:14 |
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 263 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
Line 259 rew_last(struct mdoc *mdoc, const struct mdoc_node *to |
|
while (mdoc->last != to) { |
while (mdoc->last != to) { |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
if ( ! mdoc_action_post(mdoc)) |
|
return(0); |
|
mdoc->last = mdoc->last->parent; |
mdoc->last = mdoc->last->parent; |
assert(mdoc->last); |
assert(mdoc->last); |
} |
} |
|
|
if ( ! mdoc_valid_post(mdoc)) |
return(mdoc_valid_post(mdoc)); |
return(0); |
|
return(mdoc_action_post(mdoc)); |
|
} |
} |
|
|
|
|
Line 700 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 692 blk_exp_close(MACRO_PROT_ARGS) |
|
if (later && |
if (later && |
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
MDOC_EXPLICIT & mdoc_macros[later->tok].flags) |
continue; |
continue; |
if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) { |
if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) |
assert( ! (MDOC_ACTED & n->flags)); |
|
later = n; |
later = n; |
} |
|
} |
} |
|
|
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { |
Line 794 in_line(MACRO_PROT_ARGS) |
|
Line 784 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 */ |
Line 1147 blk_full(MACRO_PROT_ARGS) |
|
Line 1137 blk_full(MACRO_PROT_ARGS) |
|
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
! (MDOC_VALID & n->flags)) { |
! (MDOC_VALID & n->flags)) { |
assert( ! (MDOC_ACTED & n->flags)); |
|
n->pending = head; |
n->pending = head; |
return(1); |
return(1); |
} |
} |
Line 1285 blk_part_imp(MACRO_PROT_ARGS) |
|
Line 1274 blk_part_imp(MACRO_PROT_ARGS) |
|
if (MDOC_BLOCK == n->type && |
if (MDOC_BLOCK == n->type && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
MDOC_EXPLICIT & mdoc_macros[n->tok].flags && |
! (MDOC_VALID & n->flags)) { |
! (MDOC_VALID & n->flags)) { |
assert( ! (MDOC_ACTED & n->flags)); |
|
if ( ! make_pending(n, tok, m, line, ppos)) |
if ( ! make_pending(n, tok, m, line, ppos)) |
return(0); |
return(0); |
if ( ! mdoc_endbody_alloc(m, line, ppos, |
if ( ! mdoc_endbody_alloc(m, line, ppos, |