version 1.131, 2014/07/06 19:09:00 |
version 1.133, 2014/07/07 21:36:20 |
Line 392 man_descope(struct man *man, int line, int offs) |
|
Line 392 man_descope(struct man *man, int line, int offs) |
|
|
|
if (MAN_ELINE & man->flags) { |
if (MAN_ELINE & man->flags) { |
man->flags &= ~MAN_ELINE; |
man->flags &= ~MAN_ELINE; |
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
} |
} |
|
|
Line 400 man_descope(struct man *man, int line, int offs) |
|
Line 400 man_descope(struct man *man, int line, int offs) |
|
return(1); |
return(1); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
return(man_body_alloc(man, line, offs, man->last->tok)); |
return(man_body_alloc(man, line, offs, man->last->tok)); |
} |
} |
Line 542 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 542 man_pmacro(struct man *man, int ln, char *buf, int off |
|
if (MAN_NSCOPED & man_macros[n->tok].flags) |
if (MAN_NSCOPED & man_macros[n->tok].flags) |
n = n->parent; |
n = n->parent; |
|
|
mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line, |
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, |
n->pos, "%s breaks %s", man_macronames[tok], |
n->pos, "%s breaks %s", man_macronames[tok], |
man_macronames[n->tok]); |
man_macronames[n->tok]); |
|
|
Line 573 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 573 man_pmacro(struct man *man, int ln, char *buf, int off |
|
assert(MAN_BLOCK == n->type); |
assert(MAN_BLOCK == n->type); |
assert(MAN_SCOPED & man_macros[n->tok].flags); |
assert(MAN_SCOPED & man_macros[n->tok].flags); |
|
|
mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line, |
mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, |
n->pos, "%s breaks %s", man_macronames[tok], |
n->pos, "%s breaks %s", man_macronames[tok], |
man_macronames[n->tok]); |
man_macronames[n->tok]); |
|
|
Line 639 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 639 man_pmacro(struct man *man, int ln, char *buf, int off |
|
assert(MAN_BLINE & man->flags); |
assert(MAN_BLINE & man->flags); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
|
|
if ( ! man_unscope(man, man->last->parent, MANDOCERR_MAX)) |
if ( ! man_unscope(man, man->last->parent)) |
return(0); |
return(0); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
return(man_body_alloc(man, ln, ppos, man->last->tok)); |
|
|