===================================================================
RCS file: /cvs/mandoc/Attic/validate.c,v
retrieving revision 1.23
retrieving revision 1.54
diff -u -p -r1.23 -r1.54
--- mandoc/Attic/validate.c	2009/01/09 15:15:31	1.23
+++ mandoc/Attic/validate.c	2009/02/24 11:43:13	1.54
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.23 2009/01/09 15:15:31 kristaps Exp $ */
+/* $Id: validate.c,v 1.54 2009/02/24 11:43:13 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,230 +21,624 @@
 
 #include "private.h"
 
+/*
+ * Pre- and post-validate macros as they're parsed.  Pre-validation
+ * occurs when the macro has been detected and its arguments parsed.
+ * Post-validation occurs when all child macros have also been parsed.
+ * In the ELEMENT case, this is simply the parameters of the macro; in
+ * the BLOCK case, this is the HEAD, BODY, TAIL and so on.
+ */
 
 typedef	int	(*v_pre)(struct mdoc *, struct mdoc_node *);
 typedef	int	(*v_post)(struct mdoc *);
 
+/* FIXME: some sections should only occur in specific msecs. */
+/* FIXME: ignoring Pp. */
+/* FIXME: math symbols. */
+/* FIXME: .Fd only in synopsis section. */
 
 struct	valids {
-	v_pre	 pre;
+	v_pre	*pre;
 	v_post	*post;
 };
 
+/* Utility checks. */
 
+static	int	check_parent(struct mdoc *, struct mdoc_node *, 
+			int, enum mdoc_type);
+static	int	check_msec(struct mdoc *, struct mdoc_node *, 
+			int, enum mdoc_msec *);
+static	int	check_stdarg(struct mdoc *, struct mdoc_node *);
+static	int	err_child_lt(struct mdoc *, const char *, int);
+static	int	err_child_gt(struct mdoc *, const char *, int);
+static	int	warn_child_gt(struct mdoc *, const char *, int);
+static	int	err_child_eq(struct mdoc *, const char *, int);
+static	int	warn_child_eq(struct mdoc *, const char *, int);
+
+/* Utility auxiliaries. */
+
+static	inline int count_child(struct mdoc *);
+static	inline int warn_count(struct mdoc *, const char *, 
+			int, const char *, int);
+static	inline int err_count(struct mdoc *, const char *, 
+			int, const char *, int);
+
+/* Specific pre-child-parse routines. */
+
 static	int	pre_display(struct mdoc *, struct mdoc_node *);
+static	int	pre_sh(struct mdoc *, struct mdoc_node *);
+static	int	pre_ss(struct mdoc *, struct mdoc_node *);
+static	int	pre_bd(struct mdoc *, struct mdoc_node *);
+static	int	pre_bl(struct mdoc *, struct mdoc_node *);
+static	int	pre_it(struct mdoc *, struct mdoc_node *);
+static	int	pre_cd(struct mdoc *, struct mdoc_node *);
+static	int	pre_er(struct mdoc *, struct mdoc_node *);
+static	int	pre_ex(struct mdoc *, struct mdoc_node *);
+static	int	pre_rv(struct mdoc *, struct mdoc_node *);
+static	int	pre_an(struct mdoc *, struct mdoc_node *);
+static	int	pre_st(struct mdoc *, struct mdoc_node *);
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
 static	int	pre_prologue(struct mdoc *, struct mdoc_node *);
-static	int	post_headchild_err_ge1(struct mdoc *);
-static	int	post_elemchild_err_ge1(struct mdoc *);
-static	int	post_elemchild_warn_eq0(struct mdoc *);
-static	int	post_bodychild_warn_ge1(struct mdoc *);
+
+/* Specific post-child-parse routines. */
+
+static	int	herr_ge1(struct mdoc *);
+static	int	herr_le1(struct mdoc *);
+static	int	herr_eq0(struct mdoc *);
+static	int	eerr_eq0(struct mdoc *);
+static	int	eerr_le1(struct mdoc *);
+static	int	eerr_le2(struct mdoc *);
+static	int	eerr_eq1(struct mdoc *);
+static	int	eerr_ge1(struct mdoc *);
+static	int	ewarn_eq0(struct mdoc *);
+static	int	ewarn_eq1(struct mdoc *);
+static	int	bwarn_ge1(struct mdoc *);
+static	int	ewarn_ge1(struct mdoc *);
+static	int	ebool(struct mdoc *);
 static	int	post_sh(struct mdoc *);
+static	int	post_sh_body(struct mdoc *);
+static	int	post_sh_head(struct mdoc *);
+static	int	post_bl(struct mdoc *);
+static	int	post_it(struct mdoc *);
+static	int	post_ex(struct mdoc *);
+static	int	post_an(struct mdoc *);
+static	int	post_at(struct mdoc *);
+static	int	post_xr(struct mdoc *);
+static	int	post_nm(struct mdoc *);
+static	int	post_bf(struct mdoc *);
+static	int	post_root(struct mdoc *);
+static	int	pre_text(struct mdoc *, const struct mdoc_node *);
 
-static	v_post	posts_sh[] = { post_headchild_err_ge1, 
-			post_bodychild_warn_ge1, post_sh, NULL };
-static	v_post	posts_ss[] = { post_headchild_err_ge1, NULL };
-static	v_post	posts_pp[] = { post_elemchild_warn_eq0, NULL };
-static	v_post	posts_dd[] = { post_elemchild_err_ge1, NULL };
-static	v_post	posts_display[] = { post_headchild_err_ge1, NULL };
+/* Collections of pre-child-parse routines. */
 
+static	v_pre	pres_prologue[] = { pre_prologue, NULL };
+static	v_pre	pres_d1[] = { pre_display, NULL };
+static	v_pre	pres_bd[] = { pre_display, pre_bd, NULL };
+static	v_pre	pres_bl[] = { pre_bl, NULL };
+static	v_pre	pres_it[] = { pre_it, NULL };
+static	v_pre	pres_ss[] = { pre_ss, NULL };
+static	v_pre	pres_sh[] = { pre_sh, NULL };
+static	v_pre	pres_cd[] = { pre_cd, NULL };
+static	v_pre	pres_er[] = { pre_er, NULL };
+static	v_pre	pres_ex[] = { pre_ex, NULL };
+static	v_pre	pres_rv[] = { pre_rv, NULL };
+static	v_pre	pres_an[] = { pre_an, NULL };
+static	v_pre	pres_st[] = { pre_st, NULL };
 
+/* Collections of post-child-parse routines. */
+
+static	v_post	posts_bool[] = { eerr_eq1, ebool, NULL };
+static	v_post	posts_bd[] = { herr_eq0, bwarn_ge1, NULL };
+static	v_post	posts_text[] = { eerr_ge1, NULL };
+static	v_post	posts_wtext[] = { ewarn_ge1, NULL };
+static	v_post	posts_notext[] = { eerr_eq0, NULL };
+static	v_post	posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
+static	v_post	posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
+static	v_post	posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };
+static	v_post	posts_it[] = { post_it, NULL };
+static	v_post	posts_in[] = { ewarn_eq1, NULL };
+static	v_post	posts_ss[] = { herr_ge1, NULL };
+static	v_post	posts_pf[] = { eerr_eq1, NULL };
+static	v_post	posts_pp[] = { ewarn_eq0, NULL };
+static	v_post	posts_ex[] = { eerr_le1, post_ex, NULL };
+static	v_post	posts_an[] = { post_an, NULL };
+static	v_post	posts_at[] = { post_at, NULL };
+static	v_post	posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL };
+static	v_post	posts_nm[] = { post_nm, NULL };
+static	v_post	posts_bf[] = { herr_le1, post_bf, NULL };
+static	v_post	posts_rs[] = { herr_eq0, bwarn_ge1, NULL };
+static	v_post	posts_fo[] = { bwarn_ge1, NULL };
+static	v_post	posts_bk[] = { herr_eq0, bwarn_ge1, NULL };
+
+/* Per-macro pre- and post-child-check routine collections. */
+
 const	struct valids mdoc_valids[MDOC_MAX] = {
-	{ NULL, NULL }, /* \" */
-	{ pre_prologue, posts_dd }, /* Dd */
-	{ pre_prologue, NULL }, /* Dt */
-	{ pre_prologue, NULL }, /* Os */
-	{ NULL, posts_sh }, /* Sh */ /* FIXME: preceding Pp. */
-	{ NULL, posts_ss }, /* Ss */ /* FIXME: preceding Pp. */
-	{ NULL, posts_pp }, /* Pp */ /* FIXME: proceeding... */
-	{ pre_display, posts_display }, /* D1 */
-	{ pre_display, posts_display }, /* Dl */
-	{ pre_display, NULL }, /* Bd */ /* FIXME: preceding Pp. */
-	{ NULL, NULL }, /* Ed */
-	{ NULL, NULL }, /* Bl */ /* FIXME: preceding Pp. */
-	{ NULL, NULL }, /* El */
-	{ NULL, NULL }, /* It */
-	{ NULL, NULL }, /* Ad */ 
-	{ NULL, NULL }, /* An */
-	{ NULL, NULL }, /* Ar */
-	{ NULL, NULL }, /* Cd */
-	{ NULL, NULL }, /* Cm */
-	{ NULL, NULL }, /* Dv */ 
-	{ NULL, NULL }, /* Er */ 
-	{ NULL, NULL }, /* Ev */ 
-	{ NULL, NULL }, /* Ex */
-	{ NULL, NULL }, /* Fa */ 
-	{ NULL, NULL }, /* Fd */ 
-	{ NULL, NULL }, /* Fl */
-	{ NULL, NULL }, /* Fn */ 
-	{ NULL, NULL }, /* Ft */ 
-	{ NULL, NULL }, /* Ic */ 
-	{ NULL, NULL }, /* In */ 
-	{ NULL, NULL }, /* Li */
-	{ NULL, NULL }, /* Nd */ 
-	{ NULL, NULL }, /* Nm */ 
-	{ NULL, NULL }, /* Op */
-	{ NULL, NULL }, /* Ot */
-	{ NULL, NULL }, /* Pa */
-	{ NULL, NULL }, /* Rv */
-	{ NULL, NULL }, /* St */
-	{ NULL, NULL }, /* Va */
-	{ NULL, NULL }, /* Vt */ 
-	{ NULL, NULL }, /* Xr */
-	{ NULL, NULL }, /* %A */
-	{ NULL, NULL }, /* %B */
-	{ NULL, NULL }, /* %D */
-	{ NULL, NULL }, /* %I */
-	{ NULL, NULL }, /* %J */
-	{ NULL, NULL }, /* %N */
-	{ NULL, NULL }, /* %O */
-	{ NULL, NULL }, /* %P */
-	{ NULL, NULL }, /* %R */
-	{ NULL, NULL }, /* %T */
-	{ NULL, NULL }, /* %V */
-	{ NULL, NULL }, /* Ac */
-	{ NULL, NULL }, /* Ao */
-	{ NULL, NULL }, /* Aq */
-	{ NULL, NULL }, /* At */ /* FIXME */
-	{ NULL, NULL }, /* Bc */
-	{ NULL, NULL }, /* Bf */ 
-	{ NULL, NULL }, /* Bo */
-	{ NULL, NULL }, /* Bq */
-	{ NULL, NULL }, /* Bsx */
-	{ NULL, NULL }, /* Bx */
-	{ NULL, NULL }, /* Db */
-	{ NULL, NULL }, /* Dc */
-	{ NULL, NULL }, /* Do */
-	{ NULL, NULL }, /* Dq */
-	{ NULL, NULL }, /* Ec */
-	{ NULL, NULL }, /* Ef */ /* -symbolic, etc. */
-	{ NULL, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
-	{ NULL, NULL }, /* Fx */
-	{ NULL, NULL }, /* Ms */
-	{ NULL, NULL }, /* No */
-	{ NULL, NULL }, /* Ns */
-	{ NULL, NULL }, /* Nx */
-	{ NULL, NULL }, /* Ox */
-	{ NULL, NULL }, /* Pc */
-	{ NULL, NULL }, /* Pf */ /* 2 or more arguments */
-	{ NULL, NULL }, /* Po */
-	{ NULL, NULL }, /* Pq */ /* FIXME: ignore following Sh/Ss */
-	{ NULL, NULL }, /* Qc */
-	{ NULL, NULL }, /* Ql */
-	{ NULL, NULL }, /* Qo */
-	{ NULL, NULL }, /* Qq */
-	{ NULL, NULL }, /* Re */
-	{ NULL, NULL }, /* Rs */
-	{ NULL, NULL }, /* Sc */
-	{ NULL, NULL }, /* So */
-	{ NULL, NULL }, /* Sq */
-	{ NULL, NULL }, /* Sm */
-	{ NULL, NULL }, /* Sx */
-	{ NULL, NULL }, /* Sy */
-	{ NULL, NULL }, /* Tn */
-	{ NULL, NULL }, /* Ux */
-	{ NULL, NULL }, /* Xc */
-	{ NULL, NULL }, /* Xo */
-	{ NULL, NULL }, /* Fo */ 
-	{ NULL, NULL }, /* Fc */ 
-	{ NULL, NULL }, /* Oo */
-	{ NULL, NULL }, /* Oc */
-	{ NULL, NULL }, /* Bk */
-	{ NULL, NULL }, /* Ek */
-	{ NULL, NULL }, /* Bt */
-	{ NULL, NULL }, /* Hf */
-	{ NULL, NULL }, /* Fr */
-	{ NULL, NULL }, /* Ud */
+	{ NULL, NULL }, 			/* \" */
+	{ pres_prologue, posts_text },		/* Dd */
+	{ pres_prologue, NULL },		/* Dt */
+	{ pres_prologue, NULL },		/* Os */
+	{ pres_sh, posts_sh },			/* Sh */ 
+	{ pres_ss, posts_ss },			/* Ss */ 
+	{ NULL, posts_pp },			/* Pp */ 
+	{ pres_d1, posts_wline },		/* D1 */
+	{ pres_d1, posts_wline },		/* Dl */
+	{ pres_bd, posts_bd },			/* Bd */
+	{ NULL, NULL },				/* Ed */
+	{ pres_bl, posts_bl },			/* Bl */ 
+	{ NULL, NULL },				/* El */
+	{ pres_it, posts_it },			/* It */
+	{ NULL, posts_text },			/* Ad */ 
+	{ pres_an, posts_an },			/* An */ 
+	{ NULL, NULL },				/* Ar */
+	{ pres_cd, posts_text },		/* Cd */ 
+	{ NULL, NULL },				/* Cm */
+	{ NULL, posts_text },			/* Dv */ 
+	{ pres_er, posts_text },		/* Er */ 
+	{ NULL, posts_text },			/* Ev */ 
+	{ pres_ex, posts_ex },			/* Ex */ 
+	{ NULL, posts_text },			/* Fa */ 
+	{ NULL, posts_wtext },			/* Fd */
+	{ NULL, NULL },				/* Fl */
+	{ NULL, posts_text },			/* Fn */ 
+	{ NULL, posts_wtext },			/* Ft */ 
+	{ NULL, posts_text },			/* Ic */ 
+	{ NULL, posts_in },			/* In */ 
+	{ NULL, posts_text },			/* Li */
+	{ NULL, posts_wtext },			/* Nd */
+	{ NULL, posts_nm },			/* Nm */
+	{ NULL, posts_wline },			/* Op */
+	{ NULL, NULL },				/* Ot */
+	{ NULL, NULL },				/* Pa */
+	{ pres_rv, posts_notext },		/* Rv */
+	{ pres_st, posts_notext },		/* St */ 
+	{ NULL, posts_text },			/* Va */
+	{ NULL, posts_text },			/* Vt */ 
+	{ NULL, posts_xr },			/* Xr */ 
+	{ NULL, posts_text },			/* %A */
+	{ NULL, posts_text },			/* %B */
+	{ NULL, posts_text },			/* %D */
+	{ NULL, posts_text },			/* %I */
+	{ NULL, posts_text },			/* %J */
+	{ NULL, posts_text },			/* %N */
+	{ NULL, posts_text },			/* %O */
+	{ NULL, posts_text },			/* %P */
+	{ NULL, posts_text },			/* %R */
+	{ NULL, posts_text },			/* %T */
+	{ NULL, posts_text },			/* %V */
+	{ NULL, NULL },				/* Ac */
+	{ NULL, NULL },				/* Ao */
+	{ NULL, posts_wline },			/* Aq */
+	{ NULL, posts_at },			/* At */ 
+	{ NULL, NULL },				/* Bc */
+	{ NULL, posts_bf },			/* Bf */
+	{ NULL, NULL },				/* Bo */
+	{ NULL, posts_wline },			/* Bq */
+	{ NULL, NULL },				/* Bsx */
+	{ NULL, NULL },				/* Bx */
+	{ NULL, posts_bool },			/* Db */
+	{ NULL, NULL },				/* Dc */
+	{ NULL, NULL },				/* Do */
+	{ NULL, posts_wline },			/* Dq */
+	{ NULL, NULL },				/* Ec */
+	{ NULL, NULL },				/* Ef */ 
+	{ NULL, posts_text },			/* Em */ 
+	{ NULL, NULL },				/* Eo */
+	{ NULL, NULL },				/* Fx */
+	{ NULL, posts_text },			/* Ms */ 
+	{ NULL, posts_notext },			/* No */
+	{ NULL, posts_notext },			/* Ns */
+	{ NULL, NULL },				/* Nx */
+	{ NULL, NULL },				/* Ox */
+	{ NULL, NULL },				/* Pc */
+	{ NULL, posts_pf },			/* Pf */
+	{ NULL, NULL },				/* Po */
+	{ NULL, posts_wline },			/* Pq */
+	{ NULL, NULL },				/* Qc */
+	{ NULL, posts_wline },			/* Ql */
+	{ NULL, NULL },				/* Qo */
+	{ NULL, posts_wline },			/* Qq */
+	{ NULL, NULL },				/* Re */
+	{ NULL, posts_rs },			/* Rs */
+	{ NULL, NULL },				/* Sc */
+	{ NULL, NULL },				/* So */
+	{ NULL, posts_wline },			/* Sq */
+	{ NULL, posts_bool },			/* Sm */ 
+	{ NULL, posts_text },			/* Sx */
+	{ NULL, posts_text },			/* Sy */
+	{ NULL, posts_text },			/* Tn */
+	{ NULL, NULL },				/* Ux */
+	{ NULL, NULL },				/* Xc */
+	{ NULL, NULL },				/* Xo */
+	{ NULL, posts_fo },			/* Fo */ 
+	{ NULL, NULL },				/* Fc */ 
+	{ NULL, NULL },				/* Oo */
+	{ NULL, NULL },				/* Oc */
+	{ NULL, posts_bk },			/* Bk */
+	{ NULL, NULL },				/* Ek */
+	{ NULL, posts_notext },			/* Bt */
+	{ NULL, NULL },				/* Hf */
+	{ NULL, NULL },				/* Fr */
+	{ NULL, posts_notext },			/* Ud */
 };
 
 
-static int
-post_bodychild_warn_ge1(struct mdoc *mdoc)
+static inline int
+warn_count(struct mdoc *m, const char *k, 
+		int want, const char *v, int has)
 {
 
-	if (MDOC_BODY != mdoc->last->type)
-		return(1);
-	if (mdoc->last->child)
-		return(1);
+	return(mdoc_warn(m, WARN_SYNTAX, "suggests %s %d %s "
+				"(has %d)", v, want, k, has));
+}
 
-	return(mdoc_warn(mdoc, WARN_ARGS_GE1));
+
+static inline int
+err_count(struct mdoc *m, const char *k,
+		int want, const char *v, int has)
+{
+
+	return(mdoc_err(m, "requires %s %d %s (has %d)",
+				v, want, k, has));
 }
 
 
+static inline int
+count_child(struct mdoc *mdoc)
+{
+	int		  i;
+	struct mdoc_node *n;
+
+	for (i = 0, n = mdoc->last->child; n; n = n->next, i++)
+		/* Do nothing */ ;
+
+	return(i);
+}
+
+
+/*
+ * Build these up with macros because they're basically the same check
+ * for different inequalities.  Yes, this could be done with functions,
+ * but this is reasonable for now.
+ */
+
+#define CHECK_CHILD_DEFN(lvl, name, ineq) 			\
+static int 							\
+lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz) 	\
+{ 								\
+	int i; 							\
+	if ((i = count_child(mdoc)) ineq sz) 			\
+		return(1); 					\
+	return(lvl##_count(mdoc, #ineq, sz, p, i)); 		\
+}
+
+#define CHECK_BODY_DEFN(name, lvl, func, num) 			\
+static int 							\
+b##lvl##_##name(struct mdoc *mdoc) 				\
+{ 								\
+	if (MDOC_BODY != mdoc->last->type) 			\
+		return(1); 					\
+	return(func(mdoc, "multiline parameters", (num))); 	\
+}
+
+#define CHECK_ELEM_DEFN(name, lvl, func, num) 			\
+static int							\
+e##lvl##_##name(struct mdoc *mdoc) 				\
+{ 								\
+	assert(MDOC_ELEM == mdoc->last->type); 			\
+	return(func(mdoc, "line parameters", (num))); 		\
+}
+
+#define CHECK_HEAD_DEFN(name, lvl, func, num)			\
+static int 							\
+h##lvl##_##name(struct mdoc *mdoc) 				\
+{ 								\
+	if (MDOC_HEAD != mdoc->last->type) 			\
+		return(1); 					\
+	return(func(mdoc, "multiline parameters", (num))); 	\
+}
+
+
+CHECK_CHILD_DEFN(warn, gt, >)			/* warn_child_gt() */
+CHECK_CHILD_DEFN(err, gt, >)			/* err_child_gt() */
+CHECK_CHILD_DEFN(warn, eq, ==)			/* warn_child_eq() */
+CHECK_CHILD_DEFN(err, eq, ==)			/* err_child_eq() */
+CHECK_CHILD_DEFN(err, lt, <)			/* err_child_lt() */
+CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)	/* bwarn_ge1() */
+CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1)	/* ewarn_eq1() */
+CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)	/* ewarn_eq0() */
+CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)	/* ewarn_gt1() */
+CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)	/* eerr_eq1() */
+CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)	/* eerr_le2() */
+CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)	/* eerr_le1() */
+CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0)	/* eerr_eq0() */
+CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0)	/* eerr_ge1() */
+CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0)	/* herr_eq0() */
+CHECK_HEAD_DEFN(le1, err, err_child_lt, 2)	/* herr_le1() */
+CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0)	/* herr_ge1() */
+
+
 static int
-post_elemchild_warn_eq0(struct mdoc *mdoc)
+check_stdarg(struct mdoc *mdoc, struct mdoc_node *node)
 {
 
-	assert(MDOC_ELEM == mdoc->last->type);
-	if (NULL == mdoc->last->child)
+	if (MDOC_Std == node->data.elem.argv[0].arg && 
+			1 == node->data.elem.argc)
 		return(1);
-	return(mdoc_warn(mdoc, WARN_ARGS_EQ0));
+
+	return(mdoc_nwarn(mdoc, node, WARN_COMPAT, 
+				"one argument suggested"));
 }
 
 
 static int
-post_elemchild_err_ge1(struct mdoc *mdoc)
+check_msec(struct mdoc *mdoc, struct mdoc_node *node, 
+		int sz, enum mdoc_msec *msecs)
 {
+	int		 i;
 
-	assert(MDOC_ELEM == mdoc->last->type);
-	if (mdoc->last->child)
-		return(1);
-	return(mdoc_err(mdoc, ERR_ARGS_GE1));
+	for (i = 0; i < sz; i++)
+		if (msecs[i] == mdoc->meta.msec)
+			return(1);
+	return(mdoc_nwarn(mdoc, node, WARN_COMPAT, 
+				"wrong manual section"));
 }
 
 
 static int
-post_headchild_err_ge1(struct mdoc *mdoc)
+check_parent(struct mdoc *mdoc, struct mdoc_node *n, 
+		int tok, enum mdoc_type t)
 {
 
-	if (MDOC_HEAD != mdoc->last->type)
+	assert(n->parent);
+	if ((MDOC_ROOT == t || tok == n->parent->tok) &&
+			(t == n->parent->type))
 		return(1);
-	if (mdoc->last->child)
-		return(1);
-	return(mdoc_err(mdoc, ERR_ARGS_GE1));
+
+	return(mdoc_nerr(mdoc, n, "require parent %s",
+		MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]));
 }
 
 
+
 static int
 pre_display(struct mdoc *mdoc, struct mdoc_node *node)
 {
 	struct mdoc_node *n;
 
-	for (n = mdoc->last; n; n = n->parent) 
+	/* Display elements (`Bd', `D1'...) cannot be nested. */
+
+	if (MDOC_BLOCK != node->type)
+		return(1);
+
+	/* LINTED */
+	for (n = mdoc->last->parent; n; n = n->parent) 
 		if (MDOC_BLOCK == n->type)
-			if (MDOC_Bd == n->data.block.tok)
+			if (MDOC_Bd == n->tok)
 				break;
 	if (NULL == n)
 		return(1);
-	return(mdoc_verr(mdoc, node, ERR_SCOPE_NONEST));
+
+	return(mdoc_nerr(mdoc, node, "displays may not be nested"));
 }
 
 
 static int
+pre_bl(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	int		 type, err, i;
+	struct mdoc_arg	*argv;
+	size_t		 argc;
+
+	if (MDOC_BLOCK != node->type)
+		return(1);
+
+	argc = node->data.block.argc; 
+
+	/* Make sure that only one type of list is specified.  */
+
+	/* LINTED */
+	for (i = 0, type = err = 0; i < (int)argc; i++) {
+		argv = &node->data.block.argv[i];
+
+		switch (argv->arg) {
+		case (MDOC_Bullet):
+			/* FALLTHROUGH */
+		case (MDOC_Dash):
+			/* FALLTHROUGH */
+		case (MDOC_Enum):
+			/* FALLTHROUGH */
+		case (MDOC_Hyphen):
+			/* FALLTHROUGH */
+		case (MDOC_Item):
+			/* FALLTHROUGH */
+		case (MDOC_Tag):
+			/* FALLTHROUGH */
+		case (MDOC_Diag):
+			/* FALLTHROUGH */
+		case (MDOC_Hang):
+			/* FALLTHROUGH */
+		case (MDOC_Ohang):
+			/* FALLTHROUGH */
+		case (MDOC_Inset):
+			/* FALLTHROUGH */
+		case (MDOC_Column):
+			if (0 == type++)
+				break;
+			return(mdoc_perr(mdoc, argv->line, argv->pos, 
+					"multiple types specified"));
+		default:
+			break;
+		}
+	}
+
+	if (type)
+		return(1);
+	return(mdoc_err(mdoc, "no type specified"));
+}
+
+
+static int
+pre_bd(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	int		 type, err, i;
+	struct mdoc_arg	*argv;
+	size_t		 argc;
+
+	if (MDOC_BLOCK != node->type)
+		return(1);
+
+	argc = node->data.block.argc;
+
+	/* Make sure that only one type of display is specified.  */
+
+	/* LINTED */
+	for (i = 0, err = type = 0; ! err && i < (int)argc; i++) {
+		argv = &node->data.block.argv[i];
+
+		switch (argv->arg) {
+		case (MDOC_Ragged):
+			/* FALLTHROUGH */
+		case (MDOC_Unfilled):
+			/* FALLTHROUGH */
+		case (MDOC_Filled):
+			/* FALLTHROUGH */
+		case (MDOC_Literal):
+			/* FALLTHROUGH */
+		case (MDOC_File):
+			if (0 == type++) 
+				break;
+			return(mdoc_perr(mdoc, argv->line, argv->pos, 
+					"multiple types specified"));
+		default:
+			break;
+		}
+	}
+
+	if (type)
+		return(1);
+	return(mdoc_err(mdoc, "no type specified"));
+}
+
+
+static int
+pre_ss(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+	if (MDOC_BLOCK != node->type)
+		return(1);
+	return(check_parent(mdoc, node, MDOC_Sh, MDOC_BODY));
+}
+
+
+static int
+pre_sh(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+	if (MDOC_BLOCK != node->type)
+		return(1);
+	return(check_parent(mdoc, node, -1, MDOC_ROOT));
+}
+
+
+static int
+pre_it(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+	/* TODO: -width attribute must be specified for -tag. */
+	/* TODO: children too big for -width? */
+
+	if (MDOC_BLOCK != node->type)
+		return(1);
+	return(check_parent(mdoc, node, MDOC_Bl, MDOC_BODY));
+}
+
+
+static int
+pre_st(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+	if (1 == node->data.elem.argc)
+		return(1);
+	return(mdoc_nerr(mdoc, node, "one argument required"));
+}
+
+
+static int
+pre_an(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+	if (1 >= node->data.elem.argc)
+		return(1);
+	return(mdoc_nerr(mdoc, node, "one argument allowed"));
+}
+
+
+static int
+pre_rv(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	enum mdoc_msec msecs[] = { MSEC_2, MSEC_3 };
+
+	if ( ! check_msec(mdoc, node, 2, msecs))
+		return(0);
+	return(check_stdarg(mdoc, node));
+}
+
+
+static int
+pre_ex(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	enum mdoc_msec msecs[] = { MSEC_1, MSEC_6, MSEC_8 };
+
+	if ( ! check_msec(mdoc, node, 3, msecs))
+		return(0);
+	return(check_stdarg(mdoc, node));
+}
+
+
+static int
+pre_er(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	enum mdoc_msec msecs[] = { MSEC_2 };
+
+	return(check_msec(mdoc, node, 1, msecs));
+}
+
+
+static int
+pre_cd(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	enum mdoc_msec msecs[] = { MSEC_4 };
+
+	return(check_msec(mdoc, node, 1, msecs));
+}
+
+
+static int
 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 {
 
-	if (SEC_PROLOGUE != mdoc->sec_lastn)
-		return(mdoc_verr(mdoc, node, ERR_SEC_NPROLOGUE));
-	assert(MDOC_ELEM == node->type);
+	if (SEC_PROLOGUE != mdoc->lastnamed)
+		return(mdoc_nerr(mdoc, node, "prologue only"));
 
 	/* Check for ordering. */
 
-	switch (node->data.elem.tok) {
+	switch (node->tok) {
 	case (MDOC_Os):
-		if (mdoc->meta.title[0] && mdoc->meta.date)
+		if (mdoc->meta.title && mdoc->meta.date)
 			break;
-		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+		return(mdoc_nerr(mdoc, node, 
+				"prologue out-of-order"));
 	case (MDOC_Dt):
-		if (0 == mdoc->meta.title[0] && mdoc->meta.date)
+		if (NULL == mdoc->meta.title && mdoc->meta.date)
 			break;
-		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+		return(mdoc_nerr(mdoc, node, 
+				"prologue out-of-order"));
 	case (MDOC_Dd):
-		if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date)
+		if (NULL == mdoc->meta.title && 0 == mdoc->meta.date)
 			break;
-		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+		return(mdoc_nerr(mdoc, node, 
+				"prologue out-of-order"));
 	default:
 		abort();
 		/* NOTREACHED */
@@ -252,9 +646,9 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node
 
 	/* Check for repetition. */
 
-	switch (node->data.elem.tok) {
+	switch (node->tok) {
 	case (MDOC_Os):
-		if (0 == mdoc->meta.os[0])
+		if (NULL == mdoc->meta.os)
 			return(1);
 		break;
 	case (MDOC_Dd):
@@ -262,7 +656,7 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node
 			return(1);
 		break;
 	case (MDOC_Dt):
-		if (0 == mdoc->meta.title[0])
+		if (NULL == mdoc->meta.title)
 			return(1);
 		break;
 	default:
@@ -270,104 +664,444 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node
 		/* NOTREACHED */
 	}
 
-	return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_REP));
+	return(mdoc_nerr(mdoc, node, "prologue repetition"));
 }
 
 
-/*
- * Warn if sections (those that are with a known title, such as NAME,
- * DESCRIPTION, and so forth) are out of the conventional order.
- */
 static int
-post_sh(struct mdoc *mdoc)
+post_bf(struct mdoc *mdoc)
 {
-	enum mdoc_sec	  sec;
-	int		  i;
+	char		 *p;
+	struct mdoc_node *head;
+
+	if (MDOC_BLOCK != mdoc->last->type)
+		return(1);
+
+	head = mdoc->last->data.block.head;
+
+	if (0 == mdoc->last->data.block.argc) {
+		if (NULL == head->child)
+			return(mdoc_err(mdoc, "argument expected"));
+
+		p = head->child->data.text.string;
+		if (xstrcmp(p, "Em"))
+			return(1);
+		else if (xstrcmp(p, "Li"))
+			return(1);
+		else if (xstrcmp(p, "Sm"))
+			return(1);
+		return(mdoc_nerr(mdoc, head->child, "invalid font"));
+	}
+
+	if (head->child)
+		return(mdoc_err(mdoc, "argument expected"));
+
+	if (1 == mdoc->last->data.block.argc)
+		return(1);
+	return(mdoc_err(mdoc, "argument expected"));
+}
+
+
+static int
+post_nm(struct mdoc *mdoc)
+{
+
+	if (mdoc->last->child)
+		return(1);
+	if (mdoc->meta.name)
+		return(1);
+	return(mdoc_err(mdoc, "not yet invoked with name"));
+}
+
+
+static int
+post_xr(struct mdoc *mdoc)
+{
 	struct mdoc_node *n;
-	char		 *args[MDOC_LINEARG_MAX];
 
-	if (MDOC_HEAD != mdoc->last->type)
+	if (NULL == (n = mdoc->last->child->next))
 		return(1);
+	if (MSEC_DEFAULT != mdoc_atomsec(n->data.text.string))
+		return(1);
+	return(mdoc_nerr(mdoc, n, "invalid manual section"));
+}
+
+
+static int
+post_at(struct mdoc *mdoc)
+{
+
+	if (NULL == mdoc->last->child)
+		return(1);
+	if (ATT_DEFAULT != mdoc_atoatt(mdoc->last->child->data.text.string))
+		return(1);
+	return(mdoc_err(mdoc, "require valid symbol"));
+}
+
+
+static int
+post_an(struct mdoc *mdoc)
+{
+
+	if (0 != mdoc->last->data.elem.argc) {
+		if (NULL == mdoc->last->child)
+			return(1);
+		return(mdoc_err(mdoc, "argument(s) expected"));
+	}
+
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_err(mdoc, "argument(s) expected"));
+}
+
+
+static int
+post_ex(struct mdoc *mdoc)
+{
+
+	if (0 == mdoc->last->data.elem.argc) {
+		if (mdoc->last->child)
+			return(1);
+		return(mdoc_err(mdoc, "argument(s) expected"));
+	}
+	if (mdoc->last->child)
+		return(mdoc_err(mdoc, "argument(s) expected"));
+	if (1 != mdoc->last->data.elem.argc)
+		return(mdoc_err(mdoc, "argument(s) expected"));
+	if (MDOC_Std != mdoc->last->data.elem.argv[0].arg)
+		return(mdoc_err(mdoc, "argument(s) expected"));
+
+	return(1);
+}
+
+
+static int
+post_it(struct mdoc *mdoc)
+{
+	int		  type, sv, i;
+#define	TYPE_NONE	 (0)
+#define	TYPE_BODY	 (1)
+#define	TYPE_HEAD	 (2)
+#define	TYPE_OHEAD	 (3)
+	size_t		  argc;
+	struct mdoc_node *n;
+
+	if (MDOC_BLOCK != mdoc->last->type)
+		return(1);
+
+	n = mdoc->last->parent->parent;
+
+	argc = n->data.block.argc;
+	type = TYPE_NONE;
+	sv = -1;
 	
-	assert(MDOC_Sh == mdoc->last->data.head.tok);
+	/* Some types require block-head, some not. */
 
-	n = mdoc->last->child;
-	assert(n);
+	/* LINTED */
+	for (i = 0; TYPE_NONE == type && i < (int)argc; i++)
+		switch (n->data.block.argv[i].arg) {
+		case (MDOC_Tag):
+			/* FALLTHROUGH */
+		case (MDOC_Diag):
+			/* FALLTHROUGH */
+		case (MDOC_Hang):
+			/* FALLTHROUGH */
+		case (MDOC_Ohang):
+			/* FALLTHROUGH */
+		case (MDOC_Inset):
+			type = TYPE_HEAD;
+			sv = n->data.block.argv[i].arg;
+			break;
+		case (MDOC_Bullet):
+			/* FALLTHROUGH */
+		case (MDOC_Dash):
+			/* FALLTHROUGH */
+		case (MDOC_Enum):
+			/* FALLTHROUGH */
+		case (MDOC_Hyphen):
+			/* FALLTHROUGH */
+		case (MDOC_Item):
+			type = TYPE_BODY;
+			sv = n->data.block.argv[i].arg;
+			break;
+		case (MDOC_Column):
+			type = TYPE_OHEAD;
+			sv = n->data.block.argv[i].arg;
+			break;
+		default:
+			break;
+		}
 
-	for (i = 0; n && i < MDOC_LINEARG_MAX; n = n->next, i++) {
-		assert(MDOC_TEXT == n->type);
-		assert(NULL == n->child);
-		assert(n->data.text.string);
-		args[i] = n->data.text.string;
+	assert(TYPE_NONE != type);
+
+	n = mdoc->last->data.block.head;
+
+	if (TYPE_HEAD == type) {
+		if (NULL == n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+					"argument(s) suggested"))
+				return(0);
+
+		n = mdoc->last->data.block.body;
+		if (NULL == n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+					"multiline body suggested"))
+				return(0);
+
+	} else if (TYPE_BODY == type) {
+		if (n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+					"no argument suggested"))
+				return(0);
+	
+		n = mdoc->last->data.block.body;
+		if (NULL == n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+					"multiline body suggested"))
+				return(0);
+	} else {
+		if (NULL == n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+					"argument(s) suggested"))
+				return(0);
+	
+		n = mdoc->last->data.block.body;
+		if (n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+					"no multiline body suggested"))
+				return(0);
 	}
 
-	sec = mdoc_atosec((size_t)i, (const char **)args);
-	if (SEC_CUSTOM == sec)
+	if (MDOC_Column != sv)
 		return(1);
-	if (sec > mdoc->sec_lastn)
+
+	argc = mdoc->last->parent->parent->data.block.argv->sz;
+	n = mdoc->last->data.block.head->child;
+
+	for (i = 0; n; n = n->next)
+		i++;
+
+	if (i == (int)argc)
 		return(1);
 
-	if (sec == mdoc->sec_lastn)
-		return(mdoc_warn(mdoc, WARN_SEC_REP));
-	return(mdoc_warn(mdoc, WARN_SEC_OO));
+	return(mdoc_err(mdoc, "need %zu columns (have %d)", argc, i));
+#undef	TYPE_NONE
+#undef	TYPE_BODY
+#undef	TYPE_HEAD
+#undef	TYPE_OHEAD
 }
 
 
-int
-mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node)
+static int
+post_bl(struct mdoc *mdoc)
 {
-	int		 t;
+	struct mdoc_node	*n;
 
-	switch (node->type) {
-	case (MDOC_BODY):
-		t = node->data.body.tok;
+	if (MDOC_BODY != mdoc->last->type)
+		return(1);
+
+	/* LINTED */
+	for (n = mdoc->last->child; n; n = n->next) {
+		if (MDOC_BLOCK == n->type) 
+			if (MDOC_It == n->tok)
+				continue;
 		break;
-	case (MDOC_ELEM):
-		t = node->data.elem.tok;
+	}
+
+	if (NULL == n)
+		return(1);
+
+	return(mdoc_nerr(mdoc, n, "bad child of parent list"));
+}
+
+
+static int
+ebool(struct mdoc *mdoc)
+{
+	struct mdoc_node *n;
+
+	/* LINTED */
+	for (n = mdoc->last->child; n; n = n->next) {
+		if (MDOC_TEXT != n->type)
+			break;
+		if (xstrcmp(n->data.text.string, "on"))
+			continue;
+		if (xstrcmp(n->data.text.string, "off"))
+			continue;
 		break;
-	case (MDOC_BLOCK):
-		t = node->data.block.tok;
-		break;
-	case (MDOC_HEAD):
-		t = node->data.head.tok;
-		break;
-	default:
+	}
+
+	if (NULL == n)
 		return(1);
+	return(mdoc_nerr(mdoc, n, "expected boolean"));
+}
+
+
+static int
+pre_text(struct mdoc *mdoc, const struct mdoc_node *n)
+{
+	size_t		 c;
+	const char	*p;
+
+	for (p = n->data.text.string; *p; p++) {
+		if ('\\' != *p)
+			continue;
+		if ((c = mdoc_isescape(p))) {
+			p += (c - 1);
+			continue;
+		}
+		return(mdoc_nerr(mdoc, n, "bad escape sequence"));
 	}
 
-	if (NULL == mdoc_valids[t].pre)
+	return(1);
+}
+
+
+static int
+post_root(struct mdoc *mdoc)
+{
+
+	if (NULL == mdoc->first->child)
+		return(mdoc_err(mdoc, "document lacks data"));
+	if (SEC_PROLOGUE == mdoc->lastnamed)
+		return(mdoc_err(mdoc, "document lacks prologue"));
+
+	if (MDOC_BLOCK != mdoc->first->child->type)
+		return(mdoc_err(mdoc, "lacking post-prologue %s", 
+					mdoc_macronames[MDOC_Sh]));
+	if (MDOC_Sh != mdoc->first->child->tok)
+		return(mdoc_err(mdoc, "lacking post-prologue %s", 
+					mdoc_macronames[MDOC_Sh]));
+
+	return(1);
+}
+
+
+static int
+post_sh(struct mdoc *mdoc)
+{
+
+	if (MDOC_HEAD == mdoc->last->type)
+		return(post_sh_head(mdoc));
+	if (MDOC_BODY == mdoc->last->type)
+		return(post_sh_body(mdoc));
+
+	return(1);
+}
+
+
+static int
+post_sh_body(struct mdoc *mdoc)
+{
+	struct mdoc_node *n;
+
+	if (SEC_NAME != mdoc->lastnamed)
 		return(1);
-	return((*mdoc_valids[t].pre)(mdoc, node));
+
+	/*
+	 * Warn if the NAME section doesn't contain the `Nm' and `Nd'
+	 * macros (can have multiple `Nm' and one `Nd').  Note that the
+	 * children of the BODY declaration can also be "text".
+	 */
+
+	if (NULL == (n = mdoc->last->child))
+		return(mdoc_warn(mdoc, WARN_SYNTAX, 
+					"section should have %s and %s",
+					mdoc_macronames[MDOC_Nm],
+					mdoc_macronames[MDOC_Nd]));
+
+	for ( ; n && n->next; n = n->next) {
+		if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
+			continue;
+		if (MDOC_TEXT == n->type)
+			continue;
+		if ( ! (mdoc_nwarn(mdoc, n, WARN_SYNTAX, 
+					"section should have %s first",
+					mdoc_macronames[MDOC_Nm])))
+			return(0);
+	}
+
+	if (MDOC_ELEM == n->type && MDOC_Nd == n->tok)
+		return(1);
+
+	return(mdoc_warn(mdoc, WARN_SYNTAX, 
+				"section should have %s last",
+				mdoc_macronames[MDOC_Nd]));
 }
 
 
+static int
+post_sh_head(struct mdoc *mdoc)
+{
+	char		  buf[64];
+	enum mdoc_sec	  sec;
+
+	assert(MDOC_Sh == mdoc->last->tok);
+
+	if ( ! xstrlcats(buf, mdoc->last->child, sizeof(buf)))
+		return(mdoc_err(mdoc, "argument too long"));
+
+	sec = mdoc_atosec(buf);
+
+	if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec)
+		return(mdoc_warn(mdoc, WARN_SYNTAX, 
+				"section NAME should be first"));
+	if (SEC_CUSTOM == sec)
+		return(1);
+	if (sec == mdoc->lastnamed)
+		return(mdoc_warn(mdoc, WARN_SYNTAX, 
+				"section repeated"));
+	if (sec < mdoc->lastnamed)
+		return(mdoc_warn(mdoc, WARN_SYNTAX, 
+				"section out of order"));
+
+	return(1);
+}
+
+
 int
+mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	v_pre		*p;
+
+	if (MDOC_TEXT == node->type)
+		return(pre_text(mdoc, node));
+	assert(MDOC_ROOT != node->type);
+
+	if (NULL == mdoc_valids[node->tok].pre)
+		return(1);
+	for (p = mdoc_valids[node->tok].pre; *p; p++)
+		if ( ! (*p)(mdoc, node)) 
+			return(0);
+	return(1);
+}
+
+
+int
 mdoc_valid_post(struct mdoc *mdoc)
 {
 	v_post		*p;
-	int		 t;
 
-	switch (mdoc->last->type) {
-	case (MDOC_BODY):
-		t = mdoc->last->data.body.tok;
-		break;
-	case (MDOC_ELEM):
-		t = mdoc->last->data.elem.tok;
-		break;
-	case (MDOC_BLOCK):
-		t = mdoc->last->data.block.tok;
-		break;
-	case (MDOC_HEAD):
-		t = mdoc->last->data.head.tok;
-		break;
-	default:
+	/*
+	 * This check occurs after the macro's children have been filled
+	 * in: postfix validation.  Since this happens when we're
+	 * rewinding the scope tree, it's possible to have multiple
+	 * invocations (as by design, for now), we set bit MDOC_VALID to
+	 * indicate that we've validated.
+	 */
+
+	if (MDOC_VALID & mdoc->last->flags)
 		return(1);
-	}
+	mdoc->last->flags |= MDOC_VALID;
 
-	if (NULL == mdoc_valids[t].post)
+	if (MDOC_TEXT == mdoc->last->type)
 		return(1);
+	if (MDOC_ROOT == mdoc->last->type)
+		return(post_root(mdoc));
 
-	for (p = mdoc_valids[t].post; *p; p++)
+	if (NULL == mdoc_valids[mdoc->last->tok].post)
+		return(1);
+	for (p = mdoc_valids[mdoc->last->tok].post; *p; p++)
 		if ( ! (*p)(mdoc)) 
 			return(0);