version 1.130, 2014/05/07 14:14:17 |
version 1.132, 2014/07/07 19:18:15 |
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 447 man_ptext(struct man *man, int line, char *buf, int of |
|
Line 447 man_ptext(struct man *man, int line, char *buf, int of |
|
|
|
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { |
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { |
if (i > 1 && '\\' != buf[i - 2]) |
if (i > 1 && '\\' != buf[i - 2]) |
man_pmsg(man, line, i - 1, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, |
|
line, i - 1, NULL); |
|
|
for (--i; i && ' ' == buf[i]; i--) |
for (--i; i && ' ' == buf[i]; i--) |
/* Spin back to non-space. */ ; |
/* Spin back to non-space. */ ; |
Line 483 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 484 man_pmacro(struct man *man, int ln, char *buf, int off |
|
struct man_node *n; |
struct man_node *n; |
|
|
if ('"' == buf[offs]) { |
if ('"' == buf[offs]) { |
man_pmsg(man, ln, offs, MANDOCERR_BADCOMMENT); |
mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse, |
|
ln, offs, NULL); |
return(1); |
return(1); |
} else if ('\0' == buf[offs]) |
} else if ('\0' == buf[offs]) |
return(1); |
return(1); |
Line 521 man_pmacro(struct man *man, int ln, char *buf, int off |
|
Line 523 man_pmacro(struct man *man, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
man_pmsg(man, ln, offs - 1, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, man->parse, |
|
ln, offs - 1, NULL); |
|
|
/* |
/* |
* Remove prior ELINE macro, as it's being clobbered by a new |
* Remove prior ELINE macro, as it's being clobbered by a new |
Line 636 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)); |
|
|