===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.44
retrieving revision 1.97
diff -u -p -r1.44 -r1.97
--- docbook2mdoc/docbook2mdoc.c	2015/03/19 10:04:32	1.44
+++ docbook2mdoc/docbook2mdoc.c	2019/04/07 17:42:36	1.97
@@ -1,6 +1,7 @@
-/*	$Id: docbook2mdoc.c,v 1.44 2015/03/19 10:04:32 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.97 2019/04/07 17:42:36 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.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,860 +15,277 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/queue.h>
-
 #include <assert.h>
 #include <ctype.h>
-#include <expat.h>
-#include <fcntl.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
-#include "extern.h"
+#include "node.h"
+#include "macro.h"
+#include "format.h"
 
 /*
- * Global parse state.
- * Keep this as simple and small as possible.
+ * The implementation of the mdoc(7) formatter.
  */
-struct	parse {
-	XML_Parser	 xml;
-	enum nodeid	 node; /* current (NODE_ROOT if pre-tree) */
-	const char	*fname; /* filename */
-	int		 stop; /* should we stop now? */
-#define	PARSE_EQN	 1
-	unsigned int	 flags; /* document-wide flags */
-	struct pnode	*root; /* root of parse tree */
-	struct pnode	*cur; /* current node in tree */
-	char		*b; /* nil-terminated buffer for pre-print */
-	size_t		 bsz; /* current length of b */
-	size_t		 mbsz; /* max bsz allocation */
-	int		 newln; /* output: are we on a fresh line */
-};
 
-struct	node {
-	const char	*name; /* docbook element name */
-	unsigned int	 flags;
-#define	NODE_IGNTEXT	 1 /* ignore all contained text */
-};
+static void	 pnode_print(struct format *, struct pnode *);
 
-TAILQ_HEAD(pnodeq, pnode);
-TAILQ_HEAD(pattrq, pattr);
 
-struct	pattr {
-	enum attrkey	 key;
-	enum attrval	 val;
-	char		*rawval;
-	TAILQ_ENTRY(pattr) child;
-};
-
-struct	pnode {
-	enum nodeid	 node; /* node type */
-	char		*b; /* binary data buffer */
-	char		*real; /* store for "b" */
-	size_t		 bsz; /* data buffer size */
-	struct pnode	*parent; /* parent (or NULL if top) */
-	struct pnodeq	 childq; /* queue of children */
-	struct pattrq	 attrq; /* attributes of node */
-	TAILQ_ENTRY(pnode) child;
-};
-
-static	const char *attrkeys[ATTRKEY__MAX] = {
-	"choice",
-	"close",
-	"id",
-	"open",
-	"rep"
-};
-
-static	const char *attrvals[ATTRVAL__MAX] = {
-	"norepeat",
-	"opt",
-	"plain",
-	"repeat",
-	"req"
-};
-
-static	const struct node nodes[NODE__MAX] = {
-	{ NULL, 0 },
-	{ "acronym", 0 },
-	{ "anchor", NODE_IGNTEXT },
-	{ "application", 0 },
-	{ "arg", 0 },
-	{ "caution", NODE_IGNTEXT },
-	{ "citerefentry", NODE_IGNTEXT },
-	{ "cmdsynopsis", NODE_IGNTEXT },
-	{ "code", 0 },
-	{ "colspec", NODE_IGNTEXT },
-	{ "command", 0 },
-	{ "constant", 0 },
-	{ "copyright", NODE_IGNTEXT },
-	{ "date", 0 },
-	{ "emphasis", 0 },
-	{ "entry", 0 },
-	{ "envar", 0 },
-	{ "fieldsynopsis", NODE_IGNTEXT },
-	{ "filename", 0 },
-	{ "funcdef", 0 },
-	{ "funcprototype", NODE_IGNTEXT },
-	{ "funcsynopsis", NODE_IGNTEXT },
-	{ "funcsynopsisinfo", 0 },
-	{ "function", 0 },
-	{ "group", NODE_IGNTEXT },
-	{ "holder", NODE_IGNTEXT },
-	{ "info", NODE_IGNTEXT },
-	{ "informalequation", NODE_IGNTEXT },
-	{ "informaltable", NODE_IGNTEXT },
-	{ "inlineequation", NODE_IGNTEXT },
-	{ "itemizedlist", NODE_IGNTEXT },
-	{ "link", 0 },
-	{ "listitem", NODE_IGNTEXT },
-	{ "literal", 0 },
-	{ "manvolnum", 0 },
-	{ "mml:math", NODE_IGNTEXT },
-	{ "mml:mfenced", 0 },
-	{ "mml:mfrac", 0 },
-	{ "mml:mi", 0 },
-	{ "mml:mn", 0 },
-	{ "mml:mo", 0 },
-	{ "mml:mrow", 0 },
-	{ "mml:msub", 0 },
-	{ "mml:msup", 0 },
-	{ "modifier", 0 },
-	{ "note", NODE_IGNTEXT },
-	{ "option", 0 },
-	{ "orderedlist", NODE_IGNTEXT },
-	{ "para", 0 },
-	{ "paramdef", 0 },
-	{ "parameter", 0 },
-	{ "programlisting", 0 },
-	{ "prompt", 0 },
-	{ "quote", 0 },
-	{ "refclass", NODE_IGNTEXT },
-	{ "refdescriptor", NODE_IGNTEXT },
-	{ "refentry", NODE_IGNTEXT },
-	{ "refentryinfo", NODE_IGNTEXT },
-	{ "refentrytitle", 0 },
-	{ "refmeta", NODE_IGNTEXT },
-	{ "refmetainfo", NODE_IGNTEXT },
-	{ "refmiscinfo", NODE_IGNTEXT },
-	{ "refname", 0 },
-	{ "refnamediv", NODE_IGNTEXT },
-	{ "refpurpose", 0 },
-	{ "refsect1", NODE_IGNTEXT },
-	{ "refsect2", NODE_IGNTEXT },
-	{ "refsect3", NODE_IGNTEXT },
-	{ "refsection", NODE_IGNTEXT },
-	{ "refsynopsisdiv", NODE_IGNTEXT },
-	{ "replaceable", 0 },
-	{ "row", NODE_IGNTEXT },
-	{ "sbr", NODE_IGNTEXT },
-	{ "screen", NODE_IGNTEXT },
-	{ "sgmltag", 0 },
-	{ "structname", 0 },
-	{ "synopsis", 0 },
-	{ "table", NODE_IGNTEXT },
-	{ "tbody", NODE_IGNTEXT },
-	{ "term", 0 },
-	{ NULL, 0 },
-	{ "tfoot", NODE_IGNTEXT },
-	{ "tgroup", NODE_IGNTEXT },
-	{ "thead", NODE_IGNTEXT },
-	{ "tip", NODE_IGNTEXT },
-	{ "title", 0 },
-	{ "trademark", 0 },
-	{ "type", 0 },
-	{ "ulink", 0 },
-	{ "userinput", 0 },
-	{ "variablelist", NODE_IGNTEXT },
-	{ "varlistentry", NODE_IGNTEXT },
-	{ "varname", 0 },
-	{ "warning", NODE_IGNTEXT },
-	{ "wordasword", 0 },
-	{ "year", NODE_IGNTEXT },
-};
-
-static	int warn = 0;
-
 static void
-pnode_print(struct parse *p, struct pnode *pn);
-
-/*
- * Process a stream of characters.
- * We store text as nodes in and of themselves.
- * If a text node is already open, append to it.
- * If it's not open, open one under the current context.
- */
-static void
-xml_char(void *arg, const XML_Char *p, int sz)
+pnode_printtext(struct format *f, struct pnode *n)
 {
-	struct parse	*ps = arg;
-	struct pnode	*dat;
-	int		 i;
+	struct pnode	*nn;
+	char		*cp;
+	char		 last;
 
-	/* Stopped or no tree yet. */
-	if (ps->stop || NODE_ROOT == ps->node)
+	if (n->bsz == 0) {
+		assert(n->real < n->b);
 		return;
+	}
 
-	/* Not supposed to be collecting text. */
-	assert(NULL != ps->cur);
-	if (NODE_IGNTEXT & nodes[ps->node].flags)
-		return;
-
 	/*
-	 * Are we in the midst of processing text?
-	 * If we're not processing text right now, then create a text
-	 * node for doing so.
-	 * However, don't do so unless we have some non-whitespace to
-	 * process: strip out all leading whitespace to be sure.
+	 * Text preceding a macro without intervening whitespace
+	 * requires a .Pf macro.
+	 * Set the spacing flag to avoid a redundant .Ns macro.
 	 */
-	if (NODE_TEXT != ps->node) {
-		for (i = 0; i < sz; i++)
-			if ( ! isspace((int)p[i]))
-				break;
-		if (i == sz)
-			return;
-		p += i;
-		sz -= i;
-		dat = calloc(1, sizeof(struct pnode));
-		if (NULL == dat) {
-			perror(NULL);
-			exit(EXIT_FAILURE);
-		}
 
-		dat->node = ps->node = NODE_TEXT;
-		dat->parent = ps->cur;
-		TAILQ_INIT(&dat->childq);
-		TAILQ_INIT(&dat->attrq);
-		TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child);
-		ps->cur = dat;
-		assert(NULL != ps->root);
+	if (f->linestate != LINE_MACRO &&
+	    (nn = TAILQ_NEXT(n, child)) != NULL && nn->spc == 0 &&
+	    (nn->node != NODE_TEXT && nn->node != NODE_ESCAPE)) {
+		macro_open(f, "Pf");
+		nn->spc = 1;
 	}
 
-	/* Append to current buffer. */
-	assert(sz >= 0);
-	ps->cur->b = realloc(ps->cur->b,
-		ps->cur->bsz + (size_t)sz);
-	if (NULL == ps->cur->b) {
-		perror(NULL);
-		exit(EXIT_FAILURE);
+	if (f->linestate == LINE_NEW) {
+		last = '\n';
+		f->linestate = LINE_TEXT;
+	} else {
+		last = ' ';
+		if (n->spc || f->linestate == LINE_MACRO)
+			putchar(' ');
 	}
-	memcpy(ps->cur->b + ps->cur->bsz, p, sz);
-	ps->cur->bsz += (size_t)sz;
-	ps->cur->real = ps->cur->b;
-}
 
-static void
-pnode_trim(struct pnode *pn)
-{
-
-	assert(NODE_TEXT == pn->node);
-	for ( ; pn->bsz > 0; pn->bsz--)
-		if ( ! isspace((int)pn->b[pn->bsz - 1]))
-			break;
-}
-
-/*
- * Begin an element.
- * First, look for the element.
- * If we don't find it and we're not parsing, keep going.
- * If we don't find it and we're parsing, puke and exit.
- * If we find it but we're not parsing yet (i.e., it's not a refentry
- * and thus out of context), keep going.
- * If we find it and we're at the root and already have a tree, puke and
- * exit (FIXME: I don't think this is right?).
- * If we find it but we're parsing a text node, close out the text node,
- * return to its parent, and keep going.
- * Make sure that the element is in the right context.
- * Lastly, put the node onto our parse tree and continue.
- */
-static void
-xml_elem_start(void *arg, const XML_Char *name, const XML_Char **atts)
-{
-	struct parse	 *ps = arg;
-	enum nodeid	  node;
-	enum attrkey	  key;
-	enum attrval	  val;
-	struct pnode	 *dat;
-	struct pattr	 *pattr;
-	const XML_Char	**att;
-
-	/* FIXME: find a better way to ditch other namespaces. */
-	if (ps->stop || 0 == strcmp(name, "xi:include"))
+	if (n->node == NODE_ESCAPE) {
+		fputs(n->b, stdout);
 		return;
-
-	/* Close out text node, if applicable... */
-	if (NODE_TEXT == ps->node) {
-		assert(NULL != ps->cur);
-		pnode_trim(ps->cur);
-		ps->cur = ps->cur->parent;
-		assert(NULL != ps->cur);
-		ps->node = ps->cur->node;
 	}
 
-	for (node = 0; node < NODE__MAX; node++)
-		if (NULL == nodes[node].name)
-			continue;
-		else if (0 == strcmp(nodes[node].name, name))
-			break;
+	/*
+	 * Remove the prefix '-' from <option> elements
+	 * because the arguments of .Fl macros do not need it.
+	 */
 
-	if (NODE__MAX == node && NODE_ROOT == ps->node) {
-		return;
-	} else if (NODE__MAX == node) {
-		fprintf(stderr, "%s:%zu:%zu: unknown node \"%s\"\n",
-			ps->fname, XML_GetCurrentLineNumber(ps->xml),
-			XML_GetCurrentColumnNumber(ps->xml), name);
-		ps->stop = 1;
-		return;
-	} else if (NODE_ROOT == ps->node && NULL != ps->root) {
-		fprintf(stderr, "%s:%zu:%zu: multiple refentries\n",
-			ps->fname, XML_GetCurrentLineNumber(ps->xml),
-			XML_GetCurrentColumnNumber(ps->xml));
-		ps->stop = 1;
-		return;
-	} else if (NODE_ROOT == ps->node && NODE_REFENTRY != node) {
-		return;
-	} else if ( ! isparent(node, ps->node)) {
-		fprintf(stderr, "%s:%zu:%zu: bad parent \"%s\" "
-			"of node \"%s\"\n",
-			ps->fname, XML_GetCurrentLineNumber(ps->xml),
-			XML_GetCurrentColumnNumber(ps->xml),
-			NULL == nodes[ps->node].name ?
-			"(none)" : nodes[ps->node].name,
-			NULL == nodes[node].name ?
-			"(none)" : nodes[node].name);
-		ps->stop = 1;
-		return;
-	}
+	cp = n->b;
+	if (n->parent != NULL && n->parent->node == NODE_OPTION && *cp == '-')
+		cp++;
 
-	if (NODE_INLINEEQUATION == node)
-		ps->flags |= PARSE_EQN;
-
-	if (NULL == (dat = calloc(1, sizeof(struct pnode)))) {
-		perror(NULL);
-		exit(EXIT_FAILURE);
-	}
-
-	dat->node = ps->node = node;
-	dat->parent = ps->cur;
-	TAILQ_INIT(&dat->childq);
-	TAILQ_INIT(&dat->attrq);
-
-	if (NULL != ps->cur)
-		TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child);
-
-	ps->cur = dat;
-	if (NULL == ps->root)
-		ps->root = dat;
-
 	/*
-	 * Process attributes.
+	 * Print the text, skipping whitespace on new lines,
+	 * escaping control characters on new lines,
+	 * and escaping backslashes.
 	 */
-	for (att = atts; NULL != *att; att += 2) {
-		for (key = 0; key < ATTRKEY__MAX; key++)
-			if (0 == strcmp(*att, attrkeys[key]))
-				break;
-		if (ATTRKEY__MAX == key) {
-			if (warn)
-				fprintf(stderr, "%s:%zu:%zu: warning: "
-					"unknown attribute \"%s\"\n",
-					ps->fname,
-					XML_GetCurrentLineNumber(ps->xml),
-					XML_GetCurrentColumnNumber(ps->xml),
-					*att);
-			continue;
-		} else if ( ! isattrkey(node, key)) {
-			if (warn)
-				fprintf(stderr, "%s:%zu:%zu: warning: "
-					"bad attribute \"%s\"\n",
-					ps->fname,
-					XML_GetCurrentLineNumber(ps->xml),
-					XML_GetCurrentColumnNumber(ps->xml),
-					*att);
-			continue;
+
+	for (; *cp != '\0'; cp++) {
+		if (last == '\n') {
+			if (isspace((unsigned char)*cp))
+				continue;
+			if (*cp == '\'' || *cp == '.')
+				fputs("\\&", stdout);
 		}
-		for (val = 0; val < ATTRVAL__MAX; val++)
-			if (0 == strcmp(*(att + 1), attrvals[val]))
-				break;
-		if (ATTRVAL__MAX != val && ! isattrval(key, val)) {
-			if (warn)
-				fprintf(stderr, "%s:%zu:%zu: warning: "
-					"bad attribute value \"%s\"\n",
-					ps->fname,
-					XML_GetCurrentLineNumber(ps->xml),
-					XML_GetCurrentColumnNumber(ps->xml),
-					*(att + 1));
-			continue;
-		}
-		pattr = calloc(1, sizeof(struct pattr));
-		pattr->key = key;
-		pattr->val = val;
-		if (ATTRVAL__MAX == val)
-			pattr->rawval = strdup(*(att + 1));
-		TAILQ_INSERT_TAIL(&dat->attrq, pattr, child);
+		putchar(last = *cp);
+		if (last == '\\')
+			putchar('e');
 	}
-
 }
 
-/*
- * Roll up the parse tree.
- * If we're at a text node, roll that one up first.
- * If we hit the root, then assign ourselves as the NODE_ROOT.
- */
 static void
-xml_elem_end(void *arg, const XML_Char *name)
+pnode_printpara(struct format *p, struct pnode *pn)
 {
-	struct parse	*ps = arg;
+	struct pnode	*pp;
 
-	/* FIXME: find a better way to ditch other namespaces. */
-	if (ps->stop || NODE_ROOT == ps->node)
+	if (pn->parent == NULL)
 		return;
-	else if (0 == strcmp(name, "xi:include"))
-		return;
 
-	/* Close out text node, if applicable... */
-	if (NODE_TEXT == ps->node) {
-		assert(NULL != ps->cur);
-		pnode_trim(ps->cur);
-		ps->cur = ps->cur->parent;
-		assert(NULL != ps->cur);
-		ps->node = ps->cur->node;
-	}
+	if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL)
+	    pp = pn->parent;
 
-	if (NULL == (ps->cur = ps->cur->parent))
-		ps->node = NODE_ROOT;
-	else
-		ps->node = ps->cur->node;
-}
-
-/*
- * Recursively free a node (NULL is ok).
- */
-static void
-pnode_free(struct pnode *pn)
-{
-	struct pnode	*pp;
-	struct pattr	*ap;
-
-	if (NULL == pn)
+	switch (pp->node) {
+	case NODE_ENTRY:
+	case NODE_LISTITEM:
 		return;
-
-	while (NULL != (pp = TAILQ_FIRST(&pn->childq))) {
-		TAILQ_REMOVE(&pn->childq, pp, child);
-		pnode_free(pp);
+	case NODE_PREFACE:
+	case NODE_SECTION:
+		if (p->level < 3)
+			return;
+		break;
+	default:
+		break;
 	}
-
-	while (NULL != (ap = TAILQ_FIRST(&pn->attrq))) {
-		TAILQ_REMOVE(&pn->attrq, ap, child);
-		free(ap->rawval);
-		free(ap);
-	}
-
-	free(pn->real);
-	free(pn);
+	macro_line(p, "Pp");
 }
 
 /*
- * Unlink a node from its parent and pnode_free() it.
+ * If the SYNOPSIS macro has a superfluous title, kill it.
  */
 static void
-pnode_unlink(struct pnode *pn)
+pnode_printrefsynopsisdiv(struct format *p, struct pnode *pn)
 {
+	struct pnode	*pp, *pq;
 
-	if (NULL != pn->parent)
-		TAILQ_REMOVE(&pn->parent->childq, pn, child);
-	pnode_free(pn);
-}
+	TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq)
+		if (pp->node == NODE_TITLE)
+			pnode_unlink(pp);
 
-/*
- * Unlink all children of a node and pnode_free() them.
- */
-static void
-pnode_unlinksub(struct pnode *pn)
-{
-
-	while ( ! TAILQ_EMPTY(&pn->childq))
-		pnode_unlink(TAILQ_FIRST(&pn->childq));
+	macro_line(p, "Sh SYNOPSIS");
 }
 
 /*
- * Reset the lookaside buffer.
+ * Start a hopefully-named `Sh' section.
  */
 static void
-bufclear(struct parse *p)
+pnode_printrefsect(struct format *p, struct pnode *pn)
 {
+	struct pnode	*pp;
+	const char	*title;
+	int		 flags, level;
 
-	p->b[p->bsz = 0] = '\0';
-}
+	if (pn->parent == NULL)
+		return;
 
-/*
- * Append NODE_TEXT contents to the current buffer, reallocating its
- * size if necessary.
- * The buffer is ALWAYS nil-terminated.
- */
-static void
-bufappend(struct parse *p, struct pnode *pn)
-{
-
-	assert(NODE_TEXT == pn->node);
-	if (p->bsz + pn->bsz + 1 > p->mbsz) {
-		p->mbsz = p->bsz + pn->bsz + 1;
-		if (NULL == (p->b = realloc(p->b, p->mbsz))) {
-			perror(NULL);
-			exit(EXIT_FAILURE);
+	level = ++p->level;
+	flags = ARG_SPACE;
+	if (level == 1)
+		flags |= ARG_UPPER;
+	if (level < 3) {
+		switch (pn->node) {
+		case NODE_CAUTION:
+		case NODE_NOTE:
+		case NODE_TIP:
+		case NODE_WARNING:
+			level = 3;
+			break;
+		default:
+			break;
 		}
 	}
-	memcpy(p->b + p->bsz, pn->b, pn->bsz);
-	p->bsz += pn->bsz;
-	p->b[p->bsz] = '\0';
-}
 
-/*
- * Recursively append all NODE_TEXT nodes to the buffer.
- * This descends into non-text nodes, but doesn't do anything beyond
- * them.
- * In other words, this is a recursive text grok.
- */
-static void
-bufappend_r(struct parse *p, struct pnode *pn)
-{
-	struct pnode	*pp;
-
-	if (NODE_TEXT == pn->node)
-		bufappend(p, pn);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		bufappend_r(p, pp);
-}
+		if (pp->node == NODE_TITLE)
+			break;
 
-/*
- * Recursively search and return the first instance of "node".
- */
-static struct pnode *
-pnode_findfirst(struct pnode *pn, enum nodeid node)
-{
-	struct pnode	*pp, *res;
-
-	res = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		res = pp->node == node ? pp :
-			pnode_findfirst(pp, node);
-		if (NULL != res)
+	if (pp == NULL) {
+		switch (pn->node) {
+		case NODE_PREFACE:
+			title = "Preface";
 			break;
+		case NODE_CAUTION:
+			title = "Caution";
+			break;
+		case NODE_NOTE:
+			title = "Note";
+			break;
+		case NODE_TIP:
+			title = "Tip";
+			break;
+		case NODE_WARNING:
+			title = "Warning";
+			break;
+		default:
+			title = "Unknown";
+			break;
+		}
 	}
 
-	return(res);
-}
-
-#define MACROLINE_NORM	0
-#define MACROLINE_UPPER	1
-#define	MACROLINE_NOWS 2
-/*
- * Recursively print text presumably on a macro line.
- * Convert all whitespace to regular spaces.
- */
-static void
-pnode_printmacrolinetext(struct parse *p, struct pnode *pn, int fl)
-{
-	char		*cp;
-
-	if (0 == p->newln && ! (MACROLINE_NOWS & fl))
-		putchar(' ');
-
-	bufclear(p);
-	bufappend_r(p, pn);
-
-	/* Convert all space to spaces. */
-	for (cp = p->b; '\0' != *cp; cp++)
-		if (isspace((int)*cp))
-			*cp = ' ';
-
-	for (cp = p->b; isspace((int)*cp); cp++)
-		/* Spin past whitespace (XXX: necessary?) */ ;
-	for ( ; '\0' != *cp; cp++) {
-		/* Escape us if we look like a macro. */
-		if ((cp == p->b || ' ' == *(cp - 1)) &&
-			isupper((int)*cp) &&
-			'\0' != *(cp + 1) &&
-			islower((int)*(cp + 1)) &&
-			('\0' == *(cp + 2) ||
-			 ' ' == *(cp + 2) ||
-			 (islower((int)*(cp + 2)) &&
-			  ('\0' == *(cp + 3) ||
-			   ' ' == *(cp + 3)))))
-			fputs("\\&", stdout);
-		if (MACROLINE_UPPER & fl)
-			putchar(toupper((int)*cp));
-		else
-			putchar((int)*cp);
-		/* If we're a character escape, escape us. */
-		if ('\\' == *cp)
-			putchar('e');
-	}
-}
-
-static void
-pnode_printmacrolinepart(struct parse *p, struct pnode *pn)
-{
-
-	pnode_printmacrolinetext(p, pn, 0);
-}
-
-/*
- * Just pnode_printmacrolinepart() but with a newline.
- * If no text, just the newline.
- */
-static void
-pnode_printmacroline(struct parse *p, struct pnode *pn)
-{
-
-	assert(0 == p->newln);
-	pnode_printmacrolinetext(p, pn, 0);
-	putchar('\n');
-	p->newln = 1;
-}
-
-static void
-pnode_printmopen(struct parse *p)
-{
-	if (p->newln) {
-		putchar('.');
-		p->newln = 0;
-	} else
-		putchar(' ');
-}
-
-static void
-pnode_printmclose(struct parse *p, int sv)
-{
-
-	if (sv && ! p->newln) {
-		putchar('\n');
-		p->newln = 1;
-	}
-}
-
-/*
- * Like pnode_printmclose() except we look to the next node, and, if
- * found, see if it starts with punctuation.
- * If it does, then we print that punctuation before the newline.
- */
-static void
-pnode_printmclosepunct(struct parse *p, struct pnode *pn, int sv)
-{
-	/* We wouldn't have done anything anyway. */
-	if ( ! (sv && ! p->newln))
-		return;
-
-	/* No next node or it's not text. */
-	if (NULL == (pn = TAILQ_NEXT(pn, child))) {
-		pnode_printmclose(p, sv);
-		return;
-	} else if (NODE_TEXT != pn->node) {
-		pnode_printmclose(p, sv);
-		return;
-	}
-
-	/* Only do this for the comma/period. */
-	if (pn->bsz > 0 &&
-		(',' == pn->b[0] || '.' == pn->b[0]) &&
-		(1 == pn->bsz || isspace((int)pn->b[1]))) {
-		putchar(' ');
-		putchar(pn->b[0]);
-		pn->b++;
-		pn->bsz--;
-	}
-
-	putchar('\n');
-	p->newln = 1;
-}
-
-/*
- * If the SYNOPSIS macro has a superfluous title, kill it.
- */
-static void
-pnode_printrefsynopsisdiv(struct parse *p, struct pnode *pn)
-{
-	struct pnode	*pp;
-
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
-			pnode_unlink(pp);
-			return;
-		}
-}
-
-/*
- * Start a hopefully-named `Sh' section.
- */
-static void
-pnode_printrefsect(struct parse *p, struct pnode *pn)
-{
-	struct pnode	*pp;
-
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node)
-			break;
-
-	switch (pn->node) {
-	case (NODE_REFSECT1):
-		fputs(".Sh", stdout);
+	switch (level) {
+	case 1:
+		macro_close(p);
+		macro_open(p, "Sh");
 		break;
-	case (NODE_REFSECT2):
-		fputs(".Ss", stdout);
+	case 2:
+		macro_close(p);
+		macro_open(p, "Ss");
 		break;
-	case (NODE_REFSECT3):
-		puts(".Pp");
-		fputs(".Sy", stdout);
-		break;
-	case (NODE_NOTE):
-		/* FALLTHROUGH */
-	case (NODE_REFSECTION):
-		/* FALLTHROUGH */
-	case (NODE_TIP):
-		/* FALLTHROUGH */
-	case (NODE_CAUTION):
-		/* FALLTHROUGH */
-	case (NODE_WARNING):
-		puts(".Pp");
-		if (NULL == pp)
-			return;
-		fputs(".Em", stdout);
-		break;
 	default:
+		pnode_printpara(p, pn);
+		macro_open(p, "Sy");
 		break;
 	}
 
-	p->newln = 0;
-
-	if (NULL != pp) {
-		pnode_printmacrolinetext(p, pp,
-			NODE_REFSECT1 == pn->node ?
-			MACROLINE_UPPER : 0);
-		pnode_printmclose(p, 1);
+	if (pp != NULL) {
+		macro_addnode(p, pp, flags);
 		pnode_unlink(pp);
-	} else {
-		puts(NODE_REFSECT1 == pn->node ?
-			"UNKNOWN" : "unknown");
-		p->newln = 1;
-	}
+	} else
+		macro_addarg(p, title, ARG_SPACE | ARG_QUOTED);
+	macro_close(p);
 }
 
 /*
  * Start a reference, extracting the title and volume.
  */
 static void
-pnode_printciterefentry(struct parse *p, struct pnode *pn)
+pnode_printciterefentry(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp, *title, *manvol;
 
 	title = manvol = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_MANVOLNUM == pp->node)
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		if (pp->node == NODE_MANVOLNUM)
 			manvol = pp;
-		else if (NODE_REFENTRYTITLE == pp->node)
+		else if (pp->node == NODE_REFENTRYTITLE)
 			title = pp;
-
-	if (NULL != title) {
-		pnode_printmacrolinepart(p, title);
-	} else
-		fputs(" unknown ", stdout);
-
-	if (NULL == manvol) {
-		puts(" 1");
-		p->newln = 1;
-	} else
-		pnode_printmacrolinepart(p, manvol);
+	}
+	macro_open(p, "Xr");
+	if (title == NULL)
+		macro_addarg(p, "unknown", ARG_SPACE);
+	else
+		macro_addnode(p, title, ARG_SPACE | ARG_SINGLE);
+	if (manvol == NULL)
+		macro_addarg(p, "1", ARG_SPACE);
+	else
+		macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE);
+	pnode_unlinksub(pn);
 }
 
 static void
-pnode_printrefmeta(struct parse *p, struct pnode *pn)
+pnode_printrefmeta(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp, *title, *manvol;
 
 	title = manvol = NULL;
-	assert(p->newln);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_MANVOLNUM == pp->node)
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		if (pp->node == NODE_MANVOLNUM)
 			manvol = pp;
-		else if (NODE_REFENTRYTITLE == pp->node)
+		else if (pp->node == NODE_REFENTRYTITLE)
 			title = pp;
-
-	puts(".Dd $Mdocdate" "$");
-	fputs(".Dt", stdout);
-	p->newln = 0;
-
-	if (NULL != title)
-		pnode_printmacrolinetext(p, title, MACROLINE_UPPER);
+	}
+	macro_close(p);
+	macro_open(p, "Dt");
+	if (title == NULL)
+		macro_addarg(p, "UNKNOWN", ARG_SPACE);
 	else
-		fputs(" UNKNOWN ", stdout);
-
-	if (NULL == manvol) {
-		puts(" 1");
-		p->newln = 1;
-	} else
-		pnode_printmacroline(p, manvol);
-
-	puts(".Os");
+		macro_addnode(p, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER);
+	if (manvol == NULL)
+		macro_addarg(p, "1", ARG_SPACE);
+	else
+		macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE);
+	macro_close(p);
+	pnode_unlink(pn);
 }
 
 static void
-pnode_printfuncdef(struct parse *p, struct pnode *pn)
+pnode_printfuncdef(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp, *ftype, *func;
+	struct pnode	*nc;
 
-	assert(p->newln);
-	ftype = func = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TEXT == pp->node)
-			ftype = pp;
-		else if (NODE_FUNCTION == pp->node)
-			func = pp;
-
-	if (NULL != ftype) {
-		fputs(".Ft", stdout);
-		p->newln = 0;
-		pnode_printmacroline(p, ftype);
+	nc = TAILQ_FIRST(&n->childq);
+	if (nc != NULL && nc->node == NODE_TEXT) {
+		macro_argline(f, "Ft", nc->b);
+		pnode_unlink(nc);
 	}
-
-	if (NULL != func) {
-		fputs(".Fo", stdout);
-		p->newln = 0;
-		pnode_printmacroline(p, func);
-	} else {
-		puts(".Fo UNKNOWN");
-		p->newln = 1;
-	}
+	macro_nodeline(f, "Fo", n, ARG_SINGLE);
+	pnode_unlinksub(n);
 }
 
-static void
-pnode_printparamdef(struct parse *p, struct pnode *pn)
-{
-	struct pnode	*pp, *ptype, *param;
-
-	assert(p->newln);
-	ptype = param = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TEXT == pp->node)
-			ptype = pp;
-		else if (NODE_PARAMETER == pp->node)
-			param = pp;
-
-	fputs(".Fa \"", stdout);
-	p->newln = 0;
-	if (NULL != ptype) {
-		pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS);
-		putchar(' ');
-	}
-
-	if (NULL != param)
-		pnode_printmacrolinepart(p, param);
-
-	puts("\"");
-	p->newln = 1;
-}
-
 /*
  * The <mml:mfenced> node is a little peculiar.
  * First, it can have arbitrary open and closing tokens, which default
@@ -875,34 +293,21 @@ pnode_printparamdef(struct parse *p, struct pnode *pn)
  * Second, >1 arguments are separated by commas.
  */
 static void
-pnode_printmathfenced(struct parse *p, struct pnode *pn)
+pnode_printmathfenced(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
-	struct pattr	*ap;
 
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_OPEN == ap->key) {
-			printf("left %s ", ap->rawval);
-			break;
-		}
-	if (NULL == ap)
-		printf("left ( ");
+	printf("left %s ", pnode_getattr_raw(pn, ATTRKEY_OPEN, "("));
 
 	pp = TAILQ_FIRST(&pn->childq);
 	pnode_print(p, pp);
 
-	while (NULL != (pp = TAILQ_NEXT(pp, child))) {
+	while ((pp = TAILQ_NEXT(pp, child)) != NULL) {
 		putchar(',');
 		pnode_print(p, pp);
 	}
-
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_CLOSE == ap->key) {
-			printf("right %s ", ap->rawval);
-			break;
-		}
-	if (NULL == ap)
-		printf("right ) ");
+	printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")"));
+	pnode_unlinksub(pn);
 }
 
 /*
@@ -912,7 +317,7 @@ pnode_printmathfenced(struct parse *p, struct pnode *p
  * particular eqn(7) word.
  */
 static void
-pnode_printmath(struct parse *p, struct pnode *pn)
+pnode_printmath(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
@@ -920,13 +325,13 @@ pnode_printmath(struct parse *p, struct pnode *pn)
 	pnode_print(p, pp);
 
 	switch (pn->node) {
-	case (NODE_MML_MSUP):
+	case NODE_MML_MSUP:
 		fputs(" sup ", stdout);
 		break;
-	case (NODE_MML_MFRAC):
+	case NODE_MML_MFRAC:
 		fputs(" over ", stdout);
 		break;
-	case (NODE_MML_MSUB):
+	case NODE_MML_MSUB:
 		fputs(" sub ", stdout);
 		break;
 	default:
@@ -935,29 +340,29 @@ pnode_printmath(struct parse *p, struct pnode *pn)
 
 	pp = TAILQ_NEXT(pp, child);
 	pnode_print(p, pp);
+	pnode_unlinksub(pn);
 }
 
 static void
-pnode_printfuncprototype(struct parse *p, struct pnode *pn)
+pnode_printfuncprototype(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp, *fdef;
 
-	assert(p->newln);
 	TAILQ_FOREACH(fdef, &pn->childq, child)
-		if (NODE_FUNCDEF == fdef->node)
+		if (fdef->node == NODE_FUNCDEF)
 			break;
 
-	if (NULL != fdef)
+	if (fdef != NULL) {
 		pnode_printfuncdef(p, fdef);
-	else
-		puts(".Fo UNKNOWN");
+		pnode_unlink(fdef);
+	} else
+		macro_line(p, "Fo UNKNOWN");
 
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_PARAMDEF == pp->node)
-			pnode_printparamdef(p, pp);
+		macro_nodeline(p, "Fa", pp, ARG_SINGLE);
 
-	puts(".Fc");
-	p->newln = 1;
+	macro_line(p, "Fc");
+	pnode_unlinksub(pn);
 }
 
 /*
@@ -968,7 +373,7 @@ pnode_printfuncprototype(struct parse *p, struct pnode
  * ellipsis following an argument) and optionality.
  */
 static void
-pnode_printarg(struct parse *p, struct pnode *pn)
+pnode_printarg(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 	struct pattr	*ap;
@@ -976,33 +381,28 @@ pnode_printarg(struct parse *p, struct pnode *pn)
 
 	isop = 1;
 	isrep = 0;
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_CHOICE == ap->key &&
-			(ATTRVAL_PLAIN == ap->val ||
-			 ATTRVAL_REQ == ap->val))
+	TAILQ_FOREACH(ap, &pn->attrq, child) {
+		if (ap->key == ATTRKEY_CHOICE &&
+		    (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ))
 			isop = 0;
-		else if (ATTRKEY_REP == ap->key &&
-			(ATTRVAL_REPEAT == ap->val))
+		else if (ap->key == ATTRKEY_REP && ap->val == ATTRVAL_REPEAT)
 			isrep = 1;
-
-	if (isop) {
-		pnode_printmopen(p);
-		fputs("Op", stdout);
 	}
+	if (isop)
+		macro_open(p, "Op");
 
 	TAILQ_FOREACH(pp, &pn->childq, child) {
-		if (NODE_TEXT == pp->node) {
-			pnode_printmopen(p);
-			fputs("Ar", stdout);
-		}
+		if (pp->node == NODE_TEXT)
+			macro_open(p, "Ar");
 		pnode_print(p, pp);
-		if (NODE_TEXT == pp->node && isrep)
-			fputs("...", stdout);
+		if (isrep && pp->node == NODE_TEXT)
+			macro_addarg(p, "...", ARG_SPACE);
 	}
+	pnode_unlinksub(pn);
 }
 
 static void
-pnode_printgroup(struct parse *p, struct pnode *pn)
+pnode_printgroup(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp, *np;
 	struct pattr	*ap;
@@ -1010,9 +410,8 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 
 	isop = 1;
 	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ATTRKEY_CHOICE == ap->key &&
-			(ATTRVAL_PLAIN == ap->val ||
-			 ATTRVAL_REQ == ap->val)) {
+		if (ap->key == ATTRKEY_CHOICE &&
+		    (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) {
 			isop = 0;
 			break;
 		}
@@ -1022,12 +421,11 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 	 * This will prevent pnode_print() for putting us on a
 	 * subsequent line.
 	 */
-	sv = p->newln;
-	pnode_printmopen(p);
+	sv = p->linestate == LINE_NEW;
 	if (isop)
-		fputs("Op", stdout);
+		macro_open(p, "Op");
 	else if (sv)
-		fputs("No", stdout);
+		macro_open(p, "No");
 
 	/*
 	 * Keep on printing text separated by the vertical bar as long
@@ -1040,168 +438,299 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 	TAILQ_FOREACH(pp, &pn->childq, child) {
 		pnode_print(p, pp);
 		np = TAILQ_NEXT(pp, child);
-		while (NULL != np) {
+		while (np != NULL) {
 			if (pp->node != np->node)
 				break;
-			fputs(" |", stdout);
-			pnode_printmacrolinepart(p, np);
+			macro_addarg(p, "|", ARG_SPACE);
+			macro_addnode(p, np, ARG_SPACE);
 			pp = np;
 			np = TAILQ_NEXT(np, child);
 		}
 	}
-
-	pnode_printmclose(p, sv);
+	if (sv)
+		macro_close(p);
+	pnode_unlinksub(pn);
 }
 
 static void
-pnode_printprologue(struct parse *p, struct pnode *pn)
+pnode_printauthor(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc, *ncn;
+	int		 have_contrib, have_name;
 
-	pp = NULL == p->root ? NULL :
-		pnode_findfirst(p->root, NODE_REFMETA);
+	/*
+	 * Print <contrib> children up front, before the .An scope,
+	 * and figure out whether we a name of a person.
+	 */
 
-	if (NULL != pp) {
-		pnode_printrefmeta(p, pp);
-		pnode_unlink(pp);
-	} else {
-		puts(".\\\" Supplying bogus prologue...");
-		puts(".Dd $Mdocdate" "$");
-		puts(".Dt UNKNOWN 1");
-		puts(".Os");
+	have_contrib = have_name = 0;
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) {
+		switch (nc->node) {
+		case NODE_CONTRIB:
+			if (have_contrib)
+				print_text(f, ",", 0);
+			print_textnode(f, nc);
+			pnode_unlink(nc);
+			have_contrib = 1;
+			break;
+		case NODE_PERSONNAME:
+			have_name = 1;
+			break;
+		default:
+			break;
+		}
 	}
+	if (TAILQ_FIRST(&n->childq) == NULL)
+		return;
 
-	if (PARSE_EQN & p->flags) {
-		puts(".EQ");
-		puts("delim $$");
-		puts(".EN");
+	if (have_contrib)
+		print_text(f, ":", 0);
+
+	/*
+         * If we have a name, print it in the .An scope and leave
+         * all other content for child handlers, to print after the
+         * scope.  Otherwise, print everything in the scope.
+	 */
+
+	macro_open(f, "An");
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) {
+		if (nc->node == NODE_PERSONNAME || have_name == 0) {
+			macro_addnode(f, nc, ARG_SPACE);
+			pnode_unlink(nc);
+		}
 	}
+
+	/*
+	 * If there is an email address,
+	 * print it on the same macro line.
+	 */
+
+	if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) {
+		pnode_print(f, nc);
+		pnode_unlink(nc);
+	}
+
+	/*
+	 * If there are still unprinted children, end the scope
+	 * with a comma.  Otherwise, leave the scope open in case
+	 * a text node follows that starts with closing punctuation.
+	 */
+
+	if (TAILQ_FIRST(&n->childq) != NULL) {
+		macro_addarg(f, ",", ARG_SPACE);
+		macro_close(f);
+	}
 }
 
+static void
+pnode_printlink(struct format *f, struct pnode *n)
+{
+	const char	*uri, *text;
+
+	uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL);
+	if (uri != NULL) {
+		if (TAILQ_FIRST(&n->childq) != NULL) {
+			print_textnode(f, n);
+			text = "";
+		} else {
+			text = pnode_getattr_raw(n, ATTRKEY_ENDTERM, NULL);
+			if (text != NULL)
+				print_text(f, text, ARG_SPACE);
+		}
+		if (text != NULL)
+			macro_open(f, "Pq");
+		macro_open(f, "Sx");
+		macro_addarg(f, uri, ARG_SPACE);
+		pnode_unlinksub(n);
+		return;
+	}
+	uri = pnode_getattr_raw(n, ATTRKEY_XLINK_HREF, NULL);
+	if (uri == NULL)
+		uri = pnode_getattr_raw(n, ATTRKEY_URL, NULL);
+	if (uri != NULL) {
+		macro_open(f, "Lk");
+		macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE);
+		if (TAILQ_FIRST(&n->childq) != NULL)
+			macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
+		pnode_unlinksub(n);
+		return;
+	}
+}
+
+static void
+pnode_printprologue(struct format *p, struct ptree *tree)
+{
+	struct pnode	*refmeta;
+
+	refmeta = tree->root == NULL ? NULL :
+	    pnode_findfirst(tree->root, NODE_REFMETA);
+
+	macro_line(p, "Dd $Mdocdate" "$");
+	if (refmeta == NULL) {
+		macro_open(p, "Dt");
+		macro_addarg(p,
+		    pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"),
+		    ARG_SPACE | ARG_SINGLE | ARG_UPPER);
+		macro_addarg(p, "1", ARG_SPACE);
+		macro_close(p);
+	} else
+		pnode_printrefmeta(p, refmeta);
+	macro_line(p, "Os");
+
+	if (tree->flags & TREE_EQN) {
+		macro_line(p, "EQ");
+		print_text(p, "delim $$", 0);
+		macro_line(p, "EN");
+	}
+}
+
 /*
  * We can have multiple <term> elements within a <varlistentry>, which
  * we should comma-separate as list headers.
  */
 static void
-pnode_printvarlistentry(struct parse *p, struct pnode *pn)
+pnode_printvarlistentry(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 	int		 first = 1;
 
-	assert(p->newln);
-	fputs(".It", stdout);
-	p->newln = 0;
-
+	macro_close(p);
+	macro_open(p, "It");
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		if (pp->node != NODE_TERM)
+			continue;
+		if ( ! first)
+			macro_addarg(p, ",", 0);
+		pnode_print(p, pp);
+		first = 0;
+	}
+	macro_close(p);
 	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TERM == pp->node) {
-			if ( ! first)
-				putchar(',');
+		if (pp->node != NODE_TERM)
 			pnode_print(p, pp);
-			pnode_unlink(pp);
-			first = 0;
-		} else
-			break;
+	pnode_unlinksub(pn);
+}
 
-	putchar('\n');
-	p->newln = 1;
+static void
+pnode_printtitle(struct format *p, struct pnode *pn)
+{
+	struct pnode	*pp, *pq;
+
+	TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) {
+		if (pp->node == NODE_TITLE) {
+			pnode_printpara(p, pp);
+			pnode_print(p, pp);
+			pnode_unlink(pp);
+		}
+	}
 }
 
 static void
-pnode_printrow(struct parse *p, struct pnode *pn)
+pnode_printrow(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
-	puts(".Bl -dash -compact");
-
+	macro_line(p, "Bl -dash -compact");
 	TAILQ_FOREACH(pp, &pn->childq, child) {
-		assert(p->newln);
-		puts(".It");
+		macro_line(p, "It");
 		pnode_print(p, pp);
-		pnode_printmclose(p, 1);
 	}
-	assert(p->newln);
-	puts(".El");
+	macro_line(p, "El");
+	pnode_unlink(pn);
 }
 
 static void
-pnode_printtable(struct parse *p, struct pnode *pn)
+pnode_printtgroup1(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
 
-	assert(p->newln);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
-			puts(".Pp");
-			pnode_print(p, pp);
-			pnode_unlink(pp);
-		}
-	assert(p->newln);
-	puts(".Bl -ohang");
-	while (NULL != (pp = pnode_findfirst(pn, NODE_ROW))) {
-		puts(".It Table Row");
-		pnode_printrow(p, pp);
-		pnode_printmclose(p, 1);
-		pnode_unlink(pp);
+	macro_line(f, "Bl -bullet -compact");
+	while ((nc = pnode_findfirst(n, NODE_ENTRY)) != NULL) {
+		macro_line(f, "It");
+		pnode_print(f, nc);
+		pnode_unlink(nc);
 	}
-	assert(p->newln);
-	puts(".El");
+	macro_line(f, "El");
+	pnode_unlinksub(n);
 }
 
 static void
-pnode_printlist(struct parse *p, struct pnode *pn)
+pnode_printtgroup2(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nr, *ne;
 
-	assert(p->newln);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
-			puts(".Pp");
-			pnode_print(p, pp);
-			pnode_unlink(pp);
-		}
-	assert(p->newln);
+	macro_line(f, "Bl -tag -width Ds");
+	while ((nr = pnode_findfirst(n, NODE_ROW)) != NULL) {
+		if ((ne = pnode_findfirst(n, NODE_ENTRY)) == NULL)
+			break;
+		macro_close(f);
+		macro_open(f, "It");
+		pnode_print(f, ne);
+		macro_close(f);
+		pnode_unlink(ne);
+		pnode_print(f, nr);
+		pnode_unlink(nr);
+	}
+	macro_line(f, "El");
+	pnode_unlinksub(n);
+}
 
-	if (NODE_ORDEREDLIST == pn->node)
-		puts(".Bl -enum");
-	else
-		puts(".Bl -item");
+static void
+pnode_printtgroup(struct format *f, struct pnode *n)
+{
+	struct pnode	*nc;
 
+	switch (atoi(pnode_getattr_raw(n, ATTRKEY_COLS, "0"))) {
+	case 1:
+		pnode_printtgroup1(f, n);
+		return;
+	case 2:
+		pnode_printtgroup2(f, n);
+		return;
+	default:
+		break;
+	}
+
+	macro_line(f, "Bl -ohang");
+	while ((nc = pnode_findfirst(n, NODE_ROW)) != NULL) {
+		macro_line(f, "It Table Row");
+		pnode_printrow(f, nc);
+	}
+	macro_line(f, "El");
+	pnode_unlinksub(n);
+}
+
+static void
+pnode_printlist(struct format *p, struct pnode *pn)
+{
+	struct pnode	*pp;
+
+	pnode_printtitle(p, pn);
+	macro_argline(p, "Bl",
+	    pn->node == NODE_ORDEREDLIST ? "-enum" : "-bullet");
 	TAILQ_FOREACH(pp, &pn->childq, child) {
-		assert(p->newln);
-		puts(".It");
+		macro_line(p, "It");
 		pnode_print(p, pp);
-		pnode_printmclose(p, 1);
 	}
-	assert(p->newln);
-	puts(".El");
+	macro_line(p, "El");
+	pnode_unlinksub(pn);
 }
 
 static void
-pnode_printvariablelist(struct parse *p, struct pnode *pn)
+pnode_printvariablelist(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
 
-	assert(p->newln);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_TITLE == pp->node) {
-			puts(".Pp");
-			pnode_print(p, pp);
-			pnode_unlink(pp);
-		}
-
-	assert(p->newln);
-	puts(".Bl -tag -width Ds");
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (NODE_VARLISTENTRY != pp->node) {
-			assert(p->newln);
-			fputs(".It", stdout);
-			pnode_printmacroline(p, pp);
-		} else {
-			assert(p->newln);
-			pnode_print(p, pp);
-		}
-	assert(p->newln);
-	puts(".El");
+	pnode_printtitle(p, pn);
+	macro_line(p, "Bl -tag -width Ds");
+	TAILQ_FOREACH(pp, &pn->childq, child) {
+		if (pp->node == NODE_VARLISTENTRY)
+			pnode_printvarlistentry(p, pp);
+		else
+			macro_nodeline(p, "It", pp, 0);
+	}
+	macro_line(p, "El");
+	pnode_unlinksub(pn);
 }
 
 /*
@@ -1211,285 +740,206 @@ pnode_printvariablelist(struct parse *p, struct pnode 
  * whatever), don't print inline macros.
  */
 static void
-pnode_print(struct parse *p, struct pnode *pn)
+pnode_print(struct format *p, struct pnode *pn)
 {
 	struct pnode	*pp;
-	char		*cp;
-	int		 last, sv;
+	enum linestate	 sv;
 
-	if (NULL == pn)
+	if (pn == NULL)
 		return;
 
-	sv = p->newln;
+	p->spc = pn->spc;
+	sv = p->linestate;
 
 	switch (pn->node) {
-	case (NODE_APPLICATION):
-		pnode_printmopen(p);
-		fputs("Nm", stdout);
+	case NODE_APPLICATION:
+		macro_open(p, "Nm");
 		break;
-	case (NODE_ANCHOR):
-		/* Don't print anything! */
-		return;
-	case (NODE_ARG):
+	case NODE_ARG:
 		pnode_printarg(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_CITEREFENTRY):
-		pnode_printmopen(p);
-		fputs("Xr", stdout);
+	case NODE_AUTHOR:
+		pnode_printauthor(p, pn);
+		break;
+	case NODE_AUTHORGROUP:
+		macro_line(p, "An -split");
+		break;
+	case NODE_BOOKINFO:
+		macro_line(p, "Sh NAME");
+		break;
+	case NODE_CITEREFENTRY:
 		pnode_printciterefentry(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_CODE):
-		pnode_printmopen(p);
-		fputs("Li", stdout);
+	case NODE_CITETITLE:
+		macro_open(p, "%T");
 		break;
-	case (NODE_COMMAND):
-		pnode_printmopen(p);
-		fputs("Nm", stdout);
+	case NODE_COMMAND:
+		macro_open(p, "Nm");
 		break;
-	case (NODE_CONSTANT):
-		pnode_printmopen(p);
-		fputs("Dv", stdout);
+	case NODE_CONSTANT:
+		macro_open(p, "Dv");
 		break;
-	case (NODE_EMPHASIS):
-		pnode_printmopen(p);
-		fputs("Em", stdout);
+	case NODE_EDITOR:
+		print_text(p, "editor:", ARG_SPACE);
+		sv = LINE_TEXT;
+		macro_open(p, "An");
 		break;
-	case (NODE_ENVAR):
-		pnode_printmopen(p);
-		fputs("Ev", stdout);
+	case NODE_EMAIL:
+		macro_open(p, "Aq Mt");
 		break;
-	case (NODE_FILENAME):
-		pnode_printmopen(p);
-		fputs("Pa", stdout);
+	case NODE_EMPHASIS:
+	case NODE_FIRSTTERM:
+		macro_open(p, "Em");
 		break;
-	case (NODE_FUNCTION):
-		pnode_printmopen(p);
-		fputs("Fn", stdout);
+	case NODE_ENVAR:
+		macro_open(p, "Ev");
 		break;
-	case (NODE_FUNCPROTOTYPE):
-		assert(p->newln);
+	case NODE_ERRORNAME:
+		macro_open(p, "Er");
+		break;
+	case NODE_FILENAME:
+		macro_open(p, "Pa");
+		break;
+	case NODE_FUNCTION:
+		macro_open(p, "Fn");
+		break;
+	case NODE_FUNCPROTOTYPE:
 		pnode_printfuncprototype(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_FUNCSYNOPSISINFO):
-		pnode_printmopen(p);
-		fputs("Fd", stdout);
+	case NODE_FUNCSYNOPSISINFO:
+		macro_open(p, "Fd");
 		break;
-	case (NODE_INFORMALEQUATION):
-		if ( ! p->newln)
-			putchar('\n');
-		puts(".EQ");
-		p->newln = 0;
+	case NODE_INFORMALEQUATION:
+		macro_line(p, "EQ");
 		break;
-	case (NODE_INLINEEQUATION):
-		fputc('$', stdout);
-		p->newln = 0;
+	case NODE_INLINEEQUATION:
+		if (p->linestate == LINE_NEW)
+			p->linestate = LINE_TEXT;
+		putchar('$');
 		break;
-	case (NODE_ITEMIZEDLIST):
-		assert(p->newln);
+	case NODE_ITEMIZEDLIST:
 		pnode_printlist(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_GROUP):
+	case NODE_GROUP:
 		pnode_printgroup(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_LITERAL):
-		pnode_printmopen(p);
-		fputs("Li", stdout);
+	case NODE_KEYSYM:
+		macro_open(p, "Sy");
 		break;
-	case (NODE_MML_MFENCED):
+	case NODE_LEGALNOTICE:
+		macro_line(p, "Sh LEGAL NOTICE");
+		break;
+	case NODE_LINK:
+		pnode_printlink(p, pn);
+		break;
+	case NODE_LITERAL:
+		macro_open(p, "Ql");
+		break;
+	case NODE_LITERALLAYOUT:
+		macro_close(p);
+		macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) ==
+		    ATTRVAL_MONOSPACED ? "-literal" : "-unfilled");
+		break;
+	case NODE_MML_MFENCED:
 		pnode_printmathfenced(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_MML_MROW):
-	case (NODE_MML_MI):
-	case (NODE_MML_MN):
-	case (NODE_MML_MO):
+	case NODE_MML_MROW:
+	case NODE_MML_MI:
+	case NODE_MML_MN:
+	case NODE_MML_MO:
 		if (TAILQ_EMPTY(&pn->childq))
 			break;
 		fputs(" { ", stdout);
 		break;
-	case (NODE_MML_MFRAC):
-	case (NODE_MML_MSUB):
-	case (NODE_MML_MSUP):
+	case NODE_MML_MFRAC:
+	case NODE_MML_MSUB:
+	case NODE_MML_MSUP:
 		pnode_printmath(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_OPTION):
-		pnode_printmopen(p);
-		fputs("Fl", stdout);
+	case NODE_OPTION:
+		macro_open(p, "Fl");
 		break;
-	case (NODE_ORDEREDLIST):
-		assert(p->newln);
+	case NODE_ORDEREDLIST:
 		pnode_printlist(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_PARA):
-		assert(p->newln);
-		if (NULL != pn->parent &&
-			NODE_LISTITEM == pn->parent->node)
-			break;
-		puts(".Pp");
+	case NODE_PARA:
+		pnode_printpara(p, pn);
 		break;
-	case (NODE_PARAMETER):
-		/* Suppress non-text children... */
-		pnode_printmopen(p);
-		fputs("Fa \"", stdout);
-		pnode_printmacrolinetext(p, pn, MACROLINE_NOWS);
-		fputs("\"", stdout);
+	case NODE_PARAMDEF:
+	case NODE_PARAMETER:
+		macro_nodeline(p, "Fa", pn, ARG_SINGLE);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_QUOTE):
-		pnode_printmopen(p);
-		fputs("Qo", stdout);
+	case NODE_QUOTE:
+		macro_open(p, "Qo");
 		break;
-	case (NODE_PROGRAMLISTING):
-		/* FALLTHROUGH */
-	case (NODE_SCREEN):
-		assert(p->newln);
-		puts(".Bd -literal");
+	case NODE_PROGRAMLISTING:
+	case NODE_SCREEN:
+	case NODE_SYNOPSIS:
+		macro_line(p, "Bd -literal");
 		break;
-	case (NODE_REFENTRYINFO):
+	case NODE_REFENTRYINFO:
 		/* Suppress. */
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_REFMETA):
-		abort();
-		break;
-	case (NODE_REFNAME):
+	case NODE_REFNAME:
 		/* Suppress non-text children... */
-		pnode_printmopen(p);
-		fputs("Nm", stdout);
-		p->newln = 0;
-		pnode_printmacrolinepart(p, pn);
+		macro_open(p, "Nm");
+		macro_addnode(p, pn, ARG_SPACE | ARG_SINGLE);
 		pnode_unlinksub(pn);
 		break;
-	case (NODE_REFNAMEDIV):
-		assert(p->newln);
-		puts(".Sh NAME");
+	case NODE_REFNAMEDIV:
+		macro_line(p, "Sh NAME");
 		break;
-	case (NODE_REFPURPOSE):
-		assert(p->newln);
-		pnode_printmopen(p);
-		fputs("Nd", stdout);
+	case NODE_REFPURPOSE:
+		macro_open(p, "Nd");
 		break;
-	case (NODE_REFSYNOPSISDIV):
-		assert(p->newln);
+	case NODE_REFSYNOPSISDIV:
 		pnode_printrefsynopsisdiv(p, pn);
-		puts(".Sh SYNOPSIS");
 		break;
-	case (NODE_REFSECT1):
-		/* FALLTHROUGH */
-	case (NODE_REFSECT2):
-		/* FALLTHROUGH */
-	case (NODE_REFSECT3):
-		/* FALLTHROUGH */
-	case (NODE_REFSECTION):
-		/* FALLTHROUGH */
-	case (NODE_NOTE):
-		/* FALLTHROUGH */
-	case (NODE_TIP):
-		/* FALLTHROUGH */
-	case (NODE_CAUTION):
-		/* FALLTHROUGH */
-	case (NODE_WARNING):
-		assert(p->newln);
+	case NODE_PREFACE:
+	case NODE_SECTION:
+	case NODE_NOTE:
+	case NODE_TIP:
+	case NODE_CAUTION:
+	case NODE_WARNING:
 		pnode_printrefsect(p, pn);
 		break;
-	case (NODE_REPLACEABLE):
-		pnode_printmopen(p);
-		fputs("Ar", stdout);
+	case NODE_REPLACEABLE:
+		macro_open(p, "Ar");
 		break;
-	case (NODE_SBR):
-		assert(p->newln);
-		puts(".br");
+	case NODE_SBR:
+		macro_line(p, "br");
 		break;
-	case (NODE_SGMLTAG):
-		pnode_printmopen(p);
-		fputs("Li", stdout);
+	case NODE_SGMLTAG:
+		macro_open(p, "Ic");
 		break;
-	case (NODE_STRUCTNAME):
-		pnode_printmopen(p);
-		fputs("Vt", stdout);
+	case NODE_TEXT:
+	case NODE_ESCAPE:
+		pnode_printtext(p, pn);
 		break;
-	case (NODE_TABLE):
-		/* FALLTHROUGH */
-	case (NODE_INFORMALTABLE):
-		assert(p->newln);
-		pnode_printtable(p, pn);
-		pnode_unlinksub(pn);
+	case NODE_TGROUP:
+		pnode_printtgroup(p, pn);
 		break;
-	case (NODE_TEXT):
-		if (0 == p->newln)
-			putchar(' ');
-
-		bufclear(p);
-		bufappend(p, pn);
-
-		if (0 == p->bsz) {
-			assert(pn->real != pn->b);
+	case NODE_TITLE:
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_BOOKINFO) {
+			macro_open(p, "Nd");
 			break;
 		}
-
-		/*
-		 * Output all characters, squeezing out whitespace
-		 * between newlines.
-		 * XXX: all whitespace, including tabs (?).
-		 * Remember to escape control characters and escapes.
-		 */
-		assert(p->bsz);
-		cp = p->b;
-
-		/*
-		 * There's often a superfluous "-" in its <option> tags
-		 * before the actual flags themselves.
-		 * "Fl" does this for us, so remove it.
-		 */
-		if (NULL != pn->parent &&
-			NODE_OPTION == pn->parent->node &&
-			'-' == *cp)
-			cp++;
-		for (last = '\n'; '\0' != *cp; ) {
-			if ('\n' == last) {
-				/* Consume all whitespace. */
-				if (isspace((int)*cp)) {
-					while (isspace((int)*cp))
-						cp++;
-					continue;
-				} else if ('\'' == *cp || '.' == *cp)
-					fputs("\\&", stdout);
-			}
-			putchar(last = *cp++);
-			/* If we're a character escape, escape us. */
-			if ('\\' == last)
-				putchar('e');
-		}
-		p->newln = 0;
+		pnode_printpara(p, pn);
+		macro_nodeline(p, "Sy", pn, 0);
+		pnode_unlinksub(pn);
 		break;
-	case (NODE_TYPE):
-		pnode_printmopen(p);
-		fputs("Vt", stdout);
+	case NODE_TYPE:
+		macro_open(p, "Vt");
 		break;
-	case (NODE_USERINPUT):
-		pnode_printmopen(p);
-		fputs("Li", stdout);
-		break;
-	case (NODE_VARIABLELIST):
-		assert(p->newln);
+	case NODE_VARIABLELIST:
 		pnode_printvariablelist(p, pn);
-		pnode_unlinksub(pn);
 		break;
-	case (NODE_VARLISTENTRY):
-		assert(p->newln);
-		pnode_printvarlistentry(p, pn);
+	case NODE_VARNAME:
+		macro_open(p, "Va");
 		break;
-	case (NODE_VARNAME):
-		pnode_printmopen(p);
-		fputs("Va", stdout);
-		break;
 	default:
 		break;
 	}
@@ -1498,193 +948,124 @@ pnode_print(struct parse *p, struct pnode *pn)
 		pnode_print(p, pp);
 
 	switch (pn->node) {
-	case (NODE_INFORMALEQUATION):
-		if ( ! p->newln)
-			putchar('\n');
-		puts(".EN");
-		p->newln = 1;
+	case NODE_INFORMALEQUATION:
+		macro_line(p, "EN");
 		break;
-	case (NODE_INLINEEQUATION):
+	case NODE_INLINEEQUATION:
 		fputs("$ ", stdout);
-		p->newln = sv;
+		p->linestate = sv;
 		break;
-	case (NODE_MML_MROW):
-	case (NODE_MML_MI):
-	case (NODE_MML_MN):
-	case (NODE_MML_MO):
+	case NODE_MEMBER:
+		if ((pp = TAILQ_NEXT(pn, child)) != NULL &&
+		    pp->node != NODE_MEMBER)
+			pp = NULL;
+		switch (p->linestate) {
+		case LINE_TEXT:
+			if (pp != NULL)
+				print_text(p, ",", 0);
+			break;
+		case LINE_MACRO:
+			if (pp != NULL)
+				macro_addarg(p, ",", ARG_SPACE);
+			macro_close(p);
+			break;
+		case LINE_NEW:
+			break;
+		}
+		break;
+	case NODE_MML_MROW:
+	case NODE_MML_MI:
+	case NODE_MML_MN:
+	case NODE_MML_MO:
 		if (TAILQ_EMPTY(&pn->childq))
 			break;
 		fputs(" } ", stdout);
 		break;
-	case (NODE_APPLICATION):
-	case (NODE_ARG):
-	case (NODE_CITEREFENTRY):
-	case (NODE_CODE):
-	case (NODE_COMMAND):
-	case (NODE_CONSTANT):
-	case (NODE_EMPHASIS):
-	case (NODE_ENVAR):
-	case (NODE_FILENAME):
-	case (NODE_FUNCTION):
-	case (NODE_FUNCSYNOPSISINFO):
-	case (NODE_LITERAL):
-	case (NODE_OPTION):
-	case (NODE_PARAMETER):
-	case (NODE_REPLACEABLE):
-	case (NODE_REFPURPOSE):
-	case (NODE_SGMLTAG):
-	case (NODE_STRUCTNAME):
-	case (NODE_TEXT):
-	case (NODE_TYPE):
-	case (NODE_USERINPUT):
-	case (NODE_VARNAME):
-		pnode_printmclosepunct(p, pn, sv);
+	case NODE_APPLICATION:
+	case NODE_ARG:
+	case NODE_AUTHOR:
+	case NODE_CITEREFENTRY:
+	case NODE_CITETITLE:
+	case NODE_COMMAND:
+	case NODE_CONSTANT:
+	case NODE_EDITOR:
+	case NODE_EMAIL:
+	case NODE_EMPHASIS:
+	case NODE_ENVAR:
+	case NODE_ERRORNAME:
+	case NODE_FILENAME:
+	case NODE_FIRSTTERM:
+	case NODE_FUNCTION:
+	case NODE_FUNCSYNOPSISINFO:
+	case NODE_KEYSYM:
+	case NODE_LINK:
+	case NODE_LITERAL:
+	case NODE_OPTION:
+	case NODE_PARAMETER:
+	case NODE_REPLACEABLE:
+	case NODE_REFPURPOSE:
+	case NODE_SGMLTAG:
+	case NODE_TYPE:
+	case NODE_VARNAME:
+		if (sv != LINE_MACRO && p->linestate == LINE_MACRO &&
+		    (pn->parent == NULL || pn->parent->node != NODE_MEMBER))
+			macro_closepunct(p, pn);
 		break;
-	case (NODE_QUOTE):
-		pnode_printmclose(p, sv);
-		sv = p->newln;
-		pnode_printmopen(p);
-		fputs("Qc", stdout);
-		pnode_printmclose(p, sv);
+	case NODE_QUOTE:
+		if (sv == LINE_NEW)
+			macro_close(p);
+		sv = p->linestate;
+		macro_open(p, "Qc");
+		if (sv == LINE_NEW)
+			macro_close(p);
 		break;
-	case (NODE_REFNAME):
+	case NODE_REFNAME:
 		/*
 		 * If we're in the NAME macro and we have multiple
 		 * <refname> macros in sequence, then print out a
 		 * trailing comma before the newline.
 		 */
-		if (NULL != pn->parent &&
-			NODE_REFNAMEDIV == pn->parent->node &&
-			NULL != TAILQ_NEXT(pn, child) &&
-			NODE_REFNAME == TAILQ_NEXT(pn, child)->node)
-			fputs(" ,", stdout);
-		pnode_printmclose(p, sv);
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_REFNAMEDIV &&
+		    TAILQ_NEXT(pn, child) != NULL &&
+		    TAILQ_NEXT(pn, child)->node == NODE_REFNAME)
+			macro_addarg(p, ",", ARG_SPACE);
+		if (sv == LINE_NEW)
+			macro_close(p);
 		break;
-	case (NODE_PROGRAMLISTING):
-		/* FALLTHROUGH */
-	case (NODE_SCREEN):
-		assert(p->newln);
-		puts(".Ed");
-		p->newln = 1;
+	case NODE_PREFACE:
+	case NODE_SECTION:
+	case NODE_NOTE:
+	case NODE_TIP:
+	case NODE_CAUTION:
+	case NODE_WARNING:
+		p->level--;
 		break;
+	case NODE_LITERALLAYOUT:
+	case NODE_PROGRAMLISTING:
+	case NODE_SCREEN:
+	case NODE_SYNOPSIS:
+		macro_line(p, "Ed");
+		break;
+	case NODE_TITLE:
+		if (pn->parent != NULL &&
+		    pn->parent->node == NODE_BOOKINFO)
+			macro_line(p, "Sh AUTHORS");
+		break;
 	default:
 		break;
 	}
 }
 
-/*
- * Loop around the read buffer until we've drained it of all data.
- * Invoke the parser context with each buffer fill.
- */
-static int
-readfile(XML_Parser xp, int fd,
-	char *b, size_t bsz, const char *fn)
+void
+ptree_print(struct ptree *tree)
 {
-	struct parse	 p;
-	int		 rc;
-	ssize_t		 ssz;
+	struct format	 formatter;
 
-	memset(&p, 0, sizeof(struct parse));
-
-	p.b = malloc(p.bsz = p.mbsz = 1024);
-	p.fname = fn;
-	p.xml = xp;
-
-	XML_SetCharacterDataHandler(xp, xml_char);
-	XML_SetElementHandler(xp, xml_elem_start, xml_elem_end);
-	XML_SetUserData(xp, &p);
-
-	while ((ssz = read(fd, b, bsz)) >= 0) {
-		if (0 == (rc = XML_Parse(xp, b, ssz, 0 == ssz)))
-			fprintf(stderr, "%s:%zu:%zu: %s\n", fn,
-				XML_GetCurrentLineNumber(xp),
-				XML_GetCurrentColumnNumber(xp),
-				XML_ErrorString
-				(XML_GetErrorCode(xp)));
-		else if ( ! p.stop && ssz > 0)
-			continue;
-		/*
-		 * Exit when we've read all or errors have occured
-		 * during the parse sequence.
-		 */
-		p.newln = 1;
-		pnode_printprologue(&p, p.root);
-		pnode_print(&p, p.root);
-		pnode_free(p.root);
-		free(p.b);
-		return(0 != rc && ! p.stop);
-	}
-
-	/* Read error has occured. */
-	perror(fn);
-	pnode_free(p.root);
-	free(p.b);
-	return(0);
-}
-
-int
-main(int argc, char *argv[])
-{
-	XML_Parser	 xp;
-	const char	*fname;
-	char		*buf;
-	int		 fd, rc, ch;
-	const char	*progname;
-
-	progname = strrchr(argv[0], '/');
-	if (progname == NULL)
-		progname = argv[0];
-	else
-		++progname;
-
-	fname = "-";
-	xp = NULL;
-	buf = NULL;
-	rc = 0;
-
-	while (-1 != (ch = getopt(argc, argv, "W")))
-		switch (ch) {
-		case ('W'):
-			warn = 1;
-			break;
-		default:
-			goto usage;
-		}
-
-	argc -= optind;
-	argv += optind;
-
-	if (argc > 1)
-		return(EXIT_FAILURE);
-	else if (argc > 0)
-		fname = argv[0];
-
-	/* Read from stdin or a file. */
-	fd = 0 == strcmp(fname, "-") ?
-		STDIN_FILENO : open(fname, O_RDONLY, 0);
-
-	/*
-	 * Open file for reading.
-	 * Allocate a read buffer.
-	 * Create the parser context.
-	 * Dive directly into the parse.
-	 */
-	if (-1 == fd)
-		perror(fname);
-	else if (NULL == (buf = malloc(4096)))
-		perror(NULL);
-	else if (NULL == (xp = XML_ParserCreate(NULL)))
-		perror(NULL);
-	else if ( ! readfile(xp, fd, buf, 4096, fname))
-		rc = 1;
-
-	XML_ParserFree(xp);
-	free(buf);
-	if (STDIN_FILENO != fd)
-		close(fd);
-	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-
-usage:
-	fprintf(stderr, "usage: %s [-W]\n", progname);
-	return(EXIT_FAILURE);
+	formatter.level = 0;
+	formatter.linestate = LINE_NEW;
+	pnode_printprologue(&formatter, tree);
+	pnode_print(&formatter, tree->root);
+	if (formatter.linestate != LINE_NEW)
+		putchar('\n');
 }