From 3993f4018345b61b4de0132b521228ff054fc092 Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Wed, 12 Jan 2011 16:55:22 +0000
Subject: Downgrade -man message of ignored empty paragraph to MANDOC_IGNPAR. 
 The change in man_macro.c was from an assertion caused by a subtle problem:
 (1) macro is removed, causing m->last to be m->last->parent; (2) by jumping
 to the m->last->parent after post-validation, the original m->last->parent is
 skipped; (3) the rewinder climbs to the root of the tree and aborts.

The original issue recorded in the TODO by schwarze@, reminded by Brad
Smith.
---
 man_validate.c | 51 ++++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

(limited to 'man_validate.c')

diff --git a/man_validate.c b/man_validate.c
index 136b63aa..0762c15a 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.58 2011/01/12 15:50:42 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.59 2011/01/12 16:55:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -80,12 +80,12 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ pres_bline, posts_th }, /* TH */
 	{ pres_bline, posts_sec }, /* SH */
 	{ pres_bline, posts_sec }, /* SS */
-	{ pres_bline, posts_par }, /* TP */
+	{ pres_bline, NULL }, /* TP */
 	{ pres_bline, posts_par }, /* LP */
 	{ pres_bline, posts_par }, /* PP */
 	{ pres_bline, posts_par }, /* P */
-	{ pres_bline, posts_par }, /* IP */
-	{ pres_bline, posts_par }, /* HP */
+	{ pres_bline, NULL }, /* IP */
+	{ pres_bline, NULL }, /* HP */
 	{ NULL, NULL }, /* SM */
 	{ NULL, NULL }, /* SB */
 	{ NULL, NULL }, /* BI */
@@ -359,33 +359,22 @@ static int
 check_par(CHKARGS)
 {
 
-	if (MAN_BODY == n->type) 
-		switch (n->tok) {
-		case (MAN_IP):
-			/* FALLTHROUGH */
-		case (MAN_HP):
-			/* FALLTHROUGH */
-		case (MAN_TP):
-			/* Body-less lists are ok. */
-			break;
-		default:
-			if (0 == n->nchild)
-				man_nmsg(m, n, MANDOCERR_NOBODY);
-			break;
-		}
-	if (MAN_HEAD == n->type)
-		switch (n->tok) {
-		case (MAN_PP):
-			/* FALLTHROUGH */
-		case (MAN_P):
-			/* FALLTHROUGH */
-		case (MAN_LP):
-			if (n->nchild)
-				man_nmsg(m, n, MANDOCERR_ARGSLOST);
-			break;
-		default:
-			break;
-		}
+	switch (n->type) {
+	case (MAN_BLOCK):
+		if (0 == n->body->nchild)
+			man_node_delete(m, n);
+		break;
+	case (MAN_BODY):
+		if (0 == n->nchild)
+			man_nmsg(m, n, MANDOCERR_IGNPAR);
+		break;
+	case (MAN_HEAD):
+		if (n->nchild)
+			man_nmsg(m, n, MANDOCERR_ARGSLOST);
+		break;
+	default:
+		break;
+	}
 
 	return(1);
 }
-- 
cgit v1.2.3