diff options
| -rw-r--r-- | man.c | 13 | ||||
| -rw-r--r-- | roff.c | 10 |
2 files changed, 14 insertions, 9 deletions
@@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.172 2017/05/05 15:17:32 schwarze Exp $ */ +/* $Id: man.c,v 1.173 2017/05/08 20:33:53 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -94,6 +94,7 @@ man_ptext(struct roff_man *man, int line, char *buf, int offs) */ if (buf[i] == '\0') { + man_breakscope(man, ROFF_sp); /* Allocate a blank entry. */ if (man->last->tok != MAN_SH && man->last->tok != MAN_SS) { @@ -258,7 +259,7 @@ man_breakscope(struct roff_man *man, int tok) * Delete the element that is being broken. */ - if (man->flags & MAN_ELINE && (tok == TOKEN_NONE || + if (man->flags & MAN_ELINE && (tok < MAN_TH || ! (man_macros[tok].flags & MAN_NSCOPED))) { n = man->last; assert(n->type != ROFFT_TEXT); @@ -267,8 +268,7 @@ man_breakscope(struct roff_man *man, int tok) mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, n->pos, "%s breaks %s", - tok == TOKEN_NONE ? "TS" : roff_name[tok], - roff_name[n->tok]); + roff_name[tok], roff_name[n->tok]); roff_node_delete(man, n); man->flags &= ~MAN_ELINE; @@ -294,7 +294,7 @@ man_breakscope(struct roff_man *man, int tok) * Delete the block that is being broken. */ - if (man->flags & MAN_BLINE && (tok == TOKEN_NONE || + if (man->flags & MAN_BLINE && (tok < MAN_TH || man_macros[tok].flags & MAN_BSCOPE)) { n = man->last; if (n->type == ROFFT_TEXT) @@ -309,8 +309,7 @@ man_breakscope(struct roff_man *man, int tok) mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line, n->pos, "%s breaks %s", - tok == TOKEN_NONE ? "TS" : roff_name[tok], - roff_name[n->tok]); + roff_name[tok], roff_name[n->tok]); roff_node_delete(man, n); man->flags &= ~MAN_BLINE; @@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.301 2017/05/08 15:34:54 schwarze Exp $ */ +/* $Id: roff.c,v 1.302 2017/05/08 20:33:53 schwarze Exp $ */ /* * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -1009,7 +1009,7 @@ roff_addtbl(struct roff_man *man, const struct tbl_span *tbl) struct roff_node *n; if (man->macroset == MACROSET_MAN) - man_breakscope(man, TOKEN_NONE); + man_breakscope(man, ROFF_TS); n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE); n->span = tbl; roff_node_append(man, n); @@ -2778,6 +2778,10 @@ roff_onearg(ROFF_ARGS) struct roff_node *n; char *cp; + if (r->man->flags & (MAN_BLINE | MAN_ELINE) && + (tok == ROFF_sp || tok == ROFF_ti)) + man_breakscope(r->man, tok); + roff_elem_alloc(r->man, ln, ppos, tok); n = r->man->last; @@ -2826,6 +2830,8 @@ roff_manyarg(ROFF_ARGS) static enum rofferr roff_br(ROFF_ARGS) { + if (r->man->flags & (MAN_BLINE | MAN_ELINE)) + man_breakscope(r->man, ROFF_br); roff_elem_alloc(r->man, ln, ppos, ROFF_br); if (buf->buf[pos] != '\0') mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos, |