===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.140
retrieving revision 1.142
diff -u -p -r1.140 -r1.142
--- mandoc/mdoc_validate.c	2010/12/15 23:39:40	1.140
+++ mandoc/mdoc_validate.c	2010/12/16 00:53:04	1.142
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.140 2010/12/15 23:39:40 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.142 2010/12/16 00:53:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -144,7 +144,7 @@ static	v_post	 posts_dd[] = { ewarn_ge1, post_dd, post
 static	v_post	 posts_dl[] = { post_literal, bwarn_ge1, herr_eq0, NULL };
 static	v_post	 posts_dt[] = { post_dt, post_prol, NULL };
 static	v_post	 posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
-static	v_post	 posts_it[] = { post_it, NULL };
+static	v_post	 posts_it[] = { post_ignpar, post_it, NULL };
 static	v_post	 posts_lb[] = { eerr_eq1, post_lb, NULL };
 static	v_post	 posts_nd[] = { berr_ge1, NULL };
 static	v_post	 posts_nm[] = { post_nm, NULL };
@@ -170,7 +170,7 @@ static	v_pre	 pres_dd[] = { pre_dd, NULL };
 static	v_pre	 pres_dt[] = { pre_dt, NULL };
 static	v_pre	 pres_er[] = { NULL, NULL };
 static	v_pre	 pres_fd[] = { NULL, NULL };
-static	v_pre	 pres_it[] = { pre_it, NULL };
+static	v_pre	 pres_it[] = { pre_it, pre_par, NULL };
 static	v_pre	 pres_os[] = { pre_os, NULL };
 static	v_pre	 pres_pp[] = { pre_par, NULL };
 static	v_pre	 pres_sh[] = { pre_sh, NULL };
@@ -1564,21 +1564,20 @@ post_bl(POST_ARGS)
 		return(post_bl_block(mdoc));
 	if (MDOC_BODY != mdoc->last->type)
 		return(1);
-	if (NULL == mdoc->last->child)
-		return(1);
 
-	/*
-	 * We only allow certain children of `Bl'.  This is usually on
-	 * `It', but apparently `Sm' occurs here and there, so we let
-	 * that one through, too.
-	 */
-
-	/* LINTED */
 	for (n = mdoc->last->child; n; n = n->next) {
-		if (MDOC_BLOCK == n->type && MDOC_It == n->tok)
+		switch (n->tok) {
+		case (MDOC_It):
 			continue;
-		if (MDOC_Sm == n->tok)
+		case (MDOC_Sm):
+			/* FALLTHROUGH */
+		case (MDOC_Pp):
+			mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
 			continue;
+		default:
+			break;
+		}
+
 		mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD);
 		return(0);
 	}
@@ -1887,12 +1886,27 @@ post_ignpar(POST_ARGS)
 	if (MDOC_BODY != mdoc->last->type)
 		return(1);
 
-	if (NULL != (np = mdoc->last->child))
+	/*
+	 * Lists are allowed to have paragraphs as the first macro (I
+	 * have no idea why: it really uglifies things).
+	 */
+
+	np = mdoc->last->child;
+	if (NULL != np && MDOC_It != mdoc->last->tok)
 		if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
 			mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR);
 			mdoc_node_delete(mdoc, np);
 		}
 
+	/*
+	 * Compact lists are allowed to have trailing paragraph macros;
+	 * however, nobody else is (including non-compact lists).
+	 */
+
+	np = mdoc->last;
+	if (MDOC_It == np->tok && ! np->parent->parent->data.Bl->comp)
+		return(1);
+
 	if (NULL != (np = mdoc->last->last))
 		if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
 			mdoc_nmsg(mdoc, np, MANDOCERR_IGNPAR);
@@ -1908,6 +1922,8 @@ pre_par(PRE_ARGS)
 
 	if (NULL == mdoc->last)
 		return(1);
+	if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type)
+		return(1);
 
 	/* 
 	 * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
@@ -1916,10 +1932,11 @@ pre_par(PRE_ARGS)
 
 	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);
+	if (MDOC_It == n->tok && n->parent->data.Bl->comp)
 		return(1);
 
 	mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);