===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.21
retrieving revision 1.39
diff -u -p -r1.21 -r1.39
--- mandoc/mdoc_validate.c	2009/07/06 11:00:05	1.21
+++ mandoc/mdoc_validate.c	2009/07/23 08:36:32	1.39
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.21 2009/07/06 11:00:05 kristaps Exp $ */
+/*	$Id: mdoc_validate.c,v 1.39 2009/07/23 08:36:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,6 +18,8 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <errno.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,44 +30,9 @@
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 /* TODO: ignoring Pp (it's superfluous in some invocations). */
 
-#define	PRE_ARGS	struct mdoc *mdoc, const struct mdoc_node *n
-#define	POST_ARGS	struct mdoc *mdoc
+#define	PRE_ARGS  struct mdoc *mdoc, const struct mdoc_node *n
+#define	POST_ARGS struct mdoc *mdoc
 
-enum	merr {
-	ETOOLONG,
-	EESCAPE,
-	EPRINT,
-	ENODATA,
-	ENOPROLOGUE,
-	ELINE,
-	EATT,
-	ENAME,
-	ELISTTYPE,
-	EDISPTYPE,
-	EMULTIDISP,
-	ESECNAME,
-	EMULTILIST,
-	EARGREP,
-	EBOOL,
-	ECOLMIS,
-	ENESTDISP,
-	ENOWIDTH,
-	EMISSWIDTH,
-	EWRONGMSEC,
-	ESECOOO,
-	ESECREP,
-	EBADSTAND,
-	ENAMESECINC,
-	ENOMULTILINE,
-	EMULTILINE,
-	ENOLINE,
-	EPROLOOO,
-	EPROLREP,
-	EARGVAL,
-	EBADSEC,
-	EBADMSEC
-};
-
 typedef	int	(*v_pre)(PRE_ARGS);
 typedef	int	(*v_post)(POST_ARGS);
 
@@ -74,116 +41,118 @@ struct	valids {
 	v_post	*post;
 };
 
-static	int	perr(struct mdoc *, int, int, enum merr, int);
-static	int	check_parent(PRE_ARGS, int, enum mdoc_type);
-static	int	check_msec(PRE_ARGS, ...);
-static	int	check_sec(PRE_ARGS, ...);
-static	int	check_stdarg(PRE_ARGS);
-static	int	check_text(struct mdoc *, int, int, const char *);
-static	int	check_argv(struct mdoc *, 
+static	int	 check_parent(PRE_ARGS, int, enum mdoc_type);
+static	int	 check_msec(PRE_ARGS, ...);
+static	int	 check_sec(PRE_ARGS, ...);
+static	int	 check_stdarg(PRE_ARGS);
+static	int	 check_text(struct mdoc *, int, int, const char *);
+static	int	 check_argv(struct mdoc *, 
 			const struct mdoc_node *,
 			const struct mdoc_argv *);
-static	int	check_args(struct mdoc *, 
+static	int	 check_args(struct mdoc *, 
 			const struct mdoc_node *);
-static	int	err_child_lt(struct mdoc *, const char *, int);
-static	int	warn_child_lt(struct mdoc *, const char *, int);
-static	int	err_child_gt(struct mdoc *, const char *, int);
-static	int	warn_child_gt(struct mdoc *, const char *, int);
-static	int	err_child_eq(struct mdoc *, const char *, int);
-static	int	warn_child_eq(struct mdoc *, const char *, int);
-static	int	warn_print(struct mdoc *, int, int);
-static	int	warn_count(struct mdoc *, const char *, 
+static	int	 err_child_lt(struct mdoc *, const char *, int);
+static	int	 warn_child_lt(struct mdoc *, const char *, int);
+static	int	 err_child_gt(struct mdoc *, const char *, int);
+static	int	 warn_child_gt(struct mdoc *, const char *, int);
+static	int	 err_child_eq(struct mdoc *, const char *, int);
+static	int	 warn_child_eq(struct mdoc *, const char *, int);
+static	int	 warn_print(struct mdoc *, int, int);
+static	int	 warn_count(struct mdoc *, const char *, 
 			int, const char *, int);
-static	int	err_count(struct mdoc *, const char *, 
+static	int	 err_count(struct mdoc *, const char *, 
 			int, const char *, int);
-static	int	pre_an(PRE_ARGS);
-static	int	pre_bd(PRE_ARGS);
-static	int	pre_bl(PRE_ARGS);
-static	int	pre_cd(PRE_ARGS);
-static	int	pre_dd(PRE_ARGS);
-static	int	pre_display(PRE_ARGS);
-static	int	pre_dt(PRE_ARGS);
-static	int	pre_er(PRE_ARGS);
-static	int	pre_ex(PRE_ARGS);
-static	int	pre_fd(PRE_ARGS);
-static	int	pre_it(PRE_ARGS);
-static	int	pre_lb(PRE_ARGS);
-static	int	pre_os(PRE_ARGS);
-static	int	pre_rv(PRE_ARGS);
-static	int	pre_sh(PRE_ARGS);
-static	int	pre_ss(PRE_ARGS);
-static	int	herr_ge1(POST_ARGS);
-static	int	hwarn_le1(POST_ARGS);
-static	int	herr_eq0(POST_ARGS);
-static	int	eerr_eq0(POST_ARGS);
-static	int	eerr_le2(POST_ARGS);
-static	int	eerr_eq1(POST_ARGS);
-static	int	eerr_ge1(POST_ARGS);
-static	int	ewarn_eq0(POST_ARGS);
-static	int	ewarn_eq1(POST_ARGS);
-static	int	bwarn_ge1(POST_ARGS);
-static	int	hwarn_eq1(POST_ARGS);
-static	int	ewarn_ge1(POST_ARGS);
-static	int	ebool(POST_ARGS);
-static	int	post_an(POST_ARGS);
-static	int	post_args(POST_ARGS);
-static	int	post_at(POST_ARGS);
-static	int	post_bf(POST_ARGS);
-static	int	post_bl(POST_ARGS);
-static	int	post_bl_head(POST_ARGS);
-static	int	post_it(POST_ARGS);
-static	int	post_nm(POST_ARGS);
-static	int	post_root(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_st(POST_ARGS);
 
-#define	vwarn(m, t) nwarn((m), (m)->last, (t))
-#define	verr(m, t) nerr((m), (m)->last, (t))
-#define	nwarn(m, n, t) perr((m), (n)->line, (n)->pos, (t), 0)
-#define	nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t), 1)
+#ifdef __linux__
+extern	size_t	 strlcat(char *, const char *, size_t);
+#endif
 
-static	v_pre	pres_an[] = { pre_an, NULL };
-static	v_pre	pres_bd[] = { pre_display, pre_bd, NULL };
-static	v_pre	pres_bl[] = { pre_bl, NULL };
-static	v_pre	pres_cd[] = { pre_cd, NULL };
-static	v_pre	pres_dd[] = { pre_dd, NULL };
-static	v_pre	pres_d1[] = { pre_display, NULL };
-static	v_pre	pres_dt[] = { pre_dt, NULL };
-static	v_pre	pres_er[] = { pre_er, NULL };
-static	v_pre	pres_ex[] = { pre_ex, NULL };
-static	v_pre	pres_fd[] = { pre_fd, NULL };
-static	v_pre	pres_it[] = { pre_it, NULL };
-static	v_pre	pres_lb[] = { pre_lb, NULL };
-static	v_pre	pres_os[] = { pre_os, 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 };
-static	v_post	posts_bool[] = { eerr_eq1, ebool, NULL };
-static	v_post	posts_bd[] = { herr_eq0, bwarn_ge1, NULL };
-static	v_post	posts_text[] = { eerr_ge1, NULL };
-static	v_post	posts_wtext[] = { ewarn_ge1, NULL };
-static	v_post	posts_notext[] = { eerr_eq0, NULL };
-static	v_post	posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
-static	v_post	posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
-static	v_post	posts_bl[] = { bwarn_ge1, post_bl, NULL };
-static	v_post	posts_it[] = { post_it, NULL };
-static	v_post	posts_in[] = { ewarn_eq1, NULL };
-static	v_post	posts_ss[] = { herr_ge1, NULL };
-static	v_post	posts_pf[] = { eerr_eq1, NULL };
-static	v_post	posts_lb[] = { eerr_eq1, NULL };
-static	v_post	posts_st[] = { eerr_eq1, post_st, NULL };
-static	v_post	posts_pp[] = { ewarn_eq0, NULL };
-static	v_post	posts_ex[] = { eerr_eq0, post_args, NULL };
-static	v_post	posts_rv[] = { eerr_eq0, post_args, NULL };
-static	v_post	posts_an[] = { post_an, NULL };
-static	v_post	posts_at[] = { post_at, NULL };
-static	v_post	posts_xr[] = { eerr_ge1, eerr_le2, NULL };
-static	v_post	posts_nm[] = { post_nm, NULL };
-static	v_post	posts_bf[] = { hwarn_le1, post_bf, NULL };
-static	v_post	posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
+static	int	 berr_ge1(POST_ARGS);
+static	int	 bwarn_ge1(POST_ARGS);
+static	int	 ebool(POST_ARGS);
+static	int	 eerr_eq0(POST_ARGS);
+static	int	 eerr_eq1(POST_ARGS);
+static	int	 eerr_ge1(POST_ARGS);
+static	int	 eerr_le2(POST_ARGS);
+static	int	 ewarn_ge1(POST_ARGS);
+static	int	 herr_eq0(POST_ARGS);
+static	int	 herr_ge1(POST_ARGS);
+static	int	 hwarn_eq1(POST_ARGS);
+static	int	 hwarn_le1(POST_ARGS);
 
+static	int	 post_an(POST_ARGS);
+static	int	 post_args(POST_ARGS);
+static	int	 post_at(POST_ARGS);
+static	int	 post_bf(POST_ARGS);
+static	int	 post_bl(POST_ARGS);
+static	int	 post_bl_head(POST_ARGS);
+static	int	 post_it(POST_ARGS);
+static	int	 post_lb(POST_ARGS);
+static	int	 post_nm(POST_ARGS);
+static	int	 post_root(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_sp(POST_ARGS);
+static	int	 post_st(POST_ARGS);
+static	int	 pre_an(PRE_ARGS);
+static	int	 pre_bd(PRE_ARGS);
+static	int	 pre_bl(PRE_ARGS);
+static	int	 pre_cd(PRE_ARGS);
+static	int	 pre_dd(PRE_ARGS);
+static	int	 pre_display(PRE_ARGS);
+static	int	 pre_dt(PRE_ARGS);
+static	int	 pre_er(PRE_ARGS);
+static	int	 pre_ex(PRE_ARGS);
+static	int	 pre_fd(PRE_ARGS);
+static	int	 pre_it(PRE_ARGS);
+static	int	 pre_lb(PRE_ARGS);
+static	int	 pre_os(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, NULL };
+static	v_post	 posts_bd[] = { herr_eq0, bwarn_ge1, NULL };
+static	v_post	 posts_bf[] = { hwarn_le1, post_bf, NULL };
+static	v_post	 posts_bl[] = { bwarn_ge1, post_bl, NULL };
+static	v_post	 posts_bool[] = { eerr_eq1, ebool, NULL };
+static	v_post	 posts_ex[] = { eerr_eq0, post_args, NULL };
+static	v_post	 posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
+static	v_post	 posts_in[] = { eerr_eq1, 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[] = { eerr_eq0, NULL };
+static	v_post	 posts_pf[] = { eerr_eq1, NULL };
+static	v_post	 posts_rv[] = { eerr_eq0, post_args, NULL };
+static	v_post	 posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
+static	v_post	 posts_sp[] = { post_sp, NULL };
+static	v_post	 posts_ss[] = { herr_ge1, NULL };
+static	v_post	 posts_st[] = { eerr_eq1, post_st, NULL };
+static	v_post	 posts_text[] = { eerr_ge1, NULL };
+static	v_post	 posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
+static	v_post	 posts_wtext[] = { ewarn_ge1, NULL };
+static	v_post	 posts_xr[] = { eerr_ge1, eerr_le2, NULL };
+static	v_pre	 pres_an[] = { pre_an, NULL };
+static	v_pre	 pres_bd[] = { pre_display, pre_bd, NULL };
+static	v_pre	 pres_bl[] = { pre_bl, NULL };
+static	v_pre	 pres_cd[] = { pre_cd, NULL };
+static	v_pre	 pres_d1[] = { pre_display, NULL };
+static	v_pre	 pres_dd[] = { pre_dd, NULL };
+static	v_pre	 pres_dt[] = { pre_dt, NULL };
+static	v_pre	 pres_er[] = { pre_er, NULL };
+static	v_pre	 pres_ex[] = { pre_ex, NULL };
+static	v_pre	 pres_fd[] = { pre_fd, NULL };
+static	v_pre	 pres_it[] = { pre_it, NULL };
+static	v_pre	 pres_lb[] = { pre_lb, NULL };
+static	v_pre	 pres_os[] = { pre_os, 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] = {
 	{ NULL, NULL },				/* Ap */
 	{ pres_dd, posts_text },		/* Dd */
@@ -191,7 +160,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ pres_os, NULL },			/* Os */
 	{ pres_sh, posts_sh },			/* Sh */ 
 	{ pres_ss, posts_ss },			/* Ss */ 
-	{ NULL, posts_pp },			/* Pp */ 
+	{ NULL, posts_notext },			/* Pp */ 
 	{ pres_d1, posts_wline },		/* D1 */
 	{ pres_d1, posts_wline },		/* Dl */
 	{ pres_bd, posts_bd },			/* Bd */
@@ -216,7 +185,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, posts_text },			/* Ic */ 
 	{ NULL, posts_in },			/* In */ 
 	{ NULL, NULL },				/* Li */
-	{ NULL, posts_wtext },			/* Nd */
+	{ NULL, posts_nd },			/* Nd */
 	{ NULL, posts_nm },			/* Nm */
 	{ NULL, posts_wline },			/* Op */
 	{ NULL, NULL },				/* Ot */
@@ -292,7 +261,7 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* Fr */
 	{ NULL, posts_notext },			/* Ud */
 	{ pres_lb, posts_lb },			/* Lb */
-	{ NULL, posts_pp },			/* Lp */ 
+	{ NULL, posts_notext },			/* Lp */ 
 	{ NULL, NULL },				/* Lk */ 
 	{ NULL, posts_text },			/* Mt */ 
 	{ NULL, posts_wline },			/* Brq */ 
@@ -303,17 +272,13 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 	{ NULL, NULL },				/* En */
 	{ NULL, NULL },				/* Dx */
 	{ NULL, posts_text },			/* %Q */
+	{ NULL, posts_notext },			/* br */
+	{ NULL, posts_sp },			/* sp */
 };
 
 
-#ifdef __linux__
-extern	size_t	strlcat(char *, const char *, size_t);
-#endif
-
-
 int
-mdoc_valid_pre(struct mdoc *mdoc, 
-		const struct mdoc_node *n)
+mdoc_valid_pre(struct mdoc *mdoc, const struct mdoc_node *n)
 {
 	v_pre		*p;
 	int		 line, pos;
@@ -342,14 +307,6 @@ mdoc_valid_post(struct mdoc *mdoc)
 {
 	v_post		*p;
 
-	/*
-	 * This check occurs after the macro's children have been filled
-	 * in: postfix validation.  Since this happens when we're
-	 * rewinding the scope tree, it's possible to have multiple
-	 * invocations (as by design, for now), we set bit MDOC_VALID to
-	 * indicate that we've validated.
-	 */
-
 	if (MDOC_VALID & mdoc->last->flags)
 		return(1);
 	mdoc->last->flags |= MDOC_VALID;
@@ -370,125 +327,12 @@ mdoc_valid_post(struct mdoc *mdoc)
 
 
 static int
-perr(struct mdoc *m, int line, int pos, enum merr type, int iserr)
-{
-	char		 *p;
-	
-	p = NULL;
-
-	switch (type) {
-	case (ETOOLONG):
-		p = "text argument too long";
-		break;
-	case (EESCAPE):
-		p = "invalid escape sequence";
-		break;
-	case (EPRINT):
-		p = "invalid character";
-		break;
-	case (ENESTDISP):
-		p = "displays may not be nested";
-		break;
-	case (EBOOL):
-		p = "expected boolean value";
-		break;
-	case (EARGREP):
-		p = "argument repeated";
-		break;
-	case (EMULTIDISP):
-		p = "multiple display types specified";
-		break;
-	case (EMULTILIST):
-		p = "multiple list types specified";
-		break;
-	case (ELISTTYPE):
-		p = "missing list type";
-		break;
-	case (EDISPTYPE):
-		p = "missing display type";
-		break;
-	case (ESECNAME):
-		p = "the NAME section must come first";
-		break;
-	case (ELINE):
-		p = "expected line arguments";
-		break;
-	case (ENOPROLOGUE):
-		p = "document has no prologue";
-		break;
-	case (ENODATA):
-		p = "document has no data";
-		break;
-	case (ECOLMIS):
-		p = "column syntax style mismatch";
-		break;
-	case (EATT):
-		p = "expected valid AT&T symbol";
-		break;
-	case (ENAME):
-		p = "default name not yet set";
-		break;
-	case (ENOWIDTH):
-		p = "superfluous width argument";
-		break;
-	case (EMISSWIDTH):
-		p = "missing width argument";
-		break;
-	case (EWRONGMSEC):
-		p = "document section in wrong manual section";
-		break;
-	case (ESECOOO):
-		p = "document section out of conventional order";
-		break;
-	case (ESECREP):
-		p = "document section repeated";
-		break;
-	case (EBADSTAND):
-		p = "unknown standard";
-		break;
-	case (ENAMESECINC):
-		p = "NAME section contents incomplete/badly-ordered";
-		break;
-	case (ENOMULTILINE):
-		p = "suggested no multi-line arguments";
-		break;
-	case (EMULTILINE):
-		p = "suggested multi-line arguments";
-		break;
-	case (ENOLINE):
-		p = "suggested no line arguments";
-		break;
-	case (EPROLOOO):
-		p = "prologue macros out-of-order";
-		break;
-	case (EPROLREP):
-		p = "prologue macros repeated";
-		break;
-	case (EARGVAL):
-		p = "argument value suggested";
-		break;
-	case (EBADMSEC):
-		p = "inappropriate manual section";
-		break;
-	case (EBADSEC):
-		p = "inappropriate document section";
-		break;
-	}
-
-	assert(p);
-
-	if (iserr)
-		return(mdoc_perr(m, line, pos, p));
-
-	return(mdoc_pwarn(m, line, pos, p));
-}
-
-
-static int
 warn_print(struct mdoc *m, int ln, int pos)
 {
 
-	return(perr(m, ln, pos, EPRINT, ! (MDOC_IGN_CHARS & m->flags)));
+	if (MDOC_IGN_CHARS & m->pflags)
+		return(mdoc_pwarn(m, ln, pos, EPRINT));
+	return(mdoc_perr(m, ln, pos, EPRINT));
 }
 
 
@@ -497,8 +341,8 @@ warn_count(struct mdoc *m, const char *k, 
 		int want, const char *v, int has)
 {
 
-	return(mdoc_warn(m, "suggests %s %s %d (has %d)", 
-				v, k, want, has));
+	return(mdoc_vwarn(m, m->last->line, m->last->pos, 
+		"suggests %s %s %d (has %d)", v, k, want, has));
 }
 
 
@@ -507,7 +351,7 @@ err_count(struct mdoc *m, const char *k,
 		int want, const char *v, int has)
 {
 
-	return(mdoc_err(m, 
+	return(mdoc_verr(m, m->last->line, m->last->pos,
 		"requires %s %s %d (has %d)", v, k, want, has));
 }
 
@@ -561,8 +405,7 @@ CHECK_CHILD_DEFN(err, eq, ==)			/* err_child_eq() */
 CHECK_CHILD_DEFN(err, lt, <)			/* err_child_lt() */
 CHECK_CHILD_DEFN(warn, lt, <)			/* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)	/* bwarn_ge1() */
-CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1)	/* ewarn_eq1() */
-CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)	/* ewarn_eq0() */
+CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)	/* berr_ge1() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)	/* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)	/* eerr_eq1() */
 CHECK_ELEM_DEFN(le2, err, err_child_lt, 3)	/* eerr_le2() */
@@ -581,7 +424,7 @@ check_stdarg(PRE_ARGS)
 	if (n->args && 1 == n->args->argc)
 		if (MDOC_Std == n->args->argv[0].arg)
 			return(1);
-	return(nwarn(mdoc, n, EARGVAL));
+	return(mdoc_nwarn(mdoc, n, EARGVAL));
 }
 
 
@@ -605,7 +448,7 @@ check_sec(PRE_ARGS, ...)
 	}
 
 	va_end(ap);
-	return(nwarn(mdoc, n, EBADSEC));
+	return(mdoc_nwarn(mdoc, n, EBADSEC));
 }
 
 
@@ -627,7 +470,7 @@ check_msec(PRE_ARGS, ...)
 	}
 
 	va_end(ap);
-	return(nwarn(mdoc, n, EBADMSEC));
+	return(mdoc_nwarn(mdoc, n, EBADMSEC));
 }
 
 
@@ -662,7 +505,7 @@ check_argv(struct mdoc *m, const struct mdoc_node *n, 
 		/* `Nm' name must be set. */
 		if (v->sz || m->meta.name)
 			return(1);
-		return(nerr(m, n, ENAME));
+		return(mdoc_nerr(m, n, ENAME));
 	}
 
 	return(1);
@@ -693,8 +536,8 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 			continue;
 		}
 		if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags))
-			return(perr(mdoc, line, pos, EESCAPE, 1));
-		if ( ! perr(mdoc, line, pos, EESCAPE, 0))
+			return(mdoc_perr(mdoc, line, pos, EESCAPE));
+		if ( ! mdoc_pwarn(mdoc, line, pos, EESCAPE))
 			return(0);
 	}
 
@@ -713,7 +556,7 @@ check_parent(PRE_ARGS, int tok, enum mdoc_type t)
 			(t == n->parent->type))
 		return(1);
 
-	return(mdoc_nerr(mdoc, n, "require parent %s",
+	return(mdoc_verr(mdoc, n->line, n->pos, "require parent %s",
 		MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]));
 }
 
@@ -737,7 +580,7 @@ pre_display(PRE_ARGS)
 	if (NULL == node)
 		return(1);
 
-	return(nerr(mdoc, n, ENESTDISP));
+	return(mdoc_nerr(mdoc, n, ENESTDISP));
 }
 
 
@@ -749,7 +592,7 @@ pre_bl(PRE_ARGS)
 	if (MDOC_BLOCK != n->type)
 		return(1);
 	if (NULL == n->args)
-		return(nerr(mdoc, n, ELISTTYPE));
+		return(mdoc_nerr(mdoc, n, ELISTTYPE));
 
 	/* Make sure that only one type of list is specified.  */
 
@@ -780,17 +623,17 @@ pre_bl(PRE_ARGS)
 			/* FALLTHROUGH */
 		case (MDOC_Column):
 			if (-1 != type) 
-				return(nerr(mdoc, n, EMULTILIST));
+				return(mdoc_nerr(mdoc, n, EMULTILIST));
 			type = n->args->argv[pos].arg;
 			break;
 		case (MDOC_Width):
 			if (-1 != width)
-				return(nerr(mdoc, n, EARGREP));
+				return(mdoc_nerr(mdoc, n, EARGREP));
 			width = n->args->argv[pos].arg;
 			break;
 		case (MDOC_Offset):
 			if (-1 != offset)
-				return(nerr(mdoc, n, EARGREP));
+				return(mdoc_nerr(mdoc, n, EARGREP));
 			offset = n->args->argv[pos].arg;
 			break;
 		default:
@@ -798,7 +641,7 @@ pre_bl(PRE_ARGS)
 		}
 
 	if (-1 == type)
-		return(nerr(mdoc, n, ELISTTYPE));
+		return(mdoc_nerr(mdoc, n, ELISTTYPE));
 
 	/* 
 	 * Validate the width field.  Some list types don't need width
@@ -808,7 +651,7 @@ pre_bl(PRE_ARGS)
 
 	switch (type) {
 	case (MDOC_Tag):
-		if (-1 == width && ! nwarn(mdoc, n, EMISSWIDTH))
+		if (-1 == width && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))
 			return(0);
 		break;
 	case (MDOC_Column):
@@ -818,7 +661,7 @@ pre_bl(PRE_ARGS)
 	case (MDOC_Inset):
 		/* FALLTHROUGH */
 	case (MDOC_Item):
-		if (-1 != width && ! nwarn(mdoc, n, ENOWIDTH))
+		if (-1 != width && ! mdoc_nwarn(mdoc, n, ENOWIDTH))
 			return(0);
 		break;
 	default:
@@ -837,7 +680,7 @@ pre_bd(PRE_ARGS)
 	if (MDOC_BLOCK != n->type)
 		return(1);
 	if (NULL == n->args) 
-		return(nerr(mdoc, n, EDISPTYPE));
+		return(mdoc_nerr(mdoc, n, EDISPTYPE));
 
 	/* Make sure that only one type of display is specified.  */
 
@@ -856,14 +699,14 @@ pre_bd(PRE_ARGS)
 		case (MDOC_File):
 			if (0 == type++) 
 				break;
-			return(nerr(mdoc, n, EMULTIDISP));
+			return(mdoc_nerr(mdoc, n, EMULTIDISP));
 		default:
 			break;
 		}
 
 	if (type)
 		return(1);
-	return(nerr(mdoc, n, EDISPTYPE));
+	return(mdoc_nerr(mdoc, n, EDISPTYPE));
 }
 
 
@@ -903,7 +746,8 @@ pre_an(PRE_ARGS)
 
 	if (NULL == n->args || 1 == n->args->argc)
 		return(1);
-	return(mdoc_nerr(mdoc, n, "only one argument allowed"));
+	return(mdoc_verr(mdoc, n->line, n->pos, 
+				"only one argument allowed"));
 }
 
 
@@ -956,10 +800,10 @@ pre_dt(PRE_ARGS)
 {
 
 	if (0 == mdoc->meta.date || mdoc->meta.os)
-		if ( ! nwarn(mdoc, n, EPROLOOO))
+		if ( ! mdoc_nwarn(mdoc, n, EPROLOOO))
 			return(0);
 	if (mdoc->meta.title)
-		if ( ! nwarn(mdoc, n, EPROLREP))
+		if ( ! mdoc_nwarn(mdoc, n, EPROLREP))
 			return(0);
 	return(1);
 }
@@ -970,10 +814,10 @@ pre_os(PRE_ARGS)
 {
 
 	if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
-		if ( ! nwarn(mdoc, n, EPROLOOO))
+		if ( ! mdoc_nwarn(mdoc, n, EPROLOOO))
 			return(0);
 	if (mdoc->meta.os)
-		if ( ! nwarn(mdoc, n, EPROLREP))
+		if ( ! mdoc_nwarn(mdoc, n, EPROLREP))
 			return(0);
 	return(1);
 }
@@ -984,10 +828,10 @@ pre_dd(PRE_ARGS)
 {
 
 	if (mdoc->meta.title || mdoc->meta.os)
-		if ( ! nwarn(mdoc, n, EPROLOOO))
+		if ( ! mdoc_nwarn(mdoc, n, EPROLOOO))
 			return(0);
 	if (mdoc->meta.date)
-		if ( ! nwarn(mdoc, n, EPROLREP))
+		if ( ! mdoc_nwarn(mdoc, n, EPROLREP))
 			return(0);
 	return(1);
 }
@@ -1005,12 +849,12 @@ post_bf(POST_ARGS)
 	head = mdoc->last->head;
 
 	if (mdoc->last->args && head->child)
-		return(mdoc_err(mdoc, "one argument expected"));
+		return(mdoc_nerr(mdoc, mdoc->last, ELINE));
 	else if (mdoc->last->args)
 		return(1);
 
 	if (NULL == head->child || MDOC_TEXT != head->child->type)
-		return(mdoc_err(mdoc, "text argument expected"));
+		return(mdoc_nerr(mdoc, mdoc->last, ELINE));
 
 	p = head->child->string;
 
@@ -1018,14 +862,24 @@ post_bf(POST_ARGS)
 		return(1);
 	else if (0 == strcmp(p, "Li"))
 		return(1);
-	else if (0 == strcmp(p, "Sm"))
+	else if (0 == strcmp(p, "Sy"))
 		return(1);
 
-	return(mdoc_nerr(mdoc, head->child, "invalid font mode"));
+	return(mdoc_nerr(mdoc, head, EFONT));
 }
 
 
 static int
+post_lb(POST_ARGS)
+{
+
+	if (mdoc_a2lib(mdoc->last->child->string))
+		return(1);
+	return(mdoc_nwarn(mdoc, mdoc->last, ELIB));
+}
+
+
+static int
 post_nm(POST_ARGS)
 {
 
@@ -1033,7 +887,7 @@ post_nm(POST_ARGS)
 		return(1);
 	if (mdoc->meta.name)
 		return(1);
-	return(verr(mdoc, ENAME));
+	return(mdoc_nerr(mdoc, mdoc->last, ENAME));
 }
 
 
@@ -1044,10 +898,10 @@ post_at(POST_ARGS)
 	if (NULL == mdoc->last->child)
 		return(1);
 	if (MDOC_TEXT != mdoc->last->child->type)
-		return(verr(mdoc, EATT));
+		return(mdoc_nerr(mdoc, mdoc->last, EATT));
 	if (mdoc_a2att(mdoc->last->child->string))
 		return(1);
-	return(verr(mdoc, EATT));
+	return(mdoc_nerr(mdoc, mdoc->last, EATT));
 }
 
 
@@ -1058,12 +912,12 @@ post_an(POST_ARGS)
 	if (mdoc->last->args) {
 		if (NULL == mdoc->last->child)
 			return(1);
-		return(verr(mdoc, ELINE));
+		return(mdoc_nerr(mdoc, mdoc->last, ELINE));
 	}
 
 	if (mdoc->last->child)
 		return(1);
-	return(verr(mdoc, ELINE));
+	return(mdoc_nerr(mdoc, mdoc->last, ELINE));
 }
 
 
@@ -1073,7 +927,7 @@ post_args(POST_ARGS)
 
 	if (mdoc->last->args)
 		return(1);
-	return(verr(mdoc, ELINE));
+	return(mdoc_nerr(mdoc, mdoc->last, ELINE));
 }
 
 
@@ -1088,7 +942,7 @@ post_it(POST_ARGS)
 
 	n = mdoc->last->parent->parent;
 	if (NULL == n->args)
-		return(verr(mdoc, ELISTTYPE));
+		return(mdoc_nerr(mdoc, mdoc->last, ELISTTYPE));
 
 	/* Some types require block-head, some not. */
 
@@ -1126,12 +980,12 @@ post_it(POST_ARGS)
 		}
 
 	if (-1 == type)
-		return(verr(mdoc, ELISTTYPE));
+		return(mdoc_nerr(mdoc, mdoc->last, ELISTTYPE));
 
 	switch (type) {
 	case (MDOC_Tag):
 		if (NULL == mdoc->last->head->child)
-			if ( ! vwarn(mdoc, ELINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))
 				return(0);
 		break;
 	case (MDOC_Hang):
@@ -1142,10 +996,10 @@ post_it(POST_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Diag):
 		if (NULL == mdoc->last->head->child)
-			if ( ! vwarn(mdoc, ELINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))
 				return(0);
 		if (NULL == mdoc->last->body->child)
-			if ( ! vwarn(mdoc, EMULTILINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, EMULTILINE))
 				return(0);
 		break;
 	case (MDOC_Bullet):
@@ -1158,26 +1012,36 @@ post_it(POST_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Item):
 		if (mdoc->last->head->child)
-			if ( ! vwarn(mdoc, ENOLINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, ENOLINE))
 				return(0);
 		if (NULL == mdoc->last->body->child)
-			if ( ! vwarn(mdoc, EMULTILINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, EMULTILINE))
 				return(0);
 		break;
 	case (MDOC_Column):
 		if (NULL == mdoc->last->head->child)
-			if ( ! vwarn(mdoc, ELINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))
 				return(0);
 		if (mdoc->last->body->child)
-			if ( ! vwarn(mdoc, ENOMULTILINE))
+			if ( ! mdoc_nwarn(mdoc, mdoc->last, ENOMULTILINE))
 				return(0);
 		c = mdoc->last->child;
 		for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
 			i++;
-		if (i == cols)
+
+		if (i < cols || i == (cols + 1)) {
+			if ( ! mdoc_vwarn(mdoc, mdoc->last->line, 
+					mdoc->last->pos, "column "
+					"mismatch: have %d, want %d", 
+					i, cols))
+				return(0);
 			break;
-		return(mdoc_err(mdoc, "column mismatch (have "
-					"%d, want %d)", i, cols));
+		} else if (i == cols)
+			break;
+
+		return(mdoc_verr(mdoc, mdoc->last->line, 
+				mdoc->last->pos, "column mismatch: "
+				"have %d, want %d", i, cols));
 	default:
 		break;
 	}
@@ -1203,7 +1067,7 @@ post_bl_head(POST_ARGS) 
 		return(1);
 
 	if (n->args->argv[i].sz && mdoc->last->child)
-		return(nerr(mdoc, n, ECOLMIS));
+		return(mdoc_nerr(mdoc, n, ECOLMIS));
 
 	return(1);
 }
@@ -1226,7 +1090,8 @@ post_bl(POST_ARGS)
 		if (MDOC_BLOCK == n->type) 
 			if (MDOC_It == n->tok)
 				continue;
-		return(mdoc_nerr(mdoc, n, "bad child of parent %s",
+		return(mdoc_verr(mdoc, n->line, n->pos, 
+				"bad child of parent %s",
 				mdoc_macronames[mdoc->last->tok]));
 	}
 
@@ -1252,7 +1117,7 @@ ebool(struct mdoc *mdoc)
 
 	if (NULL == n)
 		return(1);
-	return(nerr(mdoc, n, EBOOL));
+	return(mdoc_nerr(mdoc, n, EBOOL));
 }
 
 
@@ -1261,26 +1126,57 @@ post_root(POST_ARGS)
 {
 
 	if (NULL == mdoc->first->child)
-		return(verr(mdoc, ENODATA));
+		return(mdoc_nerr(mdoc, mdoc->first, ENODAT));
 	if ( ! (MDOC_PBODY & mdoc->flags))
-		return(verr(mdoc, ENOPROLOGUE));
+		return(mdoc_nerr(mdoc, mdoc->first, ENOPROLOGUE));
 
 	if (MDOC_BLOCK != mdoc->first->child->type)
-		return(verr(mdoc, ENODATA));
+		return(mdoc_nerr(mdoc, mdoc->first, ENODAT));
 	if (MDOC_Sh != mdoc->first->child->tok)
-		return(verr(mdoc, ENODATA));
+		return(mdoc_nerr(mdoc, mdoc->first, ENODAT));
 
 	return(1);
 }
 
 
 static int
+post_sp(POST_ARGS)
+{
+	long		 lval;
+	char		*ep, *buf;
+
+	if (NULL == mdoc->last->child)
+		return(1);
+	else if ( ! eerr_eq1(mdoc))
+		return(0);
+
+	assert(MDOC_TEXT == mdoc->last->child->type);
+	buf = mdoc->last->child->string;
+	assert(buf);
+	
+	/* From OpenBSD's strtol(3). */
+	errno = 0;
+	lval = strtol(buf, &ep, 10);
+	if (buf[0] == '\0' || *ep != '\0')
+		return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
+
+	if ((errno == ERANGE && (lval == LONG_MAX || lval == LONG_MIN)) ||
+			(lval > INT_MAX || lval < 0))
+		return(mdoc_nerr(mdoc, mdoc->last->child, ENUMFMT));
+
+	return(1);
+}
+
+
+
+
+static int
 post_st(POST_ARGS)
 {
 
 	if (mdoc_a2st(mdoc->last->child->string))
 		return(1);
-	return(vwarn(mdoc, EBADSTAND));
+	return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));
 }
 
 
@@ -1302,7 +1198,7 @@ post_sh_body(POST_ARGS)
 {
 	struct mdoc_node *n;
 
-	if (SEC_NAME != mdoc->lastnamed)
+	if (SEC_NAME != mdoc->lastsec)
 		return(1);
 
 	/*
@@ -1312,20 +1208,20 @@ post_sh_body(POST_ARGS)
 	 */
 
 	if (NULL == (n = mdoc->last->child))
-		return(vwarn(mdoc, ENAMESECINC));
+		return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC));
 
 	for ( ; n && n->next; n = n->next) {
 		if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
 			continue;
 		if (MDOC_TEXT == n->type)
 			continue;
-		if ( ! vwarn(mdoc, ENAMESECINC))
+		if ( ! mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC))
 			return(0);
 	}
 
-	if (MDOC_ELEM == n->type && MDOC_Nd == n->tok)
+	if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)
 		return(1);
-	return(vwarn(mdoc, ENAMESECINC));
+	return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC));
 }
 
 
@@ -1350,11 +1246,11 @@ post_sh_head(POST_ARGS)
 		assert(MDOC_TEXT == n->type);
 
 		if (strlcat(buf, n->string, 64) >= 64)
-			return(nerr(mdoc, n, ETOOLONG));
+			return(mdoc_nerr(mdoc, n, ETOOLONG));
 		if (NULL == n->next)
 			continue;
 		if (strlcat(buf, " ", 64) >= 64)
-			return(nerr(mdoc, n, ETOOLONG));
+			return(mdoc_nerr(mdoc, n, ETOOLONG));
 	}
 
 	sec = mdoc_atosec(buf);
@@ -1365,13 +1261,15 @@ post_sh_head(POST_ARGS)
 	 */
 
 	if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
-		return(verr(mdoc, ESECNAME));
+		return(mdoc_nerr(mdoc, mdoc->last, ESECNAME));
 	if (SEC_CUSTOM == sec)
 		return(1);
 	if (sec == mdoc->lastnamed)
-		return(vwarn(mdoc, ESECREP));
+		if ( ! mdoc_nwarn(mdoc, mdoc->last, ESECREP))
+			return(0);
 	if (sec < mdoc->lastnamed)
-		return(vwarn(mdoc, ESECOOO));
+		if ( ! mdoc_nwarn(mdoc, mdoc->last, ESECOOO))
+			return(0);
 
 	/* 
 	 * Check particular section/manual conventions.  LIBRARY can
@@ -1386,7 +1284,7 @@ post_sh_head(POST_ARGS)
 		case (3):
 			break;
 		default:
-			return(vwarn(mdoc, EWRONGMSEC));
+			return(mdoc_nwarn(mdoc, mdoc->last, EWRONGMSEC));
 		}
 		break;
 	default: