version 1.181, 2018/12/14 05:18:02 |
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 103 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 103 man_ptext(struct roff_man *man, int line, char *buf, i |
|
int i; |
int i; |
char *ep; |
char *ep; |
|
|
/* Literal free-form text whitespace is preserved. */ |
/* In no-fill mode, whitespace is preserved on text lines. */ |
|
|
if (man->flags & MAN_LITERAL) { |
if (man->flags & ROFF_NOFILL) { |
roff_word_alloc(man, line, offs, buf + offs); |
roff_word_alloc(man, line, offs, buf + offs); |
man_descope(man, line, offs, buf + offs); |
man_descope(man, line, offs, buf + offs); |
return 1; |
return 1; |
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 308 man_breakscope(struct roff_man *man, int tok) |
|
Line 308 man_breakscope(struct roff_man *man, int tok) |
|
*/ |
*/ |
|
|
if (man->flags & MAN_BLINE && |
if (man->flags & MAN_BLINE && |
(tok == MAN_nf || tok == MAN_fi) && |
(tok == ROFF_nf || tok == ROFF_fi) && |
(man->last->tok == MAN_SH || man->last->tok == MAN_SS)) { |
(man->last->tok == MAN_SH || man->last->tok == MAN_SS)) { |
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 322 man_breakscope(struct roff_man *man, int tok) |
|
Line 322 man_breakscope(struct roff_man *man, int tok) |
|
* Delete the block that is being broken. |
* Delete the block that is being broken. |
*/ |
*/ |
|
|
if (man->flags & MAN_BLINE && (tok < MAN_TH || |
if (man->flags & MAN_BLINE && tok != ROFF_nf && tok != ROFF_fi && |
man_macro(tok)->flags & MAN_XSCOPE)) { |
(tok < MAN_TH || man_macro(tok)->flags & MAN_XSCOPE)) { |
n = man->last; |
n = man->last; |
if (n->type == ROFFT_TEXT) |
if (n->type == ROFFT_TEXT) |
n = n->parent; |
n = n->parent; |
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 MAN_nf: |
|
case MAN_EX: |
|
if (man->flags & MAN_LITERAL && ! (n->flags & NODE_VALID)) |
|
mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "nf"); |
|
man->flags |= MAN_LITERAL; |
|
break; |
|
case MAN_fi: |
|
case MAN_EE: |
|
if ( ! (man->flags & MAN_LITERAL) && |
|
! (n->flags & NODE_VALID)) |
|
mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "fi"); |
|
man->flags &= ~MAN_LITERAL; |
|
break; |
|
default: |
|
break; |
|
} |
|
man->last->flags |= NODE_VALID; |
|
} |
|
|
|
void |
|
man_validate(struct roff_man *man) |
|
{ |
|
|
|
man->last = man->first; |
|
man_node_validate(man); |
|
man->flags &= ~MAN_LITERAL; |
|
} |
} |