version 1.176, 2015/02/05 01:46:56 |
version 1.180, 2015/02/07 16:42:33 |
Line 904 blk_full(MACRO_PROT_ARGS) |
|
Line 904 blk_full(MACRO_PROT_ARGS) |
|
|
|
nl = MDOC_NEWLINE & mdoc->flags; |
nl = MDOC_NEWLINE & mdoc->flags; |
|
|
|
if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
|
return; |
|
} |
|
|
if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) { |
if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) { |
|
|
/* Here, tok is one of Sh Ss Nm Nd It. */ |
/* Here, tok is one of Sh Ss Nm Nd It. */ |
Line 935 blk_full(MACRO_PROT_ARGS) |
|
Line 941 blk_full(MACRO_PROT_ARGS) |
|
mdoc_macronames[tok], |
mdoc_macronames[tok], |
mdoc_macronames[n->tok]); |
mdoc_macronames[n->tok]); |
rew_pending(mdoc, n); |
rew_pending(mdoc, n); |
|
n = mdoc->last; |
continue; |
continue; |
case MDOC_It: |
case MDOC_It: |
/* Delay in case it's astray. */ |
/* Delay in case it's astray. */ |
Line 1367 in_line_argn(MACRO_PROT_ARGS) |
|
Line 1374 in_line_argn(MACRO_PROT_ARGS) |
|
} |
} |
|
|
if (j == 0) { |
if (j == 0) { |
|
if (tok == MDOC_In || tok == MDOC_St || tok == MDOC_Xr) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
|
return; |
|
} |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
mdoc_elem_alloc(mdoc, line, ppos, tok, arg); |
if (ac == ARGS_PUNCT && tok == MDOC_Pf) |
if (ac == ARGS_PUNCT && tok == MDOC_Pf) |
append_delims(mdoc, line, pos, buf); |
append_delims(mdoc, line, pos, buf); |
Line 1390 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 1402 in_line_eoln(MACRO_PROT_ARGS) |
|
n = n->parent; |
n = n->parent; |
if (n->tok == MDOC_Nm) |
if (n->tok == MDOC_Nm) |
rew_last(mdoc, mdoc->last->parent); |
rew_last(mdoc, mdoc->last->parent); |
|
} |
|
|
|
if (buf[*pos] == '\0' && |
|
(tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) { |
|
mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse, |
|
line, ppos, mdoc_macronames[tok]); |
|
return; |
} |
} |
|
|
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |
mdoc_argv(mdoc, line, tok, &arg, pos, buf); |