===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.66
retrieving revision 1.70
diff -u -p -r1.66 -r1.70
--- mandoc/mdoc_validate.c	2010/04/06 16:27:53	1.66
+++ mandoc/mdoc_validate.c	2010/05/08 07:30:19	1.70
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.66 2010/04/06 16:27:53 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.70 2010/05/08 07:30:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -98,11 +98,9 @@ static	int	 post_vt(POST_ARGS);
 static	int	 pre_an(PRE_ARGS);
 static	int	 pre_bd(PRE_ARGS);
 static	int	 pre_bl(PRE_ARGS);
-static	int	 pre_cd(PRE_ARGS);
 static	int	 pre_dd(PRE_ARGS);
 static	int	 pre_display(PRE_ARGS);
 static	int	 pre_dt(PRE_ARGS);
-static	int	 pre_er(PRE_ARGS);
 static	int	 pre_ex(PRE_ARGS);
 static	int	 pre_fd(PRE_ARGS);
 static	int	 pre_it(PRE_ARGS);
@@ -138,11 +136,10 @@ static	v_post	 posts_xr[] = { 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_cd[] = { pre_cd, 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 };
-static	v_pre	 pres_er[] = { pre_er, NULL };
+static	v_pre	 pres_er[] = { NULL, NULL };
 static	v_pre	 pres_ex[] = { pre_ex, NULL };
 static	v_pre	 pres_fd[] = { pre_fd, NULL };
 static	v_pre	 pres_it[] = { pre_it, NULL };
@@ -170,7 +167,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_text },			/* Ad */ 
 	{ pres_an, posts_an },			/* An */ 
 	{ NULL, NULL },				/* Ar */
-	{ pres_cd, posts_text },		/* Cd */ 
+	{ NULL, posts_text },			/* Cd */ 
 	{ NULL, NULL },				/* Cm */
 	{ NULL, NULL },				/* Dv */ 
 	{ pres_er, posts_text },		/* Er */ 
@@ -750,7 +747,7 @@ pre_sh(PRE_ARGS)
 
 	if (MDOC_BLOCK != n->type)
 		return(1);
-	return(check_parent(mdoc, n, -1, MDOC_ROOT));
+	return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }
 
 
@@ -787,8 +784,6 @@ static int
 pre_rv(PRE_ARGS)
 {
 
-	if ( ! check_msec(mdoc, n, 2, 3, 0))
-		return(0);
 	return(check_stdarg(mdoc, n));
 }
 
@@ -800,22 +795,6 @@ pre_ex(PRE_ARGS)
 	if ( ! check_msec(mdoc, n, 1, 6, 8, 0))
 		return(0);
 	return(check_stdarg(mdoc, n));
-}
-
-
-static int
-pre_er(PRE_ARGS)
-{
-
-	return(check_msec(mdoc, n, 2, 3, 9, 0));
-}
-
-
-static int
-pre_cd(PRE_ARGS)
-{
-
-	return(check_msec(mdoc, n, 4, 0));
 }