===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/mandoc/man.c	2018/08/25 12:28:52	1.127
--- src/usr.bin/mandoc/man.c	2018/08/26 16:18:38	1.128
***************
*** 1,4 ****
! /*	$OpenBSD: man.c,v 1.127 2018/08/25 12:28:52 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man.c,v 1.128 2018/08/26 16:18:38 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 33,39 ****
  #include "roff_int.h"
  #include "libman.h"
  
- static	void		 man_descope(struct roff_man *, int, int, char *);
  static	char		*man_hasc(char *);
  static	int		 man_ptext(struct roff_man *, int, char *, int);
  static	int		 man_pmacro(struct roff_man *, int, char *, int);
--- 33,38 ----
***************
*** 69,91 ****
  	return (ep - cp) % 2 ? NULL : ep;
  }
  
! static void
  man_descope(struct roff_man *man, int line, int offs, char *start)
  {
  	/* Trailing \c keeps next-line scope open. */
  
! 	if (man_hasc(start) != NULL)
  		return;
  
  	/*
  	 * Co-ordinate what happens with having a next-line scope open:
! 	 * first close out the element scope (if applicable), then close
! 	 * out the block scope (also if applicable).
  	 */
  
  	if (man->flags & MAN_ELINE) {
  		man->flags &= ~MAN_ELINE;
- 		man_unscope(man, man->last->parent);
  	}
  	if ( ! (man->flags & MAN_BLINE))
  		return;
--- 68,92 ----
  	return (ep - cp) % 2 ? NULL : ep;
  }
  
! void
  man_descope(struct roff_man *man, int line, int offs, char *start)
  {
  	/* Trailing \c keeps next-line scope open. */
  
! 	if (start != NULL && man_hasc(start) != NULL)
  		return;
  
  	/*
  	 * Co-ordinate what happens with having a next-line scope open:
! 	 * first close out the element scopes (if applicable),
! 	 * then close out the block scope (also if applicable).
  	 */
  
  	if (man->flags & MAN_ELINE) {
+ 		while (man->last->parent->type != ROFFT_ROOT &&
+ 		    man_macro(man->last->parent->tok)->flags & MAN_ESCOPED)
+ 			man_unscope(man, man->last->parent);
  		man->flags &= ~MAN_ELINE;
  	}
  	if ( ! (man->flags & MAN_BLINE))
  		return;
***************
*** 241,255 ****
  	 * page, that's very likely what the author intended.
  	 */
  
! 	if (bline) {
! 		cp = strchr(buf + offs, '\0') - 2;
! 		if (cp >= buf && cp[0] == '\\' && cp[1] == 'c')
! 			bline = 0;
! 	}
  
  	/* Call to handler... */
  
- 	assert(man_macro(tok)->fp != NULL);
  	(*man_macro(tok)->fp)(man, tok, ln, ppos, &offs, buf);
  
  	/* In quick mode (for mandocdb), abort after the NAME section. */
--- 242,252 ----
  	 * page, that's very likely what the author intended.
  	 */
  
! 	if (bline && man_hasc(buf + offs))
! 		bline = 0;
  
  	/* Call to handler... */
  
  	(*man_macro(tok)->fp)(man, tok, ln, ppos, &offs, buf);
  
  	/* In quick mode (for mandocdb), abort after the NAME section. */
***************
*** 267,279 ****
  	 * unless the next-line scope is allowed to continue.
  	 */
  
! 	if ( ! bline || man->flags & MAN_ELINE ||
  	    man_macro(tok)->flags & MAN_NSCOPED)
  		return 1;
  
- 	assert(man->flags & MAN_BLINE);
  	man->flags &= ~MAN_BLINE;
- 
  	man_unscope(man, man->last->parent);
  	roff_body_alloc(man, ln, ppos, man->last->tok);
  	return 1;
--- 264,276 ----
  	 * unless the next-line scope is allowed to continue.
  	 */
  
! 	if (bline == 0 ||
! 	    (man->flags & MAN_BLINE) == 0 ||
! 	    man->flags & MAN_ELINE ||
  	    man_macro(tok)->flags & MAN_NSCOPED)
  		return 1;
  
  	man->flags &= ~MAN_BLINE;
  	man_unscope(man, man->last->parent);
  	roff_body_alloc(man, ln, ppos, man->last->tok);
  	return 1;
***************
*** 296,302 ****
  		if (n->type == ROFFT_TEXT)
  			n = n->parent;
  		if (n->tok < MAN_TH ||
! 		    man_macro(n->tok)->flags & MAN_NSCOPED)
  			n = n->parent;
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
--- 293,300 ----
  		if (n->type == ROFFT_TEXT)
  			n = n->parent;
  		if (n->tok < MAN_TH ||
! 		    (man_macro(n->tok)->flags & (MAN_NSCOPED | MAN_ESCOPED))
! 		     == MAN_NSCOPED)
  			n = n->parent;
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
***************
*** 328,345 ****
  	 */
  
  	if (man->flags & MAN_BLINE && (tok < MAN_TH ||
! 	    man_macro(tok)->flags & MAN_BSCOPE)) {
  		n = man->last;
  		if (n->type == ROFFT_TEXT)
  			n = n->parent;
  		if (n->tok < MAN_TH ||
! 		    (man_macro(n->tok)->flags & MAN_BSCOPE) == 0)
  			n = n->parent;
  
  		assert(n->type == ROFFT_HEAD);
  		n = n->parent;
  		assert(n->type == ROFFT_BLOCK);
! 		assert(man_macro(n->tok)->flags & MAN_SCOPED);
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
  		    n->line, n->pos, "%s breaks %s",
--- 326,343 ----
  	 */
  
  	if (man->flags & MAN_BLINE && (tok < MAN_TH ||
! 	    man_macro(tok)->flags & MAN_XSCOPE)) {
  		n = man->last;
  		if (n->type == ROFFT_TEXT)
  			n = n->parent;
  		if (n->tok < MAN_TH ||
! 		    (man_macro(n->tok)->flags & MAN_XSCOPE) == 0)
  			n = n->parent;
  
  		assert(n->type == ROFFT_HEAD);
  		n = n->parent;
  		assert(n->type == ROFFT_BLOCK);
! 		assert(man_macro(n->tok)->flags & MAN_BSCOPED);
  
  		mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
  		    n->line, n->pos, "%s breaks %s",