===================================================================
RCS file: /cvs/mandoc/roff.c,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -p -r1.301 -r1.302
--- mandoc/roff.c	2017/05/08 15:34:54	1.301
+++ mandoc/roff.c	2017/05/08 20:33:53	1.302
@@ -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_spa
 	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,