===================================================================
RCS file: /cvs/mandoc/Attic/validate.c,v
retrieving revision 1.14
retrieving revision 1.27
diff -u -p -r1.14 -r1.27
--- mandoc/Attic/validate.c	2009/01/03 18:38:39	1.14
+++ mandoc/Attic/validate.c	2009/01/12 17:26:42	1.27
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.14 2009/01/03 18:38:39 kristaps Exp $ */
+/* $Id: validate.c,v 1.27 2009/01/12 17:26:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,456 +21,675 @@
 
 #include "private.h"
 
-/* FIXME: `.St' can only have one argument set. */
 
-typedef int	(*v_args_sz)(struct mdoc *, int, int, int);
-typedef int	(*v_args)(struct mdoc *, int, int, 
-			int, const char *[],
-			int, const struct mdoc_arg *);
-typedef int	(*v_tree)(struct mdoc *, int, int);
+typedef	int	(*v_pre)(struct mdoc *, struct mdoc_node *);
+typedef	int	(*v_post)(struct mdoc *);
 
 
 struct	valids {
-	v_args_sz sz;
-	v_args	  args;
-	v_tree	  tree_pre;
-	v_tree	  tree_post;
+	v_pre	*pre;
+	v_post	*post;
 };
 
 
-static	int	  assert_eq0(struct mdoc *, int, int, int);
-static	int	  assert_le1(struct mdoc *, int, int, int);
-static	int	  need_eq0(struct mdoc *, int, int, int);
-static	int	  need_eq1(struct mdoc *, int, int, int);
-static	int	  need_ge1(struct mdoc *, int, int, int);
-static	int	  need_le2(struct mdoc *, int, int, int);
-static	int	  want_eq0(struct mdoc *, int, int, int);
-static	int	  want_ge1(struct mdoc *, int, int, int);
+static	int	pre_display(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_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	  tree_pre_ref(struct mdoc *, int, int);
-static	int	  tree_pre_display(struct mdoc *, int, int);
+static	int	headchild_err_ge1(struct mdoc *);
+static	int	headchild_warn_ge1(struct mdoc *);
+static	int	headchild_err_eq0(struct mdoc *);
+static	int	elemchild_err_eq0(struct mdoc *);
+static	int	elemchild_err_ge1(struct mdoc *);
+static	int	elemchild_warn_eq0(struct mdoc *);
+static	int	bodychild_warn_ge1(struct mdoc *);
+static	int	bodychild_err_eq0(struct mdoc *);
+static	int	elemchild_warn_ge1(struct mdoc *);
+static	int	post_sh(struct mdoc *);
+static	int	post_bl(struct mdoc *);
+static	int	post_it(struct mdoc *);
 
-static	int	  tree_post_onlyhead(struct mdoc *, int, int);
-static	int	  tree_post_onlybody(struct mdoc *, int, int);
-static	int	  tree_post_warnemptybody(struct mdoc *, int, int);
+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	int	  args_bool(struct mdoc *, int, int, 
-			int, const char *[], 
-			int, const struct mdoc_arg *);
-static	int	  args_sh(struct mdoc *, int, int, 
-			int, const char *[], 
-			int, const struct mdoc_arg *);
-static	int	  args_an(struct mdoc *, int, int, 
-			int, const char *[], 
-			int, const struct mdoc_arg *);
-static	int	  args_nopunct(struct mdoc *, int, int, 
-			int, const char *[], 
-			int, const struct mdoc_arg *);
-static	int	  args_xr(struct mdoc *, int, int, 
-			int, const char *[], 
-			int, const struct mdoc_arg *);
+static	v_post	posts_bd[] = { headchild_err_eq0, bodychild_warn_ge1, NULL };
+static	v_post	posts_text[] = { elemchild_err_ge1, NULL };
+static	v_post	posts_wtext[] = { elemchild_warn_ge1, NULL };
+static	v_post	posts_notext[] = { elemchild_err_eq0, NULL };
+static	v_post	posts_wline[] = { headchild_warn_ge1, bodychild_err_eq0, NULL };
+static	v_post	posts_sh[] = { headchild_err_ge1, bodychild_warn_ge1, post_sh, NULL };
+static	v_post	posts_bl[] = { headchild_err_eq0, bodychild_warn_ge1, post_bl, NULL };
+static	v_post	posts_it[] = { post_it, NULL };
+static	v_post	posts_ss[] = { headchild_err_ge1, NULL };
+static	v_post	posts_pp[] = { elemchild_warn_eq0, NULL };
+static	v_post	posts_d1[] = { headchild_err_ge1, NULL };
 
 
 const	struct valids mdoc_valids[MDOC_MAX] = {
-	{ NULL, NULL, NULL, NULL }, /* \" */
-	{ NULL, NULL, NULL, NULL }, /* Dd */ /* TODO */
-	{ NULL, NULL, NULL, NULL }, /* Dt */ /* TODO */
-	{ NULL, NULL, NULL, NULL }, /* Os */ /* TODO */
-	{ want_ge1, args_sh, NULL, NULL }, /* Sh */
-	{ want_ge1, NULL, NULL, NULL }, /* Ss */ 
-	{ want_eq0, NULL, NULL, NULL }, /* Pp */ 
-	{ assert_eq0, NULL, tree_pre_display, tree_post_onlyhead }, /* D1 */
-	{ assert_eq0, NULL, tree_pre_display, tree_post_onlyhead }, /* Dl */
-	{ want_eq0, NULL, tree_pre_display, tree_post_warnemptybody }, /* Bd */
-	{ assert_eq0, NULL, NULL, tree_post_onlybody }, /* Ed */
-	{ want_eq0, NULL, NULL, NULL }, /* Bl */
-	{ assert_eq0, NULL, NULL, tree_post_onlybody }, /* El */
-	{ NULL, NULL, NULL, NULL }, /* It */
-	{ need_ge1, NULL, NULL, NULL }, /* Ad */ 
-	{ NULL, args_an, NULL, NULL }, /* An */
-	{ NULL, NULL, NULL, NULL }, /* Ar */
-	{ need_ge1, NULL, NULL, NULL }, /* Cd */
-	{ NULL, NULL, NULL, NULL }, /* Cm */
-	{ need_ge1, NULL, NULL, NULL }, /* Dv */ 
-	{ need_ge1, NULL, NULL, NULL }, /* Er */ 
-	{ need_ge1, NULL, NULL, NULL }, /* Ev */ 
-	{ NULL, NULL, NULL, NULL }, /* Ex */
-	{ need_ge1, NULL, NULL, NULL }, /* Fa */ 
-	{ NULL, NULL, NULL, NULL }, /* Fd */ 
-	{ NULL, NULL, NULL, NULL }, /* Fl */
-	{ need_ge1, NULL, NULL, NULL }, /* Fn */ 
-	{ want_ge1, NULL, NULL, NULL }, /* Ft */ 
-	{ need_ge1, NULL, NULL, NULL }, /* Ic */ 
-	{ need_eq1, NULL, NULL, NULL }, /* In */ 
-	{ want_ge1, NULL, NULL, NULL }, /* Li */
-	{ want_ge1, NULL, NULL, NULL }, /* Nd */ 
-	{ NULL, NULL, NULL, NULL }, /* Nm */ 
-	{ NULL, NULL, NULL, NULL }, /* Op */
-	{ NULL, NULL, NULL, NULL }, /* Ot */
-	{ want_ge1, NULL, NULL, NULL }, /* Pa */
-	{ NULL, NULL, NULL, NULL }, /* Rv */
-	{ NULL, NULL, NULL, NULL }, /* St */
-	{ need_ge1, NULL, NULL, NULL }, /* Va */
-	{ need_ge1, NULL, NULL, NULL }, /* Vt */ 
-	{ need_le2, args_xr, NULL, NULL }, /* Xr */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %A */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %B */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %D */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %I */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %J */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %N */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %O */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %P */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %R */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %T */
-	{ need_ge1, NULL, tree_pre_ref, NULL }, /* %V */
-	{ NULL, NULL, NULL, NULL }, /* Ac */
-	{ NULL, NULL, NULL, NULL }, /* Ao */
-	{ NULL, NULL, NULL, NULL }, /* Aq */
-	{ need_le2, args_nopunct, NULL, NULL }, /* At */
-	{ NULL, NULL, NULL, NULL }, /* Bc */
-	{ NULL, NULL, NULL, NULL }, /* Bf */ 
-	{ NULL, NULL, NULL, NULL }, /* Bo */
-	{ NULL, NULL, NULL, NULL }, /* Bq */
-	{ assert_le1, NULL, NULL, NULL }, /* Bsx */
-	{ assert_le1, NULL, NULL, NULL }, /* Bx */
-	{ need_eq1, args_bool, NULL, NULL }, /* Db */
-	{ NULL, NULL, NULL, NULL }, /* Dc */
-	{ NULL, NULL, NULL, NULL }, /* Do */
-	{ NULL, NULL, NULL, NULL }, /* Dq */
-	{ NULL, NULL, NULL, NULL }, /* Ec */
-	{ NULL, NULL, NULL, NULL }, /* Ef */ /* -symbolic, etc. */
-	{ need_ge1, NULL, NULL, NULL }, /* Em */ 
-	{ NULL, NULL, NULL, NULL }, /* Eo */
-	{ assert_le1, NULL, NULL, NULL }, /* Fx */
-	{ want_ge1, NULL, NULL, NULL }, /* Ms */
-	{ NULL, NULL, NULL, NULL }, /* No */
-	{ NULL, NULL, NULL, NULL }, /* Ns */
-	{ assert_le1, NULL, NULL, NULL }, /* Nx */
-	{ assert_le1, NULL, NULL, NULL }, /* Ox */
-	{ NULL, NULL, NULL, NULL }, /* Pc */
-	{ NULL, NULL, NULL, NULL }, /* Pf */ /* 2 or more arguments */
-	{ NULL, NULL, NULL, NULL }, /* Po */
-	{ NULL, NULL, NULL, NULL }, /* Pq */
-	{ NULL, NULL, NULL, NULL }, /* Qc */
-	{ NULL, NULL, NULL, NULL }, /* Ql */
-	{ NULL, NULL, NULL, NULL }, /* Qo */
-	{ NULL, NULL, NULL, NULL }, /* Qq */
-	{ NULL, NULL, NULL, NULL }, /* Re */
-	{ NULL, NULL, NULL, NULL }, /* Rs */
-	{ NULL, NULL, NULL, NULL }, /* Sc */
-	{ NULL, NULL, NULL, NULL }, /* So */
-	{ NULL, NULL, NULL, NULL }, /* Sq */
-	{ need_eq1, args_bool, NULL, NULL }, /* Sm */
-	{ need_ge1, NULL, NULL, NULL }, /* Sx */
-	{ need_ge1, NULL, NULL, NULL }, /* Sy */
-	{ want_ge1, NULL, NULL, NULL }, /* Tn */
-	{ assert_eq0, NULL, NULL, NULL }, /* Ux */
-	{ NULL, NULL, NULL, NULL }, /* Xc */
-	{ NULL, NULL, NULL, NULL }, /* Xo */
-	{ NULL, NULL, NULL, NULL }, /* Fo */ 
-	{ NULL, NULL, NULL, NULL }, /* Fc */ 
-	{ NULL, NULL, NULL, NULL }, /* Oo */
-	{ NULL, NULL, NULL, NULL }, /* Oc */
-	{ NULL, NULL, NULL, NULL }, /* Bk */
-	{ NULL, NULL, NULL, NULL }, /* Ek */
-	{ need_eq0, NULL, NULL, NULL }, /* Bt */
-	{ need_eq1, NULL, NULL, NULL }, /* Hf */
-	{ NULL, NULL, NULL, NULL }, /* Fr */
-	{ need_eq0, NULL, NULL, NULL }, /* Ud */
+	{ NULL, NULL }, /* \" */
+	{ pres_prologue, posts_text }, /* Dd */
+	{ pres_prologue, NULL }, /* Dt */
+	{ pres_prologue, NULL }, /* Os */
+	/* FIXME: preceding Pp. */ 
+	/* FIXME: NAME section internal ordering. */
+	{ NULL, posts_sh }, /* Sh */ 
+	/* FIXME: preceding Pp. */
+	{ NULL, posts_ss }, /* Ss */ 
+	/* FIXME: proceeding... */
+	{ NULL, posts_pp }, /* Pp */ 
+	{ pres_d1, posts_d1 }, /* D1 */
+	{ pres_d1, posts_d1 }, /* Dl */
+	 /* FIXME: preceding Pp. */
+	{ pres_bd, posts_bd }, /* Bd */
+	{ NULL, NULL }, /* Ed */
+	/* FIXME: preceding Pp. */
+	{ pres_bl, posts_bl }, /* Bl */ 
+	{ NULL, NULL }, /* El */
+	{ pres_it, posts_it }, /* It */
+	{ NULL, posts_text }, /* Ad */ 
+	/* FIXME */
+	{ NULL, NULL }, /* An */ 
+	{ NULL, NULL }, /* Ar */
+
+	{ NULL, posts_text }, /* Cd */ /* FIXME: section 4 only. */
+	{ NULL, NULL }, /* Cm */
+	{ NULL, posts_text }, /* Dv */ 
+	{ NULL, posts_text }, /* Er */ /* FIXME: section 2 only. */
+	{ NULL, posts_text }, /* Ev */ 
+	{ NULL, posts_notext }, /* Ex */ /* FIXME: sections 1,6,8 only. */ /* -std required */
+	{ NULL, posts_text }, /* Fa */ 
+	{ NULL, NULL }, /* Fd */ /* FIXME: SYNOPSIS section. */
+	{ NULL, NULL }, /* Fl */
+	{ NULL, posts_text }, /* Fn */ 
+	{ NULL, NULL }, /* Ft */ 
+	{ NULL, posts_text }, /* Ic */ 
+	{ NULL, posts_wtext }, /* In */ 
+	{ NULL, posts_text }, /* Li */
+	{ NULL, posts_wtext }, /* Nd */
+	{ NULL, NULL }, /* Nm */  /* FIXME: If name not set? */
+	{ NULL, posts_wline }, /* Op */
+	{ NULL, NULL }, /* Ot */
+	{ NULL, NULL }, /* Pa */
+	{ NULL, posts_notext }, /* Rv */ /* -std required */
+	{ NULL, posts_notext }, /* St */ /* arg required */
+	{ NULL, posts_text }, /* Va */
+	{ NULL, posts_text }, /* Vt */ 
+	{ NULL, NULL }, /* Xr */ /* FIXME */
+	{ 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, NULL }, /* At */ /* FIXME */
+	{ NULL, NULL }, /* Bc */
+	{ NULL, NULL }, /* Bf */ 
+	{ NULL, NULL }, /* Bo */
+	{ NULL, posts_wline }, /* Bq */
+	{ NULL, NULL }, /* Bsx */
+	{ NULL, NULL }, /* Bx */
+	{ NULL, NULL }, /* Db */ /* FIXME: boolean */
+	{ NULL, NULL }, /* Dc */
+	{ NULL, NULL }, /* Do */
+	{ NULL, posts_wline }, /* Dq */
+	{ NULL, NULL }, /* Ec */
+	{ NULL, NULL }, /* Ef */ /* -symbolic, etc. */
+	{ NULL, posts_text }, /* Em */ 
+	{ NULL, NULL }, /* Eo */
+	{ NULL, NULL }, /* Fx */
+	{ NULL, posts_text }, /* Ms */ /* FIXME: which symbols? */
+	{ NULL, posts_notext }, /* No */
+	{ NULL, posts_notext }, /* Ns */
+	{ NULL, NULL }, /* Nx */
+	{ NULL, NULL }, /* Ox */
+	{ NULL, NULL }, /* Pc */
+	{ NULL, NULL }, /* Pf */ /* FIXME: 2 or more arguments */
+	{ NULL, NULL }, /* Po */
+	{ NULL, posts_wline }, /* Pq */ /* FIXME: ignore following Sh/Ss */
+	{ NULL, NULL }, /* Qc */
+	{ NULL, posts_wline }, /* Ql */
+	{ NULL, NULL }, /* Qo */
+	{ NULL, posts_wline }, /* Qq */
+	{ NULL, NULL }, /* Re */
+	{ NULL, NULL }, /* Rs */
+	{ NULL, NULL }, /* Sc */
+	{ NULL, NULL }, /* So */
+	{ NULL, posts_wline }, /* Sq */
+	{ NULL, NULL }, /* Sm */ /* FIXME: boolean */
+	{ NULL, posts_text }, /* Sx */
+	{ NULL, posts_text }, /* Sy */
+	{ NULL, posts_text }, /* 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, posts_notext }, /* Bt */
+	{ NULL, NULL }, /* Hf */
+	{ NULL, NULL }, /* Fr */
+	{ NULL, posts_notext }, /* Ud */
 };
 
 
 static int
-need_le2(struct mdoc *mdoc, int tok, int pos, int sz)
+bodychild_err_eq0(struct mdoc *mdoc)
 {
-	if (sz <= 2)
+
+	if (MDOC_BODY != mdoc->last->type)
 		return(1);
-	return(mdoc_err(mdoc, tok, pos, ERR_ARGS_LE2));
+	if (NULL == mdoc->last->child)
+		return(1);
+	return(mdoc_warn(mdoc, WARN_ARGS_EQ0));
 }
 
 
 static int
-want_ge1(struct mdoc *mdoc, int tok, int pos, int sz)
+bodychild_warn_ge1(struct mdoc *mdoc)
 {
-	if (sz > 0)
+
+	if (MDOC_BODY != mdoc->last->type)
 		return(1);
-	return(mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1));
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_warn(mdoc, WARN_ARGS_GE1));
 }
 
 
 static int
-want_eq0(struct mdoc *mdoc, int tok, int pos, int sz)
+elemchild_warn_eq0(struct mdoc *mdoc)
 {
-	if (sz == 0)
+
+	assert(MDOC_ELEM == mdoc->last->type);
+	if (NULL == mdoc->last->child)
 		return(1);
-	return(mdoc_warn(mdoc, tok, pos, WARN_ARGS_EQ0));
+	return(mdoc_pwarn(mdoc, mdoc->last->child->line,
+			mdoc->last->child->pos, WARN_ARGS_EQ0));
 }
 
 
 static int
-need_eq0(struct mdoc *mdoc, int tok, int pos, int sz)
+elemchild_warn_ge1(struct mdoc *mdoc)
 {
-	if (sz == 0)
+
+	assert(MDOC_ELEM == mdoc->last->type);
+	if (mdoc->last->child)
 		return(1);
-	return(mdoc_err(mdoc, tok, pos, ERR_ARGS_EQ0));
+	return(mdoc_warn(mdoc, WARN_ARGS_GE1));
 }
 
 
 static int
-assert_le1(struct mdoc *mdoc, int tok, int pos, int sz)
+elemchild_err_eq0(struct mdoc *mdoc)
 {
 
-	assert(sz <= 1);
-	return(1);
+	assert(MDOC_ELEM == mdoc->last->type);
+	if (NULL == mdoc->last->child)
+		return(1);
+	return(mdoc_err(mdoc, ERR_ARGS_EQ0));
 }
 
 
 static int
-assert_eq0(struct mdoc *mdoc, int tok, int pos, int sz)
+elemchild_err_ge1(struct mdoc *mdoc)
 {
 
-	assert(sz == 0);
-	return(1);
+	assert(MDOC_ELEM == mdoc->last->type);
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_err(mdoc, ERR_ARGS_GE1));
 }
 
 
 static int
-need_eq1(struct mdoc *mdoc, int tok, int pos, int sz)
+headchild_err_eq0(struct mdoc *mdoc)
 {
-	if (sz == 1)
+
+	if (MDOC_HEAD != mdoc->last->type)
 		return(1);
-	return(mdoc_err(mdoc, tok, pos, ERR_ARGS_EQ1));
+	if (NULL == mdoc->last->child)
+		return(1);
+	return(mdoc_perr(mdoc, mdoc->last->child->line,
+			mdoc->last->child->pos, ERR_ARGS_EQ0));
 }
 
 
 static int
-need_ge1(struct mdoc *mdoc, int tok, int pos, int sz)
+headchild_warn_ge1(struct mdoc *mdoc)
 {
-	if (sz > 0)
+
+	if (MDOC_HEAD != mdoc->last->type)
 		return(1);
-	return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_warn(mdoc, WARN_ARGS_GE1));
 }
 
 
 static int
-tree_post_onlybody(struct mdoc *mdoc, int tok, int pos)
+headchild_err_ge1(struct mdoc *mdoc)
 {
-	struct mdoc_node *n;
 
-	assert(mdoc->last);
-	n = mdoc->last;
+	if (MDOC_HEAD != mdoc->last->type)
+		return(1);
+	if (mdoc->last->child)
+		return(1);
+	return(mdoc_err(mdoc, ERR_ARGS_GE1));
+}
 
-	assert(MDOC_BLOCK == n->type);
-	assert(n->child);
 
-	if (MDOC_BODY == n->child->type) {
-		if (n->child->child)
-			return(1);
-		return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_EMPTYBODY));
-	}
+static int
+pre_display(struct mdoc *mdoc, struct mdoc_node *node)
+{
+	struct mdoc_node *n;
 
-	return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_CHILDBODY));
+	if (MDOC_BLOCK != node->type)
+		return(1);
+
+	for (n = mdoc->last; n; n = n->parent) 
+		if (MDOC_BLOCK == n->type)
+			if (MDOC_Bd == n->tok)
+				break;
+	if (NULL == n)
+		return(1);
+	return(mdoc_verr(mdoc, node, ERR_SCOPE_NONEST));
 }
 
 
 static int
-tree_post_warnemptybody(struct mdoc *mdoc, int tok, int pos)
+pre_bl(struct mdoc *mdoc, struct mdoc_node *node)
 {
-	struct mdoc_node *n;
+	int		 type, err;
+	struct mdoc_arg	*argv;
+	size_t		 i, argc;
 
-	assert(mdoc->last);
-	n = mdoc->last;
+	if (MDOC_BLOCK != node->type)
+		return(1);
+	assert(MDOC_Bl == node->tok);
 
-	assert(MDOC_BLOCK == n->type);
-	assert(n->child);
+	argv = NULL;
+	argc = node->data.block.argc; 
 
-	for (n = n->child; n; n = n->next)
-		if (MDOC_BODY == n->type)
+	for (i = type = err = 0; i < argc; i++) {
+		argv = &node->data.block.argv[(int)i];
+		assert(argv);
+		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 (type)
+				err++;
+			type++;
 			break;
-
-	if (n && n->child)
+		default:
+			break;
+		}
+	}
+	if (0 == type)
+		return(mdoc_err(mdoc, ERR_SYNTAX_ARGMISS));
+	if (0 == err)
 		return(1);
-	return(mdoc_warn(mdoc, tok, pos, WARN_SYNTAX_EMPTYBODY));
+	assert(argv);
+	return(mdoc_perr(mdoc, argv->line, 
+			argv->pos, ERR_SYNTAX_ARGBAD));
 }
 
 
 static int
-tree_post_onlyhead(struct mdoc *mdoc, int tok, int pos)
+pre_bd(struct mdoc *mdoc, struct mdoc_node *node)
 {
-	struct mdoc_node *n;
+	int		 type, err;
+	struct mdoc_arg	*argv;
+	size_t		 i, argc;
 
-	assert(mdoc->last);
-	n = mdoc->last;
+	if (MDOC_BLOCK != node->type)
+		return(1);
+	assert(MDOC_Bd == node->tok);
 
-	assert(MDOC_BLOCK == n->type);
-	assert(n->child);
+	argv = NULL;
+	argc = node->data.block.argc;
 
-	n = n->child;
-
-	if (MDOC_HEAD != n->type) 
-		return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_CHILDHEAD));
-	if (n->child)
+	for (err = i = type = 0; 0 == err && i < argc; i++) {
+		argv = &node->data.block.argv[(int)i];
+		assert(argv);
+		switch (argv->arg) {
+		case (MDOC_Ragged):
+			/* FALLTHROUGH */
+		case (MDOC_Unfilled):
+			/* FALLTHROUGH */
+		case (MDOC_Literal):
+			/* FALLTHROUGH */
+		case (MDOC_File):
+			if (type)
+				err++;
+			type++;
+			break;
+		default:
+			break;
+		}
+	}
+	if (0 == type)
+		return(mdoc_err(mdoc, ERR_SYNTAX_ARGMISS));
+	if (0 == err)
 		return(1);
-	return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_EMPTYHEAD));
+	assert(argv);
+	return(mdoc_perr(mdoc, argv->line, 
+			argv->pos, ERR_SYNTAX_ARGBAD));
 }
 
 
 static int
-args_an(struct mdoc *mdoc, int tok, int pos, 
-		int sz, const char *args[],
-		int argc, const struct mdoc_arg *argv)
+pre_it(struct mdoc *mdoc, struct mdoc_node *node)
 {
 
-	printf("argc=%d, sz=%d\n", argc, sz);
-	if (0 != argc && 0 != sz) 
-		return(mdoc_warn(mdoc, tok, pos, WARN_ARGS_EQ0));
+	if (MDOC_BLOCK != mdoc->last->type)
+		return(1);
+	assert(MDOC_It == mdoc->last->tok);
+
+	if (MDOC_BODY != mdoc->last->parent->type) 
+		return(mdoc_verr(mdoc, node, ERR_SYNTAX_PARENTBAD));
+	if (MDOC_Bl != mdoc->last->parent->tok)
+		return(mdoc_verr(mdoc, node, ERR_SYNTAX_PARENTBAD));
+
 	return(1);
 }
 
 
 static int
-args_sh(struct mdoc *mdoc, int tok, int pos, 
-		int sz, const char *args[],
-		int argc, const struct mdoc_arg *argv)
+pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 {
-	enum mdoc_sec	 sec;
 
-	sec = mdoc_atosec((size_t)sz, args);
-	if (SEC_CUSTOM != sec && sec < mdoc->sec_lastn)
-		if ( ! mdoc_warn(mdoc, tok, pos, WARN_SEC_OO))
-			return(0);
-	if (SEC_BODY == mdoc->sec_last && SEC_NAME != sec)
-		return(mdoc_err(mdoc, tok, pos, ERR_SEC_NAME));
+	if (SEC_PROLOGUE != mdoc->sec_lastn)
+		return(mdoc_verr(mdoc, node, ERR_SEC_NPROLOGUE));
+	assert(MDOC_ELEM == node->type);
 
-	return(1);
-}
+	/* Check for ordering. */
 
+	switch (node->tok) {
+	case (MDOC_Os):
+		if (mdoc->meta.title[0] && mdoc->meta.date)
+			break;
+		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+	case (MDOC_Dt):
+		if (0 == mdoc->meta.title[0] && mdoc->meta.date)
+			break;
+		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+	case (MDOC_Dd):
+		if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date)
+			break;
+		return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+	default:
+		abort();
+		/* NOTREACHED */
+	}
 
-static int
-args_bool(struct mdoc *mdoc, int tok, int pos, 
-		int sz, const char *args[],
-		int argc, const struct mdoc_arg *argv)
-{
-	int	 	 i;
+	/* Check for repetition. */
 
-	for (i = 0; i < sz; i++) {
-		if (xstrcmp(args[i], "on"))
-			continue;
-		if (xstrcmp(args[i], "off"))
-			continue;
-		return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_ARGBAD));
+	switch (node->tok) {
+	case (MDOC_Os):
+		if (0 == mdoc->meta.os[0])
+			return(1);
+		break;
+	case (MDOC_Dd):
+		if (0 == mdoc->meta.date)
+			return(1);
+		break;
+	case (MDOC_Dt):
+		if (0 == mdoc->meta.title[0])
+			return(1);
+		break;
+	default:
+		abort();
+		/* NOTREACHED */
 	}
-	return(1);
+
+	return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_REP));
 }
 
 
+/* Warn if `Bl' type-specific syntax isn't reflected in items. */
 static int
-tree_pre_ref(struct mdoc *mdoc, int tok, int pos)
+post_it(struct mdoc *mdoc)
 {
+	int		  type, sv;
+#define	TYPE_NONE	 (0)
+#define	TYPE_BODY	 (1)
+#define	TYPE_HEAD	 (2)
+	size_t		  i, argc;
 	struct mdoc_node *n;
 
-	assert(mdoc->last);
-	for (n = mdoc->last ; n; n = n->parent) {
-		if (MDOC_BLOCK != n->type)
-			continue;
-		if (MDOC_Rs != n->data.block.tok)
+	if (MDOC_BLOCK != mdoc->last->type)
+		return(1);
+
+	assert(MDOC_It == mdoc->last->tok);
+
+	n = mdoc->last->parent;
+	assert(n);
+	assert(MDOC_Bl == n->tok);
+
+	n = n->parent;
+	assert(MDOC_BLOCK == n->type);
+	assert(MDOC_Bl == n->tok);
+
+	argc = n->data.block.argc;
+	type = TYPE_NONE;
+	
+	/* Some types require block-head, some not. */
+
+	for (i = 0; TYPE_NONE == type && i < argc; i++)
+		switch (n->data.block.argv[(int)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[(int)i].arg;
 			break;
+		case (MDOC_Bullet):
+			/* FALLTHROUGH */
+		case (MDOC_Dash):
+			/* FALLTHROUGH */
+		case (MDOC_Enum):
+			/* FALLTHROUGH */
+		case (MDOC_Hyphen):
+			/* FALLTHROUGH */
+		case (MDOC_Item):
+			/* FALLTHROUGH */
+		case (MDOC_Column):
+			type = TYPE_BODY;
+			sv = n->data.block.argv[(int)i].arg;
+			break;
+		default:
+			break;
+		}
+
+	assert(TYPE_NONE != type);
+
+	if (TYPE_HEAD == type) {
+		if (NULL == (n = mdoc->last->data.block.head)) {
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
+				return(0);
+		} else if (NULL == n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
+				return(0);
+
+		if (NULL == (n = mdoc->last->data.block.body)) {
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYBODY))
+				return(0);
+		} else if (NULL == n->child)
+			if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYBODY))
+				return(0);
+
 		return(1);
 	}
 
-	return(mdoc_err(mdoc, tok, pos, ERR_SCOPE_NOCTX));
-}
+	if (NULL == (n = mdoc->last->data.block.head)) {
+		if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
+			return(0);
+	} else if (NULL == n->child)
+		if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
+			return(0);
 
+	if ((n = mdoc->last->data.block.body) && n->child)
+		if ( ! mdoc_warn(mdoc, WARN_SYNTAX_NOBODY))
+			return(0);
 
-static int
-args_xr(struct mdoc *mdoc, int tok, int pos, 
-		int sz, const char *args[],
-		int argc, const struct mdoc_arg *argv)
-{
+	if (MDOC_Column != sv) 
+		return(1);
 
-	if (1 == sz)
+	/* Make sure the number of columns is sane. */
+
+	sv = 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 == (size_t)sv)
 		return(1);
-	if (0 == sz)
-		return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
-	if (MSEC_DEFAULT == mdoc_atomsec(args[1]))
-		return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_ARGFORM));
-	return(1);
+	return(mdoc_err(mdoc, ERR_SYNTAX_ARGFORM));
+
+#undef	TYPE_NONE
+#undef	TYPE_BODY
+#undef	TYPE_HEAD
 }
 
 
+/* Make sure that only `It' macros are our body-children. */
 static int
-args_nopunct(struct mdoc *mdoc, int tok, int pos, 
-		int sz, const char *args[],
-		int argc, const struct mdoc_arg *argv)
+post_bl(struct mdoc *mdoc)
 {
-	int		 i;
+	struct mdoc_node *n;
 
-	if (0 == sz)
+	if (MDOC_BODY != mdoc->last->type)
 		return(1);
+	assert(MDOC_Bl == mdoc->last->tok);
 
-	i = 0;
-	if (ATT_DEFAULT == mdoc_atoatt(args[i]))
-		i++;
-	for ( ; i < sz; i++) {
-		if ( ! mdoc_isdelim(args[i]))
-			continue;
-		return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT));
+	for (n = mdoc->last->child; n; n = n->next) {
+		if (MDOC_BLOCK == n->type) 
+			if (MDOC_It == n->tok)
+				continue;
+		break;
 	}
-	return(1);
+	if (NULL == n)
+		return(1);
+	return(mdoc_verr(mdoc, n, ERR_SYNTAX_CHILDBAD));
 }
 
 
+/* Warn if conventional sections are out of order. */
 static int
-tree_pre_display(struct mdoc *mdoc, int tok, int pos)
+post_sh(struct mdoc *mdoc)
 {
-	struct mdoc_node *node;
+	enum mdoc_sec	  sec;
+	int		  i;
+	struct mdoc_node *n;
+	char		 *args[MDOC_LINEARG_MAX];
 
-	assert(mdoc->last);
+	if (MDOC_HEAD != mdoc->last->type)
+		return(1);
+	
+	assert(MDOC_Sh == mdoc->last->tok);
 
-	/* Displays may not be nested in other displays. */
+	n = mdoc->last->child;
+	assert(n);
 
-	/* LINTED */
-	for (node = mdoc->last; node; node = node->parent) {
-		if (node->type != MDOC_BLOCK)
-			continue;
-		if (node->data.block.tok != MDOC_Bd)
-			continue;
-		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;
 	}
-	if (NULL == node)
+
+	sec = mdoc_atosec((size_t)i, (const char **)args);
+	if (SEC_CUSTOM == sec)
 		return(1);
-	return(mdoc_err(mdoc, tok, pos, ERR_SCOPE_NONEST));
+	if (sec > mdoc->sec_lastn)
+		return(1);
+
+	if (sec == mdoc->sec_lastn)
+		return(mdoc_warn(mdoc, WARN_SEC_REP));
+	return(mdoc_warn(mdoc, WARN_SEC_OO));
 }
 
 
 int
-mdoc_valid_pre(struct mdoc *mdoc, int tok, int pos, 
-		int sz, const char *args[], 
-		int argc, const struct mdoc_arg *argv)
+mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node)
 {
+	v_pre		*p;
 
-	assert(tok < MDOC_MAX);
-	if (mdoc_valids[tok].sz) 
-		if ( ! (*mdoc_valids[tok].sz)(mdoc, tok, pos, sz))
+	/* TODO: character-escape checks. */
+
+	if (MDOC_TEXT == node->type)
+		return(1);
+	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);
-	if (mdoc_valids[tok].args) 
-		if ( ! (*mdoc_valids[tok].args)(mdoc, tok, pos, 
-					sz, args, argc, argv))
-			return(0);
-	if (mdoc_valids[tok].tree_pre) 
-		if ( ! (*mdoc_valids[tok].tree_pre)(mdoc, tok, pos))
-			return(0);
 	return(1);
 }
 
 
 int
-mdoc_valid_post(struct mdoc *mdoc, int tok, int pos)
+mdoc_valid_post(struct mdoc *mdoc)
 {
+	v_post		*p;
 
-	if (mdoc_valids[tok].tree_post)
-		return((*mdoc_valids[tok].tree_post)(mdoc, tok, pos));
+	if (MDOC_TEXT == mdoc->last->type)
+		return(1);
+	if (MDOC_ROOT == mdoc->last->type)
+		return(1);
+
+	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);
+
 	return(1);
 }