===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -c -r1.173 -r1.174
*** src/usr.bin/mandoc/mdoc_macro.c	2017/02/16 02:59:42	1.173
--- src/usr.bin/mandoc/mdoc_macro.c	2017/02/16 09:47:10	1.174
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.173 2017/02/16 02:59:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.174 2017/02/16 09:47:10 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 379,384 ****
--- 379,388 ----
  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;
***************
*** 408,415 ****
  		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;
  			else if ( ! (target->flags & NODE_ENDED)) {
--- 412,418 ----
  		if (n->type == ROFFT_BLOCK &&
  		    mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
  			irc = 1;
! 			break_intermediate(mdoc->last, target);
  			if (target->type == ROFFT_HEAD)
  				target->flags |= NODE_ENDED;
  			else if ( ! (target->flags & NODE_ENDED)) {