===================================================================
RCS file: /cvs/mandoc/man_validate.c,v
retrieving revision 1.55
retrieving revision 1.58
diff -u -p -r1.55 -r1.58
--- mandoc/man_validate.c	2010/12/06 15:31:19	1.55
+++ mandoc/man_validate.c	2011/01/12 15:50:42	1.58
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.55 2010/12/06 15:31:19 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.58 2011/01/12 15:50:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -98,11 +98,9 @@ static	const struct man_valid man_valids[MAN_MAX] = {
 	{ NULL, NULL }, /* IR */
 	{ NULL, NULL }, /* RI */
 	{ NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
-	{ NULL, NULL }, /* i */
 	{ NULL, posts_le1 }, /* sp */ /* FIXME: should warn only. */
 	{ pres_bline, posts_nf }, /* nf */
 	{ pres_bline, posts_fi }, /* fi */
-	{ NULL, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
 	{ NULL, posts_part }, /* RS */
 	{ NULL, NULL }, /* DT */
@@ -119,10 +117,16 @@ man_valid_pre(struct man *m, struct man_node *n)
 {
 	v_check		*cp;
 
-	if (MAN_TEXT == n->type)
+	switch (n->type) {
+	case (MAN_TEXT):
+		/* FALLTHROUGH */
+	case (MAN_ROOT):
+		/* FALLTHROUGH */
+	case (MAN_TBL):
 		return(1);
-	if (MAN_ROOT == n->type)
-		return(1);
+	default:
+		break;
+	}
 
 	if (NULL == (cp = man_valids[n->tok].pres))
 		return(1);
@@ -147,6 +151,8 @@ man_valid_post(struct man *m)
 		return(check_text(m, m->last));
 	case (MAN_ROOT):
 		return(check_root(m, m->last));
+	case (MAN_TBL):
+		return(1);
 	default:
 		break;
 	}
@@ -483,7 +489,7 @@ post_fi(CHKARGS)
 {
 
 	if ( ! (MAN_LITERAL & m->flags))
-		man_nmsg(m, n, MANDOCERR_NOSCOPE);
+		man_nmsg(m, n, MANDOCERR_WNOSCOPE);
 
 	m->flags &= ~MAN_LITERAL;
 	return(1);