X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/dc32127d6dd6104e6701f4e6c9a96b182e247747..022b8bdab4bc87d590cb930db853e246e42e46ae:/mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 3c61f3e2..c0ed2621 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,6 +1,8 @@
-/*	$Id: mdoc_validate.c,v 1.132 2010/11/30 12:59:20 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.254 2014/10/30 20:10:02 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,16 +16,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifndef	OSNAME
+#include <sys/types.h>
+#ifndef OSNAME
 #include <sys/utsname.h>
 #endif
 
-#include <sys/types.h>
-
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
@@ -32,7 +31,9 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 
@@ -41,9 +42,6 @@
 #define	PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define	POST_ARGS struct mdoc *mdoc
 
-#define	NUMSIZ	  32
-#define	DATESIZ	  32
-
 enum	check_ineq {
 	CHECK_LT,
 	CHECK_GT,
@@ -53,69 +51,78 @@ enum	check_ineq {
 enum	check_lvl {
 	CHECK_WARN,
 	CHECK_ERROR,
-	CHECK_FATAL
 };
 
 typedef	int	(*v_pre)(PRE_ARGS);
 typedef	int	(*v_post)(POST_ARGS);
 
 struct	valids {
-	v_pre	*pre;
-	v_post	*post;
+	v_pre	 pre;
+	v_post	 post;
 };
 
-static	int	 check_count(struct mdoc *, enum mdoc_type, 
+static	int	 check_count(struct mdoc *, enum mdoc_type,
 			enum check_lvl, enum check_ineq, int);
-static	int	 check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
-static	int	 check_stdarg(PRE_ARGS);
-static	int	 check_text(struct mdoc *, int, int, char *);
-static	int	 check_argv(struct mdoc *, 
+static	void	 check_text(struct mdoc *, int, int, char *);
+static	void	 check_argv(struct mdoc *,
 			struct mdoc_node *, struct mdoc_argv *);
-static	int	 check_args(struct mdoc *, struct mdoc_node *);
-
-static	int	 concat(struct mdoc *, char *, 
-			const struct mdoc_node *, size_t);
+static	void	 check_args(struct mdoc *, struct mdoc_node *);
+static	int	 child_an(const struct mdoc_node *);
+static	enum mdoc_sec	a2sec(const char *);
+static	size_t		macro2len(enum mdoct);
+static	void	 rewrite_macro2len(char **);
 
 static	int	 ebool(POST_ARGS);
 static	int	 berr_ge1(POST_ARGS);
 static	int	 bwarn_ge1(POST_ARGS);
-static	int	 eerr_eq0(POST_ARGS);
-static	int	 eerr_eq1(POST_ARGS);
-static	int	 eerr_ge1(POST_ARGS);
-static	int	 eerr_le1(POST_ARGS);
 static	int	 ewarn_eq0(POST_ARGS);
+static	int	 ewarn_eq1(POST_ARGS);
 static	int	 ewarn_ge1(POST_ARGS);
-static	int	 herr_eq0(POST_ARGS);
-static	int	 herr_ge1(POST_ARGS);
+static	int	 ewarn_le1(POST_ARGS);
 static	int	 hwarn_eq0(POST_ARGS);
 static	int	 hwarn_eq1(POST_ARGS);
-static	int	 hwarn_le1(POST_ARGS);
+static	int	 hwarn_ge1(POST_ARGS);
 
 static	int	 post_an(POST_ARGS);
 static	int	 post_at(POST_ARGS);
 static	int	 post_bf(POST_ARGS);
+static	int	 post_bk(POST_ARGS);
 static	int	 post_bl(POST_ARGS);
 static	int	 post_bl_block(POST_ARGS);
-static	int	 post_bl_block_width(POST_ARGS);
 static	int	 post_bl_block_tag(POST_ARGS);
 static	int	 post_bl_head(POST_ARGS);
+static	int	 post_bx(POST_ARGS);
+static	int	 post_d1(POST_ARGS);
+static	int	 post_defaults(POST_ARGS);
 static	int	 post_dd(POST_ARGS);
 static	int	 post_dt(POST_ARGS);
-static	int	 post_defaults(POST_ARGS);
-static	int	 post_literal(POST_ARGS);
+static	int	 post_en(POST_ARGS);
+static	int	 post_es(POST_ARGS);
 static	int	 post_eoln(POST_ARGS);
+static	int	 post_ex(POST_ARGS);
+static	int	 post_fa(POST_ARGS);
+static	int	 post_fn(POST_ARGS);
+static	int	 post_fname(POST_ARGS);
+static	int	 post_fo(POST_ARGS);
+static	int	 post_hyph(POST_ARGS);
+static	int	 post_hyphtext(POST_ARGS);
+static	int	 post_ignpar(POST_ARGS);
 static	int	 post_it(POST_ARGS);
 static	int	 post_lb(POST_ARGS);
+static	int	 post_literal(POST_ARGS);
+static	int	 post_nd(POST_ARGS);
 static	int	 post_nm(POST_ARGS);
+static	int	 post_ns(POST_ARGS);
 static	int	 post_os(POST_ARGS);
-static	int	 post_prol(POST_ARGS);
+static	int	 post_par(POST_ARGS);
 static	int	 post_root(POST_ARGS);
 static	int	 post_rs(POST_ARGS);
 static	int	 post_sh(POST_ARGS);
-static	int	 post_sh_body(POST_ARGS);
 static	int	 post_sh_head(POST_ARGS);
+static	int	 post_sh_name(POST_ARGS);
+static	int	 post_sh_see_also(POST_ARGS);
+static	int	 post_sh_authors(POST_ARGS);
 static	int	 post_st(POST_ARGS);
-static	int	 post_std(POST_ARGS);
 static	int	 post_vt(POST_ARGS);
 static	int	 pre_an(PRE_ARGS);
 static	int	 pre_bd(PRE_ARGS);
@@ -123,184 +130,136 @@ static	int	 pre_bl(PRE_ARGS);
 static	int	 pre_dd(PRE_ARGS);
 static	int	 pre_display(PRE_ARGS);
 static	int	 pre_dt(PRE_ARGS);
-static	int	 pre_it(PRE_ARGS);
 static	int	 pre_literal(PRE_ARGS);
+static	int	 pre_obsolete(PRE_ARGS);
 static	int	 pre_os(PRE_ARGS);
 static	int	 pre_par(PRE_ARGS);
-static	int	 pre_rv(PRE_ARGS);
-static	int	 pre_sh(PRE_ARGS);
-static	int	 pre_ss(PRE_ARGS);
-
-static	v_post	 posts_an[] = { post_an, NULL };
-static	v_post	 posts_at[] = { post_at, post_defaults, NULL };
-static	v_post	 posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL };
-static	v_post	 posts_bf[] = { hwarn_le1, post_bf, NULL };
-static	v_post	 posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL };
-static	v_post	 posts_bl[] = { bwarn_ge1, post_bl, NULL };
-static	v_post	 posts_bool[] = { eerr_eq1, ebool, NULL };
-static	v_post	 posts_eoln[] = { post_eoln, NULL };
-static	v_post	 posts_defaults[] = { post_defaults, NULL };
-static	v_post	 posts_dd[] = { ewarn_ge1, post_dd, post_prol, NULL };
-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_lb[] = { eerr_eq1, post_lb, NULL };
-static	v_post	 posts_nd[] = { berr_ge1, NULL };
-static	v_post	 posts_nm[] = { post_nm, NULL };
-static	v_post	 posts_notext[] = { ewarn_eq0, NULL };
-static	v_post	 posts_os[] = { post_os, post_prol, NULL };
-static	v_post	 posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL };
-static	v_post	 posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
-static	v_post	 posts_sp[] = { eerr_le1, NULL };
-static	v_post	 posts_ss[] = { herr_ge1, NULL };
-static	v_post	 posts_st[] = { eerr_eq1, post_st, NULL };
-static	v_post	 posts_std[] = { post_std, NULL };
-static	v_post	 posts_text[] = { eerr_ge1, NULL };
-static	v_post	 posts_text1[] = { eerr_eq1, NULL };
-static	v_post	 posts_vt[] = { post_vt, NULL };
-static	v_post	 posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
-static	v_post	 posts_wtext[] = { ewarn_ge1, NULL };
-static	v_pre	 pres_an[] = { pre_an, NULL };
-static	v_pre	 pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL };
-static	v_pre	 pres_bl[] = { pre_bl, pre_par, NULL };
-static	v_pre	 pres_d1[] = { pre_display, NULL };
-static	v_pre	 pres_dl[] = { pre_literal, pre_display, NULL };
-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_ex[] = { NULL, NULL };
-static	v_pre	 pres_fd[] = { NULL, NULL };
-static	v_pre	 pres_it[] = { pre_it, NULL };
-static	v_pre	 pres_os[] = { pre_os, NULL };
-static	v_pre	 pres_pp[] = { pre_par, NULL };
-static	v_pre	 pres_rv[] = { pre_rv, NULL };
-static	v_pre	 pres_sh[] = { pre_sh, NULL };
-static	v_pre	 pres_ss[] = { pre_ss, NULL };
-
-const	struct valids mdoc_valids[MDOC_MAX] = {
+static	int	 pre_std(PRE_ARGS);
+
+static	const struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* Ap */
-	{ pres_dd, posts_dd },			/* Dd */
-	{ pres_dt, posts_dt },			/* Dt */
-	{ pres_os, posts_os },			/* Os */
-	{ pres_sh, posts_sh },			/* Sh */ 
-	{ pres_ss, posts_ss },			/* Ss */ 
-	{ pres_pp, posts_notext },		/* Pp */ 
-	{ pres_d1, posts_wline },		/* D1 */
-	{ pres_dl, posts_dl },			/* Dl */
-	{ pres_bd, posts_bd },			/* Bd */
+	{ pre_dd, post_dd },			/* Dd */
+	{ pre_dt, post_dt },			/* Dt */
+	{ pre_os, post_os },			/* Os */
+	{ NULL, post_sh },			/* Sh */
+	{ NULL, post_ignpar },			/* Ss */
+	{ pre_par, post_par },			/* Pp */
+	{ pre_display, post_d1 },		/* D1 */
+	{ pre_literal, post_literal },		/* Dl */
+	{ pre_bd, post_literal },		/* Bd */
 	{ NULL, NULL },				/* Ed */
-	{ pres_bl, posts_bl },			/* Bl */ 
+	{ pre_bl, post_bl },			/* Bl */
 	{ NULL, NULL },				/* El */
-	{ pres_it, posts_it },			/* It */
-	{ NULL, posts_text },			/* Ad */ 
-	{ pres_an, posts_an },			/* An */ 
-	{ NULL, posts_defaults },		/* Ar */
-	{ NULL, posts_text },			/* Cd */ 
+	{ pre_par, post_it },			/* It */
+	{ NULL, NULL },				/* Ad */
+	{ pre_an, post_an },			/* An */
+	{ NULL, post_defaults },		/* Ar */
+	{ NULL, NULL },				/* Cd */
 	{ NULL, NULL },				/* Cm */
-	{ NULL, NULL },				/* Dv */ 
-	{ pres_er, posts_text },		/* Er */ 
-	{ NULL, NULL },				/* Ev */ 
-	{ pres_ex, posts_std },			/* Ex */ 
-	{ NULL, NULL },				/* Fa */ 
-	{ pres_fd, posts_wtext },		/* Fd */
+	{ NULL, NULL },				/* Dv */
+	{ NULL, NULL },				/* Er */
+	{ NULL, NULL },				/* Ev */
+	{ pre_std, post_ex },			/* Ex */
+	{ NULL, post_fa },			/* Fa */
+	{ NULL, ewarn_ge1 },			/* Fd */
 	{ NULL, NULL },				/* Fl */
-	{ NULL, posts_text },			/* Fn */ 
-	{ NULL, posts_wtext },			/* Ft */ 
-	{ NULL, posts_text },			/* Ic */ 
-	{ NULL, posts_text1 },			/* In */ 
-	{ NULL, posts_defaults },		/* Li */
-	{ NULL, posts_nd },			/* Nd */
-	{ NULL, posts_nm },			/* Nm */
-	{ NULL, posts_wline },			/* Op */
-	{ NULL, NULL },				/* Ot */
-	{ NULL, posts_defaults },		/* Pa */
-	{ pres_rv, posts_std },			/* Rv */
-	{ NULL, posts_st },			/* St */ 
+	{ NULL, post_fn },			/* Fn */
+	{ NULL, NULL },				/* Ft */
+	{ NULL, NULL },				/* Ic */
+	{ NULL, ewarn_eq1 },			/* In */
+	{ NULL, post_defaults },		/* Li */
+	{ NULL, post_nd },			/* Nd */
+	{ NULL, post_nm },			/* Nm */
+	{ NULL, NULL },				/* Op */
+	{ pre_obsolete, NULL },			/* Ot */
+	{ NULL, post_defaults },		/* Pa */
+	{ pre_std, NULL },			/* Rv */
+	{ NULL, post_st },			/* St */
 	{ NULL, NULL },				/* Va */
-	{ NULL, posts_vt },			/* Vt */ 
-	{ NULL, posts_wtext },			/* Xr */ 
-	{ NULL, posts_text },			/* %A */
-	{ NULL, posts_text },			/* %B */ /* FIXME: can be used outside Rs/Re. */
-	{ NULL, posts_text },			/* %D */ /* FIXME: check date with mandoc_a2time(). */
-	{ 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 */ /* FIXME: can be used outside Rs/Re. */
-	{ NULL, posts_text },			/* %V */
+	{ NULL, post_vt },			/* Vt */
+	{ NULL, ewarn_ge1 },			/* Xr */
+	{ NULL, ewarn_ge1 },			/* %A */
+	{ NULL, post_hyphtext },		/* %B */ /* FIXME: can be used outside Rs/Re. */
+	{ NULL, ewarn_ge1 },			/* %D */
+	{ NULL, ewarn_ge1 },			/* %I */
+	{ NULL, ewarn_ge1 },			/* %J */
+	{ NULL, post_hyphtext },		/* %N */
+	{ NULL, post_hyphtext },		/* %O */
+	{ NULL, ewarn_ge1 },			/* %P */
+	{ NULL, post_hyphtext },		/* %R */
+	{ NULL, post_hyphtext },		/* %T */ /* FIXME: can be used outside Rs/Re. */
+	{ NULL, ewarn_ge1 },			/* %V */
 	{ NULL, NULL },				/* Ac */
 	{ NULL, NULL },				/* Ao */
-	{ NULL, posts_wline },			/* Aq */
-	{ NULL, posts_at },			/* At */ 
+	{ NULL, NULL },				/* Aq */
+	{ NULL, post_at },			/* At */
 	{ NULL, NULL },				/* Bc */
-	{ NULL, posts_bf },			/* Bf */
+	{ NULL, post_bf },			/* Bf */
 	{ NULL, NULL },				/* Bo */
-	{ NULL, posts_wline },			/* Bq */
+	{ NULL, NULL },				/* Bq */
 	{ NULL, NULL },				/* Bsx */
-	{ NULL, NULL },				/* Bx */
-	{ NULL, posts_bool },			/* Db */
+	{ NULL, post_bx },			/* Bx */
+	{ NULL, ebool },			/* Db */
 	{ NULL, NULL },				/* Dc */
 	{ NULL, NULL },				/* Do */
-	{ NULL, posts_wline },			/* Dq */
+	{ NULL, NULL },				/* Dq */
 	{ NULL, NULL },				/* Ec */
-	{ NULL, NULL },				/* Ef */ 
-	{ NULL, NULL },				/* Em */ 
+	{ NULL, NULL },				/* Ef */
+	{ NULL, NULL },				/* Em */
 	{ NULL, NULL },				/* Eo */
 	{ NULL, NULL },				/* Fx */
-	{ NULL, posts_text },			/* Ms */ 
-	{ NULL, posts_notext },			/* No */
-	{ NULL, posts_notext },			/* Ns */
+	{ NULL, NULL },				/* Ms */
+	{ NULL, ewarn_eq0 },			/* No */
+	{ NULL, post_ns },			/* Ns */
 	{ NULL, NULL },				/* Nx */
 	{ NULL, NULL },				/* Ox */
 	{ NULL, NULL },				/* Pc */
-	{ NULL, posts_text1 },			/* Pf */
+	{ NULL, ewarn_eq1 },			/* Pf */
 	{ NULL, NULL },				/* Po */
-	{ NULL, posts_wline },			/* Pq */
+	{ NULL, NULL },				/* Pq */
 	{ NULL, NULL },				/* Qc */
-	{ NULL, posts_wline },			/* Ql */
+	{ NULL, NULL },				/* Ql */
 	{ NULL, NULL },				/* Qo */
-	{ NULL, posts_wline },			/* Qq */
+	{ NULL, NULL },				/* Qq */
 	{ NULL, NULL },				/* Re */
-	{ NULL, posts_rs },			/* Rs */
+	{ NULL, post_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 },				/* Sq */
+	{ NULL, ebool },			/* Sm */
+	{ NULL, post_hyph },			/* Sx */
+	{ NULL, NULL },				/* Sy */
+	{ NULL, NULL },				/* Tn */
 	{ NULL, NULL },				/* Ux */
 	{ NULL, NULL },				/* Xc */
 	{ NULL, NULL },				/* Xo */
-	{ NULL, posts_fo },			/* Fo */ 
-	{ NULL, NULL },				/* Fc */ 
+	{ NULL, post_fo },			/* Fo */
+	{ NULL, NULL },				/* Fc */
 	{ NULL, NULL },				/* Oo */
 	{ NULL, NULL },				/* Oc */
-	{ NULL, posts_bk },			/* Bk */
+	{ NULL, post_bk },			/* Bk */
 	{ NULL, NULL },				/* Ek */
-	{ NULL, posts_eoln },			/* Bt */
+	{ NULL, post_eoln },			/* Bt */
 	{ NULL, NULL },				/* Hf */
-	{ NULL, NULL },				/* Fr */
-	{ NULL, posts_eoln },			/* Ud */
-	{ NULL, posts_lb },			/* Lb */
-	{ NULL, posts_notext },			/* Lp */ 
-	{ NULL, posts_text },			/* Lk */ 
-	{ NULL, posts_defaults },		/* Mt */ 
-	{ NULL, posts_wline },			/* Brq */ 
-	{ NULL, NULL },				/* Bro */ 
-	{ NULL, NULL },				/* Brc */ 
-	{ NULL, posts_text },			/* %C */
-	{ NULL, NULL },				/* Es */
-	{ NULL, NULL },				/* En */
+	{ pre_obsolete, NULL },			/* Fr */
+	{ NULL, post_eoln },			/* Ud */
+	{ NULL, post_lb },			/* Lb */
+	{ pre_par, post_par },			/* Lp */
+	{ NULL, NULL },				/* Lk */
+	{ NULL, post_defaults },		/* Mt */
+	{ NULL, NULL },				/* Brq */
+	{ NULL, NULL },				/* Bro */
+	{ NULL, NULL },				/* Brc */
+	{ NULL, ewarn_ge1 },			/* %C */
+	{ pre_obsolete, post_es },		/* Es */
+	{ pre_obsolete, post_en },		/* En */
 	{ NULL, NULL },				/* Dx */
-	{ NULL, posts_text },			/* %Q */
-	{ NULL, posts_notext },			/* br */
-	{ pres_pp, posts_sp },			/* sp */
-	{ NULL, posts_text1 },			/* %U */
+	{ NULL, ewarn_ge1 },			/* %Q */
+	{ NULL, post_par },			/* br */
+	{ NULL, post_par },			/* sp */
+	{ NULL, ewarn_eq1 },			/* %U */
 	{ NULL, NULL },				/* Ta */
+	{ NULL, NULL },				/* ll */
 };
 
 #define	RSORD_MAX 14 /* Number of `Rs' blocks. */
@@ -314,108 +273,134 @@ static	const enum mdoct rsord[RSORD_MAX] = {
 	MDOC__R,
 	MDOC__N,
 	MDOC__V,
+	MDOC__U,
 	MDOC__P,
 	MDOC__Q,
-	MDOC__D,
-	MDOC__O,
 	MDOC__C,
-	MDOC__U
+	MDOC__D,
+	MDOC__O
+};
+
+static	const char * const secnames[SEC__MAX] = {
+	NULL,
+	"NAME",
+	"LIBRARY",
+	"SYNOPSIS",
+	"DESCRIPTION",
+	"CONTEXT",
+	"IMPLEMENTATION NOTES",
+	"RETURN VALUES",
+	"ENVIRONMENT",
+	"FILES",
+	"EXIT STATUS",
+	"EXAMPLES",
+	"DIAGNOSTICS",
+	"COMPATIBILITY",
+	"ERRORS",
+	"SEE ALSO",
+	"STANDARDS",
+	"HISTORY",
+	"AUTHORS",
+	"CAVEATS",
+	"BUGS",
+	"SECURITY CONSIDERATIONS",
+	NULL
 };
 
 
 int
 mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
 {
-	v_pre		*p;
-	int		 line, pos;
-	char		*tp;
+	v_pre	 p;
 
-	if (MDOC_TEXT == n->type) {
-		tp = n->string;
-		line = n->line;
-		pos = n->pos;
-		return(check_text(mdoc, line, pos, tp));
+	switch (n->type) {
+	case MDOC_TEXT:
+		check_text(mdoc, n->line, n->pos, n->string);
+		/* FALLTHROUGH */
+	case MDOC_TBL:
+		/* FALLTHROUGH */
+	case MDOC_EQN:
+		/* FALLTHROUGH */
+	case MDOC_ROOT:
+		return(1);
+	default:
+		break;
 	}
 
-	if ( ! check_args(mdoc, n))
-		return(0);
-	if (NULL == mdoc_valids[n->tok].pre)
-		return(1);
-	for (p = mdoc_valids[n->tok].pre; *p; p++)
-		if ( ! (*p)(mdoc, n)) 
-			return(0);
-	return(1);
+	check_args(mdoc, n);
+	p = mdoc_valids[n->tok].pre;
+	return(*p ? (*p)(mdoc, n) : 1);
 }
 
-
 int
 mdoc_valid_post(struct mdoc *mdoc)
 {
-	v_post		*p;
+	struct mdoc_node *n;
+	v_post p;
 
-	if (MDOC_VALID & mdoc->last->flags)
+	n = mdoc->last;
+	if (n->flags & MDOC_VALID)
 		return(1);
-	mdoc->last->flags |= MDOC_VALID;
+	n->flags |= MDOC_VALID;
 
-	if (MDOC_TEXT == mdoc->last->type)
+	switch (n->type) {
+	case MDOC_TEXT:
+		/* FALLTHROUGH */
+	case MDOC_EQN:
+		/* FALLTHROUGH */
+	case MDOC_TBL:
 		return(1);
-	if (MDOC_ROOT == mdoc->last->type)
+	case MDOC_ROOT:
 		return(post_root(mdoc));
-
-	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);
+	default:
+		p = mdoc_valids[n->tok].post;
+		return(*p ? (*p)(mdoc) : 1);
+	}
 }
 
 static int
-check_count(struct mdoc *m, enum mdoc_type type, 
+check_count(struct mdoc *mdoc, enum mdoc_type type,
 		enum check_lvl lvl, enum check_ineq ineq, int val)
 {
 	const char	*p;
+	enum mandocerr	 t;
 
-	if (m->last->type != type)
+	if (mdoc->last->type != type)
 		return(1);
-	
+
 	switch (ineq) {
-	case (CHECK_LT):
+	case CHECK_LT:
 		p = "less than ";
-		if (m->last->nchild < val)
+		if (mdoc->last->nchild < val)
 			return(1);
 		break;
-	case (CHECK_GT):
-		p = "greater than ";
-		if (m->last->nchild > val)
+	case CHECK_GT:
+		p = "more than ";
+		if (mdoc->last->nchild > val)
 			return(1);
 		break;
-	case (CHECK_EQ):
+	case CHECK_EQ:
 		p = "";
-		if (val == m->last->nchild)
+		if (val == mdoc->last->nchild)
 			return(1);
 		break;
+	default:
+		abort();
+		/* NOTREACHED */
 	}
 
-	if (CHECK_WARN == lvl) {
-		return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,
-				m->last->line, m->last->pos,
-				"want %s%d children (have %d)",
-				p, val, m->last->nchild));
-	}
-
-	return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,
-			m->last->line, m->last->pos,
-			"require %s%d children (have %d)",
-			p, val, m->last->nchild));
+	t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
+	mandoc_vmsg(t, mdoc->parse, mdoc->last->line,
+	    mdoc->last->pos, "want %s%d children (have %d)",
+	    p, val, mdoc->last->nchild);
+	return(1);
 }
 
 static int
 berr_ge1(POST_ARGS)
 {
 
-	return(check_count(mdoc, MDOC_BODY, CHECK_FATAL, CHECK_GT, 0));
+	return(check_count(mdoc, MDOC_BODY, CHECK_ERROR, CHECK_GT, 0));
 }
 
 static int
@@ -424,30 +409,6 @@ bwarn_ge1(POST_ARGS)
 	return(check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0));
 }
 
-static int
-eerr_eq0(POST_ARGS)
-{
-	return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 0));
-}
-
-static int
-eerr_eq1(POST_ARGS)
-{
-	return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 1));
-}
-
-static int
-eerr_ge1(POST_ARGS)
-{
-	return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_GT, 0));
-}
-
-static int
-eerr_le1(POST_ARGS)
-{
-	return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_LT, 2));
-}
-
 static int
 ewarn_eq0(POST_ARGS)
 {
@@ -455,21 +416,21 @@ ewarn_eq0(POST_ARGS)
 }
 
 static int
-ewarn_ge1(POST_ARGS)
+ewarn_eq1(POST_ARGS)
 {
-	return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0));
+	return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1));
 }
 
 static int
-herr_eq0(POST_ARGS)
+ewarn_ge1(POST_ARGS)
 {
-	return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_EQ, 0));
+	return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0));
 }
 
 static int
-herr_ge1(POST_ARGS)
+ewarn_le1(POST_ARGS)
 {
-	return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_GT, 0));
+	return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2));
 }
 
 static int
@@ -485,145 +446,75 @@ hwarn_eq1(POST_ARGS)
 }
 
 static int
-hwarn_le1(POST_ARGS)
-{
-	return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2));
-}
-
-
-static int
-check_stdarg(PRE_ARGS)
+hwarn_ge1(POST_ARGS)
 {
-
-	if (n->args && 1 == n->args->argc)
-		if (MDOC_Std == n->args->argv[0].arg)
-			return(1);
-	return(mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV));
+	return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0));
 }
 
-
-static int
-check_args(struct mdoc *m, struct mdoc_node *n)
+static void
+check_args(struct mdoc *mdoc, struct mdoc_node *n)
 {
 	int		 i;
 
 	if (NULL == n->args)
-		return(1);
+		return;
 
 	assert(n->args->argc);
 	for (i = 0; i < (int)n->args->argc; i++)
-		if ( ! check_argv(m, n, &n->args->argv[i]))
-			return(0);
-
-	return(1);
+		check_argv(mdoc, n, &n->args->argv[i]);
 }
 
-
-static int
-check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
+static void
+check_argv(struct mdoc *mdoc, struct mdoc_node *n, struct mdoc_argv *v)
 {
 	int		 i;
 
 	for (i = 0; i < (int)v->sz; i++)
-		if ( ! check_text(m, v->line, v->pos, v->value[i]))
-			return(0);
-
-	if (MDOC_Std == v->arg) {
-		if (v->sz || m->meta.name)
-			return(1);
-		if ( ! mdoc_nmsg(m, n, MANDOCERR_NONAME))
-			return(0);
-	}
-
-	return(1);
-}
-
-
-static int
-check_text(struct mdoc *m, int ln, int pos, char *p)
-{
-	int		 c;
-	size_t		 sz;
-
-	for ( ; *p; p++, pos++) {
-		sz = strcspn(p, "\t\\");
-		p += (int)sz;
-
-		if ('\0' == *p)
-			break;
-
-		pos += (int)sz;
-
-		if ('\t' == *p) {
-			if (MDOC_LITERAL & m->flags)
-				continue;
-			if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB))
-				continue;
-			return(0);
-		}
-
-		/* Check the special character. */
-
-		c = mandoc_special(p);
-		if (c) {
-			p += c - 1;
-			pos += c - 1;
-		} else
-			mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
-	}
-
-	return(1);
+		check_text(mdoc, v->line, v->pos, v->value[i]);
 }
 
-
-static int
-check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
+static void
+check_text(struct mdoc *mdoc, int ln, int pos, char *p)
 {
+	char		*cp;
 
-	assert(n->parent);
-	if ((MDOC_ROOT == t || tok == n->parent->tok) &&
-			(t == n->parent->type))
-		return(1);
+	if (MDOC_LITERAL & mdoc->flags)
+		return;
 
-	mdoc_vmsg(mdoc, MANDOCERR_SYNTCHILD,
-				n->line, n->pos, "want parent %s",
-				MDOC_ROOT == t ? "<root>" : 
-					mdoc_macronames[tok]);
-	return(0);
+	for (cp = p; NULL != (p = strchr(p, '\t')); p++)
+		mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,
+		    ln, pos + (int)(p - cp), NULL);
 }
 
-
 static int
 pre_display(PRE_ARGS)
 {
 	struct mdoc_node *node;
 
-	/* Display elements (`Bd', `D1'...) cannot be nested. */
-
 	if (MDOC_BLOCK != n->type)
 		return(1);
 
-	/* LINTED */
-	for (node = mdoc->last->parent; node; node = node->parent) 
+	for (node = mdoc->last->parent; node; node = node->parent)
 		if (MDOC_BLOCK == node->type)
 			if (MDOC_Bd == node->tok)
 				break;
 
-	if (NULL == node)
-		return(1);
+	if (node)
+		mandoc_vmsg(MANDOCERR_BD_NEST,
+		    mdoc->parse, n->line, n->pos,
+		    "%s in Bd", mdoc_macronames[n->tok]);
 
-	mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);
-	return(0);
+	return(1);
 }
 
-
 static int
 pre_bl(PRE_ARGS)
 {
-	int		  i, comp, dup;
-	const char	 *offs, *width;
-	enum mdoc_list	  lt;
 	struct mdoc_node *np;
+	struct mdoc_argv *argv, *wa;
+	int		  i;
+	enum mdocargt	  mdoclt;
+	enum mdoc_list	  lt;
 
 	if (MDOC_BLOCK != n->type) {
 		if (ENDBODY_NOT != n->end) {
@@ -635,176 +526,190 @@ pre_bl(PRE_ARGS)
 		assert(np);
 		assert(MDOC_BLOCK == np->type);
 		assert(MDOC_Bl == np->tok);
-		assert(np->data.Bl);
-		n->data.Bl = np->data.Bl;
 		return(1);
 	}
 
-	/* 
+	/*
 	 * First figure out which kind of list to use: bind ourselves to
 	 * the first mentioned list type and warn about any remaining
 	 * ones.  If we find no list type, we default to LIST_item.
 	 */
 
-	assert(NULL == n->data.Bl);
-	n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl));
-
-	/* LINTED */
+	wa = (n->args == NULL) ? NULL : n->args->argv;
+	mdoclt = MDOC_ARG_MAX;
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
+		argv = n->args->argv + i;
 		lt = LIST__NONE;
-		dup = comp = 0;
-		width = offs = NULL;
-		switch (n->args->argv[i].arg) {
+		switch (argv->arg) {
 		/* Set list types. */
-		case (MDOC_Bullet):
+		case MDOC_Bullet:
 			lt = LIST_bullet;
 			break;
-		case (MDOC_Dash):
+		case MDOC_Dash:
 			lt = LIST_dash;
 			break;
-		case (MDOC_Enum):
+		case MDOC_Enum:
 			lt = LIST_enum;
 			break;
-		case (MDOC_Hyphen):
+		case MDOC_Hyphen:
 			lt = LIST_hyphen;
 			break;
-		case (MDOC_Item):
+		case MDOC_Item:
 			lt = LIST_item;
 			break;
-		case (MDOC_Tag):
+		case MDOC_Tag:
 			lt = LIST_tag;
 			break;
-		case (MDOC_Diag):
+		case MDOC_Diag:
 			lt = LIST_diag;
 			break;
-		case (MDOC_Hang):
+		case MDOC_Hang:
 			lt = LIST_hang;
 			break;
-		case (MDOC_Ohang):
+		case MDOC_Ohang:
 			lt = LIST_ohang;
 			break;
-		case (MDOC_Inset):
+		case MDOC_Inset:
 			lt = LIST_inset;
 			break;
-		case (MDOC_Column):
+		case MDOC_Column:
 			lt = LIST_column;
 			break;
 		/* Set list arguments. */
-		case (MDOC_Compact):
-			dup = n->data.Bl->comp;
-			comp = 1;
+		case MDOC_Compact:
+			if (n->norm->Bl.comp)
+				mandoc_msg(MANDOCERR_ARG_REP,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bl -compact");
+			n->norm->Bl.comp = 1;
 			break;
-		case (MDOC_Width):
-			dup = (NULL != n->data.Bl->width);
-			width = n->args->argv[i].value[0];
+		case MDOC_Width:
+			wa = argv;
+			if (0 == argv->sz) {
+				mandoc_msg(MANDOCERR_ARG_EMPTY,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bl -width");
+				n->norm->Bl.width = "0n";
+				break;
+			}
+			if (NULL != n->norm->Bl.width)
+				mandoc_vmsg(MANDOCERR_ARG_REP,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bl -width %s",
+				    argv->value[0]);
+			rewrite_macro2len(argv->value);
+			n->norm->Bl.width = argv->value[0];
 			break;
-		case (MDOC_Offset):
-			/* NB: this can be empty! */
-			if (n->args->argv[i].sz) {
-				offs = n->args->argv[i].value[0];
-				dup = (NULL != n->data.Bl->offs);
+		case MDOC_Offset:
+			if (0 == argv->sz) {
+				mandoc_msg(MANDOCERR_ARG_EMPTY,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bl -offset");
 				break;
 			}
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
-				return(0);
+			if (NULL != n->norm->Bl.offs)
+				mandoc_vmsg(MANDOCERR_ARG_REP,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bl -offset %s",
+				    argv->value[0]);
+			rewrite_macro2len(argv->value);
+			n->norm->Bl.offs = argv->value[0];
 			break;
 		default:
 			continue;
 		}
-
-		/* Check: duplicate auxiliary arguments. */
-
-		if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
-			return(0);
-
-		if (comp && ! dup)
-			n->data.Bl->comp = comp;
-		if (offs && ! dup)
-			n->data.Bl->offs = offs;
-		if (width && ! dup)
-			n->data.Bl->width = width;
+		if (LIST__NONE == lt)
+			continue;
+		mdoclt = argv->arg;
 
 		/* Check: multiple list types. */
 
-		if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE)
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))
-				return(0);
-
-		/* Assign list type. */
-
-		if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {
-			n->data.Bl->type = lt;
-			/* Set column information, too. */
-			if (LIST_column == lt) {
-				n->data.Bl->ncols = 
-					n->args->argv[i].sz;
-				n->data.Bl->cols = (const char **)
-					n->args->argv[i].value;
-			}
+		if (LIST__NONE != n->norm->Bl.type) {
+			mandoc_vmsg(MANDOCERR_BL_REP,
+			    mdoc->parse, n->line, n->pos,
+			    "Bl -%s", mdoc_argnames[argv->arg]);
+			continue;
 		}
 
 		/* The list type should come first. */
 
-		if (n->data.Bl->type == LIST__NONE)
-			if (n->data.Bl->width || 
-					n->data.Bl->offs || 
-					n->data.Bl->comp)
-				if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
-					return(0);
-
-		continue;
+		if (n->norm->Bl.width ||
+		    n->norm->Bl.offs ||
+		    n->norm->Bl.comp)
+			mandoc_vmsg(MANDOCERR_BL_LATETYPE,
+			    mdoc->parse, n->line, n->pos, "Bl -%s",
+			    mdoc_argnames[n->args->argv[0].arg]);
+
+		n->norm->Bl.type = lt;
+		if (LIST_column == lt) {
+			n->norm->Bl.ncols = argv->sz;
+			n->norm->Bl.cols = (void *)argv->value;
+		}
 	}
 
 	/* Allow lists to default to LIST_item. */
 
-	if (LIST__NONE == n->data.Bl->type) {
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE))
-			return(0);
-		n->data.Bl->type = LIST_item;
+	if (LIST__NONE == n->norm->Bl.type) {
+		mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,
+		    n->line, n->pos, "Bl");
+		n->norm->Bl.type = LIST_item;
 	}
 
-	/* 
+	/*
 	 * Validate the width field.  Some list types don't need width
 	 * types and should be warned about them.  Others should have it
-	 * and must also be warned.
+	 * and must also be warned.  Yet others have a default and need
+	 * no warning.
 	 */
 
-	switch (n->data.Bl->type) {
-	case (LIST_tag):
-		if (n->data.Bl->width)
-			break;
-		if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))
-			break;
-		return(0);
-	case (LIST_column):
+	switch (n->norm->Bl.type) {
+	case LIST_tag:
+		if (NULL == n->norm->Bl.width)
+			mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,
+			    n->line, n->pos, "Bl -tag");
+		break;
+	case LIST_column:
 		/* FALLTHROUGH */
-	case (LIST_diag):
+	case LIST_diag:
 		/* FALLTHROUGH */
-	case (LIST_ohang):
+	case LIST_ohang:
 		/* FALLTHROUGH */
-	case (LIST_inset):
+	case LIST_inset:
 		/* FALLTHROUGH */
-	case (LIST_item):
-		if (NULL == n->data.Bl->width)
-			break;
-		if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG))
-			break;
-		return(0);
+	case LIST_item:
+		if (n->norm->Bl.width)
+			mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
+			    wa->line, wa->pos, "Bl -%s",
+			    mdoc_argnames[mdoclt]);
+		break;
+	case LIST_bullet:
+		/* FALLTHROUGH */
+	case LIST_dash:
+		/* FALLTHROUGH */
+	case LIST_hyphen:
+		if (NULL == n->norm->Bl.width)
+			n->norm->Bl.width = "2n";
+		break;
+	case LIST_enum:
+		if (NULL == n->norm->Bl.width)
+			n->norm->Bl.width = "3n";
+		break;
 	default:
 		break;
 	}
 
-	return(1);
+	return(pre_par(mdoc, n));
 }
 
-
 static int
 pre_bd(PRE_ARGS)
 {
-	int		  i, dup, comp;
-	enum mdoc_disp 	  dt;
-	const char	 *offs;
 	struct mdoc_node *np;
+	struct mdoc_argv *argv;
+	int		  i;
+	enum mdoc_disp	  dt;
+
+	pre_literal(mdoc, n);
 
 	if (MDOC_BLOCK != n->type) {
 		if (ENDBODY_NOT != n->end) {
@@ -816,168 +721,139 @@ pre_bd(PRE_ARGS)
 		assert(np);
 		assert(MDOC_BLOCK == np->type);
 		assert(MDOC_Bd == np->tok);
-		assert(np->data.Bd);
-		n->data.Bd = np->data.Bd;
 		return(1);
 	}
 
-	assert(NULL == n->data.Bd);
-	n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));
-
-	/* LINTED */
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
+		argv = n->args->argv + i;
 		dt = DISP__NONE;
-		dup = comp = 0;
-		offs = NULL;
 
-		switch (n->args->argv[i].arg) {
-		case (MDOC_Centred):
-			dt = DISP_centred;
+		switch (argv->arg) {
+		case MDOC_Centred:
+			dt = DISP_centered;
 			break;
-		case (MDOC_Ragged):
+		case MDOC_Ragged:
 			dt = DISP_ragged;
 			break;
-		case (MDOC_Unfilled):
+		case MDOC_Unfilled:
 			dt = DISP_unfilled;
 			break;
-		case (MDOC_Filled):
+		case MDOC_Filled:
 			dt = DISP_filled;
 			break;
-		case (MDOC_Literal):
+		case MDOC_Literal:
 			dt = DISP_literal;
 			break;
-		case (MDOC_File):
-			mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);
+		case MDOC_File:
+			mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,
+			    n->line, n->pos, NULL);
 			return(0);
-		case (MDOC_Offset):
-			/* NB: this can be empty! */
-			if (n->args->argv[i].sz) {
-				offs = n->args->argv[i].value[0];
-				dup = (NULL != n->data.Bd->offs);
+		case MDOC_Offset:
+			if (0 == argv->sz) {
+				mandoc_msg(MANDOCERR_ARG_EMPTY,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bd -offset");
 				break;
 			}
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
-				return(0);
+			if (NULL != n->norm->Bd.offs)
+				mandoc_vmsg(MANDOCERR_ARG_REP,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bd -offset %s",
+				    argv->value[0]);
+			rewrite_macro2len(argv->value);
+			n->norm->Bd.offs = argv->value[0];
 			break;
-		case (MDOC_Compact):
-			comp = 1;
-			dup = n->data.Bd->comp;
+		case MDOC_Compact:
+			if (n->norm->Bd.comp)
+				mandoc_msg(MANDOCERR_ARG_REP,
+				    mdoc->parse, argv->line,
+				    argv->pos, "Bd -compact");
+			n->norm->Bd.comp = 1;
 			break;
 		default:
 			abort();
 			/* NOTREACHED */
 		}
+		if (DISP__NONE == dt)
+			continue;
 
-		/* Check whether we have duplicates. */
-
-		if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
-			return(0);
-
-		/* Make our auxiliary assignments. */
-
-		if (offs && ! dup)
-			n->data.Bd->offs = offs;
-		if (comp && ! dup)
-			n->data.Bd->comp = comp;
-
-		/* Check whether a type has already been assigned. */
-
-		if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE)
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP))
-				return(0);
-
-		/* Make our type assignment. */
-
-		if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE)
-			n->data.Bd->type = dt;
+		if (DISP__NONE == n->norm->Bd.type)
+			n->norm->Bd.type = dt;
+		else
+			mandoc_vmsg(MANDOCERR_BD_REP,
+			    mdoc->parse, n->line, n->pos,
+			    "Bd -%s", mdoc_argnames[argv->arg]);
 	}
 
-	if (DISP__NONE == n->data.Bd->type) {
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE))
-			return(0);
-		n->data.Bd->type = DISP_ragged;
+	if (DISP__NONE == n->norm->Bd.type) {
+		mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse,
+		    n->line, n->pos, "Bd");
+		n->norm->Bd.type = DISP_ragged;
 	}
 
-	return(1);
-}
-
-
-static int
-pre_ss(PRE_ARGS)
-{
-
-	if (MDOC_BLOCK != n->type)
-		return(1);
-	return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
+	return(pre_par(mdoc, n));
 }
 
-
 static int
-pre_sh(PRE_ARGS)
+pre_an(PRE_ARGS)
 {
+	struct mdoc_argv *argv;
+	size_t	 i;
 
-	if (MDOC_BLOCK != n->type)
+	if (n->args == NULL)
 		return(1);
 
-	mdoc->regs->regs[(int)REG_nS].set = 0;
-	return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
-}
-
+	for (i = 1; i < n->args->argc; i++) {
+		argv = n->args->argv + i;
+		mandoc_vmsg(MANDOCERR_AN_REP,
+		    mdoc->parse, argv->line, argv->pos,
+		    "An -%s", mdoc_argnames[argv->arg]);
+	}
 
-static int
-pre_it(PRE_ARGS)
-{
+	argv = n->args->argv;
+	if (argv->arg == MDOC_Split)
+		n->norm->An.auth = AUTH_split;
+	else if (argv->arg == MDOC_Nosplit)
+		n->norm->An.auth = AUTH_nosplit;
+	else
+		abort();
 
-	if (MDOC_BLOCK != n->type)
-		return(1);
-	/* 
-	 * FIXME: this can probably be lifted if we make the It into
-	 * something else on-the-fly?
-	 */
-	return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
+	return(1);
 }
 
-
 static int
-pre_an(PRE_ARGS)
+pre_std(PRE_ARGS)
 {
-	int		 i;
-
-	if (NULL == n->args)
-		return(1);
-	
-	for (i = 1; i < (int)n->args->argc; i++)
-		if ( ! mdoc_pmsg(mdoc, n->args->argv[i].line,
-			n->args->argv[i].pos, MANDOCERR_IGNARGV))
-			return(0);
 
-	if (MDOC_Split == n->args->argv[0].arg)
-		n->data.An.auth = AUTH_split;
-	else if (MDOC_Nosplit == n->args->argv[0].arg)
-		n->data.An.auth = AUTH_nosplit;
-	else
-		abort();
+	if (n->args && 1 == n->args->argc)
+		if (MDOC_Std == n->args->argv[0].arg)
+			return(1);
 
+	mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
+	    n->line, n->pos, mdoc_macronames[n->tok]);
 	return(1);
 }
 
 static int
-pre_rv(PRE_ARGS)
+pre_obsolete(PRE_ARGS)
 {
 
-	return(check_stdarg(mdoc, n));
+	if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type)
+		mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
+		    n->line, n->pos, mdoc_macronames[n->tok]);
+	return(1);
 }
 
 static int
 pre_dt(PRE_ARGS)
 {
 
-	if (0 == mdoc->meta.date || mdoc->meta.os)
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))
-			return(0);
-	if (mdoc->meta.title)
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP))
-			return(0);
+	if (mdoc->meta.title != NULL)
+		mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+		    n->line, n->pos, "Dt");
+	else if (mdoc->meta.os != NULL)
+		mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+		    n->line, n->pos, "Dt after Os");
 	return(1);
 }
 
@@ -985,12 +861,12 @@ static int
 pre_os(PRE_ARGS)
 {
 
-	if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))
-			return(0);
-	if (mdoc->meta.os)
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP))
-			return(0);
+	if (mdoc->meta.os != NULL)
+		mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+		    n->line, n->pos, "Os");
+	else if (mdoc->flags & MDOC_PBODY)
+		mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
+		    n->line, n->pos, "Os");
 	return(1);
 }
 
@@ -998,20 +874,25 @@ static int
 pre_dd(PRE_ARGS)
 {
 
-	if (mdoc->meta.title || mdoc->meta.os)
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))
-			return(0);
-	if (mdoc->meta.date)
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP))
-			return(0);
+	if (mdoc->meta.date != NULL)
+		mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+		    n->line, n->pos, "Dd");
+	else if (mdoc->flags & MDOC_PBODY)
+		mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
+		    n->line, n->pos, "Dd");
+	else if (mdoc->meta.title != NULL)
+		mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+		    n->line, n->pos, "Dd after Dt");
+	else if (mdoc->meta.os != NULL)
+		mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+		    n->line, n->pos, "Dd after Os");
 	return(1);
 }
 
-
 static int
 post_bf(POST_ARGS)
 {
-	struct mdoc_node *np;
+	struct mdoc_node *np, *nch;
 	enum mdocargt	  arg;
 
 	/*
@@ -1025,43 +906,44 @@ post_bf(POST_ARGS)
 			np = mdoc->last->pending->parent->head;
 		} else if (MDOC_BLOCK != mdoc->last->type) {
 			np = mdoc->last->parent->head;
-		} else 
+		} else
 			np = mdoc->last->head;
 
 		assert(np);
 		assert(MDOC_HEAD == np->type);
 		assert(MDOC_Bf == np->tok);
-		assert(np->data.Bf);
-		mdoc->last->data.Bf = np->data.Bf;
 		return(1);
 	}
 
 	np = mdoc->last;
 	assert(MDOC_BLOCK == np->parent->type);
 	assert(MDOC_Bf == np->parent->tok);
-	np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));
 
-	/* 
-	 * Cannot have both argument and parameter.
-	 * If neither is specified, let it through with a warning. 
-	 */
+	/* Check the number of arguments. */
 
-	if (np->parent->args && np->child) {
-		mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);
-		return(0);
-	} else if (NULL == np->parent->args && NULL == np->child)
-		return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE));
+	nch = np->child;
+	if (NULL == np->parent->args) {
+		if (NULL == nch) {
+			mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,
+			    np->line, np->pos, "Bf");
+			return(1);
+		}
+		nch = nch->next;
+	}
+	if (NULL != nch)
+		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+		    nch->line, nch->pos, "Bf ... %s", nch->string);
 
 	/* Extract argument into data. */
-	
+
 	if (np->parent->args) {
 		arg = np->parent->args->argv[0].arg;
 		if (MDOC_Emphasis == arg)
-			np->data.Bf->font = FONT_Em;
+			np->norm->Bf.font = FONT_Em;
 		else if (MDOC_Literal == arg)
-			np->data.Bf->font = FONT_Li;
+			np->norm->Bf.font = FONT_Li;
 		else if (MDOC_Symbolic == arg)
-			np->data.Bf->font = FONT_Sy;
+			np->norm->Bf.font = FONT_Sy;
 		else
 			abort();
 		return(1);
@@ -1070,13 +952,15 @@ post_bf(POST_ARGS)
 	/* Extract parameter into data. */
 
 	if (0 == strcmp(np->child->string, "Em"))
-		np->data.Bf->font = FONT_Em;
+		np->norm->Bf.font = FONT_Em;
 	else if (0 == strcmp(np->child->string, "Li"))
-		np->data.Bf->font = FONT_Li;
+		np->norm->Bf.font = FONT_Li;
 	else if (0 == strcmp(np->child->string, "Sy"))
-		np->data.Bf->font = FONT_Sy;
-	else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE))
-		return(0);
+		np->norm->Bf.font = FONT_Sy;
+	else
+		mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,
+		    np->child->line, np->child->pos,
+		    "Bf %s", np->child->string);
 
 	return(1);
 }
@@ -1084,98 +968,163 @@ post_bf(POST_ARGS)
 static int
 post_lb(POST_ARGS)
 {
-	const char	*p;
-	char		*buf;
-	size_t		 sz;
-
-	assert(mdoc->last->child);
-	assert(MDOC_TEXT == mdoc->last->child->type);
+	struct mdoc_node	*n;
+	const char		*stdlibname;
+	char			*libname;
 
-	p = mdoc_a2lib(mdoc->last->child->string);
+	check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1);
 
-	/* If lookup ok, replace with table value. */
+	n = mdoc->last->child;
 
-	if (p) {
-		free(mdoc->last->child->string);
-		mdoc->last->child->string = mandoc_strdup(p);
-		return(1);
-	}
+	assert(n);
+	assert(MDOC_TEXT == n->type);
 
-	/* If not, use "library ``xxxx''. */
+	if (NULL == (stdlibname = mdoc_a2lib(n->string)))
+		mandoc_asprintf(&libname,
+		    "library \\(lq%s\\(rq", n->string);
+	else
+		libname = mandoc_strdup(stdlibname);
 
-	sz = strlen(mdoc->last->child->string) +
-		2 + strlen("\\(lqlibrary\\(rq");
-	buf = mandoc_malloc(sz);
-	snprintf(buf, sz, "library \\(lq%s\\(rq", 
-			mdoc->last->child->string);
-	free(mdoc->last->child->string);
-	mdoc->last->child->string = buf;
+	free(n->string);
+	n->string = libname;
 	return(1);
 }
 
 static int
 post_eoln(POST_ARGS)
 {
+	const struct mdoc_node *n;
 
-	if (NULL == mdoc->last->child)
-		return(1);
-	return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST));
+	n = mdoc->last;
+	if (n->child)
+		mandoc_vmsg(MANDOCERR_ARG_SKIP,
+		    mdoc->parse, n->line, n->pos,
+		    "%s %s", mdoc_macronames[n->tok],
+		    n->child->string);
+	return(1);
 }
 
+static int
+post_fname(POST_ARGS)
+{
+	const struct mdoc_node	*n;
+	const char		*cp;
+	size_t			 pos;
+
+	n = mdoc->last->child;
+	pos = strcspn(n->string, "()");
+	cp = n->string + pos;
+	if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))
+		mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse,
+		    n->line, n->pos + pos, n->string);
+	return(1);
+}
 
 static int
-post_vt(POST_ARGS)
+post_fn(POST_ARGS)
 {
-	const struct mdoc_node *n;
 
-	/*
-	 * The Vt macro comes in both ELEM and BLOCK form, both of which
-	 * have different syntaxes (yet more context-sensitive
-	 * behaviour).  ELEM types must have a child; BLOCK types,
-	 * specifically the BODY, should only have TEXT children.
-	 */
+	post_fname(mdoc);
+	post_fa(mdoc);
+	return(1);
+}
 
-	if (MDOC_ELEM == mdoc->last->type)
-		return(eerr_ge1(mdoc));
-	if (MDOC_BODY != mdoc->last->type)
-		return(1);
-	
-	for (n = mdoc->last->child; n; n = n->next)
-		if (MDOC_TEXT != n->type) 
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_CHILD))
-				return(0);
+static int
+post_fo(POST_ARGS)
+{
 
+	hwarn_eq1(mdoc);
+	bwarn_ge1(mdoc);
+	if (mdoc->last->type == MDOC_HEAD && mdoc->last->nchild)
+		post_fname(mdoc);
 	return(1);
 }
 
-
 static int
-post_nm(POST_ARGS)
+post_fa(POST_ARGS)
 {
-	char		 buf[BUFSIZ];
+	const struct mdoc_node *n;
+	const char *cp;
 
-	/* If no child specified, make sure we have the meta name. */
+	for (n = mdoc->last->child; n != NULL; n = n->next) {
+		for (cp = n->string; *cp != '\0'; cp++) {
+			/* Ignore callbacks and alterations. */
+			if (*cp == '(' || *cp == '{')
+				break;
+			if (*cp != ',')
+				continue;
+			mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse,
+			    n->line, n->pos + (cp - n->string),
+			    n->string);
+			break;
+		}
+	}
+	return(1);
+}
 
-	if (NULL == mdoc->last->child && NULL == mdoc->meta.name) {
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);
-		return(1);
-	} else if (mdoc->meta.name)
+static int
+post_vt(POST_ARGS)
+{
+	const struct mdoc_node *n;
+
+	/*
+	 * The Vt macro comes in both ELEM and BLOCK form, both of which
+	 * have different syntaxes (yet more context-sensitive
+	 * behaviour).  ELEM types must have a child, which is already
+	 * guaranteed by the in_line parsing routine; BLOCK types,
+	 * specifically the BODY, should only have TEXT children.
+	 */
+
+	if (MDOC_BODY != mdoc->last->type)
 		return(1);
 
-	/* If no meta name, set it from the child. */
+	for (n = mdoc->last->child; n; n = n->next)
+		if (MDOC_TEXT != n->type)
+			mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
+			    n->line, n->pos, mdoc_macronames[n->tok]);
 
-	if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
-		return(0);
+	return(1);
+}
+
+static int
+post_nm(POST_ARGS)
+{
+
+	if (NULL != mdoc->meta.name)
+		return(1);
 
-	mdoc->meta.name = mandoc_strdup(buf);
+	mdoc_deroff(&mdoc->meta.name, mdoc->last);
 
+	if (NULL == mdoc->meta.name)
+		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos, "Nm");
 	return(1);
 }
 
+static int
+post_nd(POST_ARGS)
+{
+
+	berr_ge1(mdoc);
+	return(post_hyph(mdoc));
+}
+
+static int
+post_d1(POST_ARGS)
+{
+
+	bwarn_ge1(mdoc);
+	return(post_hyph(mdoc));
+}
+
 static int
 post_literal(POST_ARGS)
 {
-	
+
+	if (mdoc->last->tok == MDOC_Bd)
+		hwarn_eq0(mdoc);
+	bwarn_ge1(mdoc);
+
 	/*
 	 * The `Dl' (note "el" not "one") and `Bd' macros unset the
 	 * MDOC_LITERAL flag as they leave.  Note that `Bd' only sets
@@ -1184,7 +1133,7 @@ post_literal(POST_ARGS)
 	 */
 
 	if (MDOC_BODY == mdoc->last->type)
-		mdoc->last->flags &= ~MDOC_LITERAL;
+		mdoc->flags &= ~MDOC_LITERAL;
 
 	return(1);
 }
@@ -1202,37 +1151,31 @@ post_defaults(POST_ARGS)
 
 	if (mdoc->last->child)
 		return(1);
-	
+
 	nn = mdoc->last;
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	switch (nn->tok) {
-	case (MDOC_Ar):
+	case MDOC_Ar:
 		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "file"))
 			return(0);
 		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))
 			return(0);
 		break;
-	case (MDOC_At):
-		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "AT&T"))
-			return(0);
-		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "UNIX"))
-			return(0);
-		break;
-	case (MDOC_Li):
+	case MDOC_Li:
 		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
 			return(0);
 		break;
-	case (MDOC_Pa):
+	case MDOC_Pa:
 		/* FALLTHROUGH */
-	case (MDOC_Mt):
+	case MDOC_Mt:
 		if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))
 			return(0);
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
-	} 
+	}
 
 	mdoc->last = nn;
 	return(1);
@@ -1241,37 +1184,36 @@ post_defaults(POST_ARGS)
 static int
 post_at(POST_ARGS)
 {
-	const char	 *p, *q;
-	char		 *buf;
-	size_t		  sz;
+	struct mdoc_node	*n;
+	const char		*std_att;
+	char			*att;
+
+	n = mdoc->last;
+	if (n->child == NULL) {
+		mdoc->next = MDOC_NEXT_CHILD;
+		if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX"))
+			return(0);
+		mdoc->last = n;
+		return(1);
+	}
 
 	/*
 	 * If we have a child, look it up in the standard keys.  If a
 	 * key exist, use that instead of the child; if it doesn't,
 	 * prefix "AT&T UNIX " to the existing data.
 	 */
-	
-	if (NULL == mdoc->last->child)
-		return(1);
 
-	assert(MDOC_TEXT == mdoc->last->child->type);
-	p = mdoc_a2att(mdoc->last->child->string);
-
-	if (p) {
-		free(mdoc->last->child->string);
-		mdoc->last->child->string = mandoc_strdup(p);
-	} else {
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);
-		p = "AT&T UNIX ";
-		q = mdoc->last->child->string;
-		sz = strlen(p) + strlen(q) + 1;
-		buf = mandoc_malloc(sz);
-		strlcpy(buf, p, sz);
-		strlcat(buf, q, sz);
-		free(mdoc->last->child->string);
-		mdoc->last->child->string = buf;
-	}
+	n = n->child;
+	assert(MDOC_TEXT == n->type);
+	if (NULL == (std_att = mdoc_a2att(n->string))) {
+		mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
+		    n->line, n->pos, "At %s", n->string);
+		mandoc_asprintf(&att, "AT&T UNIX %s", n->string);
+	} else
+		att = mandoc_strdup(std_att);
 
+	free(n->string);
+	n->string = att;
 	return(1);
 }
 
@@ -1281,108 +1223,106 @@ post_an(POST_ARGS)
 	struct mdoc_node *np;
 
 	np = mdoc->last;
-	if (AUTH__NONE != np->data.An.auth && np->child)
-		return(eerr_eq0(mdoc));
-	/* 
-	 * FIXME: make this ewarn and make sure that the front-ends
-	 * don't print the arguments.
-	 */
-	if (AUTH__NONE != np->data.An.auth || np->child)
-		return(1);
-	return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS));
+	if (AUTH__NONE == np->norm->An.auth) {
+		if (0 == np->child)
+			check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0);
+	} else if (np->child)
+		check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0);
+
+	return(1);
 }
 
+static int
+post_en(POST_ARGS)
+{
+
+	if (MDOC_BLOCK == mdoc->last->type)
+		mdoc->last->norm->Es = mdoc->last_es;
+	return(1);
+}
+
+static int
+post_es(POST_ARGS)
+{
+
+	mdoc->last_es = mdoc->last;
+	return(1);
+}
 
 static int
 post_it(POST_ARGS)
 {
-	int		  i, cols, rc;
+	int		  i, cols;
 	enum mdoc_list	  lt;
-	struct mdoc_node *n, *c;
-	enum mandocerr	  er;
+	struct mdoc_node *nbl, *nit, *nch;
 
-	if (MDOC_BLOCK != mdoc->last->type)
+	nit = mdoc->last;
+	if (MDOC_BLOCK != nit->type)
 		return(1);
 
-	n = mdoc->last->parent->parent;
-	assert(n->data.Bl);
-	lt = n->data.Bl->type;
-
-	if (LIST__NONE == lt) {
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
-		return(0);
-	}
+	nbl = nit->parent->parent;
+	lt = nbl->norm->Bl.type;
 
 	switch (lt) {
-	case (LIST_tag):
-		if (mdoc->last->head->child)
-			break;
-		/* FIXME: give this a dummy value. */
-		if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))
-			return(0);
-		break;
-	case (LIST_hang):
+	case LIST_tag:
+		/* FALLTHROUGH */
+	case LIST_hang:
 		/* FALLTHROUGH */
-	case (LIST_ohang):
+	case LIST_ohang:
 		/* FALLTHROUGH */
-	case (LIST_inset):
+	case LIST_inset:
 		/* FALLTHROUGH */
-	case (LIST_diag):
-		if (NULL == mdoc->last->head->child)
-			if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))
-				return(0);
+	case LIST_diag:
+		if (NULL == nit->head->child)
+			mandoc_vmsg(MANDOCERR_IT_NOHEAD,
+			    mdoc->parse, nit->line, nit->pos,
+			    "Bl -%s It",
+			    mdoc_argnames[nbl->args->argv[0].arg]);
 		break;
-	case (LIST_bullet):
+	case LIST_bullet:
 		/* FALLTHROUGH */
-	case (LIST_dash):
+	case LIST_dash:
 		/* FALLTHROUGH */
-	case (LIST_enum):
+	case LIST_enum:
 		/* FALLTHROUGH */
-	case (LIST_hyphen):
-		if (NULL == mdoc->last->body->child)
-			if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-				return(0);
+	case LIST_hyphen:
+		if (NULL == nit->body->child)
+			mandoc_vmsg(MANDOCERR_IT_NOBODY,
+			    mdoc->parse, nit->line, nit->pos,
+			    "Bl -%s It",
+			    mdoc_argnames[nbl->args->argv[0].arg]);
 		/* FALLTHROUGH */
-	case (LIST_item):
-		if (mdoc->last->head->child)
-			if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))
-				return(0);
+	case LIST_item:
+		if (NULL != nit->head->child)
+			mandoc_vmsg(MANDOCERR_ARG_SKIP,
+			    mdoc->parse, nit->line, nit->pos,
+			    "It %s", nit->head->child->string);
 		break;
-	case (LIST_column):
-		cols = (int)n->data.Bl->ncols;
+	case LIST_column:
+		cols = (int)nbl->norm->Bl.ncols;
 
-		assert(NULL == mdoc->last->head->child);
+		assert(NULL == nit->head->child);
 
-		if (NULL == mdoc->last->body->child)
-			if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-				return(0);
-
-		for (i = 0, c = mdoc->last->child; c; c = c->next)
-			if (MDOC_BODY == c->type)
+		for (i = 0, nch = nit->child; nch; nch = nch->next)
+			if (MDOC_BODY == nch->type)
 				i++;
 
-		if (i < cols)
-			er = MANDOCERR_ARGCOUNT;
-		else if (i == cols || i == cols + 1)
-			break;
-		else
-			er = MANDOCERR_SYNTARGCOUNT;
-
-		rc = mdoc_vmsg(mdoc, er, 
-				mdoc->last->line, mdoc->last->pos, 
-				"columns == %d (have %d)", cols, i);
-		return(rc);
-	default:
+		if (i < cols || i > cols + 1)
+			mandoc_vmsg(MANDOCERR_ARGCOUNT,
+			    mdoc->parse, nit->line, nit->pos,
+			    "columns == %d (have %d)", cols, i);
 		break;
+	default:
+		abort();
 	}
 
 	return(1);
 }
 
 static int
-post_bl_block(POST_ARGS) 
+post_bl_block(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct mdoc_node *n, *ni, *nc;
 
 	/*
 	 * These are fairly complicated, so we've broken them into two
@@ -1394,64 +1334,71 @@ post_bl_block(POST_ARGS)
 
 	n = mdoc->last;
 
-	if (LIST_tag == n->data.Bl->type && 
-			NULL == n->data.Bl->width) {
+	if (LIST_tag == n->norm->Bl.type &&
+	    NULL == n->norm->Bl.width) {
 		if ( ! post_bl_block_tag(mdoc))
 			return(0);
-	} else if (NULL != n->data.Bl->width) {
-		if ( ! post_bl_block_width(mdoc))
-			return(0);
-	} else 
-		return(1);
+		assert(n->norm->Bl.width);
+	}
 
-	assert(n->data.Bl->width);
+	for (ni = n->body->child; ni; ni = ni->next) {
+		if (NULL == ni->body)
+			continue;
+		nc = ni->body->last;
+		while (NULL != nc) {
+			switch (nc->tok) {
+			case MDOC_Pp:
+				/* FALLTHROUGH */
+			case MDOC_Lp:
+				/* FALLTHROUGH */
+			case MDOC_br:
+				break;
+			default:
+				nc = NULL;
+				continue;
+			}
+			if (NULL == ni->next) {
+				mandoc_msg(MANDOCERR_PAR_MOVE,
+				    mdoc->parse, nc->line, nc->pos,
+				    mdoc_macronames[nc->tok]);
+				if ( ! mdoc_node_relink(mdoc, nc))
+					return(0);
+			} else if (0 == n->norm->Bl.comp &&
+			    LIST_column != n->norm->Bl.type) {
+				mandoc_vmsg(MANDOCERR_PAR_SKIP,
+				    mdoc->parse, nc->line, nc->pos,
+				    "%s before It",
+				    mdoc_macronames[nc->tok]);
+				mdoc_node_delete(mdoc, nc);
+			} else
+				break;
+			nc = ni->body->last;
+		}
+	}
 	return(1);
 }
 
-static int
-post_bl_block_width(POST_ARGS)
+/*
+ * If the argument of -offset or -width is a macro,
+ * replace it with the associated default width.
+ */
+void
+rewrite_macro2len(char **arg)
 {
 	size_t		  width;
-	int		  i;
 	enum mdoct	  tok;
-	struct mdoc_node *n;
-	char		  buf[NUMSIZ];
 
-	n = mdoc->last;
-
-	/*
-	 * Calculate the real width of a list from the -width string,
-	 * which may contain a macro (with a known default width), a
-	 * literal string, or a scaling width.
-	 *
-	 * If the value to -width is a macro, then we re-write it to be
-	 * the macro's width as set in share/tmac/mdoc/doc-common.
-	 */
-
-	if (0 == strcmp(n->data.Bl->width, "Ds"))
+	if (*arg == NULL)
+		return;
+	else if ( ! strcmp(*arg, "Ds"))
 		width = 6;
-	else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width)))
-		return(1);
-	else if (0 == (width = mdoc_macro2len(tok))) 
-		return(mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH));
-
-	/* The value already exists: free and reallocate it. */
-
-	assert(n->args);
-
-	for (i = 0; i < (int)n->args->argc; i++) 
-		if (MDOC_Width == n->args->argv[i].arg)
-			break;
-
-	assert(i < (int)n->args->argc);
-
-	snprintf(buf, NUMSIZ, "%zun", width);
-	free(n->args->argv[i].value[0]);
-	n->args->argv[i].value[0] = mandoc_strdup(buf);
+	else if ((tok = mdoc_hash_find(*arg)) == MDOC_MAX)
+		return;
+	else
+		width = macro2len(tok);
 
-	/* Set our width! */
-	n->data.Bl->width = n->args->argv[i].value[0];
-	return(1);
+	free(*arg);
+	mandoc_asprintf(arg, "%zun", width);
 }
 
 static int
@@ -1460,13 +1407,13 @@ post_bl_block_tag(POST_ARGS)
 	struct mdoc_node *n, *nn;
 	size_t		  sz, ssz;
 	int		  i;
-	char		  buf[NUMSIZ];
+	char		  buf[24];
 
 	/*
 	 * Calculate the -width for a `Bl -tag' list if it hasn't been
 	 * provided.  Uses the first head macro.  NOTE AGAIN: this is
 	 * ONLY if the -width argument has NOT been provided.  See
-	 * post_bl_block_width() for converting the -width string.
+	 * rewrite_macro2len() for converting the -width string.
 	 */
 
 	sz = 10;
@@ -1479,29 +1426,23 @@ post_bl_block_tag(POST_ARGS)
 		assert(MDOC_BLOCK == nn->type);
 		nn = nn->head->child;
 
-		if (nn == NULL) {
-			/* No -width for .Bl and first .It is emtpy */
-			if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))
-				return(0);
+		if (nn == NULL)
 			break;
-		}
 
 		if (MDOC_TEXT == nn->type) {
 			sz = strlen(nn->string) + 1;
 			break;
 		}
 
-		if (0 != (ssz = mdoc_macro2len(nn->tok)))
+		if (0 != (ssz = macro2len(nn->tok)))
 			sz = ssz;
-		else if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))
-			return(0);
 
 		break;
-	} 
+	}
 
 	/* Defaults to ten ens. */
 
-	snprintf(buf, NUMSIZ, "%zun", sz);
+	(void)snprintf(buf, sizeof(buf), "%un", (unsigned int)sz);
 
 	/*
 	 * We have to dynamically add this to the macro's argument list.
@@ -1511,8 +1452,8 @@ post_bl_block_tag(POST_ARGS)
 	assert(n->args);
 	i = (int)(n->args->argc)++;
 
-	n->args->argv = mandoc_realloc(n->args->argv, 
-			n->args->argc * sizeof(struct mdoc_argv));
+	n->args->argv = mandoc_reallocarray(n->args->argv,
+	    n->args->argc, sizeof(struct mdoc_argv));
 
 	n->args->argv[i].arg = MDOC_Width;
 	n->args->argv[i].line = n->line;
@@ -1522,65 +1463,56 @@ post_bl_block_tag(POST_ARGS)
 	n->args->argv[i].value[0] = mandoc_strdup(buf);
 
 	/* Set our width! */
-	n->data.Bl->width = n->args->argv[i].value[0];
+	n->norm->Bl.width = n->args->argv[i].value[0];
 	return(1);
 }
 
-
 static int
-post_bl_head(POST_ARGS) 
+post_bl_head(POST_ARGS)
 {
 	struct mdoc_node *np, *nn, *nnp;
+	struct mdoc_argv *argv;
 	int		  i, j;
 
-	if (LIST_column != mdoc->last->data.Bl->type)
+	if (LIST_column != mdoc->last->norm->Bl.type)
 		/* FIXME: this should be ERROR class... */
 		return(hwarn_eq0(mdoc));
 
 	/*
-	 * Convert old-style lists, where the column width specifiers
+	 * Append old-style lists, where the column width specifiers
 	 * trail as macro parameters, to the new-style ("normal-form")
 	 * lists where they're argument values following -column.
 	 */
 
-	/* First, disallow both types and allow normal-form. */
-
-	/* 
-	 * TODO: technically, we can accept both and just merge the two
-	 * lists, but I'll leave that for another day.
-	 */
-
-	if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) {
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
-		return(0);
-	} else if (NULL == mdoc->last->child)
+	if (mdoc->last->child == NULL)
 		return(1);
 
 	np = mdoc->last->parent;
 	assert(np->args);
 
-	for (j = 0; j < (int)np->args->argc; j++) 
+	for (j = 0; j < (int)np->args->argc; j++)
 		if (MDOC_Column == np->args->argv[j].arg)
 			break;
 
 	assert(j < (int)np->args->argc);
-	assert(0 == np->args->argv[j].sz);
 
 	/*
-	 * Accomodate for new-style groff column syntax.  Shuffle the
+	 * Accommodate for new-style groff column syntax.  Shuffle the
 	 * child nodes, all of which must be TEXT, as arguments for the
 	 * column field.  Then, delete the head children.
 	 */
 
-	np->args->argv[j].sz = (size_t)mdoc->last->nchild;
-	np->args->argv[j].value = mandoc_malloc
-		((size_t)mdoc->last->nchild * sizeof(char *));
+	argv = np->args->argv + j;
+	i = argv->sz;
+	argv->sz += mdoc->last->nchild;
+	argv->value = mandoc_reallocarray(argv->value,
+	    argv->sz, sizeof(char *));
 
-	mdoc->last->data.Bl->ncols = np->args->argv[j].sz;
-	mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value;
+	mdoc->last->norm->Bl.ncols = argv->sz;
+	mdoc->last->norm->Bl.cols = (void *)argv->value;
 
-	for (i = 0, nn = mdoc->last->child; nn; i++) {
-		np->args->argv[j].value[i] = nn->string;
+	for (nn = mdoc->last->child; nn; i++) {
+		argv->value[i] = nn->string;
 		nn->string = NULL;
 		nnp = nn;
 		nn = nn->next;
@@ -1596,92 +1528,192 @@ post_bl_head(POST_ARGS)
 static int
 post_bl(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct mdoc_node	*nparent, *nprev; /* of the Bl block */
+	struct mdoc_node	*nblock, *nbody;  /* of the Bl */
+	struct mdoc_node	*nchild, *nnext;  /* of the Bl body */
 
-	if (MDOC_HEAD == mdoc->last->type) 
-		return(post_bl_head(mdoc));
-	if (MDOC_BLOCK == mdoc->last->type)
+	nbody = mdoc->last;
+	switch (nbody->type) {
+	case MDOC_BLOCK:
 		return(post_bl_block(mdoc));
-	if (MDOC_BODY != mdoc->last->type)
-		return(1);
-	if (NULL == mdoc->last->child)
+	case MDOC_HEAD:
+		return(post_bl_head(mdoc));
+	case MDOC_BODY:
+		break;
+	default:
 		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.
-	 */
+	bwarn_ge1(mdoc);
 
-	/* LINTED */
-	for (n = mdoc->last->child; n; n = n->next) {
-		if (MDOC_BLOCK == n->type && MDOC_It == n->tok)
-			continue;
-		if (MDOC_Sm == n->tok)
+	nchild = nbody->child;
+	while (NULL != nchild) {
+		if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {
+			nchild = nchild->next;
 			continue;
-		mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD);
-		return(0);
+		}
+
+		mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
+		    nchild->line, nchild->pos,
+		    mdoc_macronames[nchild->tok]);
+
+		/*
+		 * Move the node out of the Bl block.
+		 * First, collect all required node pointers.
+		 */
+
+		nblock  = nbody->parent;
+		nprev   = nblock->prev;
+		nparent = nblock->parent;
+		nnext   = nchild->next;
+
+		/*
+		 * Unlink this child.
+		 */
+
+		assert(NULL == nchild->prev);
+		if (0 == --nbody->nchild) {
+			nbody->child = NULL;
+			nbody->last  = NULL;
+			assert(NULL == nnext);
+		} else {
+			nbody->child = nnext;
+			nnext->prev = NULL;
+		}
+
+		/*
+		 * Relink this child.
+		 */
+
+		nchild->parent = nparent;
+		nchild->prev   = nprev;
+		nchild->next   = nblock;
+
+		nblock->prev = nchild;
+		nparent->nchild++;
+		if (NULL == nprev)
+			nparent->child = nchild;
+		else
+			nprev->next = nchild;
+
+		nchild = nnext;
 	}
 
 	return(1);
 }
 
+static int
+post_bk(POST_ARGS)
+{
+
+	hwarn_eq0(mdoc);
+	bwarn_ge1(mdoc);
+	return(1);
+}
 
 static int
 ebool(struct mdoc *mdoc)
 {
-	struct mdoc_node *n;
+	struct mdoc_node	*nch;
+	enum mdoct		 tok;
 
-	/* LINTED */
-	for (n = mdoc->last->child; n; n = n->next) {
-		if (MDOC_TEXT != n->type)
-			break;
-		if (0 == strcmp(n->string, "on"))
-			continue;
-		if (0 == strcmp(n->string, "off"))
-			continue;
-		break;
+	tok = mdoc->last->tok;
+	nch = mdoc->last->child;
+
+	if (NULL == nch) {
+		if (MDOC_Sm == tok)
+			mdoc->flags ^= MDOC_SMOFF;
+		return(1);
 	}
 
-	if (NULL == n)
+	check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2);
+
+	assert(MDOC_TEXT == nch->type);
+
+	if (0 == strcmp(nch->string, "on")) {
+		if (MDOC_Sm == tok)
+			mdoc->flags &= ~MDOC_SMOFF;
 		return(1);
-	return(mdoc_nmsg(mdoc, n, MANDOCERR_BADBOOL));
-}
+	}
+	if (0 == strcmp(nch->string, "off")) {
+		if (MDOC_Sm == tok)
+			mdoc->flags |= MDOC_SMOFF;
+		return(1);
+	}
 
+	mandoc_vmsg(MANDOCERR_SM_BAD,
+	    mdoc->parse, nch->line, nch->pos,
+	    "%s %s", mdoc_macronames[tok], nch->string);
+	return(mdoc_node_relink(mdoc, nch));
+}
 
 static int
 post_root(POST_ARGS)
 {
+	struct mdoc_node *n;
 
-	if (NULL == mdoc->first->child)
-		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY);
-	else if ( ! (MDOC_PBODY & mdoc->flags))
-		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
-	else if (MDOC_BLOCK != mdoc->first->child->type)
-		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY);
-	else if (MDOC_Sh != mdoc->first->child->tok)
-		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY);
-	else
-		return(1);
+	/* Add missing prologue data. */
 
-	return(0);
+	if (mdoc->meta.date == NULL)
+		mdoc->meta.date = mdoc->quick ?
+		    mandoc_strdup("") :
+		    mandoc_normdate(mdoc->parse, NULL, 0, 0);
+
+	if (mdoc->meta.title == NULL) {
+		mandoc_msg(MANDOCERR_DT_NOTITLE,
+		    mdoc->parse, 0, 0, "EOF");
+		mdoc->meta.title = mandoc_strdup("UNTITLED");
+	}
+
+	if (mdoc->meta.vol == NULL)
+		mdoc->meta.vol = mandoc_strdup("LOCAL");
+
+	if (mdoc->meta.os == NULL) {
+		mandoc_msg(MANDOCERR_OS_MISSING,
+		    mdoc->parse, 0, 0, NULL);
+		mdoc->meta.os = mandoc_strdup("");
+	}
+
+	/* Check that we begin with a proper `Sh'. */
+
+	n = mdoc->first->child;
+	while (n != NULL && mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
+		n = n->next;
+
+	if (n == NULL)
+		mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
+	else if (n->tok != MDOC_Sh)
+		mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
+		    n->line, n->pos, mdoc_macronames[n->tok]);
+
+	return(1);
 }
 
 static int
 post_st(POST_ARGS)
 {
-	const char	*p;
+	struct mdoc_node	 *n, *nch;
+	const char		 *p;
+
+	n = mdoc->last;
+	nch = n->child;
 
-	assert(MDOC_TEXT == mdoc->last->child->type);
+	if (NULL == nch) {
+		mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+		    n->line, n->pos, mdoc_macronames[n->tok]);
+		mdoc_node_delete(mdoc, n);
+		return(1);
+	}
 
-	p = mdoc_a2st(mdoc->last->child->string);
+	assert(MDOC_TEXT == nch->type);
 
-	if (p == NULL) {
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD);
-		mdoc_node_delete(mdoc, mdoc->last);
+	if (NULL == (p = mdoc_a2st(nch->string))) {
+		mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
+		    nch->line, nch->pos, "St %s", nch->string);
+		mdoc_node_delete(mdoc, n);
 	} else {
-		free(mdoc->last->child->string);
-		mdoc->last->child->string = mandoc_strdup(p);
+		free(nch->string);
+		nch->string = mandoc_strdup(p);
 	}
 
 	return(1);
@@ -1693,35 +1725,23 @@ post_rs(POST_ARGS)
 	struct mdoc_node *nn, *next, *prev;
 	int		  i, j;
 
-	if (MDOC_BODY != mdoc->last->type)
+	switch (mdoc->last->type) {
+	case MDOC_HEAD:
+		check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0);
+		return(1);
+	case MDOC_BODY:
+		if (mdoc->last->child)
+			break;
+		check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0);
+		return(1);
+	default:
 		return(1);
-
-	/*
-	 * Make sure only certain types of nodes are allowed within the
-	 * the `Rs' body.  Delete offending nodes and raise a warning.
-	 * Do this before re-ordering for the sake of clarity.
-	 */
-
-	next = NULL;
-	for (nn = mdoc->last->child; nn; nn = next) {
-		for (i = 0; i < RSORD_MAX; i++)
-			if (nn->tok == rsord[i])
-				break;
-
-		if (i < RSORD_MAX) {
-			next = nn->next;
-			continue;
-		}
-
-		next = nn->next;
-		mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD);
-		mdoc_node_delete(mdoc, nn);
 	}
 
 	/*
 	 * The full `Rs' block needs special handling to order the
 	 * sub-elements according to `rsord'.  Pick through each element
-	 * and correctly order it.  This is a insertion sort.
+	 * and correctly order it.  This is an insertion sort.
 	 */
 
 	next = NULL;
@@ -1731,13 +1751,21 @@ post_rs(POST_ARGS)
 			if (rsord[i] == nn->tok)
 				break;
 
-		/* 
+		if (i == RSORD_MAX) {
+			mandoc_msg(MANDOCERR_RS_BAD,
+			    mdoc->parse, nn->line, nn->pos,
+			    mdoc_macronames[nn->tok]);
+			i = -1;
+		} else if (MDOC__J == nn->tok || MDOC__B == nn->tok)
+			mdoc->last->norm->Rs.quote_T++;
+
+		/*
 		 * Remove `nn' from the chain.  This somewhat
 		 * repeats mdoc_node_unlink(), but since we're
 		 * just re-ordering, there's no need for the
 		 * full unlink process.
 		 */
-		
+
 		if (NULL != (next = nn->next))
 			next->prev = nn->prev;
 
@@ -1746,7 +1774,7 @@ post_rs(POST_ARGS)
 
 		nn->prev = nn->next = NULL;
 
-		/* 
+		/*
 		 * Scan back until we reach a node that's
 		 * ordered before `nn'.
 		 */
@@ -1756,6 +1784,8 @@ post_rs(POST_ARGS)
 			for (j = 0; j < RSORD_MAX; j++)
 				if (rsord[j] == prev->tok)
 					break;
+			if (j == RSORD_MAX)
+				j = -1;
 
 			if (j <= i)
 				break;
@@ -1783,57 +1813,217 @@ post_rs(POST_ARGS)
 	return(1);
 }
 
+/*
+ * For some arguments of some macros,
+ * convert all breakable hyphens into ASCII_HYPH.
+ */
+static int
+post_hyph(POST_ARGS)
+{
+	struct mdoc_node	*n, *nch;
+	char			*cp;
+
+	n = mdoc->last;
+	switch (n->type) {
+	case MDOC_HEAD:
+		if (MDOC_Sh == n->tok || MDOC_Ss == n->tok)
+			break;
+		return(1);
+	case MDOC_BODY:
+		if (MDOC_D1 == n->tok || MDOC_Nd == n->tok)
+			break;
+		return(1);
+	case MDOC_ELEM:
+		break;
+	default:
+		return(1);
+	}
+
+	for (nch = n->child; nch; nch = nch->next) {
+		if (MDOC_TEXT != nch->type)
+			continue;
+		cp = nch->string;
+		if ('\0' == *cp)
+			continue;
+		while ('\0' != *(++cp))
+			if ('-' == *cp &&
+			    isalpha((unsigned char)cp[-1]) &&
+			    isalpha((unsigned char)cp[1]))
+				*cp = ASCII_HYPH;
+	}
+	return(1);
+}
+
+static int
+post_hyphtext(POST_ARGS)
+{
+
+	ewarn_ge1(mdoc);
+	return(post_hyph(mdoc));
+}
+
+static int
+post_ns(POST_ARGS)
+{
+
+	if (MDOC_LINE & mdoc->last->flags)
+		mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos, NULL);
+	return(1);
+}
 
 static int
 post_sh(POST_ARGS)
 {
 
-	if (MDOC_HEAD == mdoc->last->type)
+	post_ignpar(mdoc);
+
+	switch (mdoc->last->type) {
+	case MDOC_HEAD:
 		return(post_sh_head(mdoc));
-	if (MDOC_BODY == mdoc->last->type)
-		return(post_sh_body(mdoc));
+	case MDOC_BODY:
+		switch (mdoc->lastsec)  {
+		case SEC_NAME:
+			return(post_sh_name(mdoc));
+		case SEC_SEE_ALSO:
+			return(post_sh_see_also(mdoc));
+		case SEC_AUTHORS:
+			return(post_sh_authors(mdoc));
+		default:
+			break;
+		}
+		break;
+	default:
+		break;
+	}
 
 	return(1);
 }
 
-
 static int
-post_sh_body(POST_ARGS)
+post_sh_name(POST_ARGS)
 {
 	struct mdoc_node *n;
 
-	if (SEC_NAME != mdoc->lastsec)
-		return(1);
-
 	/*
 	 * 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_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC));
+	if (NULL == (n = mdoc->last->child)) {
+		mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos, "empty");
+		return(1);
+	}
 
 	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_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC))
-			return(0);
+		mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+		    n->line, n->pos, mdoc_macronames[n->tok]);
 	}
 
 	assert(n);
 	if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)
 		return(1);
-	return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC));
+
+	mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+	    n->line, n->pos, mdoc_macronames[n->tok]);
+	return(1);
 }
 
+static int
+post_sh_see_also(POST_ARGS)
+{
+	const struct mdoc_node	*n;
+	const char 		*name, *sec;
+	const char		*lastname, *lastsec, *lastpunct;
+	int			 cmp;
+
+	n = mdoc->last->child;
+	lastname = lastsec = lastpunct = NULL;
+	while (n != NULL) {
+		if (n->tok != MDOC_Xr || n->nchild < 2)
+			break;
+
+		/* Process one .Xr node. */
+
+		name = n->child->string;
+		sec = n->child->next->string;
+		if (lastsec != NULL) {
+			if (lastpunct[0] != ',' || lastpunct[1] != '\0')
+				mandoc_vmsg(MANDOCERR_XR_PUNCT,
+				    mdoc->parse, n->line, n->pos,
+				    "%s before %s(%s)", lastpunct,
+				    name, sec);
+			cmp = strcmp(lastsec, sec);
+			if (cmp > 0)
+				mandoc_vmsg(MANDOCERR_XR_ORDER,
+				    mdoc->parse, n->line, n->pos,
+				    "%s(%s) after %s(%s)", name,
+				    sec, lastname, lastsec);
+			else if (cmp == 0 &&
+			    strcasecmp(lastname, name) > 0)
+				mandoc_vmsg(MANDOCERR_XR_ORDER,
+				    mdoc->parse, n->line, n->pos,
+				    "%s after %s", name, lastname);
+		}
+		lastname = name;
+		lastsec = sec;
+
+		/* Process the following node. */
+
+		n = n->next;
+		if (n == NULL)
+			break;
+		if (n->tok == MDOC_Xr) {
+			lastpunct = "none";
+			continue;
+		}
+		if (n->type != MDOC_TEXT)
+			break;
+		for (name = n->string; *name != '\0'; name++)
+			if (isalpha((const unsigned char)*name))
+				return(1);
+		lastpunct = n->string;
+		if (n->next == NULL)
+			mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
+			    n->line, n->pos, "%s after %s(%s)",
+			    lastpunct, lastname, lastsec);
+		n = n->next;
+	}
+	return(1);
+}
+
+static int
+child_an(const struct mdoc_node *n)
+{
+
+	for (n = n->child; n != NULL; n = n->next)
+		if ((n->tok == MDOC_An && n->nchild) || child_an(n))
+			return(1);
+	return(0);
+}
+
+static int
+post_sh_authors(POST_ARGS)
+{
+
+	if ( ! child_an(mdoc->last))
+		mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos, NULL);
+	return(1);
+}
 
 static int
 post_sh_head(POST_ARGS)
 {
-	char		 buf[BUFSIZ];
+	struct mdoc_node *n;
+	const char	*goodsec;
+	char		*secname;
 	enum mdoc_sec	 sec;
 
 	/*
@@ -1843,31 +2033,52 @@ post_sh_head(POST_ARGS)
 	 * manual sections.
 	 */
 
-	if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
-		return(0);
-
-	sec = mdoc_str2sec(buf);
+	secname = NULL;
+	sec = SEC_CUSTOM;
+	mdoc_deroff(&secname, mdoc->last);
+	sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);
 
 	/* The NAME should be first. */
 
 	if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST);
+		mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos,
+		    "Sh %s", secname);
 
 	/* The SYNOPSIS gets special attention in other areas. */
 
-	if (SEC_SYNOPSIS == sec)
+	if (SEC_SYNOPSIS == sec) {
+		roff_setreg(mdoc->roff, "nS", 1, '=');
 		mdoc->flags |= MDOC_SYNOPSIS;
-	else
+	} else {
+		roff_setreg(mdoc->roff, "nS", 0, '=');
 		mdoc->flags &= ~MDOC_SYNOPSIS;
+	}
 
 	/* Mark our last section. */
 
 	mdoc->lastsec = sec;
 
+	/*
+	 * Set the section attribute for the current HEAD, for its
+	 * parent BLOCK, and for the HEAD children; the latter can
+	 * only be TEXT nodes, so no recursion is needed.
+	 * For other blocks and elements, including .Sh BODY, this is
+	 * done when allocating the node data structures, but for .Sh
+	 * BLOCK and HEAD, the section is still unknown at that time.
+	 */
+
+	mdoc->last->parent->sec = sec;
+	mdoc->last->sec = sec;
+	for (n = mdoc->last->child; n; n = n->next)
+		n->sec = sec;
+
 	/* We don't care about custom sections after this. */
 
-	if (SEC_CUSTOM == sec)
+	if (SEC_CUSTOM == sec) {
+		free(secname);
 		return(1);
+	}
 
 	/*
 	 * Check whether our non-custom section is being repeated or is
@@ -1875,10 +2086,14 @@ post_sh_head(POST_ARGS)
 	 */
 
 	if (sec == mdoc->lastnamed)
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP);
+		mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos,
+		    "Sh %s", secname);
 
 	if (sec < mdoc->lastnamed)
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO);
+		mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos,
+		    "Sh %s", secname);
 
 	/* Mark the last named section. */
 
@@ -1886,26 +2101,74 @@ post_sh_head(POST_ARGS)
 
 	/* Check particular section/manual conventions. */
 
-	assert(mdoc->meta.msec);
+	if (mdoc->meta.msec == NULL) {
+		free(secname);
+		return(1);
+	}
 
+	goodsec = NULL;
 	switch (sec) {
-	case (SEC_RETURN_VALUES):
+	case SEC_ERRORS:
+		if (*mdoc->meta.msec == '4')
+			break;
+		goodsec = "2, 3, 4, 9";
 		/* FALLTHROUGH */
-	case (SEC_ERRORS):
+	case SEC_RETURN_VALUES:
 		/* FALLTHROUGH */
-	case (SEC_LIBRARY):
+	case SEC_LIBRARY:
 		if (*mdoc->meta.msec == '2')
 			break;
 		if (*mdoc->meta.msec == '3')
 			break;
+		if (NULL == goodsec)
+			goodsec = "2, 3, 9";
+		/* FALLTHROUGH */
+	case SEC_CONTEXT:
 		if (*mdoc->meta.msec == '9')
 			break;
-		mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC);
+		if (NULL == goodsec)
+			goodsec = "9";
+		mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
+		    mdoc->last->line, mdoc->last->pos,
+		    "Sh %s for %s only", secname, goodsec);
 		break;
 	default:
 		break;
 	}
 
+	free(secname);
+	return(1);
+}
+
+static int
+post_ignpar(POST_ARGS)
+{
+	struct mdoc_node *np;
+
+	hwarn_ge1(mdoc);
+	post_hyph(mdoc);
+
+	if (MDOC_BODY != mdoc->last->type)
+		return(1);
+
+	if (NULL != (np = mdoc->last->child))
+		if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+			mandoc_vmsg(MANDOCERR_PAR_SKIP,
+			    mdoc->parse, np->line, np->pos,
+			    "%s after %s", mdoc_macronames[np->tok],
+			    mdoc_macronames[mdoc->last->tok]);
+			mdoc_node_delete(mdoc, np);
+		}
+
+	if (NULL != (np = mdoc->last->last))
+		if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+			mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+			    np->line, np->pos, "%s at the end of %s",
+			    mdoc_macronames[np->tok],
+			    mdoc_macronames[mdoc->last->tok]);
+			mdoc_node_delete(mdoc, np);
+		}
+
 	return(1);
 }
 
@@ -1915,21 +2178,62 @@ 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
 	 * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
 	 */
 
-	if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
+	if (MDOC_Pp != mdoc->last->tok &&
+	    MDOC_Lp != mdoc->last->tok &&
+	    MDOC_br != mdoc->last->tok)
 		return(1);
-
-	if (MDOC_Bl == n->tok && n->data.Bl->comp)
+	if (MDOC_Bl == n->tok && n->norm->Bl.comp)
 		return(1);
-	if (MDOC_Bd == n->tok && n->data.Bd->comp)
+	if (MDOC_Bd == n->tok && n->norm->Bd.comp)
 		return(1);
+	if (MDOC_It == n->tok && n->parent->norm->Bl.comp)
+		return(1);
+
+	mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+	    mdoc->last->line, mdoc->last->pos,
+	    "%s before %s", mdoc_macronames[mdoc->last->tok],
+	    mdoc_macronames[n->tok]);
+	mdoc_node_delete(mdoc, mdoc->last);
+	return(1);
+}
+
+static int
+post_par(POST_ARGS)
+{
+	struct mdoc_node *np;
+
+	if (mdoc->last->tok == MDOC_sp)
+		ewarn_le1(mdoc);
+	else
+		ewarn_eq0(mdoc);
+
+	if (MDOC_ELEM != mdoc->last->type &&
+	    MDOC_BLOCK != mdoc->last->type)
+		return(1);
+
+	if (NULL == (np = mdoc->last->prev)) {
+		np = mdoc->last->parent;
+		if (MDOC_Sh != np->tok && MDOC_Ss != np->tok)
+			return(1);
+	} else {
+		if (MDOC_Pp != np->tok && MDOC_Lp != np->tok &&
+		    (MDOC_br != mdoc->last->tok ||
+		     (MDOC_sp != np->tok && MDOC_br != np->tok)))
+			return(1);
+	}
 
-	mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
+	mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+	    mdoc->last->line, mdoc->last->pos,
+	    "%s after %s", mdoc_macronames[mdoc->last->tok],
+	    mdoc_macronames[np->tok]);
 	mdoc_node_delete(mdoc, mdoc->last);
 	return(1);
 }
@@ -1938,6 +2242,8 @@ static int
 pre_literal(PRE_ARGS)
 {
 
+	pre_display(mdoc, n);
+
 	if (MDOC_BODY != n->type)
 		return(1);
 
@@ -1947,49 +2253,50 @@ pre_literal(PRE_ARGS)
 	 */
 
 	switch (n->tok) {
-	case (MDOC_Dl):
+	case MDOC_Dl:
 		mdoc->flags |= MDOC_LITERAL;
 		break;
-	case (MDOC_Bd):
-		assert(n->data.Bd);
-		if (DISP_literal == n->data.Bd->type)
+	case MDOC_Bd:
+		if (DISP_literal == n->norm->Bd.type)
 			mdoc->flags |= MDOC_LITERAL;
-		if (DISP_unfilled == n->data.Bd->type)
+		if (DISP_unfilled == n->norm->Bd.type)
 			mdoc->flags |= MDOC_LITERAL;
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
-	
+
 	return(1);
 }
 
 static int
 post_dd(POST_ARGS)
 {
-	char		  buf[DATESIZ];
 	struct mdoc_node *n;
+	char		 *datestr;
 
-	n = mdoc->last;
+	if (mdoc->meta.date)
+		free(mdoc->meta.date);
 
-	if (NULL == n->child) {
-		mdoc->meta.date = time(NULL);
-		return(post_prol(mdoc));
+	n = mdoc->last;
+	if (NULL == n->child || '\0' == n->child->string[0]) {
+		mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
+		    mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);
+		goto out;
 	}
 
-	if ( ! concat(mdoc, buf, n->child, DATESIZ))
-		return(0);
-
-	mdoc->meta.date = mandoc_a2time
-		(MTIME_MDOCDATE | MTIME_CANONICAL, buf);
-
-	if (0 == mdoc->meta.date) {
-		if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE))
-			return(0);
-		mdoc->meta.date = time(NULL);
+	datestr = NULL;
+	mdoc_deroff(&datestr, n);
+	if (mdoc->quick)
+		mdoc->meta.date = datestr;
+	else {
+		mdoc->meta.date = mandoc_normdate(mdoc->parse,
+		    datestr, n->line, n->pos);
+		free(datestr);
 	}
-
+out:
+	mdoc_node_delete(mdoc, n);
 	return(1);
 }
 
@@ -2002,79 +2309,78 @@ post_dt(POST_ARGS)
 
 	n = mdoc->last;
 
-	if (mdoc->meta.title)
-		free(mdoc->meta.title);
-	if (mdoc->meta.vol)
-		free(mdoc->meta.vol);
-	if (mdoc->meta.arch)
-		free(mdoc->meta.arch);
+	free(mdoc->meta.title);
+	free(mdoc->meta.msec);
+	free(mdoc->meta.vol);
+	free(mdoc->meta.arch);
 
-	mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;
+	mdoc->meta.title = NULL;
+	mdoc->meta.msec = NULL;
+	mdoc->meta.vol = NULL;
+	mdoc->meta.arch = NULL;
 
-	/* First make all characters uppercase. */
+	/* First check that all characters are uppercase. */
 
 	if (NULL != (nn = n->child))
 		for (p = nn->string; *p; p++) {
-			if (toupper((u_char)*p) == *p)
+			if (toupper((unsigned char)*p) == *p)
 				continue;
-			if ( ! mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE))
-				return(0);
+			mandoc_vmsg(MANDOCERR_TITLE_CASE,
+			    mdoc->parse, nn->line,
+			    nn->pos + (p - nn->string),
+			    "Dt %s", nn->string);
 			break;
 		}
 
-	/* Handles: `.Dt' 
-	 *   --> title = unknown, volume = local, msec = 0, arch = NULL
-	 */
+	/* No argument: msec and arch remain NULL. */
 
 	if (NULL == (nn = n->child)) {
-		/* XXX: make these macro values. */
-		/* FIXME: warn about missing values. */
-		mdoc->meta.title = mandoc_strdup("UNKNOWN");
+		mandoc_msg(MANDOCERR_DT_NOTITLE,
+		    mdoc->parse, n->line, n->pos, "Dt");
+		mdoc->meta.title = mandoc_strdup("UNTITLED");
 		mdoc->meta.vol = mandoc_strdup("LOCAL");
-		mdoc->meta.msec = mandoc_strdup("1");
-		return(1);
+		goto out;
 	}
 
-	/* Handles: `.Dt TITLE' 
-	 *   --> title = TITLE, volume = local, msec = 0, arch = NULL
-	 */
+	/* One argument: msec and arch remain NULL. */
 
-	mdoc->meta.title = mandoc_strdup
-		('\0' == nn->string[0] ? "UNKNOWN" : nn->string);
+	mdoc->meta.title = mandoc_strdup(
+	    '\0' == nn->string[0] ? "UNTITLED" : nn->string);
 
 	if (NULL == (nn = nn->next)) {
-		/* FIXME: warn about missing msec. */
-		/* XXX: make this a macro value. */
+		mandoc_vmsg(MANDOCERR_MSEC_MISSING,
+		    mdoc->parse, n->line, n->pos,
+		    "Dt %s", mdoc->meta.title);
 		mdoc->meta.vol = mandoc_strdup("LOCAL");
-		mdoc->meta.msec = mandoc_strdup("1");
-		return(1);
+		goto out;
 	}
 
 	/* Handles: `.Dt TITLE SEC'
-	 *   --> title = TITLE, volume = SEC is msec ? 
-	 *           format(msec) : SEC,
-	 *       msec = SEC is msec ? atoi(msec) : 0,
-	 *       arch = NULL
+	 * title = TITLE,
+	 * volume = SEC is msec ? format(msec) : SEC,
+	 * msec = SEC is msec ? atoi(msec) : 0,
+	 * arch = NULL
 	 */
 
-	cp = mdoc_a2msec(nn->string);
+	cp = mandoc_a2msec(nn->string);
 	if (cp) {
 		mdoc->meta.vol = mandoc_strdup(cp);
 		mdoc->meta.msec = mandoc_strdup(nn->string);
-	} else if (mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC)) {
+	} else {
+		mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse,
+		    nn->line, nn->pos, "Dt ... %s", nn->string);
 		mdoc->meta.vol = mandoc_strdup(nn->string);
 		mdoc->meta.msec = mandoc_strdup(nn->string);
-	} else
-		return(0);
+	}
 
 	if (NULL == (nn = nn->next))
-		return(1);
+		goto out;
 
 	/* Handles: `.Dt TITLE SEC VOL'
-	 *   --> title = TITLE, volume = VOL is vol ?
-	 *       format(VOL) : 
-	 *           VOL is arch ? format(arch) : 
-	 *               VOL
+	 * title = TITLE,
+	 * volume = VOL is vol ? format(VOL) :
+	 *	    VOL is arch ? format(arch) :
+	 *	    VOL
 	 */
 
 	cp = mdoc_a2vol(nn->string);
@@ -2082,33 +2388,37 @@ post_dt(POST_ARGS)
 		free(mdoc->meta.vol);
 		mdoc->meta.vol = mandoc_strdup(cp);
 	} else {
-		/* FIXME: warn about bad arch. */
 		cp = mdoc_a2arch(nn->string);
 		if (NULL == cp) {
+			mandoc_vmsg(MANDOCERR_ARCH_BAD, mdoc->parse,
+			    nn->line, nn->pos, "Dt ... %s", nn->string);
 			free(mdoc->meta.vol);
 			mdoc->meta.vol = mandoc_strdup(nn->string);
-		} else 
+		} else
 			mdoc->meta.arch = mandoc_strdup(cp);
-	}	
+	}
 
 	/* Ignore any subsequent parameters... */
 	/* FIXME: warn about subsequent parameters. */
-
+out:
+	mdoc_node_delete(mdoc, n);
 	return(1);
 }
 
 static int
-post_prol(POST_ARGS)
+post_bx(POST_ARGS)
 {
+	struct mdoc_node	*n;
+
 	/*
-	 * Remove prologue macros from the document after they're
-	 * processed.  The final document uses mdoc_meta for these
-	 * values and discards the originals.
+	 * Make `Bx's second argument always start with an uppercase
+	 * letter.  Groff checks if it's an "accepted" term, but we just
+	 * uppercase blindly.
 	 */
 
-	mdoc_node_delete(mdoc, mdoc->last);
-	if (mdoc->meta.title && mdoc->meta.date && mdoc->meta.os)
-		mdoc->flags |= MDOC_PBODY;
+	n = mdoc->last->child;
+	if (n && NULL != (n = n->next))
+		*n->string = (char)toupper((unsigned char)*n->string);
 
 	return(1);
 }
@@ -2116,116 +2426,184 @@ post_prol(POST_ARGS)
 static int
 post_os(POST_ARGS)
 {
-	struct mdoc_node *n;
-	char		  buf[BUFSIZ];
 #ifndef OSNAME
 	struct utsname	  utsname;
+	static char	 *defbuf;
 #endif
+	struct mdoc_node *n;
 
 	n = mdoc->last;
 
 	/*
-	 * Set the operating system by way of the `Os' macro.  Note that
-	 * if an argument isn't provided and -DOSNAME="\"foo\"" is
-	 * provided during compilation, this value will be used instead
-	 * of filling in "sysname release" from uname().
- 	 */
+	 * Set the operating system by way of the `Os' macro.
+	 * The order of precedence is:
+	 * 1. the argument of the `Os' macro, unless empty
+	 * 2. the -Ios=foo command line argument, if provided
+	 * 3. -DOSNAME="\"foo\"", if provided during compilation
+	 * 4. "sysname release" from uname(3)
+	 */
 
+	free(mdoc->meta.os);
+	mdoc->meta.os = NULL;
+	mdoc_deroff(&mdoc->meta.os, n);
 	if (mdoc->meta.os)
-		free(mdoc->meta.os);
+		goto out;
 
-	if ( ! concat(mdoc, buf, n->child, BUFSIZ))
-		return(0);
-
-	/* XXX: yes, these can all be dynamically-adjusted buffers, but
-	 * it's really not worth the extra hackery.
-	 */
+	if (mdoc->defos) {
+		mdoc->meta.os = mandoc_strdup(mdoc->defos);
+		goto out;
+	}
 
-	if ('\0' == buf[0]) {
 #ifdef OSNAME
-		if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
-			mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-			return(0);
-		}
+	mdoc->meta.os = mandoc_strdup(OSNAME);
 #else /*!OSNAME */
-		if (-1 == uname(&utsname))
-			return(mdoc_nmsg(mdoc, n, MANDOCERR_UTSNAME));
-
-		if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
-			mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-			return(0);
-		}
-		if (strlcat(buf, " ", 64) >= BUFSIZ) {
-			mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-			return(0);
-		}
-		if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
-			mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-			return(0);
-		}
-#endif /*!OSNAME*/
+	if (NULL == defbuf) {
+		if (-1 == uname(&utsname)) {
+			mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,
+			    n->line, n->pos, "Os");
+			defbuf = mandoc_strdup("UNKNOWN");
+		} else
+			mandoc_asprintf(&defbuf, "%s %s",
+			    utsname.sysname, utsname.release);
 	}
+	mdoc->meta.os = mandoc_strdup(defbuf);
+#endif /*!OSNAME*/
 
-	mdoc->meta.os = mandoc_strdup(buf);
+out:
+	mdoc_node_delete(mdoc, n);
 	return(1);
 }
 
+/*
+ * If no argument is provided,
+ * fill in the name of the current manual page.
+ */
 static int
-post_std(POST_ARGS)
+post_ex(POST_ARGS)
 {
-	struct mdoc_node *nn, *n;
+	struct mdoc_node *n;
 
 	n = mdoc->last;
 
-	/*
-	 * Macros accepting `-std' as an argument have the name of the
-	 * current document (`Nm') filled in as the argument if it's not
-	 * provided.
-	 */
-
 	if (n->child)
 		return(1);
-	if (NULL == mdoc->meta.name)
+
+	if (mdoc->meta.name == NULL) {
+		mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
+		    n->line, n->pos, "Ex");
 		return(1);
-	
-	nn = n;
+	}
+
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name))
 		return(0);
-	mdoc->last = nn;
+
+	mdoc->last = n;
 	return(1);
 }
 
-static int
-concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
+static enum mdoc_sec
+a2sec(const char *p)
 {
+	int		 i;
 
-	p[0] = '\0';
-
-	/*
-	 * Concatenate sibling nodes together.  All siblings must be of
-	 * type MDOC_TEXT or an assertion is raised.  Concatenation is
-	 * separated by a single whitespace.
-	 */
-
-	for ( ; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-
-		if (strlcat(p, n->string, sz) >= sz) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
+	for (i = 0; i < (int)SEC__MAX; i++)
+		if (secnames[i] && 0 == strcmp(p, secnames[i]))
+			return((enum mdoc_sec)i);
 
-		if (NULL == n->next)
-			continue;
+	return(SEC_CUSTOM);
+}
 
-		if (strlcat(p, " ", sz) >= sz) {
-			mdoc_nmsg(m, n, MANDOCERR_MEM);
-			return(0);
-		}
-	}
+static size_t
+macro2len(enum mdoct macro)
+{
 
-	return(1);
+	switch (macro) {
+	case MDOC_Ad:
+		return(12);
+	case MDOC_Ao:
+		return(12);
+	case MDOC_An:
+		return(12);
+	case MDOC_Aq:
+		return(12);
+	case MDOC_Ar:
+		return(12);
+	case MDOC_Bo:
+		return(12);
+	case MDOC_Bq:
+		return(12);
+	case MDOC_Cd:
+		return(12);
+	case MDOC_Cm:
+		return(10);
+	case MDOC_Do:
+		return(10);
+	case MDOC_Dq:
+		return(12);
+	case MDOC_Dv:
+		return(12);
+	case MDOC_Eo:
+		return(12);
+	case MDOC_Em:
+		return(10);
+	case MDOC_Er:
+		return(17);
+	case MDOC_Ev:
+		return(15);
+	case MDOC_Fa:
+		return(12);
+	case MDOC_Fl:
+		return(10);
+	case MDOC_Fo:
+		return(16);
+	case MDOC_Fn:
+		return(16);
+	case MDOC_Ic:
+		return(10);
+	case MDOC_Li:
+		return(16);
+	case MDOC_Ms:
+		return(6);
+	case MDOC_Nm:
+		return(10);
+	case MDOC_No:
+		return(12);
+	case MDOC_Oo:
+		return(10);
+	case MDOC_Op:
+		return(14);
+	case MDOC_Pa:
+		return(32);
+	case MDOC_Pf:
+		return(12);
+	case MDOC_Po:
+		return(12);
+	case MDOC_Pq:
+		return(12);
+	case MDOC_Ql:
+		return(16);
+	case MDOC_Qo:
+		return(12);
+	case MDOC_So:
+		return(12);
+	case MDOC_Sq:
+		return(12);
+	case MDOC_Sy:
+		return(6);
+	case MDOC_Sx:
+		return(16);
+	case MDOC_Tn:
+		return(10);
+	case MDOC_Va:
+		return(12);
+	case MDOC_Vt:
+		return(12);
+	case MDOC_Xr:
+		return(10);
+	default:
+		break;
+	};
+	return(0);
 }
-