===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_validate.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- src/usr.bin/mandoc/man_validate.c	2011/01/04 22:28:17	1.38
+++ src/usr.bin/mandoc/man_validate.c	2011/01/16 19:27:25	1.39
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.38 2011/01/04 22:28:17 schwarze Exp $ */
+/*	$Id: man_validate.c,v 1.39 2011/01/16 19:27:25 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -77,12 +77,12 @@
 	{ 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 */
@@ -356,33 +356,22 @@
 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);
 }
@@ -486,7 +475,7 @@
 {
 
 	if ( ! (MAN_LITERAL & m->flags))
-		man_nmsg(m, n, MANDOCERR_NOSCOPE);
+		man_nmsg(m, n, MANDOCERR_WNOSCOPE);
 
 	m->flags &= ~MAN_LITERAL;
 	return(1);