===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.213
retrieving revision 1.216
diff -u -p -r1.213 -r1.216
--- mandoc/mdoc_macro.c	2017/02/11 13:24:12	1.213
+++ mandoc/mdoc_macro.c	2017/02/16 03:00:23	1.216
@@ -1,7 +1,7 @@
-/*	$Id: mdoc_macro.c,v 1.213 2017/02/11 13:24:12 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.216 2017/02/16 03:00:23 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
@@ -400,6 +400,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)
@@ -417,7 +420,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 +634,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;
@@ -647,10 +650,16 @@ blk_exp_close(MACRO_PROT_ARGS)
 			break;
 		}
 
-		/* Explicit blocks close out description lines. */
+		/*
+		 * Explicit blocks close out description lines, but
+		 * even those can get broken together with a child.
+		 */
 
 		if (n->tok == MDOC_Nd) {
-			rew_last(mdoc, n);
+			if (later != NULL)
+				n->flags |= NODE_BROKEN | NODE_ENDED;
+			else
+				rew_last(mdoc, n);
 			continue;
 		}
 
@@ -727,9 +736,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);