version 1.184, 2018/12/31 07:08:12 |
version 1.187, 2019/01/05 00:36:50 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 92 man_descope(struct roff_man *man, int line, int offs, |
|
Line 92 man_descope(struct roff_man *man, int line, int offs, |
|
} |
} |
if ( ! (man->flags & MAN_BLINE)) |
if ( ! (man->flags & MAN_BLINE)) |
return; |
return; |
man->flags &= ~MAN_BLINE; |
|
man_unscope(man, man->last->parent); |
man_unscope(man, man->last->parent); |
roff_body_alloc(man, line, offs, man->last->tok); |
roff_body_alloc(man, line, offs, man->last->tok); |
|
man->flags &= ~(MAN_BLINE | ROFF_NONOFILL); |
} |
} |
|
|
static int |
static int |
Line 268 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 268 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
man_macro(tok)->flags & MAN_NSCOPED) |
man_macro(tok)->flags & MAN_NSCOPED) |
return 1; |
return 1; |
|
|
man->flags &= ~MAN_BLINE; |
|
man_unscope(man, man->last->parent); |
man_unscope(man, man->last->parent); |
roff_body_alloc(man, ln, ppos, man->last->tok); |
roff_body_alloc(man, ln, ppos, man->last->tok); |
|
man->flags &= ~(MAN_BLINE | ROFF_NONOFILL); |
return 1; |
return 1; |
} |
} |
|
|
Line 313 man_breakscope(struct roff_man *man, int tok) |
|
Line 313 man_breakscope(struct roff_man *man, int tok) |
|
n = man->last; |
n = man->last; |
man_unscope(man, n); |
man_unscope(man, n); |
roff_body_alloc(man, n->line, n->pos, n->tok); |
roff_body_alloc(man, n->line, n->pos, n->tok); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~(MAN_BLINE | ROFF_NONOFILL); |
} |
} |
|
|
/* |
/* |
Line 340 man_breakscope(struct roff_man *man, int tok) |
|
Line 340 man_breakscope(struct roff_man *man, int tok) |
|
"%s breaks %s", roff_name[tok], roff_name[n->tok]); |
"%s breaks %s", roff_name[tok], roff_name[n->tok]); |
|
|
roff_node_delete(man, n); |
roff_node_delete(man, n); |
man->flags &= ~MAN_BLINE; |
man->flags &= ~(MAN_BLINE | ROFF_NONOFILL); |
} |
} |
} |
|
|
|
void |
|
man_state(struct roff_man *man, struct roff_node *n) |
|
{ |
|
|
|
switch(n->tok) { |
|
case ROFF_nf: |
|
case MAN_EX: |
|
if (man->flags & ROFF_NOFILL && (n->flags & NODE_VALID) == 0) |
|
mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "nf"); |
|
man->flags |= ROFF_NOFILL; |
|
break; |
|
case ROFF_fi: |
|
case MAN_EE: |
|
if ( (man->flags & ROFF_NOFILL) == 0 && |
|
! (n->flags & NODE_VALID)) |
|
mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "fi"); |
|
man->flags &= ~ROFF_NOFILL; |
|
break; |
|
default: |
|
break; |
|
} |
|
man->last->flags |= NODE_VALID; |
|
} |
} |