version 1.140, 2018/12/31 07:08:12 |
version 1.145, 2020/09/09 17:01:10 |
|
|
/* $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) 2012-2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 107 man_unscope(struct roff_man *man, const struct roff_no |
|
Line 107 man_unscope(struct roff_man *man, const struct roff_no |
|
mandoc_msg(MANDOCERR_BLK_LINE, |
mandoc_msg(MANDOCERR_BLK_LINE, |
n->line, n->pos, |
n->line, n->pos, |
"EOF breaks %s", roff_name[n->tok]); |
"EOF breaks %s", roff_name[n->tok]); |
if (man->flags & MAN_ELINE) |
if (man->flags & MAN_ELINE) { |
man->flags &= ~MAN_ELINE; |
if ((man_macro(n->parent->tok)->flags & |
else { |
MAN_ESCOPED) == 0) |
|
man->flags &= ~MAN_ELINE; |
|
} else { |
assert(n->type == ROFFT_HEAD); |
assert(n->type == ROFFT_HEAD); |
n = n->parent; |
n = n->parent; |
man->flags &= ~MAN_BLINE; |
man->flags &= ~MAN_BLINE; |
Line 297 blk_exp(MACRO_PROT_ARGS) |
|
Line 299 blk_exp(MACRO_PROT_ARGS) |
|
char *p; |
char *p; |
int la; |
int la; |
|
|
if (tok == MAN_RS) |
if (tok == MAN_RS) { |
rew_scope(man, tok); |
rew_scope(man, tok); |
|
man->flags |= ROFF_NONOFILL; |
|
} |
roff_block_alloc(man, line, ppos, tok); |
roff_block_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
head = roff_head_alloc(man, line, ppos, tok); |
|
|
Line 322 blk_exp(MACRO_PROT_ARGS) |
|
Line 326 blk_exp(MACRO_PROT_ARGS) |
|
|
|
man_unscope(man, head); |
man_unscope(man, head); |
roff_body_alloc(man, line, ppos, tok); |
roff_body_alloc(man, line, ppos, tok); |
|
man->flags &= ~ROFF_NONOFILL; |
} |
} |
|
|
/* |
/* |
Line 338 blk_imp(MACRO_PROT_ARGS) |
|
Line 343 blk_imp(MACRO_PROT_ARGS) |
|
struct roff_node *n; |
struct roff_node *n; |
|
|
rew_scope(man, tok); |
rew_scope(man, tok); |
|
man->flags |= ROFF_NONOFILL; |
if (tok == MAN_SH || tok == MAN_SS) |
if (tok == MAN_SH || tok == MAN_SS) |
man->flags &= ~ROFF_NOFILL; |
man->flags &= ~ROFF_NOFILL; |
roff_block_alloc(man, line, ppos, tok); |
roff_block_alloc(man, line, ppos, tok); |
Line 369 blk_imp(MACRO_PROT_ARGS) |
|
Line 375 blk_imp(MACRO_PROT_ARGS) |
|
|
|
man_unscope(man, n); |
man_unscope(man, n); |
roff_body_alloc(man, line, ppos, tok); |
roff_body_alloc(man, line, ppos, tok); |
|
man->flags &= ~ROFF_NONOFILL; |
} |
} |
|
|
void |
void |
Line 381 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 388 in_line_eoln(MACRO_PROT_ARGS) |
|
roff_elem_alloc(man, line, ppos, tok); |
roff_elem_alloc(man, line, ppos, tok); |
n = man->last; |
n = man->last; |
|
|
|
if (tok == MAN_EX) |
|
man->flags |= ROFF_NOFILL; |
|
else if (tok == MAN_EE) |
|
man->flags &= ~ROFF_NOFILL; |
|
|
for (;;) { |
for (;;) { |
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) { |
if (buf[*pos] != '\0' && man->last != n && tok == MAN_PD) { |
mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos, |
mandoc_msg(MANDOCERR_ARG_EXCESS, line, *pos, |
Line 424 in_line_eoln(MACRO_PROT_ARGS) |
|
Line 436 in_line_eoln(MACRO_PROT_ARGS) |
|
/* Rewind our element scope. */ |
/* Rewind our element scope. */ |
|
|
for ( ; man->last; man->last = man->last->parent) { |
for ( ; man->last; man->last = man->last->parent) { |
man_state(man, man->last); |
man->last->flags |= NODE_VALID; |
if (man->last == n) |
if (man->last == n) |
break; |
break; |
} |
} |