version 1.113, 2015/10/22 21:54:23 |
version 1.115, 2017/01/10 13:47:00 |
Line 95 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 95 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
/* Reached the end of the document? */ |
/* Reached the end of the document? */ |
|
|
if (to == NULL && ! (n->flags & MAN_VALID)) { |
if (to == NULL && ! (n->flags & NODE_VALID)) { |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
if (man->flags & (MAN_BLINE | MAN_ELINE) && |
man_macros[n->tok].flags & MAN_SCOPED) { |
man_macros[n->tok].flags & MAN_SCOPED) { |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
mandoc_vmsg(MANDOCERR_BLK_LINE, |
Line 130 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 130 man_unscope(struct roff_man *man, const struct roff_no |
|
|
|
man->last = n; |
man->last = n; |
n = n->parent; |
n = n->parent; |
man->last->flags |= MAN_VALID; |
man->last->flags |= NODE_VALID; |
} |
} |
|
|
/* |
/* |
Line 157 rew_scope(struct roff_man *man, int tok) |
|
Line 157 rew_scope(struct roff_man *man, int tok) |
|
/* Preserve empty paragraphs before RS. */ |
/* Preserve empty paragraphs before RS. */ |
|
|
n = man->last; |
n = man->last; |
if (tok == MAN_RS && n->nchild == 0 && |
if (tok == MAN_RS && n->child == NULL && |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
(n->tok == MAN_P || n->tok == MAN_PP || n->tok == MAN_LP)) |
return; |
return; |
|
|
for (;;) { |
for (;;) { |
if (n->type == ROFFT_ROOT) |
if (n->type == ROFFT_ROOT) |
return; |
return; |
if (n->flags & MAN_VALID) { |
if (n->flags & NODE_VALID) { |
n = n->parent; |
n = n->parent; |
continue; |
continue; |
} |
} |
Line 356 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 356 in_line_eoln(MACRO_PROT_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Append MAN_EOS in case the last snipped argument |
* Append NODE_EOS in case the last snipped argument |
* ends with a dot, e.g. `.IR syslog (3).' |
* ends with a dot, e.g. `.IR syslog (3).' |
*/ |
*/ |
|
|
if (n != man->last && |
if (n != man->last && |
mandoc_eos(man->last->string, strlen(man->last->string))) |
mandoc_eos(man->last->string, strlen(man->last->string))) |
man->last->flags |= MAN_EOS; |
man->last->flags |= NODE_EOS; |
|
|
/* |
/* |
* If no arguments are specified and this is MAN_SCOPED (i.e., |
* If no arguments are specified and this is MAN_SCOPED (i.e., |