===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -c -r1.238 -r1.239
*** src/usr.bin/mandoc/mdoc_validate.c	2017/04/29 12:43:55	1.238
--- src/usr.bin/mandoc/mdoc_validate.c	2017/05/04 17:48:24	1.239
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_validate.c,v 1.238 2017/04/29 12:43:55 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_validate.c,v 1.239 2017/05/04 17:48:24 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 225,231 ****
  	post_en,	/* En */
  	post_xx,	/* Dx */
  	NULL,		/* %Q */
- 	post_par,	/* br */
  	post_par,	/* sp */
  	NULL,		/* %U */
  	NULL,		/* Ta */
--- 225,230 ----
***************
*** 325,330 ****
--- 324,341 ----
  
  		/* Call the macro's postprocessor. */
  
+ 		if (n->tok < ROFF_MAX) {
+ 			switch(n->tok) {
+ 			case ROFF_br:
+ 				post_par(mdoc);
+ 				break;
+ 			default:
+ 				abort();
+ 			}
+ 			break;
+ 		}
+ 
+ 		assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
  		p = mdoc_valids + n->tok;
  		if (*p)
  			(*p)(mdoc);
***************
*** 1298,1304 ****
  			switch (nc->tok) {
  			case MDOC_Pp:
  			case MDOC_Lp:
! 			case MDOC_br:
  				break;
  			default:
  				nc = NULL;
--- 1309,1315 ----
  			switch (nc->tok) {
  			case MDOC_Pp:
  			case MDOC_Lp:
! 			case ROFF_br:
  				break;
  			default:
  				nc = NULL;
***************
*** 2052,2058 ****
  
  	if (n->prev->tok != MDOC_Pp &&
  	    n->prev->tok != MDOC_Lp &&
! 	    n->prev->tok != MDOC_br)
  		return;
  	if (n->tok == MDOC_Bl && n->norm->Bl.comp)
  		return;
--- 2063,2069 ----
  
  	if (n->prev->tok != MDOC_Pp &&
  	    n->prev->tok != MDOC_Lp &&
! 	    n->prev->tok != ROFF_br)
  		return;
  	if (n->tok == MDOC_Bl && n->norm->Bl.comp)
  		return;
***************
*** 2073,2079 ****
  	struct roff_node *np;
  
  	np = mdoc->last;
! 	if (np->tok != MDOC_br && np->tok != MDOC_sp)
  		post_prevpar(mdoc);
  
  	if (np->tok == MDOC_sp) {
--- 2084,2090 ----
  	struct roff_node *np;
  
  	np = mdoc->last;
! 	if (np->tok != ROFF_br && np->tok != MDOC_sp)
  		post_prevpar(mdoc);
  
  	if (np->tok == MDOC_sp) {
***************
*** 2091,2098 ****
  		if (np->tok != MDOC_Sh && np->tok != MDOC_Ss)
  			return;
  	} else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp &&
! 	    (mdoc->last->tok != MDOC_br ||
! 	     (np->tok != MDOC_sp && np->tok != MDOC_br)))
  		return;
  
  	mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
--- 2102,2109 ----
  		if (np->tok != MDOC_Sh && np->tok != MDOC_Ss)
  			return;
  	} else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp &&
! 	    (mdoc->last->tok != ROFF_br ||
! 	     (np->tok != MDOC_sp && np->tok != ROFF_br)))
  		return;
  
  	mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,