===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -c -r1.105 -r1.106
*** src/usr.bin/mandoc/mdoc_validate.c	2012/07/12 15:09:50	1.105
--- src/usr.bin/mandoc/mdoc_validate.c	2012/07/16 09:51:03	1.106
***************
*** 1,4 ****
! /*	$Id: mdoc_validate.c,v 1.105 2012/07/12 15:09:50 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_validate.c,v 1.106 2012/07/16 09:51:03 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 103,108 ****
--- 103,109 ----
  static	int	 post_nm(POST_ARGS);
  static	int	 post_ns(POST_ARGS);
  static	int	 post_os(POST_ARGS);
+ static	int	 post_par(POST_ARGS);
  static	int	 post_ignpar(POST_ARGS);
  static	int	 post_prol(POST_ARGS);
  static	int	 post_root(POST_ARGS);
***************
*** 148,156 ****
  static	v_post	 posts_notext[] = { ewarn_eq0, NULL };
  static	v_post	 posts_ns[] = { post_ns, NULL };
  static	v_post	 posts_os[] = { post_os, post_prol, NULL };
  static	v_post	 posts_rs[] = { post_rs, NULL };
  static	v_post	 posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL };
! static	v_post	 posts_sp[] = { ewarn_le1, NULL };
  static	v_post	 posts_ss[] = { post_ignpar, hwarn_ge1, NULL };
  static	v_post	 posts_st[] = { post_st, NULL };
  static	v_post	 posts_std[] = { post_std, NULL };
--- 149,158 ----
  static	v_post	 posts_notext[] = { ewarn_eq0, NULL };
  static	v_post	 posts_ns[] = { post_ns, NULL };
  static	v_post	 posts_os[] = { post_os, post_prol, NULL };
+ static	v_post	 posts_pp[] = { post_par, ewarn_eq0, NULL };
  static	v_post	 posts_rs[] = { post_rs, NULL };
  static	v_post	 posts_sh[] = { post_ignpar, hwarn_ge1, post_sh, NULL };
! static	v_post	 posts_sp[] = { post_par, ewarn_le1, NULL };
  static	v_post	 posts_ss[] = { post_ignpar, hwarn_ge1, NULL };
  static	v_post	 posts_st[] = { post_st, NULL };
  static	v_post	 posts_std[] = { post_std, NULL };
***************
*** 181,187 ****
  	{ pres_os, posts_os },			/* Os */
  	{ pres_sh, posts_sh },			/* Sh */ 
  	{ pres_ss, posts_ss },			/* Ss */ 
! 	{ pres_pp, posts_notext },		/* Pp */ 
  	{ pres_d1, posts_wline },		/* D1 */
  	{ pres_dl, posts_dl },			/* Dl */
  	{ pres_bd, posts_bd },			/* Bd */
--- 183,189 ----
  	{ pres_os, posts_os },			/* Os */
  	{ pres_sh, posts_sh },			/* Sh */ 
  	{ pres_ss, posts_ss },			/* Ss */ 
! 	{ pres_pp, posts_pp },			/* Pp */ 
  	{ pres_d1, posts_wline },		/* D1 */
  	{ pres_dl, posts_dl },			/* Dl */
  	{ pres_bd, posts_bd },			/* Bd */
***************
*** 282,288 ****
  	{ NULL, NULL },				/* Fr */
  	{ NULL, posts_eoln },			/* Ud */
  	{ NULL, posts_lb },			/* Lb */
! 	{ NULL, posts_notext },			/* Lp */ 
  	{ NULL, NULL },				/* Lk */ 
  	{ NULL, posts_defaults },		/* Mt */ 
  	{ NULL, NULL },				/* Brq */ 
--- 284,290 ----
  	{ NULL, NULL },				/* Fr */
  	{ NULL, posts_eoln },			/* Ud */
  	{ NULL, posts_lb },			/* Lb */
! 	{ pres_pp, posts_pp },			/* Lp */ 
  	{ NULL, NULL },				/* Lk */ 
  	{ NULL, posts_defaults },		/* Mt */ 
  	{ NULL, NULL },				/* Brq */ 
***************
*** 293,300 ****
  	{ NULL, NULL },				/* En */
  	{ NULL, NULL },				/* Dx */
  	{ NULL, posts_text },			/* %Q */
! 	{ NULL, posts_notext },			/* br */
! 	{ pres_pp, posts_sp },			/* sp */
  	{ NULL, posts_text1 },			/* %U */
  	{ NULL, NULL },				/* Ta */
  };
--- 295,302 ----
  	{ NULL, NULL },				/* En */
  	{ NULL, NULL },				/* Dx */
  	{ NULL, posts_text },			/* %Q */
! 	{ NULL, posts_pp },			/* br */
! 	{ NULL, posts_sp },			/* sp */
  	{ NULL, posts_text1 },			/* %U */
  	{ NULL, NULL },				/* Ta */
  };
***************
*** 1975,1981 ****
  	 * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
  	 */
  
! 	if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
  		return(1);
  	if (MDOC_Bl == n->tok && n->norm->Bl.comp)
  		return(1);
--- 1977,1985 ----
  	 * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
  	 */
  
! 	if (MDOC_Pp != mdoc->last->tok &&
! 	    MDOC_Lp != mdoc->last->tok &&
! 	    MDOC_br != mdoc->last->tok)
  		return(1);
  	if (MDOC_Bl == n->tok && n->norm->Bl.comp)
  		return(1);
***************
*** 1983,1988 ****
--- 1987,2018 ----
  		return(1);
  	if (MDOC_It == n->tok && n->parent->norm->Bl.comp)
  		return(1);
+ 
+ 	mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
+ 	mdoc_node_delete(mdoc, mdoc->last);
+ 	return(1);
+ }
+ 
+ static int
+ post_par(POST_ARGS)
+ {
+ 
+ 	if (MDOC_ELEM != mdoc->last->type &&
+ 	    MDOC_BLOCK != mdoc->last->type)
+ 		return(1);
+ 
+ 	if (NULL == mdoc->last->prev) {
+ 		if (MDOC_Sh != mdoc->last->parent->tok &&
+ 		    MDOC_Ss != mdoc->last->parent->tok)
+ 			return(1);
+ 	} else {
+ 		if (MDOC_Pp != mdoc->last->prev->tok &&
+ 		    MDOC_Lp != mdoc->last->prev->tok &&
+ 		    (MDOC_br != mdoc->last->tok ||
+ 		     (MDOC_sp != mdoc->last->prev->tok &&
+ 		      MDOC_br != mdoc->last->prev->tok)))
+ 			return(1);
+ 	}
  
  	mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
  	mdoc_node_delete(mdoc, mdoc->last);