===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.212
retrieving revision 1.216
diff -u -p -r1.212 -r1.216
--- mandoc/mdoc_macro.c	2017/02/10 22:19:18	1.212
+++ mandoc/mdoc_macro.c	2017/02/16 03:00:23	1.216
@@ -1,7 +1,7 @@
-/*	$Id: mdoc_macro.c,v 1.212 2017/02/10 22:19:18 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
@@ -50,6 +50,8 @@ static	int		find_pending(struct roff_man *, int, int, 
 				struct roff_node *);
 static	int		lookup(struct roff_man *, int, int, int, const char *);
 static	int		macro_or_word(MACRO_PROT_ARGS, int);
+static	void		break_intermediate(struct roff_node *,
+			    struct roff_node *);
 static	int		parse_rest(struct roff_man *, int, int, int *, char *);
 static	int		rew_alt(int);
 static	void		rew_elem(struct roff_man *, int);
@@ -376,6 +378,16 @@ rew_elem(struct roff_man *mdoc, int tok)
 	rew_last(mdoc, n);
 }
 
+static void
+break_intermediate(struct roff_node *n, struct roff_node *breaker)
+{
+	while (n != breaker) {
+		if ( ! (n->flags & NODE_VALID))
+			n->flags |= NODE_BROKEN;
+		n = n->parent;
+	}
+}
+
 /*
  * If there is an open sub-block of the target requiring
  * explicit close-out, postpone closing out the target until
@@ -388,16 +400,17 @@ 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) {
-			if ( ! (n->flags & NODE_VALID))
-				n->flags |= NODE_BROKEN;
+		if (n->flags & NODE_ENDED)
 			continue;
-		}
 		if (n->type == ROFFT_BLOCK &&
 		    mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
 			irc = 1;
+			break_intermediate(mdoc->last, n);
 			n->flags |= NODE_BROKEN;
 			if (target->type == ROFFT_HEAD)
 				target->flags |= NODE_ENDED;
@@ -407,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);
 			}
 		}
 	}
@@ -568,11 +581,8 @@ blk_exp_close(MACRO_PROT_ARGS)
 
 	endbody = itblk = later = NULL;
 	for (n = mdoc->last; n; n = n->parent) {
-		if (n->flags & NODE_ENDED) {
-			if ( ! (n->flags & NODE_VALID))
-				n->flags |= NODE_BROKEN;
+		if (n->flags & NODE_ENDED)
 			continue;
-		}
 
 		/*
 		 * Mismatching end macros can never break anything
@@ -599,7 +609,6 @@ blk_exp_close(MACRO_PROT_ARGS)
 		}
 
 		if (atok == n->tok) {
-			assert(body);
 
 			/*
 			 * Found the start of our own block.
@@ -625,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;
@@ -641,15 +650,22 @@ 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;
 		}
 
 		/* Breaking an open sub block. */
 
+		break_intermediate(mdoc->last, body);
 		n->flags |= NODE_BROKEN;
 		if (later == NULL)
 			later = n;
@@ -720,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);