===================================================================
RCS file: /cvs/mandoc/Attic/action.c,v
retrieving revision 1.26
retrieving revision 1.45
diff -u -p -r1.26 -r1.45
--- mandoc/Attic/action.c	2009/02/28 19:15:28	1.26
+++ mandoc/Attic/action.c	2009/03/20 16:43:28	1.45
@@ -1,6 +1,6 @@
-/* $Id: action.c,v 1.26 2009/02/28 19:15:28 kristaps Exp $ */
+/* $Id: action.c,v 1.45 2009/03/20 16:43:28 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the
@@ -16,11 +16,13 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/utsname.h>
+
 #include <assert.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
 
 #include "private.h"
 
@@ -30,163 +32,292 @@
  * children have been filled in (post-fix order).
  */
 
+enum	merr {
+	ENOWIDTH
+};
+
+enum	mwarn {
+	WBADSEC,
+	WNOWIDTH,
+	WBADDATE
+};
+
+#define	PRE_ARGS  struct mdoc *m, const struct mdoc_node *n
+#define	POST_ARGS struct mdoc *m
+
 struct	actions {
-	int	(*post)(struct mdoc *);
+	int	(*pre)(PRE_ARGS);
+	int	(*post)(POST_ARGS);
 };
 
-/* Per-macro action routines. */
+static	int	  pwarn(struct mdoc *, int, int, enum mwarn);
+static	int	  perr(struct mdoc *, int, int, enum merr);
 
-static	int	 post_bl(struct mdoc *);
-static	int	 post_bl_width(struct mdoc *);
-static	int	 post_bl_tagwidth(struct mdoc *);
-static	int	 post_sh(struct mdoc *);
-static	int	 post_os(struct mdoc *);
-static	int	 post_dt(struct mdoc *);
-static	int	 post_dd(struct mdoc *);
-static	int	 post_nm(struct mdoc *);
+static	int	  post_ar(POST_ARGS);
+static	int	  post_bl(POST_ARGS);
+static	int	  post_bl_width(POST_ARGS);
+static	int	  post_bl_tagwidth(POST_ARGS);
+static	int	  post_bd(POST_ARGS);
+static	int	  post_dd(POST_ARGS);
+static	int	  post_dt(POST_ARGS);
+static	int	  post_nm(POST_ARGS);
+static	int	  post_os(POST_ARGS);
+static	int	  post_prol(POST_ARGS);
+static	int	  post_sh(POST_ARGS);
+static	int	  post_std(POST_ARGS);
 
-static	int	 post_prologue(struct mdoc *);
+static	int	  pre_bd(PRE_ARGS);
 
-/* Array of macro action routines. */
+#define	merr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t))
+#define	mwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t))
 
 const	struct actions mdoc_actions[MDOC_MAX] = {
-	{ NULL }, /* \" */
-	{ post_dd }, /* Dd */ 
-	{ post_dt }, /* Dt */ 
-	{ post_os }, /* Os */ 
-	{ post_sh }, /* Sh */ 
-	{ NULL }, /* Ss */ 
-	{ NULL }, /* Pp */ 
-	{ NULL }, /* D1 */
-	{ NULL }, /* Dl */
-	{ NULL }, /* Bd */ 
-	{ NULL }, /* Ed */
-	{ post_bl }, /* Bl */ 
-	{ NULL }, /* El */
-	{ NULL }, /* It */
-	{ NULL }, /* Ad */ 
-	{ NULL }, /* An */
-	{ NULL }, /* Ar */
-	{ NULL }, /* Cd */
-	{ NULL }, /* Cm */
-	{ NULL }, /* Dv */ 
-	{ NULL }, /* Er */ 
-	{ NULL }, /* Ev */ 
-	{ NULL }, /* Ex */
-	{ NULL }, /* Fa */ 
-	{ NULL }, /* Fd */ 
-	{ NULL }, /* Fl */
-	{ NULL }, /* Fn */ 
-	{ NULL }, /* Ft */ 
-	{ NULL }, /* Ic */ 
-	{ NULL }, /* In */ 
-	{ NULL }, /* Li */
-	{ NULL }, /* Nd */ 
-	{ post_nm }, /* Nm */ 
-	{ NULL }, /* Op */
-	{ NULL }, /* Ot */
-	{ NULL }, /* Pa */
-	{ NULL }, /* Rv */
-	{ NULL }, /* St */
-	{ NULL }, /* Va */
-	{ NULL }, /* Vt */ 
-	{ NULL }, /* Xr */
-	{ NULL }, /* %A */
-	{ NULL }, /* %B */
-	{ NULL }, /* %D */
-	{ NULL }, /* %I */
-	{ NULL }, /* %J */
-	{ NULL }, /* %N */
-	{ NULL }, /* %O */
-	{ NULL }, /* %P */
-	{ NULL }, /* %R */
-	{ NULL }, /* %T */
-	{ NULL }, /* %V */
-	{ NULL }, /* Ac */
-	{ NULL }, /* Ao */
-	{ NULL }, /* Aq */
-	{ NULL }, /* At */ 
-	{ NULL }, /* Bc */
-	{ NULL }, /* Bf */ 
-	{ NULL }, /* Bo */
-	{ NULL }, /* Bq */
-	{ NULL }, /* Bsx */
-	{ NULL }, /* Bx */
-	{ NULL }, /* Db */
-	{ NULL }, /* Dc */
-	{ NULL }, /* Do */
-	{ NULL }, /* Dq */
-	{ NULL }, /* Ec */
-	{ NULL }, /* Ef */
-	{ NULL }, /* Em */ 
-	{ NULL }, /* Eo */
-	{ NULL }, /* Fx */
-	{ NULL }, /* Ms */
-	{ NULL }, /* No */
-	{ NULL }, /* Ns */
-	{ NULL }, /* Nx */
-	{ NULL }, /* Ox */
-	{ NULL }, /* Pc */
-	{ NULL }, /* Pf */
-	{ NULL }, /* Po */
-	{ NULL }, /* Pq */
-	{ NULL }, /* Qc */
-	{ NULL }, /* Ql */
-	{ NULL }, /* Qo */
-	{ NULL }, /* Qq */
-	{ NULL }, /* Re */
-	{ NULL }, /* Rs */
-	{ NULL }, /* Sc */
-	{ NULL }, /* So */
-	{ NULL }, /* Sq */
-	{ NULL }, /* Sm */
-	{ NULL }, /* Sx */
-	{ NULL }, /* Sy */
-	{ NULL }, /* Tn */
-	{ NULL }, /* Ux */
-	{ NULL }, /* Xc */
-	{ NULL }, /* Xo */
-	{ NULL }, /* Fo */ 
-	{ NULL }, /* Fc */ 
-	{ NULL }, /* Oo */
-	{ NULL }, /* Oc */
-	{ NULL }, /* Bk */
-	{ NULL }, /* Ek */
-	{ NULL }, /* Bt */
-	{ NULL }, /* Hf */
-	{ NULL }, /* Fr */
-	{ NULL }, /* Ud */
+	{ NULL, NULL }, /* \" */
+	{ NULL, post_dd }, /* Dd */ 
+	{ NULL, post_dt }, /* Dt */ 
+	{ NULL, post_os }, /* Os */ 
+	{ NULL, post_sh }, /* Sh */ 
+	{ NULL, NULL }, /* Ss */ 
+	{ NULL, NULL }, /* Pp */ 
+	{ NULL, NULL }, /* D1 */
+	{ NULL, NULL }, /* Dl */
+	{ pre_bd, post_bd }, /* Bd */ 
+	{ NULL, NULL }, /* Ed */
+	{ NULL, post_bl }, /* Bl */ 
+	{ NULL, NULL }, /* El */
+	{ NULL, NULL }, /* It */
+	{ NULL, NULL }, /* Ad */ 
+	{ NULL, NULL }, /* An */
+	{ NULL, post_ar }, /* Ar */
+	{ NULL, NULL }, /* Cd */
+	{ NULL, NULL }, /* Cm */
+	{ NULL, NULL }, /* Dv */ 
+	{ NULL, NULL }, /* Er */ 
+	{ NULL, NULL }, /* Ev */ 
+	{ NULL, post_std }, /* Ex */
+	{ NULL, NULL }, /* Fa */ 
+	{ NULL, NULL }, /* Fd */ 
+	{ NULL, NULL }, /* Fl */
+	{ NULL, NULL }, /* Fn */ 
+	{ NULL, NULL }, /* Ft */ 
+	{ NULL, NULL }, /* Ic */ 
+	{ NULL, NULL }, /* In */ 
+	{ NULL, NULL }, /* Li */
+	{ NULL, NULL }, /* Nd */ 
+	{ NULL, post_nm }, /* Nm */ 
+	{ NULL, NULL }, /* Op */
+	{ NULL, NULL }, /* Ot */
+	{ NULL, NULL }, /* Pa */
+	{ NULL, post_std }, /* Rv */
+	{ NULL, NULL }, /* St */
+	{ NULL, NULL }, /* Va */
+	{ NULL, NULL }, /* Vt */ 
+	{ NULL, NULL }, /* Xr */
+	{ NULL, NULL }, /* %A */
+	{ NULL, NULL }, /* %B */
+	{ NULL, NULL }, /* %D */
+	{ NULL, NULL }, /* %I */
+	{ NULL, NULL }, /* %J */
+	{ NULL, NULL }, /* %N */
+	{ NULL, NULL }, /* %O */
+	{ NULL, NULL }, /* %P */
+	{ NULL, NULL }, /* %R */
+	{ NULL, NULL }, /* %T */
+	{ NULL, NULL }, /* %V */
+	{ NULL, NULL }, /* Ac */
+	{ NULL, NULL }, /* Ao */
+	{ NULL, NULL }, /* Aq */
+	{ NULL, NULL }, /* At */ 
+	{ NULL, NULL }, /* Bc */
+	{ NULL, NULL }, /* Bf */ 
+	{ NULL, NULL }, /* Bo */
+	{ NULL, NULL }, /* Bq */
+	{ NULL, NULL }, /* Bsx */
+	{ NULL, NULL }, /* Bx */
+	{ NULL, NULL }, /* Db */
+	{ NULL, NULL }, /* Dc */
+	{ NULL, NULL }, /* Do */
+	{ NULL, NULL }, /* Dq */
+	{ NULL, NULL }, /* Ec */
+	{ NULL, NULL }, /* Ef */
+	{ NULL, NULL }, /* Em */ 
+	{ NULL, NULL }, /* Eo */
+	{ NULL, NULL }, /* Fx */
+	{ NULL, NULL }, /* Ms */
+	{ NULL, NULL }, /* No */
+	{ NULL, NULL }, /* Ns */
+	{ NULL, NULL }, /* Nx */
+	{ NULL, NULL }, /* Ox */
+	{ NULL, NULL }, /* Pc */
+	{ NULL, NULL }, /* Pf */
+	{ NULL, NULL }, /* Po */
+	{ NULL, NULL }, /* Pq */
+	{ NULL, NULL }, /* Qc */
+	{ NULL, NULL }, /* Ql */
+	{ NULL, NULL }, /* Qo */
+	{ NULL, NULL }, /* Qq */
+	{ NULL, NULL }, /* Re */
+	{ NULL, NULL }, /* Rs */
+	{ NULL, NULL }, /* Sc */
+	{ NULL, NULL }, /* So */
+	{ NULL, NULL }, /* Sq */
+	{ NULL, NULL }, /* Sm */
+	{ NULL, NULL }, /* Sx */
+	{ NULL, NULL }, /* Sy */
+	{ NULL, NULL }, /* Tn */
+	{ NULL, NULL }, /* Ux */
+	{ NULL, NULL }, /* Xc */
+	{ NULL, NULL }, /* Xo */
+	{ NULL, NULL }, /* Fo */ 
+	{ NULL, NULL }, /* Fc */ 
+	{ NULL, NULL }, /* Oo */
+	{ NULL, NULL }, /* Oc */
+	{ NULL, NULL }, /* Bk */
+	{ NULL, NULL }, /* Ek */
+	{ NULL, NULL }, /* Bt */
+	{ NULL, NULL }, /* Hf */
+	{ NULL, NULL }, /* Fr */
+	{ NULL, NULL }, /* Ud */
+	{ NULL, NULL }, /* Lb */
+	{ NULL, NULL }, /* Ap */
+	{ NULL, NULL }, /* Lp */
+	{ NULL, NULL }, /* Lk */
+	{ NULL, NULL }, /* Mt */
+	{ NULL, NULL }, /* Brq */
+	{ NULL, NULL }, /* Bro */
+	{ NULL, NULL }, /* Brc */
+	{ NULL, NULL }, /* %C */
+	{ NULL, NULL }, /* Es */
+	{ NULL, NULL }, /* En */
+	{ NULL, NULL }, /* Dx */
 };
 
 
+int
+mdoc_action_pre(struct mdoc *m, const struct mdoc_node *n)
+{
+
+	switch (n->type) {
+	case (MDOC_ROOT):
+		break;
+	case (MDOC_TEXT):
+		break;
+	default:
+		if (NULL == mdoc_actions[m->last->tok].pre)
+			break;
+		return((*mdoc_actions[m->last->tok].pre)(m, n));
+	}
+	return(1);
+}
+
+
+int
+mdoc_action_post(struct mdoc *m)
+{
+
+	if (MDOC_ACTED & m->last->flags)
+		return(1);
+	m->last->flags |= MDOC_ACTED;
+
+	switch (m->last->type) {
+	case (MDOC_TEXT):
+		break;
+	case (MDOC_ROOT):
+		break;
+	default:
+		if (NULL == mdoc_actions[m->last->tok].post)
+			break;
+		return((*mdoc_actions[m->last->tok].post)(m));
+	}
+	return(1);
+}
+
+
 static int
-post_nm(struct mdoc *mdoc)
+perr(struct mdoc *m, int line, int pos, enum merr type)
 {
-	char		 buf[64];
+	char		*p;
 
-	assert(MDOC_ELEM == mdoc->last->type);
-	assert(MDOC_Nm == mdoc->last->tok);
+	p = NULL;
 
+	switch (type) {
+	case (ENOWIDTH):
+		p = "missing width argument";
+		break;
+	}
+
+	assert(p);
+	return(mdoc_perr(m, line, pos, p));
+}
+
+
+static int
+pwarn(struct mdoc *m, int line, int pos, enum mwarn type)
+{
+	char		*p;
+	int		 c;
+
+	p = NULL;
+	c = WARN_SYNTAX;
+
+	switch (type) {
+	case (WBADSEC):
+		p = "inappropriate document section in manual section";
+		c = WARN_COMPAT;
+		break;
+	case (WNOWIDTH):
+		p = "cannot determine default width";
+		break;
+	case (WBADDATE):
+		p = "malformed date syntax";
+		break;
+	}
+
+	assert(p);
+	return(mdoc_pwarn(m, line, pos, c, p));
+}
+
+
+static int
+post_std(POST_ARGS)
+{
+
 	/*
-	 * The `Nm' macro sets the document's name when used the first
-	 * time with an argument.  Subsequent calls without a value will
-	 * result in the name value being used.
+	 * If '-std' is invoked without an argument, fill it in with our
+	 * name (if it's been set).
 	 */
 
-	if (mdoc->meta.name)
+	if (NULL == m->last->args)
 		return(1);
+	if (m->last->args->argv[0].sz)
+		return(1);
 
-	if (xstrlcats(buf, mdoc->last->child, 64)) {
-		mdoc->meta.name = xstrdup(buf);
+	assert(m->meta.name);
+
+	m->last->args->argv[0].value = xcalloc(1, sizeof(char *));
+	m->last->args->argv[0].sz = 1;
+	m->last->args->argv[0].value[0] = xstrdup(m->meta.name);
+	return(1);
+}
+
+
+static int
+post_nm(POST_ARGS)
+{
+	char		 buf[64];
+
+	if (m->meta.name)
 		return(1);
-	}
 
-	return(mdoc_err(mdoc, "macro parameters too long"));
+	(void)xstrlcpys(buf, m->last->child, sizeof(buf));
+	m->meta.name = xstrdup(buf);
+
+	return(1);
 }
 
 
 static int
-post_sh(struct mdoc *mdoc)
+post_sh(POST_ARGS)
 {
 	enum mdoc_sec	 sec;
 	char		 buf[64];
@@ -197,30 +328,26 @@ post_sh(struct mdoc *mdoc)
 	 * check ordering.
 	 */
 
-	if (MDOC_HEAD != mdoc->last->type)
+	if (MDOC_HEAD != m->last->type)
 		return(1);
-	if (xstrlcats(buf, mdoc->last->child, 64)) {
-		if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
-			mdoc->lastnamed = sec;
-		mdoc->lastsec = sec;
-	} else
-		return(mdoc_err(mdoc, "parameters too long"));
 
-	switch (mdoc->lastsec) {
+	(void)xstrlcpys(buf, m->last->child, sizeof(buf));
+	if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
+		m->lastnamed = sec;
+
+	switch ((m->lastsec = sec)) {
 	case (SEC_RETURN_VALUES):
 		/* FALLTHROUGH */
 	case (SEC_ERRORS):
-		switch (mdoc->meta.msec) {
-		case (MSEC_2):
+		switch (m->meta.msec) {
+		case (2):
 			/* FALLTHROUGH */
-		case (MSEC_3):
+		case (3):
 			/* FALLTHROUGH */
-		case (MSEC_9):
+		case (9):
 			break;
 		default:
-			return(mdoc_warn(mdoc, WARN_COMPAT,
-					"inappropriate section for "
-					"manual section"));
+			return(mwarn(m, WBADSEC));
 		}
 		break;
 	default:
@@ -231,86 +358,119 @@ post_sh(struct mdoc *mdoc)
 
 
 static int
-post_dt(struct mdoc *mdoc)
+post_dt(POST_ARGS)
 {
-	int		  i;
-	char		 *p;
 	struct mdoc_node *n;
+	const char	 *cp;
+	char		 *ep;
+	long		  lval;
 
-	/* 
-	 * Prologue title must be parsed into document meta-data.
+	if (m->meta.title)
+		free(m->meta.title);
+	if (m->meta.vol)
+		free(m->meta.vol);
+	if (m->meta.arch)
+		free(m->meta.arch);
+
+	m->meta.title = m->meta.vol = m->meta.arch = NULL;
+	m->meta.msec = 0;
+
+	/* Handles: `.Dt' 
+	 *   --> title = unknown, volume = local, msec = 0, arch = NULL
 	 */
 
-	assert(MDOC_ELEM == mdoc->last->type);
-	assert(MDOC_Dt == mdoc->last->tok);
+	if (NULL == (n = m->last->child)) {
+		m->meta.title = xstrdup("unknown");
+		m->meta.vol = xstrdup("local");
+		return(post_prol(m));
+	}
 
-	assert(NULL == mdoc->meta.title);
+	/* Handles: `.Dt TITLE' 
+	 *   --> title = TITLE, volume = local, msec = 0, arch = NULL
+	 */
 
-	/* LINTED */
-	for (i = 0, n = mdoc->last->child; n; n = n->next, i++) {
-		assert(MDOC_TEXT == n->type);
-		p = n->data.text.string;
+	m->meta.title = xstrdup(n->string);
 
-		switch (i) {
-		case (0):
-			mdoc->meta.title = xstrdup(p);
-			break;
-		case (1):
-			mdoc->meta.msec = mdoc_atomsec(p);
-			if (MSEC_DEFAULT != mdoc->meta.msec)
-				break;
-			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
-		case (2):
-			mdoc->meta.vol = mdoc_atovol(p);
-			if (VOL_DEFAULT != mdoc->meta.vol)
-				break;
-			mdoc->meta.arch = mdoc_atoarch(p);
-			if (ARCH_DEFAULT != mdoc->meta.arch)
-				break;
-			return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
-		default:
-			return(mdoc_nerr(mdoc, n, "too many parameters"));
-		}
+	if (NULL == (n = n->next)) {
+		m->meta.vol = xstrdup("local");
+		return(post_prol(m));
 	}
 
-	if (NULL == mdoc->meta.title)
-		mdoc->meta.title = xstrdup("UNTITLED");
+	/* Handles: `.Dt TITLE SEC'
+	 *   --> title = TITLE, volume = SEC is msec ? 
+	 *           format(msec) : SEC,
+	 *       msec = SEC is msec ? atoi(msec) : 0,
+	 *       arch = NULL
+	 */
 
-	mdoc_msg(mdoc, "title: %s", mdoc->meta.title);
+	if ((cp = mdoc_a2msec(n->string))) {
+		m->meta.vol = xstrdup(cp);
+		errno = 0;
+		lval = strtol(n->string, &ep, 10);
+		if (n->string[0] != '\0' && *ep == '\0')
+			m->meta.msec = (int)lval;
+	} else 
+		m->meta.vol = xstrdup(n->string);
 
-	return(post_prologue(mdoc));
+	if (NULL == (n = n->next))
+		return(post_prol(m));
+
+	/* Handles: `.Dt TITLE SEC VOL'
+	 *   --> title = TITLE, volume = VOL is vol ?
+	 *       format(VOL) : 
+	 *           VOL is arch ? format(arch) : 
+	 *               VOL
+	 */
+
+	if ((cp = mdoc_a2vol(n->string))) {
+		free(m->meta.vol);
+		m->meta.vol = xstrdup(cp);
+		n = n->next;
+	} else {
+		cp = mdoc_a2arch(n->string);
+		if (NULL == cp) {
+			free(m->meta.vol);
+			m->meta.vol = xstrdup(n->string);
+		} else
+			m->meta.arch = xstrdup(cp);
+	}	
+
+	/* Ignore any subsequent parameters... */
+
+	return(post_prol(m));
 }
 
 
 static int
-post_os(struct mdoc *mdoc)
+post_os(POST_ARGS)
 {
 	char		  buf[64];
+	struct utsname	  utsname;
 
-	/* 
-	 * Prologue operating system must be parsed into document
-	 * meta-data.
-	 */
+	if (m->meta.os)
+		free(m->meta.os);
 
-	assert(MDOC_ELEM == mdoc->last->type);
-	assert(MDOC_Os == mdoc->last->tok);
-	assert(NULL == mdoc->meta.os);
+	(void)xstrlcpys(buf, m->last->child, sizeof(buf));
 
-	if ( ! xstrlcats(buf, mdoc->last->child, 64))
-		return(mdoc_err(mdoc, "macro parameters too long")); 
+	if (0 == buf[0]) {
+		if (-1 == uname(&utsname))
+			return(mdoc_err(m, "utsname"));
+		(void)xstrlcpy(buf, utsname.sysname, sizeof(buf));
+		(void)xstrlcat(buf, " ", sizeof(buf));
+		(void)xstrlcat(buf, utsname.release, sizeof(buf));
+	}
 
-	mdoc->meta.os = xstrdup(buf[0] ? buf : "LOCAL");
-	mdoc->lastnamed = SEC_BODY;
+	m->meta.os = xstrdup(buf);
+	m->lastnamed = m->lastsec = SEC_BODY;
 
-	return(post_prologue(mdoc));
+	return(post_prol(m));
 }
 
 
 static int
-post_bl_tagwidth(struct mdoc *mdoc)
+post_bl_tagwidth(struct mdoc *m)
 {
 	struct mdoc_node  *n;
-	struct mdoc_block *b;
 	int		   sz;
 	char		   buf[32];
 
@@ -319,30 +479,25 @@ post_bl_tagwidth(struct mdoc *mdoc)
 	 * to intuit our width from the first body element.  
 	 */
 
-	b = &mdoc->last->data.block;
-
-	if (NULL == (n = b->body->child))
+	if (NULL == (n = m->last->body->child))
 		return(1);
-	assert(MDOC_It == n->tok);
 
 	/*
 	 * Use the text width, if a text node, or the default macro
 	 * width if a macro.
 	 */
 
-	if ((n = n->data.block.head->child)) {
+	if ((n = n->head->child)) {
 		if (MDOC_TEXT != n->type) {
-			if (0 == (sz = mdoc_macro2len(n->tok)))
+			if (0 == (sz = (int)mdoc_macro2len(n->tok)))
 				sz = -1;
 		} else
-			sz = (int)strlen(n->data.text.string) + 1;
+			sz = (int)strlen(n->string) + 1;
 	} else
 		sz = -1;
 
 	if (-1 == sz) {
-		if ( ! mdoc_warn(mdoc, WARN_SYNTAX,
-				"cannot determine default %s",
-				mdoc_argnames[MDOC_Width]))
+		if ( ! mwarn(m, WNOWIDTH))
 			return(0);
 		sz = 10;
 	}
@@ -354,77 +509,80 @@ post_bl_tagwidth(struct mdoc *mdoc)
 	 * We're guaranteed that a MDOC_Width doesn't already exist.
 	 */
 
-	(b->argc)++;
-	b->argv = xrealloc(b->argv, b->argc * sizeof(struct mdoc_arg));
+	if (NULL == m->last->args) {
+		m->last->args = xcalloc
+			(1, sizeof(struct mdoc_arg));
+		m->last->args->refcnt = 1;
+	}
 
-	b->argv[b->argc - 1].arg = MDOC_Width;
-	b->argv[b->argc - 1].line = mdoc->last->line;
-	b->argv[b->argc - 1].pos = mdoc->last->pos;
-	b->argv[b->argc - 1].sz = 1;
-	b->argv[b->argc - 1].value = xcalloc(1, sizeof(char *));
-	b->argv[b->argc - 1].value[0] = xstrdup(buf);
+	n = m->last;
+	sz = (int)n->args->argc;
+	
+	(n->args->argc)++;
 
-	mdoc_msg(mdoc, "adding %s argument: %dn", 
-			mdoc_argnames[MDOC_Width], sz);
+	n->args->argv = xrealloc(n->args->argv, 
+			n->args->argc * sizeof(struct mdoc_arg));
 
+	n->args->argv[sz - 1].arg = MDOC_Width;
+	n->args->argv[sz - 1].line = m->last->line;
+	n->args->argv[sz - 1].pos = m->last->pos;
+	n->args->argv[sz - 1].sz = 1;
+	n->args->argv[sz - 1].value = xcalloc(1, sizeof(char *));
+	n->args->argv[sz - 1].value[0] = xstrdup(buf);
+
 	return(1);
 }
 
 
 static int
-post_bl_width(struct mdoc *mdoc)
+post_bl_width(struct mdoc *m)
 {
 	size_t		  width;
 	int		  i, tok;
 	char		  buf[32];
-	char		**p;
+	char		 *p;
 
-	for (i = 0; i < (int)mdoc->last->data.block.argc; i++) 
-		if (MDOC_Width == mdoc->last->data.block.argv[i].arg)
+	if (NULL == m->last->args)
+		return(merr(m, ENOWIDTH));
+
+	for (i = 0; i < (int)m->last->args->argc; i++)
+		if (MDOC_Width == m->last->args->argv[i].arg)
 			break;
 
-	assert(i < (int)mdoc->last->data.block.argc);
-	assert(1 == mdoc->last->data.block.argv[i].sz);
-	p = &mdoc->last->data.block.argv[i].value[0];
+	if (i == (int)m->last->args->argc)
+		return(merr(m, ENOWIDTH));
 
+	p = m->last->args->argv[i].value[0];
+
 	/*
 	 * 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 (xstrcmp(*p, "Ds")) {
-		if ( ! mdoc_warn(mdoc, WARN_COMPAT,
-					"%s argument deprecated",
-					mdoc_argnames[MDOC_Width]))
-			return(0);
+	if (xstrcmp(p, "Ds"))
 		width = 8;
-	} else if (MDOC_MAX == (tok = mdoc_find(mdoc, *p)))
+	else if (MDOC_MAX == (tok = mdoc_tokhash_find(m->htab, p)))
 		return(1);
 	else if (0 == (width = mdoc_macro2len(tok))) 
-		return(mdoc_warn(mdoc, WARN_SYNTAX,
-					"%s macro has no length", 
-					mdoc_argnames[MDOC_Width]));
+		return(mwarn(m, WNOWIDTH));
 
-	mdoc_msg(mdoc, "re-writing %s argument: %s -> %zun", 
-			mdoc_argnames[MDOC_Width], *p, width);
-
 	/* The value already exists: free and reallocate it. */
 
 	(void)snprintf(buf, sizeof(buf), "%zun", width);
 
-	free(*p);
-	*p = strdup(buf);
+	free(m->last->args->argv[i].value[0]);
+	m->last->args->argv[i].value[0] = xstrdup(buf);
 
 	return(1);
 }
 
 
 static int
-post_bl(struct mdoc *mdoc)
+post_bl(POST_ARGS)
 {
-	int		  i, r;
+	int		  i, r, len;
 
-	if (MDOC_BLOCK != mdoc->last->type)
+	if (MDOC_BLOCK != m->last->type)
 		return(1);
 
 	/*
@@ -435,18 +593,20 @@ post_bl(struct mdoc *mdoc)
 	 * rewritten into real lengths).
 	 */
 
-	for (r = i = 0; i < (int)mdoc->last->data.block.argc; i++) {
-		if (MDOC_Tag == mdoc->last->data.block.argv[i].arg)
+	len = (int)(m->last->args ? m->last->args->argc : 0);
+
+	for (r = i = 0; i < len; i++) {
+		if (MDOC_Tag == m->last->args->argv[i].arg)
 			r |= 1 << 0;
-		if (MDOC_Width == mdoc->last->data.block.argv[i].arg)
+		if (MDOC_Width == m->last->args->argv[i].arg)
 			r |= 1 << 1;
 	}
 
 	if (r & (1 << 0) && ! (r & (1 << 1))) {
-		if ( ! post_bl_tagwidth(mdoc))
+		if ( ! post_bl_tagwidth(m))
 			return(0);
 	} else if (r & (1 << 1))
-		if ( ! post_bl_width(mdoc))
+		if ( ! post_bl_width(m))
 			return(0);
 
 	return(1);
@@ -454,34 +614,48 @@ post_bl(struct mdoc *mdoc)
 
 
 static int
-post_dd(struct mdoc *mdoc)
+post_ar(POST_ARGS)
 {
-	char		  buf[64];
+	struct mdoc_node *n;
 
-	/* 
-	 * Prologue date must be parsed into document meta-data.  We
-	 * accept multiple kinds of dates, described mostly in
-	 * mdoc_atotime().
-	 */
+	if (m->last->child)
+		return(1);
+	
+	n = m->last;
+	m->next = MDOC_NEXT_CHILD;
+	if ( ! mdoc_word_alloc(m, m->last->line,
+				m->last->pos, "file"))
+		return(0);
+	m->next = MDOC_NEXT_SIBLING;
+	if ( ! mdoc_word_alloc(m, m->last->line, 
+				m->last->pos, "..."))
+		return(0);
 
-	assert(MDOC_ELEM == mdoc->last->type);
-	assert(MDOC_Dd == mdoc->last->tok);
+	m->last = n;
+	m->next = MDOC_NEXT_SIBLING;
+	return(1);
+}
 
-	assert(0 == mdoc->meta.date);
 
-	if ( ! xstrlcats(buf, mdoc->last->child, 64))
-		return(mdoc_err(mdoc, "macro parameters too long"));
-	if (0 == (mdoc->meta.date = mdoc_atotime(buf)))
-		return(mdoc_err(mdoc, "invalid parameter syntax"));
+static int
+post_dd(POST_ARGS)
+{
+	char		  buf[64];
 
-	mdoc_msg(mdoc, "date: %u", mdoc->meta.date);
+	(void)xstrlcpys(buf, m->last->child, sizeof(buf));
 
-	return(post_prologue(mdoc));
+	if (0 == (m->meta.date = mdoc_atotime(buf))) {
+		if ( ! mwarn(m, WBADDATE))
+			return(0);
+		m->meta.date = time(NULL);
+	}
+
+	return(post_prol(m));
 }
 
 
 static int
-post_prologue(struct mdoc *mdoc)
+post_prol(POST_ARGS)
 {
 	struct mdoc_node *n;
 
@@ -490,20 +664,20 @@ post_prologue(struct mdoc *mdoc)
 	 * of the syntax tree (they encompass only meta-data).  
 	 */
 
-	if (mdoc->last->parent->child == mdoc->last)
-		mdoc->last->parent->child = mdoc->last->prev;
-	if (mdoc->last->prev)
-		mdoc->last->prev->next = NULL;
+	if (m->last->parent->child == m->last)
+		m->last->parent->child = m->last->prev;
+	if (m->last->prev)
+		m->last->prev->next = NULL;
 
-	n = mdoc->last;
-	assert(NULL == mdoc->last->next);
+	n = m->last;
+	assert(NULL == m->last->next);
 
-	if (mdoc->last->prev) {
-		mdoc->last = mdoc->last->prev;
-		mdoc->next = MDOC_NEXT_SIBLING;
+	if (m->last->prev) {
+		m->last = m->last->prev;
+		m->next = MDOC_NEXT_SIBLING;
 	} else {
-		mdoc->last = mdoc->last->parent;
-		mdoc->next = MDOC_NEXT_CHILD;
+		m->last = m->last->parent;
+		m->next = MDOC_NEXT_CHILD;
 	}
 
 	mdoc_node_freelist(n);
@@ -511,19 +685,41 @@ post_prologue(struct mdoc *mdoc)
 }
 
 
-int
-mdoc_action_post(struct mdoc *mdoc)
+static int
+pre_bd(PRE_ARGS)
 {
+	int		 i;
 
-	if (MDOC_ACTED & mdoc->last->flags)
+	if (MDOC_BODY != n->type)
 		return(1);
-	mdoc->last->flags |= MDOC_ACTED;
 
-	if (MDOC_TEXT == mdoc->last->type)
-		return(1);
-	if (MDOC_ROOT == mdoc->last->type)
-		return(1);
-	if (NULL == mdoc_actions[mdoc->last->tok].post)
-		return(1);
-	return((*mdoc_actions[mdoc->last->tok].post)(mdoc));
+	/* 
+	 * We ONLY enter a literal context if `Bd -literal' or `Bd
+	 * -unfilled'.  
+	 */
+
+	n = n->parent;
+
+	for (i = 0; i < (int)n->args->argc; i++)
+		if (MDOC_Literal == n->args->argv[i].arg)
+			break;
+		else if (MDOC_Unfilled == n->args->argv[i].arg)
+			break;
+
+	if (i < (int)n->args->argc)
+		m->flags |= MDOC_LITERAL;
+
+	return(1);
 }
+
+
+static int
+post_bd(POST_ARGS)
+{
+
+	if (MDOC_BODY == m->last->type)
+		m->flags &= ~MDOC_LITERAL;
+	return(1);
+}
+
+