From d39b9a9c079e3622caebd814ddef8fbd4eea6eb8 Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Mon, 27 Sep 2010 21:25:28 +0000
Subject: Merge the last bits of 1.10.6 (released today), most were already in:
 * ignore double-.Pp * ignore .Pp before .Bd and .Bl (unless -compact in
 specified) * avoid double blank line upon .Pp, .br and friends in literal
 context * cast enums to int when passing them to exit(3) to please lint(1)
 While merging, fix a regression introduced by kristaps@: Outside literal
 mode, double blank lines must both be printed. To achieve this again after
 kristaps@ improvements in 1.10.6, treat such blank lines as .sp (instead of
 .Pp as in 1.10.5) and drop .Pp before .sp just like dropping .Pp before .Pp.

---
 usr.bin/mandoc/mdoc_validate.c | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

(limited to 'usr.bin/mandoc/mdoc_validate.c')

diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 6e92e5668ea..ef91057b64d 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.69 2010/09/20 19:48:21 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.70 2010/09/27 21:25:28 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -96,6 +96,7 @@ static	int	 pre_display(PRE_ARGS);
 static	int	 pre_dt(PRE_ARGS);
 static	int	 pre_it(PRE_ARGS);
 static	int	 pre_os(PRE_ARGS);
+static	int	 pre_pp(PRE_ARGS);
 static	int	 pre_rv(PRE_ARGS);
 static	int	 pre_sh(PRE_ARGS);
 static	int	 pre_ss(PRE_ARGS);
@@ -125,8 +126,8 @@ static	v_post	 posts_vt[] = { post_vt, NULL };
 static	v_post	 posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static	v_post	 posts_wtext[] = { ewarn_ge1, NULL };
 static	v_pre	 pres_an[] = { pre_an, NULL };
-static	v_pre	 pres_bd[] = { pre_display, pre_bd, NULL };
-static	v_pre	 pres_bl[] = { pre_bl, NULL };
+static	v_pre	 pres_bd[] = { pre_display, pre_bd, pre_pp, NULL };
+static	v_pre	 pres_bl[] = { pre_bl, pre_pp, NULL };
 static	v_pre	 pres_d1[] = { pre_display, NULL };
 static	v_pre	 pres_dd[] = { pre_dd, NULL };
 static	v_pre	 pres_dt[] = { pre_dt, NULL };
@@ -135,6 +136,7 @@ static	v_pre	 pres_ex[] = { NULL, NULL };
 static	v_pre	 pres_fd[] = { NULL, NULL };
 static	v_pre	 pres_it[] = { pre_it, NULL };
 static	v_pre	 pres_os[] = { pre_os, NULL };
+static	v_pre	 pres_pp[] = { pre_pp, NULL };
 static	v_pre	 pres_rv[] = { pre_rv, NULL };
 static	v_pre	 pres_sh[] = { pre_sh, NULL };
 static	v_pre	 pres_ss[] = { pre_ss, NULL };
@@ -146,7 +148,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ pres_os, NULL },			/* Os */
 	{ pres_sh, posts_sh },			/* Sh */ 
 	{ pres_ss, posts_ss },			/* Ss */ 
-	{ NULL, posts_notext },			/* Pp */ 
+	{ pres_pp, posts_notext },		/* Pp */ 
 	{ pres_d1, posts_wline },		/* D1 */
 	{ pres_d1, posts_wline },		/* Dl */
 	{ pres_bd, posts_bd_bk },		/* Bd */
@@ -259,7 +261,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* Dx */
 	{ NULL, posts_text },			/* %Q */
 	{ NULL, posts_notext },			/* br */
-	{ NULL, posts_sp },			/* sp */
+	{ pres_pp, posts_sp },			/* sp */
 	{ NULL, posts_text1 },			/* %U */
 	{ NULL, NULL },				/* Ta */
 };
@@ -1461,3 +1463,26 @@ post_sh_head(POST_ARGS)
 
 	return(1);
 }
+
+
+static int
+pre_pp(PRE_ARGS)
+{
+
+	if (NULL == mdoc->last)
+		return(1);
+
+	/* Don't allow prior `Lp' or `Pp'. */
+
+	if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
+		return(1);
+
+	if (MDOC_Bl == n->tok && n->data.Bl->comp)
+		return(1);
+	if (MDOC_Bd == n->tok && n->data.Bd->comp)
+		return(1);
+
+	mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
+	mdoc_node_delete(mdoc, mdoc->last);
+	return(1);
+}
-- 
cgit v1.2.3-59-g8ed1b