===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.214
retrieving revision 1.217
diff -u -p -r1.214 -r1.217
--- mandoc/mdoc_macro.c	2017/02/11 14:11:17	1.214
+++ mandoc/mdoc_macro.c	2017/02/16 09:47:31	1.217
@@ -1,7 +1,7 @@
-/*	$Id: mdoc_macro.c,v 1.214 2017/02/11 14:11:17 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.217 2017/02/16 09:47:31 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -381,6 +381,10 @@ rew_elem(struct roff_man *mdoc, int tok)
 static void
 break_intermediate(struct roff_node *n, struct roff_node *breaker)
 {
+	if (n != breaker &&
+	    n->type != ROFFT_BLOCK && n->type != ROFFT_HEAD &&
+	    (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
+		n = n->parent;
 	while (n != breaker) {
 		if ( ! (n->flags & NODE_VALID))
 			n->flags |= NODE_BROKEN;
@@ -400,6 +404,9 @@ find_pending(struct roff_man *mdoc, int tok, int line,
 	struct roff_node	*n;
 	int			 irc;
 
+	if (target->flags & NODE_VALID)
+		return 0;
+
 	irc = 0;
 	for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
 		if (n->flags & NODE_ENDED)
@@ -407,8 +414,7 @@ find_pending(struct roff_man *mdoc, int tok, int line,
 		if (n->type == ROFFT_BLOCK &&
 		    mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
 			irc = 1;
-			break_intermediate(mdoc->last, n);
-			n->flags |= NODE_BROKEN;
+			break_intermediate(mdoc->last, target);
 			if (target->type == ROFFT_HEAD)
 				target->flags |= NODE_ENDED;
 			else if ( ! (target->flags & NODE_ENDED)) {
@@ -417,7 +423,7 @@ find_pending(struct roff_man *mdoc, int tok, int line,
 				    "%s breaks %s", mdoc_macronames[tok],
 				    mdoc_macronames[n->tok]);
 				mdoc_endbody_alloc(mdoc, line, ppos,
-				    tok, target, ENDBODY_NOSPACE);
+				    tok, target);
 			}
 		}
 	}
@@ -631,7 +637,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 			    mdoc_macronames[later->tok]);
 
 			endbody = mdoc_endbody_alloc(mdoc, line, ppos,
-			    atok, body, ENDBODY_SPACE);
+			    atok, body);
 
 			if (tok == MDOC_El)
 				itblk->flags |= NODE_ENDED | NODE_BROKEN;
@@ -733,9 +739,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 			do
 				target = target->parent;
 			while ( ! (target->flags & NODE_ENDED));
-			if ( ! (target->flags & NODE_VALID))
-				pending = find_pending(mdoc, ntok,
-				    line, ppos, target);
+			pending = find_pending(mdoc, ntok, line, ppos, target);
 		}
 		if ( ! pending)
 			rew_pending(mdoc, n);