version 1.144, 2014/11/17 06:44:58 |
version 1.147, 2014/11/26 19:22:51 |
Line 171 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 171 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | |
MDOC_EXPLICIT | MDOC_JOIN }, /* So */ |
MDOC_EXPLICIT | MDOC_JOIN }, /* So */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */ |
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */ |
{ in_line_eoln, 0 }, /* Sm */ |
{ in_line_argn, 0 }, /* Sm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ |
Line 437 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
Line 437 rew_dohalt(enum mdoct tok, enum mdoc_type type, |
|
* Default block rewinding rules. |
* Default block rewinding rules. |
* In particular, always skip block end markers, |
* In particular, always skip block end markers, |
* and let all blocks rewind Nm children. |
* and let all blocks rewind Nm children. |
|
* Do not warn again when closing a block, |
|
* since closing the body already warned. |
*/ |
*/ |
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok || |
(MDOC_BLOCK == p->type && |
MDOC_BLOCK == type || (MDOC_BLOCK == p->type && |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
! (MDOC_EXPLICIT & mdoc_macros[tok].flags))) |
return(REWIND_MORE); |
return(REWIND_MORE); |
|
|
Line 926 in_line(MACRO_PROT_ARGS) |
|
Line 928 in_line(MACRO_PROT_ARGS) |
|
break; |
break; |
} |
} |
|
|
ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p); |
ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ? |
|
MDOC_MAX : lookup(tok, p); |
|
|
/* |
/* |
* In this case, we've located a submacro and must |
* In this case, we've located a submacro and must |
Line 991 in_line(MACRO_PROT_ARGS) |
|
Line 994 in_line(MACRO_PROT_ARGS) |
|
if (scope && ! rew_elem(mdoc, tok)) |
if (scope && ! rew_elem(mdoc, tok)) |
return(0); |
return(0); |
scope = 0; |
scope = 0; |
|
if (tok == MDOC_Fn) |
|
mayopen = 0; |
} else if (mayopen && !scope) { |
} else if (mayopen && !scope) { |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) |
return(0); |
return(0); |