X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/3aebc3c30c9b70518679c6e3c9610ac4ffc32b61..a038e809aea161a77e12fae7992376d0f29351e1:/man_macro.c diff --git a/man_macro.c b/man_macro.c index eec4896c..b3c3a3cb 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,7 +1,7 @@ -/* $Id: man_macro.c,v 1.143 2019/01/05 00:36:50 schwarze Exp $ */ +/* $Id: man_macro.c,v 1.145 2020/09/09 17:01:10 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2012-2015, 2017-2019 Ingo Schwarze + * Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze * Copyright (c) 2013 Franco Fichtner * * Permission to use, copy, modify, and distribute this software for any @@ -107,9 +107,11 @@ man_unscope(struct roff_man *man, const struct roff_node *to) mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos, "EOF breaks %s", roff_name[n->tok]); - if (man->flags & MAN_ELINE) - man->flags &= ~MAN_ELINE; - else { + if (man->flags & MAN_ELINE) { + if ((man_macro(n->parent->tok)->flags & + MAN_ESCOPED) == 0) + man->flags &= ~MAN_ELINE; + } else { assert(n->type == ROFFT_HEAD); n = n->parent; man->flags &= ~MAN_BLINE; @@ -297,8 +299,10 @@ blk_exp(MACRO_PROT_ARGS) char *p; int la; - if (tok == MAN_RS) + if (tok == MAN_RS) { rew_scope(man, tok); + man->flags |= ROFF_NONOFILL; + } roff_block_alloc(man, line, ppos, tok); head = roff_head_alloc(man, line, ppos, tok); @@ -322,6 +326,7 @@ blk_exp(MACRO_PROT_ARGS) man_unscope(man, head); roff_body_alloc(man, line, ppos, tok); + man->flags &= ~ROFF_NONOFILL; } /*