version 1.185, 2015/04/02 22:48:17 |
version 1.186, 2015/04/05 14:43:36 |
Line 256 rew_last(struct mdoc *mdoc, const struct roff_node *to |
|
Line 256 rew_last(struct mdoc *mdoc, const struct roff_node *to |
|
{ |
{ |
struct roff_node *n, *np; |
struct roff_node *n, *np; |
|
|
assert(to); |
if (to->flags & MDOC_VALID) |
|
return; |
|
|
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
while (mdoc->last != to) { |
while (mdoc->last != to) { |
/* |
/* |
Line 625 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 627 blk_exp_close(MACRO_PROT_ARGS) |
|
for (j = 0; ; j++) { |
for (j = 0; ; j++) { |
lastarg = *pos; |
lastarg = *pos; |
|
|
if (j == maxargs && n != NULL) { |
if (j == maxargs && n != NULL) |
rew_pending(mdoc, n); |
rew_last(mdoc, n); |
n = NULL; |
|
} |
|
|
|
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
ac = mdoc_args(mdoc, line, pos, buf, tok, &p); |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
if (ac == ARGS_PUNCT || ac == ARGS_EOLN) |
Line 643 blk_exp_close(MACRO_PROT_ARGS) |
|
Line 643 blk_exp_close(MACRO_PROT_ARGS) |
|
continue; |
continue; |
} |
} |
|
|
if (n != NULL) { |
if (n != NULL) |
rew_pending(mdoc, n); |
rew_last(mdoc, n); |
n = NULL; |
|
} |
|
mdoc->flags &= ~MDOC_NEWLINE; |
mdoc->flags &= ~MDOC_NEWLINE; |
mdoc_macro(mdoc, ntok, line, lastarg, pos, buf); |
mdoc_macro(mdoc, ntok, line, lastarg, pos, buf); |
break; |
break; |