===================================================================
RCS file: /cvs/docbook2mdoc/docbook2mdoc.c,v
retrieving revision 1.67
retrieving revision 1.109
diff -u -p -r1.67 -r1.109
--- docbook2mdoc/docbook2mdoc.c	2019/03/23 10:53:52	1.67
+++ docbook2mdoc/docbook2mdoc.c	2019/04/12 10:34:48	1.109
@@ -1,4 +1,4 @@
-/* $Id: docbook2mdoc.c,v 1.67 2019/03/23 10:53:52 schwarze Exp $ */
+/* $Id: docbook2mdoc.c,v 1.109 2019/04/12 10:34:48 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,754 +15,175 @@
  * 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; /* NUL-terminated buffer for pre-print */
-	size_t		 bsz; /* current length of b */
-	size_t		 mbsz; /* max bsz allocation */
-	int		 level; /* header level, starting at 1 */
-	int		 newln; /* output: are we on a fresh line */
-};
 
-struct	node {
-	const char	*name; /* docbook element name */
-	enum nodeid	 node; /* docbook element to generate */
-};
+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",
-	"class",
-	"close",
-	"id",
-	"linkend",
-	"open",
-	"rep"
-};
-
-static	const char *attrvals[ATTRVAL__MAX] = {
-	"monospaced",
-	"norepeat",
-	"opt",
-	"plain",
-	"repeat",
-	"req"
-};
-
-static	const struct node nodes[] = {
-	{ "acronym",		NODE_ACRONYM },
-	{ "affiliation",	NODE_AFFILIATION },
-	{ "anchor",		NODE_ANCHOR },
-	{ "application",	NODE_APPLICATION },
-	{ "arg",		NODE_ARG },
-	{ "author",		NODE_AUTHOR },
-	{ "authorgroup",	NODE_AUTHORGROUP },
-	{ "blockquote",		NODE_BLOCKQUOTE },
-	{ "book",		NODE_BOOK },
-	{ "bookinfo",		NODE_BOOKINFO },
-	{ "caution",		NODE_CAUTION },
-	{ "chapter",		NODE_SECTION },
-	{ "citerefentry",	NODE_CITEREFENTRY },
-	{ "citetitle",		NODE_CITETITLE },
-	{ "cmdsynopsis",	NODE_CMDSYNOPSIS },
-	{ "code",		NODE_CODE },
-	{ "colspec",		NODE_COLSPEC },
-	{ "command",		NODE_COMMAND },
-	{ "constant",		NODE_CONSTANT },
-	{ "copyright",		NODE_COPYRIGHT },
-	{ "date",		NODE_DATE },
-	{ "editor",		NODE_EDITOR },
-	{ "email",		NODE_EMAIL },
-	{ "emphasis",		NODE_EMPHASIS },
-	{ "entry",		NODE_ENTRY },
-	{ "envar",		NODE_ENVAR },
-	{ "fieldsynopsis",	NODE_FIELDSYNOPSIS },
-	{ "filename",		NODE_FILENAME },
-	{ "firstname",		NODE_FIRSTNAME },
-	{ "firstterm",		NODE_FIRSTTERM },
-	{ "footnote",		NODE_FOOTNOTE },
-	{ "funcdef",		NODE_FUNCDEF },
-	{ "funcprototype",	NODE_FUNCPROTOTYPE },
-	{ "funcsynopsis",	NODE_FUNCSYNOPSIS },
-	{ "funcsynopsisinfo",	NODE_FUNCSYNOPSISINFO },
-	{ "function",		NODE_FUNCTION },
-	{ "glossterm",		NODE_GLOSSTERM },
-	{ "group",		NODE_GROUP },
-	{ "holder",		NODE_HOLDER },
-	{ "index",		NODE_INDEX },
-	{ "indexterm",		NODE_INDEXTERM },
-	{ "info",		NODE_INFO },
-	{ "informalequation",	NODE_INFORMALEQUATION },
-	{ "informaltable",	NODE_INFORMALTABLE },
-	{ "inlineequation",	NODE_INLINEEQUATION },
-	{ "itemizedlist",	NODE_ITEMIZEDLIST },
-	{ "keysym",		NODE_KEYSYM },
-	{ "legalnotice",	NODE_LEGALNOTICE },
-	{ "link",		NODE_LINK },
-	{ "listitem",		NODE_LISTITEM },
-	{ "literal",		NODE_LITERAL },
-	{ "literallayout",	NODE_LITERALLAYOUT },
-	{ "manvolnum",		NODE_MANVOLNUM },
-	{ "member",		NODE_MEMBER },
-	{ "mml:math",		NODE_MML_MATH },
-	{ "mml:mfenced",	NODE_MML_MFENCED },
-	{ "mml:mfrac",		NODE_MML_MFRAC },
-	{ "mml:mi",		NODE_MML_MI },
-	{ "mml:mn",		NODE_MML_MN },
-	{ "mml:mo",		NODE_MML_MO },
-	{ "mml:mrow",		NODE_MML_MROW },
-	{ "mml:msub",		NODE_MML_MSUB },
-	{ "mml:msup",		NODE_MML_MSUP },
-	{ "modifier",		NODE_MODIFIER },
-	{ "note",		NODE_NOTE },
-	{ "option",		NODE_OPTION },
-	{ "orderedlist",	NODE_ORDEREDLIST },
-	{ "orgname",		NODE_ORGNAME },
-	{ "othername",		NODE_OTHERNAME },
-	{ "para",		NODE_PARA },
-	{ "paramdef",		NODE_PARAMDEF },
-	{ "parameter",		NODE_PARAMETER },
-	{ "part",		NODE_SECTION },
-	{ "personname",		NODE_PERSONNAME },
-	{ "phrase",		NODE_PHRASE },
-	{ "preface",		NODE_PREFACE },
-	{ "primary",		NODE_PRIMARY },
-	{ "programlisting",	NODE_PROGRAMLISTING },
-	{ "prompt",		NODE_PROMPT },
-	{ "quote",		NODE_QUOTE },
-	{ "refclass",		NODE_REFCLASS },
-	{ "refdescriptor",	NODE_REFDESCRIPTOR },
-	{ "refentry",		NODE_REFENTRY },
-	{ "refentryinfo",	NODE_REFENTRYINFO },
-	{ "refentrytitle",	NODE_REFENTRYTITLE },
-	{ "refmeta",		NODE_REFMETA },
-	{ "refmetainfo",	NODE_REFMETAINFO },
-	{ "refmiscinfo",	NODE_REFMISCINFO },
-	{ "refname",		NODE_REFNAME },
-	{ "refnamediv",		NODE_REFNAMEDIV },
-	{ "refpurpose",		NODE_REFPURPOSE },
-	{ "refsect1",		NODE_SECTION },
-	{ "refsect2",		NODE_SECTION },
-	{ "refsect3",		NODE_SECTION },
-	{ "refsection",		NODE_SECTION },
-	{ "refsynopsisdiv",	NODE_REFSYNOPSISDIV },
-	{ "releaseinfo",	NODE_RELEASEINFO },
-	{ "replaceable",	NODE_REPLACEABLE },
-	{ "row",		NODE_ROW },
-	{ "sbr",		NODE_SBR },
-	{ "screen",		NODE_SCREEN },
-	{ "secondary",		NODE_SECONDARY },
-	{ "sect1",		NODE_SECTION },
-	{ "sect2",		NODE_SECTION },
-	{ "section",		NODE_SECTION },
-	{ "sgmltag",		NODE_SGMLTAG },
-	{ "simplelist",		NODE_SIMPLELIST },
-	{ "spanspec",		NODE_SPANSPEC },
-	{ "structname",		NODE_STRUCTNAME },
-	{ "subtitle",		NODE_SUBTITLE },
-	{ "surname",		NODE_SURNAME },
-	{ "synopsis",		NODE_SYNOPSIS },
-	{ "table",		NODE_TABLE },
-	{ "tbody",		NODE_TBODY },
-	{ "term",		NODE_TERM },
-	{ "tfoot",		NODE_TFOOT },
-	{ "tgroup",		NODE_TGROUP },
-	{ "thead",		NODE_THEAD },
-	{ "tip",		NODE_TIP },
-	{ "title",		NODE_TITLE },
-	{ "trademark",		NODE_TRADEMARK },
-	{ "type",		NODE_TYPE },
-	{ "ulink",		NODE_ULINK },
-	{ "userinput",		NODE_USERINPUT },
-	{ "variablelist",	NODE_VARIABLELIST },
-	{ "varlistentry",	NODE_VARLISTENTRY },
-	{ "varname",		NODE_VARNAME },
-	{ "warning",		NODE_WARNING },
-	{ "wordasword",		NODE_WORDASWORD },
-	{ "year",		NODE_YEAR },
-	{ NULL,			NODE__MAX }
-};
-
-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;
+	int		 accept_arg;
 
-	/* Stopped or no tree yet. */
-	if (ps->stop || ps->node == NODE_ROOT)
-		return;
+	cp = n->b;
+	accept_arg = f->flags & FMT_ARG;
+	if (f->linestate == LINE_MACRO && !n->spc && !accept_arg) {
+		for (;;) {
+			if (*cp == '\0')
+				return;
+			if (strchr("!),.:;?]", *cp) == NULL)
+				break;
+			printf(" %c", *cp++);
+		}
+		if (isspace((unsigned char)*cp)) {
+			while (isspace((unsigned char)*cp))
+				cp++;
+			macro_close(f);
+		} else {
+			fputs(" Ns", stdout);
+			f->flags &= FMT_IMPL;
+			accept_arg = 1;
+		}
+	}
+	if (f->linestate == LINE_MACRO && !accept_arg &&
+	    (f->flags & (FMT_CHILD | FMT_IMPL)) == 0)
+		macro_close(f);
 
-	assert(ps->cur != NULL);
-
 	/*
-	 * 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 (ps->node != NODE_TEXT) {
-		for (i = 0; i < sz; i++)
-			if ( ! isspace((unsigned char)p[i]))
-				break;
-		if (i == sz)
-			return;
-		p += i;
-		sz -= i;
-		dat = calloc(1, sizeof(struct pnode));
-		if (dat == NULL) {
-			perror(NULL);
-			exit(1);
-		}
 
-		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(ps->root != NULL);
+	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");
+		accept_arg = 1;
+		f->flags |= FMT_CHILD;
+		nn->spc = 1;
 	}
 
-	/* Append to current buffer. */
-	assert(sz >= 0);
-	ps->cur->b = realloc(ps->cur->b,
-		ps->cur->bsz + (size_t)sz);
-	if (ps->cur->b == NULL) {
-		perror(NULL);
-		exit(1);
+	switch (f->linestate) {
+	case LINE_NEW:
+		break;
+	case LINE_TEXT:
+		if (n->spc) {
+			if (n->node == NODE_TEXT)
+				macro_close(f);
+			else
+				putchar(' ');
+		}
+		break;
+	case LINE_MACRO:
+		if (accept_arg)
+			putchar(' ');
+		else
+			macro_close(f);
+		break;
 	}
-	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(pn->node == NODE_TEXT);
-	for ( ; pn->bsz > 0; pn->bsz--)
-		if ( ! isspace((unsigned char)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;
-	const struct node *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 || strcmp(name, "xi:include") == 0)
+	if (n->node == NODE_ESCAPE) {
+		fputs(n->b, stdout);
+		if (f->linestate == LINE_NEW)
+			f->linestate = LINE_TEXT;
 		return;
-
-	/* Close out text node, if applicable... */
-	if (ps->node == NODE_TEXT) {
-		pnode_trim(ps->cur);
-		ps->cur = ps->cur->parent;
-		ps->node = ps->cur->node;
 	}
 
-	for (node = nodes; node->name != NULL; node++)
-		if (strcmp(node->name, name) == 0)
-			break;
-
-	if (node->name == NULL) {
-		if (ps->node == NODE_ROOT)
-			return;
-		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 (ps->node == NODE_ROOT && ps->root != NULL) {
-		fprintf(stderr, "%s:%zu:%zu: multiple refentries\n",
-			ps->fname, XML_GetCurrentLineNumber(ps->xml),
-			XML_GetCurrentColumnNumber(ps->xml));
-		ps->stop = 1;
-		return;
-	}
-
-	if (node->node == NODE_INLINEEQUATION)
-		ps->flags |= PARSE_EQN;
-
-	if ((dat = calloc(1, sizeof(struct pnode))) == NULL) {
-		perror(NULL);
-		exit(1);
-	}
-
-	dat->node = ps->node = node->node;
-	dat->parent = ps->cur;
-	TAILQ_INIT(&dat->childq);
-	TAILQ_INIT(&dat->attrq);
-
-	if (ps->cur != NULL)
-		TAILQ_INSERT_TAIL(&ps->cur->childq, dat, child);
-
-	ps->cur = dat;
-	if (ps->root == NULL)
-		ps->root = dat;
-
 	/*
-	 * Process attributes.
+	 * Remove the prefix '-' from <option> elements
+	 * because the arguments of .Fl macros do not need it.
 	 */
-	for (att = atts; *att != NULL; att += 2) {
-		for (key = 0; key < ATTRKEY__MAX; key++)
-			if (strcmp(*att, attrkeys[key]) == 0)
-				break;
-		if (key == ATTRKEY__MAX) {
-			if (warn)
-				fprintf(stderr, "%s:%zu:%zu: warning: "
-					"unknown attribute \"%s\"\n",
-					ps->fname,
-					XML_GetCurrentLineNumber(ps->xml),
-					XML_GetCurrentColumnNumber(ps->xml),
-					*att);
-			continue;
-		}
-		for (val = 0; val < ATTRVAL__MAX; val++)
-			if (strcmp(att[1], attrvals[val]) == 0)
-				break;
-		pattr = calloc(1, sizeof(struct pattr));
-		pattr->key = key;
-		pattr->val = val;
-		if (val == ATTRVAL__MAX)
-			pattr->rawval = strdup(att[1]);
-		TAILQ_INSERT_TAIL(&dat->attrq, pattr, child);
-	}
 
-}
+	if (n->parent != NULL && n->parent->node == NODE_OPTION && *cp == '-')
+		cp++;
 
-/*
- * 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)
-{
-	struct parse	*ps = arg;
-
-	/* FIXME: find a better way to ditch other namespaces. */
-	if (ps->stop || ps->node == NODE_ROOT)
-		return;
-	else if (strcmp(name, "xi:include") == 0)
-		return;
-
-	/* Close out text node, if applicable... */
-	if (ps->node == NODE_TEXT) {
-		pnode_trim(ps->cur);
-		ps->cur = ps->cur->parent;
-		ps->node = ps->cur->node;
-	}
-
-	if ((ps->cur = ps->cur->parent) == NULL)
-		ps->node = NODE_ROOT;
+	if (f->linestate == LINE_MACRO)
+		macro_addarg(f, cp, 0);
 	else
-		ps->node = ps->cur->node;
+		print_text(f, cp, 0);
 }
 
-/*
- * Recursively free a node (NULL is ok).
- */
 static void
-pnode_free(struct pnode *pn)
+pnode_printpara(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
-	struct pattr	*ap;
+	struct pnode	*np;
 
-	if (pn == NULL)
+	if (n->parent == NULL)
 		return;
 
-	while ((pp = TAILQ_FIRST(&pn->childq)) != NULL) {
-		TAILQ_REMOVE(&pn->childq, pp, child);
-		pnode_free(pp);
-	}
+	if ((np = TAILQ_PREV(n, pnodeq, child)) == NULL)
+	    np = n->parent;
 
-	while ((ap = TAILQ_FIRST(&pn->attrq)) != NULL) {
-		TAILQ_REMOVE(&pn->attrq, ap, child);
-		free(ap->rawval);
-		free(ap);
-	}
+	f->flags = 0;
 
-	free(pn->real);
-	free(pn);
-}
-
-/*
- * Unlink a node from its parent and pnode_free() it.
- */
-static void
-pnode_unlink(struct pnode *pn)
-{
-	if (pn->parent != NULL)
-		TAILQ_REMOVE(&pn->parent->childq, pn, child);
-	pnode_free(pn);
-}
-
-/*
- * 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));
-}
-
-/*
- * Retrieve an enumeration attribute from a node.
- * Return ATTRVAL__MAX if the node has no such attribute.
- */
-enum attrval
-pnode_getattr(struct pnode *pn, enum attrkey key)
-{
-	struct pattr	*ap;
-
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ap->key == key)
-			return ap->val;
-	return ATTRVAL__MAX;
-}
-
-/*
- * Retrieve an attribute string from a node.
- * Return defval if the node has no such attribute.
- */
-const char *
-pnode_getattr_raw(struct pnode *pn, enum attrkey key, const char *defval)
-{
-	struct pattr	*ap;
-
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ap->key == key)
-			return ap->val == ATTRVAL__MAX ? ap->rawval :
-			    attrvals[ap->val];
-	return defval;
-}
-
-/*
- * Reset the lookaside buffer.
- */
-static void
-bufclear(struct parse *p)
-{
-
-	p->b[p->bsz = 0] = '\0';
-}
-
-/*
- * Append NODE_TEXT contents to the current buffer, reallocating its
- * size if necessary.
- * The buffer is ALWAYS NUL-terminated.
- */
-static void
-bufappend(struct parse *p, struct pnode *pn)
-{
-
-	assert(pn->node == NODE_TEXT);
-	if (p->bsz + pn->bsz + 1 > p->mbsz) {
-		p->mbsz = p->bsz + pn->bsz + 1;
-		if ((p->b = realloc(p->b, p->mbsz)) == NULL) {
-			perror(NULL);
-			exit(1);
-		}
-	}
-	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 (pn->node == NODE_TEXT)
-		bufappend(p, pn);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		bufappend_r(p, pp);
-}
-
-/*
- * 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 (res != NULL)
-			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 (p->newln == 0 && (fl & MACROLINE_NOWS) == 0)
-		putchar(' ');
-
-	bufclear(p);
-	bufappend_r(p, pn);
-
-	/* Convert all space to spaces. */
-	for (cp = p->b; *cp != '\0'; cp++)
-		if (isspace((unsigned char)*cp))
-			*cp = ' ';
-
-	for (cp = p->b; isspace((unsigned char)*cp); cp++)
-		/* Spin past whitespace (XXX: necessary?) */ ;
-	for ( ; *cp != '\0'; cp++) {
-		/* Escape us if we look like a macro. */
-		if ((cp == p->b || cp[-1] == ' ') &&
-		    isupper((unsigned char)cp[0]) &&
-		    islower((unsigned char)cp[1]) &&
-		    (cp[2] == '\0' || cp[2] == ' ' ||
-		     (islower((unsigned char)cp[2]) &&
-		      (cp[3] == '\0' || cp[3] == ' '))))
-			fputs("\\&", stdout);
-		if (fl & MACROLINE_UPPER)
-			putchar(toupper((unsigned char)*cp));
-		else
-			putchar(*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(p->newln == 0);
-	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 ((pn = TAILQ_NEXT(pn, child)) == NULL) {
-		pnode_printmclose(p, sv);
-		return;
-	} else if (pn->node != NODE_TEXT) {
-		pnode_printmclose(p, sv);
-		return;
-	}
-
-	/* Only do this for the comma/period. */
-	if (pn->bsz > 0 &&
-	    (pn->b[0] == ',' || pn->b[0] == '.') &&
-	    (pn->bsz == 1 || isspace((unsigned char)pn->b[1]))) {
-		putchar(' ');
-		putchar(pn->b[0]);
-		pn->b++;
-		pn->bsz--;
-	}
-
-	putchar('\n');
-	p->newln = 1;
-}
-
-static void
-pnode_printpara(struct parse *p, struct pnode *pn)
-{
-	struct pnode	*pp;
-
-	assert(p->newln);
-	if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL &&
-	    (pp = pn->parent) == NULL)
-		return;
-
-	switch (pp->node) {
+	switch (np->node) {
 	case NODE_ENTRY:
+	case NODE_GLOSSTERM:
 	case NODE_LISTITEM:
+	case NODE_TERM:
 		return;
+	case NODE_APPENDIX:
+	case NODE_LEGALNOTICE:
 	case NODE_PREFACE:
 	case NODE_SECTION:
-		if (p->level < 3)
+		if (f->level < 3)
 			return;
 		break;
 	default:
 		break;
 	}
-	puts(".Pp");
+	macro_line(f, "Pp");
 }
 
 /*
  * If the SYNOPSIS macro has a superfluous title, kill it.
  */
 static void
-pnode_printrefsynopsisdiv(struct parse *p, struct pnode *pn)
+pnode_printrefsynopsisdiv(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc, *nn;
 
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_TITLE) {
-			pnode_unlink(pp);
-			return;
-		}
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn)
+		if (nc->node == NODE_TITLE)
+			pnode_unlink(nc);
+
+	macro_line(f, "Sh SYNOPSIS");
 }
 
 /*
  * Start a hopefully-named `Sh' section.
  */
 static void
-pnode_printrefsect(struct parse *p, struct pnode *pn)
+pnode_printrefsect(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
 	const char	*title;
 	int		 flags, level;
 
-	if (pn->parent == NULL)
+	if (n->parent == NULL)
 		return;
 
-	level = ++p->level;
-	flags = level == 1 ? MACROLINE_UPPER : 0;
+	level = ++f->level;
+	flags = ARG_SPACE;
+	if (level == 1)
+		flags |= ARG_UPPER;
 	if (level < 3) {
-		switch (pn->node) {
+		switch (n->node) {
 		case NODE_CAUTION:
 		case NODE_NOTE:
 		case NODE_TIP:
@@ -774,15 +195,21 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 		}
 	}
 
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_TITLE)
+	TAILQ_FOREACH(nc, &n->childq, child)
+		if (nc->node == NODE_TITLE)
 			break;
 
-	if (pp == NULL) {
-		switch (pn->node) {
+	if (nc == NULL) {
+		switch (n->node) {
 		case NODE_PREFACE:
 			title = "Preface";
 			break;
+		case NODE_APPENDIX:
+			title = "Appendix";
+			break;
+		case NODE_LEGALNOTICE:
+			title = "Legal Notice";
+			break;
 		case NODE_CAUTION:
 			title = "Caution";
 			break;
@@ -803,137 +230,94 @@ pnode_printrefsect(struct parse *p, struct pnode *pn)
 
 	switch (level) {
 	case 1:
-		fputs(".Sh", stdout);
+		macro_close(f);
+		macro_open(f, "Sh");
 		break;
 	case 2:
-		fputs(".Ss", stdout);
+		macro_close(f);
+		macro_open(f, "Ss");
 		break;
 	default:
-		pnode_printpara(p, pn);
-		fputs(".Sy", stdout);
+		pnode_printpara(f, n);
+		macro_open(f, "Sy");
 		break;
 	}
 
-	if (pp != NULL) {
-		p->newln = 0;
-		pnode_printmacrolinetext(p, pp, flags);
-		pnode_printmclose(p, 1);
-		pnode_unlink(pp);
+	if (nc != NULL) {
+		macro_addnode(f, nc, flags);
+		pnode_unlink(nc);
 	} else
-		printf(" %s\n", title);
+		macro_addarg(f, title, flags | ARG_QUOTED);
+	macro_close(f);
 }
 
 /*
  * Start a reference, extracting the title and volume.
  */
 static void
-pnode_printciterefentry(struct parse *p, struct pnode *pn)
+pnode_printciterefentry(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp, *title, *manvol;
+	struct pnode	*nc, *title, *manvol;
 
 	title = manvol = NULL;
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_MANVOLNUM)
-			manvol = pp;
-		else if (pp->node == NODE_REFENTRYTITLE)
-			title = pp;
-
-	if (title != NULL)
-		pnode_printmacrolinepart(p, title);
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		if (nc->node == NODE_MANVOLNUM)
+			manvol = nc;
+		else if (nc->node == NODE_REFENTRYTITLE)
+			title = nc;
+	}
+	macro_open(f, "Xr");
+	if (title == NULL)
+		macro_addarg(f, "unknown", ARG_SPACE);
 	else
-		fputs(" unknown ", stdout);
-
-	if (manvol == NULL) {
-		puts(" 1");
-		p->newln = 1;
-	} else
-		pnode_printmacrolinepart(p, manvol);
+		macro_addnode(f, title, ARG_SPACE | ARG_SINGLE);
+	if (manvol == NULL)
+		macro_addarg(f, "1", ARG_SPACE);
+	else
+		macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE);
+	pnode_unlinksub(n);
 }
 
 static void
-pnode_printrefmeta(struct parse *p, struct pnode *pn)
+pnode_printrefmeta(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp, *title, *manvol;
+	struct pnode	*nc, *title, *manvol;
 
 	title = manvol = NULL;
-	assert(p->newln);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_MANVOLNUM)
-			manvol = pp;
-		else if (pp->node == NODE_REFENTRYTITLE)
-			title = pp;
-
-	fputs(".Dt", stdout);
-	p->newln = 0;
-
-	if (title != NULL)
-		pnode_printmacrolinetext(p, title, MACROLINE_UPPER);
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		if (nc->node == NODE_MANVOLNUM)
+			manvol = nc;
+		else if (nc->node == NODE_REFENTRYTITLE)
+			title = nc;
+	}
+	macro_close(f);
+	macro_open(f, "Dt");
+	if (title == NULL)
+		macro_addarg(f, "UNKNOWN", ARG_SPACE);
 	else
-		fputs(" UNKNOWN ", stdout);
-
-	if (manvol == NULL) {
-		puts(" 1");
-		p->newln = 1;
-	} else
-		pnode_printmacroline(p, manvol);
+		macro_addnode(f, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER);
+	if (manvol == NULL)
+		macro_addarg(f, "1", ARG_SPACE);
+	else
+		macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE);
+	macro_close(f);
+	pnode_unlink(n);
 }
 
 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 (pp->node == NODE_TEXT)
-			ftype = pp;
-		else if (pp->node == NODE_FUNCTION)
-			func = pp;
-
-	if (ftype != NULL) {
-		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 (func != NULL) {
-		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 (pp->node == NODE_TEXT)
-			ptype = pp;
-		else if (pp->node == NODE_PARAMETER)
-			param = pp;
-
-	fputs(".Fa \"", stdout);
-	p->newln = 0;
-	if (ptype != NULL) {
-		pnode_printmacrolinetext(p, ptype, MACROLINE_NOWS);
-		putchar(' ');
-	}
-
-	if (param != NULL)
-		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
@@ -941,21 +325,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 *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
 
-	printf("left %s ", pnode_getattr_raw(pn, ATTRKEY_OPEN, "("));
+	printf("left %s ", pnode_getattr_raw(n, ATTRKEY_OPEN, "("));
 
-	pp = TAILQ_FIRST(&pn->childq);
-	pnode_print(p, pp);
+	nc = TAILQ_FIRST(&n->childq);
+	pnode_print(f, nc);
 
-	while ((pp = TAILQ_NEXT(pp, child)) != NULL) {
+	while ((nc = TAILQ_NEXT(nc, child)) != NULL) {
 		putchar(',');
-		pnode_print(p, pp);
+		pnode_print(f, nc);
 	}
-
-	printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")"));
+	printf("right %s ", pnode_getattr_raw(n, ATTRKEY_CLOSE, ")"));
+	pnode_unlinksub(n);
 }
 
 /*
@@ -965,14 +349,14 @@ 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 *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
 
-	pp = TAILQ_FIRST(&pn->childq);
-	pnode_print(p, pp);
+	nc = TAILQ_FIRST(&n->childq);
+	pnode_print(f, nc);
 
-	switch (pn->node) {
+	switch (n->node) {
 	case NODE_MML_MSUP:
 		fputs(" sup ", stdout);
 		break;
@@ -986,31 +370,31 @@ pnode_printmath(struct parse *p, struct pnode *pn)
 		break;
 	}
 
-	pp = TAILQ_NEXT(pp, child);
-	pnode_print(p, pp);
+	nc = TAILQ_NEXT(nc, child);
+	pnode_print(f, nc);
+	pnode_unlinksub(n);
 }
 
 static void
-pnode_printfuncprototype(struct parse *p, struct pnode *pn)
+pnode_printfuncprototype(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp, *fdef;
+	struct pnode	*nc, *fdef;
 
-	assert(p->newln);
-	TAILQ_FOREACH(fdef, &pn->childq, child)
+	TAILQ_FOREACH(fdef, &n->childq, child)
 		if (fdef->node == NODE_FUNCDEF)
 			break;
 
-	if (fdef != NULL)
-		pnode_printfuncdef(p, fdef);
-	else
-		puts(".Fo UNKNOWN");
+	if (fdef != NULL) {
+		pnode_printfuncdef(f, fdef);
+		pnode_unlink(fdef);
+	} else
+		macro_line(f, "Fo UNKNOWN");
 
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_PARAMDEF)
-			pnode_printparamdef(p, pp);
+	TAILQ_FOREACH(nc, &n->childq, child)
+		macro_nodeline(f, "Fa", nc, ARG_SINGLE);
 
-	puts(".Fc");
-	p->newln = 1;
+	macro_line(f, "Fc");
+	pnode_unlinksub(n);
 }
 
 /*
@@ -1021,48 +405,58 @@ 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 *f, struct pnode *n)
 {
-	struct pnode	*pp;
-	struct pattr	*ap;
-	int		 isop, isrep;
+	struct pnode	*nc;
+	struct pattr	*a;
+	int		 isop, isrep, was_impl;
 
 	isop = 1;
-	isrep = 0;
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ap->key == ATTRKEY_CHOICE &&
-		    (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ))
+	isrep = was_impl = 0;
+	TAILQ_FOREACH(a, &n->attrq, child) {
+		if (a->key == ATTRKEY_CHOICE &&
+		    (a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ))
 			isop = 0;
-		else if (ap->key == ATTRKEY_REP && ap->val == ATTRVAL_REPEAT)
+		else if (a->key == ATTRKEY_REP && a->val == ATTRVAL_REPEAT)
 			isrep = 1;
-
+	}
 	if (isop) {
-		pnode_printmopen(p);
-		fputs("Op", stdout);
+		if (f->flags & FMT_IMPL) {
+			was_impl = 1;
+			macro_open(f, "Oo");
+		} else {
+			macro_open(f, "Op");
+			f->flags |= FMT_IMPL;
+		}
 	}
 
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		if (pp->node == NODE_TEXT) {
-			pnode_printmopen(p);
-			fputs("Ar", stdout);
-		}
-		pnode_print(p, pp);
-		if (isrep && pp->node == NODE_TEXT)
-			fputs("...", stdout);
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		if (nc->node == NODE_TEXT)
+			macro_open(f, "Ar");
+		pnode_print(f, nc);
+		if (isrep && nc->node == NODE_TEXT)
+			macro_addarg(f, "...", ARG_SPACE);
 	}
+	if (isop) {
+		if (was_impl)
+			macro_open(f, "Oc");
+		else
+			f->flags &= ~FMT_IMPL;
+	}
+	pnode_unlinksub(n);
 }
 
 static void
-pnode_printgroup(struct parse *p, struct pnode *pn)
+pnode_printgroup(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp, *np;
-	struct pattr	*ap;
+	struct pnode	*nc, *nn;
+	struct pattr	*a;
 	int		 isop, sv;
 
 	isop = 1;
-	TAILQ_FOREACH(ap, &pn->attrq, child)
-		if (ap->key == ATTRKEY_CHOICE &&
-		    (ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) {
+	TAILQ_FOREACH(a, &n->attrq, child)
+		if (a->key == ATTRKEY_CHOICE &&
+		    (a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ)) {
 			isop = 0;
 			break;
 		}
@@ -1072,12 +466,12 @@ 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 = f->linestate == LINE_NEW;
 	if (isop)
-		fputs("Op", stdout);
+		macro_open(f, "Op");
 	else if (sv)
-		fputs("No", stdout);
+		macro_open(f, "No");
+	f->flags |= FMT_IMPL;
 
 	/*
 	 * Keep on printing text separated by the vertical bar as long
@@ -1087,43 +481,166 @@ pnode_printgroup(struct parse *p, struct pnode *pn)
 	 * FIXME: if there's a "Fl", we don't cut off the leading "-"
 	 * like we do in pnode_print().
 	 */
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		pnode_print(p, pp);
-		np = TAILQ_NEXT(pp, child);
-		while (np != NULL) {
-			if (pp->node != np->node)
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		pnode_print(f, nc);
+		nn = TAILQ_NEXT(nc, child);
+		while (nn != NULL) {
+			if (nc->node != nn->node)
 				break;
-			fputs(" |", stdout);
-			pnode_printmacrolinepart(p, np);
-			pp = np;
-			np = TAILQ_NEXT(np, child);
+			macro_addarg(f, "|", ARG_SPACE);
+			macro_addnode(f, nn, ARG_SPACE);
+			nc = nn;
+			nn = TAILQ_NEXT(nn, child);
 		}
 	}
+	if (sv)
+		macro_close(f);
+	f->flags &= ~FMT_IMPL;
+	pnode_unlinksub(n);
+}
 
-	pnode_printmclose(p, sv);
+static void
+pnode_printauthor(struct format *f, struct pnode *n)
+{
+	struct pnode	*nc, *nn;
+	int		 have_contrib, have_name;
+
+	/*
+	 * Print <contrib> children up front, before the .An scope,
+	 * and figure out whether we a name of a person.
+	 */
+
+	have_contrib = have_name = 0;
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
+		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 (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, nn) {
+		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) {
+		f->flags |= FMT_CHILD;
+		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_printprologue(struct parse *p, struct pnode *pn)
+pnode_printlink(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
+	const char	*uri, *text;
 
-	pp = p->root == NULL ? NULL :
-		pnode_findfirst(p->root, NODE_REFMETA);
+	uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL);
+	if (uri != NULL) {
+		if (TAILQ_FIRST(&n->childq) != NULL) {
+			TAILQ_FOREACH(nc, &n->childq, child)
+				pnode_print(f, nc);
+			text = "";
+		} else if ((text = pnode_getattr_raw(n,
+		    ATTRKEY_ENDTERM, NULL)) != NULL) {
+			if (f->linestate == LINE_MACRO && f->flags & FMT_ARG)
+				macro_addarg(f, text, ARG_SPACE);
+			else
+				print_text(f, text, ARG_SPACE);
+		}
+		if (text != NULL) {
+			if (f->flags & FMT_IMPL)
+				macro_open(f, "Po");
+			else {
+				macro_open(f, "Pq");
+				f->flags |= FMT_CHILD;
+			}
+		}
+		macro_open(f, "Sx");
+		macro_addarg(f, uri, ARG_SPACE);
+		if (text != NULL && f->flags & FMT_IMPL)
+			macro_open(f, "Pc");
+		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;
+	}
+}
 
-	puts(".Dd $Mdocdate" "$");
-	if (pp != NULL) {
-		pnode_printrefmeta(p, pp);
-		pnode_unlink(pp);
+static void
+pnode_printprologue(struct format *f, struct ptree *tree)
+{
+	struct pnode	*refmeta;
+
+	refmeta = tree->root == NULL ? NULL :
+	    pnode_findfirst(tree->root, NODE_REFMETA);
+
+	macro_line(f, "Dd $Mdocdate" "$");
+	if (refmeta == NULL) {
+		macro_open(f, "Dt");
+		macro_addarg(f,
+		    pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"),
+		    ARG_SPACE | ARG_SINGLE | ARG_UPPER);
+		macro_addarg(f, "1", ARG_SPACE);
+		macro_close(f);
 	} else
-		printf(".Dt %s 1\n",
-		    pnode_getattr_raw(p->root, ATTRKEY_ID, "UNKNOWN"));
-	puts(".Os");
+		pnode_printrefmeta(f, refmeta);
+	macro_line(f, "Os");
 
-	if (p->flags & PARSE_EQN) {
-		puts(".EQ");
-		puts("delim $$");
-		puts(".EN");
+	if (tree->flags & TREE_EQN) {
+		macro_line(f, "EQ");
+		print_text(f, "delim $$", 0);
+		macro_line(f, "EN");
 	}
 }
 
@@ -1132,125 +649,160 @@ pnode_printprologue(struct parse *p, struct pnode *pn)
  * we should comma-separate as list headers.
  */
 static void
-pnode_printvarlistentry(struct parse *p, struct pnode *pn)
+pnode_printvarlistentry(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc, *nn;
 	int		 first = 1;
 
-	assert(p->newln);
-	fputs(".It", stdout);
-	p->newln = 0;
+	macro_open(f, "It");
+	f->flags |= FMT_IMPL;
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
+		if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM)
+			continue;
+		if (first == 0) {
+			switch (f->linestate) {
+			case LINE_NEW:
+				break;
+			case LINE_TEXT:
+				print_text(f, ",", 0);
+				break;
+			case LINE_MACRO:
+				macro_addarg(f, ",", 0);
+				break;
+			}
+		}
+		pnode_print(f, nc);
+		pnode_unlink(nc);
+		first = 0;
+	}
+	macro_close(f);
+	while ((nc = TAILQ_FIRST(&n->childq)) != NULL) {
+		pnode_print(f, nc);
+		pnode_unlink(nc);
+	}
+	macro_close(f);
+}
 
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_TERM) {
-			if ( ! first)
-				putchar(',');
-			pnode_print(p, pp);
-			pnode_unlink(pp);
-			first = 0;
-		} else
-			break;
+static void
+pnode_printtitle(struct format *f, struct pnode *n)
+{
+	struct pnode	*nc, *nn;
 
-	putchar('\n');
-	p->newln = 1;
+	TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) {
+		if (nc->node == NODE_TITLE) {
+			pnode_printpara(f, nc);
+			pnode_print(f, nc);
+			pnode_unlink(nc);
+		}
+	}
 }
 
 static void
-pnode_printrow(struct parse *p, struct pnode *pn)
+pnode_printrow(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
 
-	puts(".Bl -dash -compact");
-
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		assert(p->newln);
-		puts(".It");
-		pnode_print(p, pp);
-		pnode_printmclose(p, 1);
+	macro_line(f, "Bl -dash -compact");
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		macro_line(f, "It");
+		pnode_print(f, nc);
 	}
-	assert(p->newln);
-	puts(".El");
+	macro_line(f, "El");
+	pnode_unlink(n);
 }
 
 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 (pp->node == NODE_TITLE) {
-			pnode_printpara(p, pp);
-			pnode_print(p, pp);
-			pnode_unlink(pp);
-		}
-	assert(p->newln);
-	puts(".Bl -ohang");
-	while ((pp = pnode_findfirst(pn, NODE_ROW)) != NULL) {
-		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 (pp->node == NODE_TITLE) {
-			pnode_printpara(p, 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_open(f, "It");
+		f->flags |= FMT_IMPL;
+		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 (pn->node == NODE_ORDEREDLIST)
-		puts(".Bl -enum");
-	else
-		puts(".Bl -bullet");
+static void
+pnode_printtgroup(struct format *f, struct pnode *n)
+{
+	struct pnode	*nc;
 
-	TAILQ_FOREACH(pp, &pn->childq, child) {
-		assert(p->newln);
-		puts(".It");
-		pnode_print(p, pp);
-		pnode_printmclose(p, 1);
+	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;
 	}
-	assert(p->newln);
-	puts(".El");
+
+	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_printvariablelist(struct parse *p, struct pnode *pn)
+pnode_printlist(struct format *f, struct pnode *n)
 {
-	struct pnode	*pp;
+	struct pnode	*nc;
 
-	assert(p->newln);
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node == NODE_TITLE) {
-			pnode_printpara(p, pp);
-			pnode_print(p, pp);
-			pnode_unlink(pp);
-		}
+	pnode_printtitle(f, n);
+	macro_argline(f, "Bl",
+	    n->node == NODE_ORDEREDLIST ? "-enum" : "-bullet");
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		macro_line(f, "It");
+		pnode_print(f, nc);
+	}
+	macro_line(f, "El");
+	pnode_unlinksub(n);
+}
 
-	assert(p->newln);
-	puts(".Bl -tag -width Ds");
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		if (pp->node != NODE_VARLISTENTRY) {
-			assert(p->newln);
-			fputs(".It", stdout);
-			pnode_printmacroline(p, pp);
-		} else {
-			assert(p->newln);
-			pnode_print(p, pp);
-		}
-	assert(p->newln);
-	puts(".El");
+static void
+pnode_printvariablelist(struct format *f, struct pnode *n)
+{
+	struct pnode	*nc;
+
+	pnode_printtitle(f, n);
+	macro_line(f, "Bl -tag -width Ds");
+	TAILQ_FOREACH(nc, &n->childq, child) {
+		if (nc->node == NODE_VARLISTENTRY)
+			pnode_printvarlistentry(f, nc);
+		else
+			macro_nodeline(f, "It", nc, 0);
+	}
+	macro_line(f, "El");
+	pnode_unlinksub(n);
 }
 
 /*
@@ -1260,383 +812,267 @@ 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 *f, struct pnode *n)
 {
-	struct pnode	*pp;
-	const char	*ccp;
-	char		*cp;
-	int		 last, sv;
+	struct pnode	*nc, *nn;
+	enum linestate	 sv;
 
-	if (pn == NULL)
+	if (n == NULL)
 		return;
 
-	sv = p->newln;
+	sv = f->linestate;
+	if (n->spc)
+		f->flags &= ~FMT_NOSPC;
+	else
+		f->flags |= FMT_NOSPC;
 
-	switch (pn->node) {
+	switch (n->node) {
 	case NODE_APPLICATION:
-		pnode_printmopen(p);
-		fputs("Nm", stdout);
+		macro_open(f, "Nm");
 		break;
-	case NODE_ANCHOR:
-		/* Don't print anything! */
-		return;
 	case NODE_ARG:
-		pnode_printarg(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printarg(f, n);
 		break;
 	case NODE_AUTHOR:
-		pnode_printmopen(p);
-		fputs("An", stdout);
+		pnode_printauthor(f, n);
 		break;
 	case NODE_AUTHORGROUP:
-		assert(p->newln);
-		puts(".An -split");
+		macro_line(f, "An -split");
 		break;
+	case NODE_BLOCKQUOTE:
+		macro_line(f, "Bd -ragged -offset indent");
+		break;
 	case NODE_BOOKINFO:
-		assert(p->newln);
-		puts(".Sh NAME");
+		macro_line(f, "Sh NAME");
 		break;
 	case NODE_CITEREFENTRY:
-		pnode_printmopen(p);
-		fputs("Xr", stdout);
-		pnode_printciterefentry(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printciterefentry(f, n);
 		break;
-	case NODE_CODE:
-		pnode_printmopen(p);
-		fputs("Li", stdout);
+	case NODE_CITETITLE:
+		macro_open(f, "%T");
 		break;
 	case NODE_COMMAND:
-		pnode_printmopen(p);
-		fputs("Nm", stdout);
+		macro_open(f, "Nm");
 		break;
 	case NODE_CONSTANT:
-		pnode_printmopen(p);
-		fputs("Dv", stdout);
+		macro_open(f, "Dv");
 		break;
 	case NODE_EDITOR:
-		puts("editor: ");
-		pnode_printmopen(p);
-		fputs("An", stdout);
+		print_text(f, "editor:", ARG_SPACE);
+		sv = LINE_TEXT;
+		macro_open(f, "An");
 		break;
 	case NODE_EMAIL:
-		pnode_printmopen(p);
-		fputs("Aq Mt", stdout);
+		macro_open(f, "Aq Mt");
 		break;
 	case NODE_EMPHASIS:
 	case NODE_FIRSTTERM:
-		pnode_printmopen(p);
-		fputs("Em", stdout);
+	case NODE_GLOSSTERM:
+		macro_open(f, "Em");
 		break;
 	case NODE_ENVAR:
-		pnode_printmopen(p);
-		fputs("Ev", stdout);
+		macro_open(f, "Ev");
 		break;
+	case NODE_ERRORNAME:
+		macro_open(f, "Er");
+		break;
 	case NODE_FILENAME:
-		pnode_printmopen(p);
-		fputs("Pa", stdout);
+		macro_open(f, "Pa");
 		break;
 	case NODE_FUNCTION:
-		pnode_printmopen(p);
-		fputs("Fn", stdout);
+		macro_open(f, "Fn");
 		break;
 	case NODE_FUNCPROTOTYPE:
-		assert(p->newln);
-		pnode_printfuncprototype(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printfuncprototype(f, n);
 		break;
 	case NODE_FUNCSYNOPSISINFO:
-		pnode_printmopen(p);
-		fputs("Fd", stdout);
+		macro_open(f, "Fd");
 		break;
-	case NODE_INDEXTERM:
-		return;
 	case NODE_INFORMALEQUATION:
-		if ( ! p->newln)
-			putchar('\n');
-		puts(".EQ");
-		p->newln = 0;
+		macro_line(f, "EQ");
 		break;
 	case NODE_INLINEEQUATION:
-		fputc('$', stdout);
-		p->newln = 0;
+		if (f->linestate == LINE_NEW)
+			f->linestate = LINE_TEXT;
+		putchar('$');
 		break;
 	case NODE_ITEMIZEDLIST:
-		assert(p->newln);
-		pnode_printlist(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printlist(f, n);
 		break;
 	case NODE_GROUP:
-		pnode_printgroup(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printgroup(f, n);
 		break;
 	case NODE_KEYSYM:
-		pnode_printmopen(p);
-		fputs("Sy", stdout);
+		macro_open(f, "Sy");
 		break;
-	case NODE_LEGALNOTICE:
-		assert(p->newln);
-		puts(".Sh LEGAL NOTICE");
-		break;
 	case NODE_LINK:
-		ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL);
-		if (ccp == NULL)
-			break;
-		pnode_printmopen(p);
-		printf("Sx %s\n", ccp);
-		p->newln = 1;
-		return;
+		pnode_printlink(f, n);
+		break;
 	case NODE_LITERAL:
-		pnode_printmopen(p);
-		fputs("Li", stdout);
+		macro_open(f, "Ql");
 		break;
 	case NODE_LITERALLAYOUT:
-		assert(p->newln);
-		printf(".Bd %s\n", pnode_getattr(pn, ATTRKEY_CLASS) ==
+		macro_close(f);
+		macro_argline(f, "Bd", pnode_getattr(n, ATTRKEY_CLASS) ==
 		    ATTRVAL_MONOSPACED ? "-literal" : "-unfilled");
 		break;
+	case NODE_MARKUP:
+		macro_open(f, "Ic");
+		break;
 	case NODE_MML_MFENCED:
-		pnode_printmathfenced(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printmathfenced(f, n);
 		break;
 	case NODE_MML_MROW:
 	case NODE_MML_MI:
 	case NODE_MML_MN:
 	case NODE_MML_MO:
-		if (TAILQ_EMPTY(&pn->childq))
+		if (TAILQ_EMPTY(&n->childq))
 			break;
 		fputs(" { ", stdout);
 		break;
 	case NODE_MML_MFRAC:
 	case NODE_MML_MSUB:
 	case NODE_MML_MSUP:
-		pnode_printmath(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printmath(f, n);
 		break;
 	case NODE_OPTION:
-		pnode_printmopen(p);
-		fputs("Fl", stdout);
+		macro_open(f, "Fl");
 		break;
 	case NODE_ORDEREDLIST:
-		assert(p->newln);
-		pnode_printlist(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printlist(f, n);
 		break;
 	case NODE_PARA:
-		pnode_printpara(p, pn);
+		pnode_printpara(f, n);
 		break;
+	case NODE_PARAMDEF:
 	case NODE_PARAMETER:
-		/* Suppress non-text children... */
-		pnode_printmopen(p);
-		fputs("Fa \"", stdout);
-		pnode_printmacrolinetext(p, pn, MACROLINE_NOWS);
-		fputs("\"", stdout);
-		pnode_unlinksub(pn);
+		/* More often, these appear inside NODE_FUNCPROTOTYPE. */
+		macro_open(f, "Fa");
+		macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
+		pnode_unlinksub(n);
 		break;
 	case NODE_QUOTE:
-		pnode_printmopen(p);
-		fputs("Qo", stdout);
+		macro_open(f, "Qo");
 		break;
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
-		assert(p->newln);
-		puts(".Bd -literal");
+	case NODE_SYNOPSIS:
+		macro_line(f, "Bd -literal");
 		break;
 	case NODE_REFENTRYINFO:
 		/* Suppress. */
-		pnode_unlinksub(pn);
+		pnode_unlinksub(n);
 		break;
-	case NODE_REFMETA:
-		abort();
-		break;
 	case NODE_REFNAME:
 		/* Suppress non-text children... */
-		pnode_printmopen(p);
-		fputs("Nm", stdout);
-		p->newln = 0;
-		pnode_printmacrolinepart(p, pn);
-		pnode_unlinksub(pn);
+		macro_open(f, "Nm");
+		macro_addnode(f, n, ARG_SPACE | ARG_SINGLE);
+		pnode_unlinksub(n);
 		break;
 	case NODE_REFNAMEDIV:
-		assert(p->newln);
-		puts(".Sh NAME");
+		macro_line(f, "Sh NAME");
 		break;
 	case NODE_REFPURPOSE:
-		assert(p->newln);
-		pnode_printmopen(p);
-		fputs("Nd", stdout);
+		macro_open(f, "Nd");
 		break;
 	case NODE_REFSYNOPSISDIV:
-		assert(p->newln);
-		pnode_printrefsynopsisdiv(p, pn);
-		puts(".Sh SYNOPSIS");
+		pnode_printrefsynopsisdiv(f, n);
 		break;
 	case NODE_PREFACE:
 	case NODE_SECTION:
+	case NODE_APPENDIX:
+	case NODE_LEGALNOTICE:
 	case NODE_NOTE:
 	case NODE_TIP:
 	case NODE_CAUTION:
 	case NODE_WARNING:
-		assert(p->newln);
-		pnode_printrefsect(p, pn);
+		pnode_printrefsect(f, n);
 		break;
 	case NODE_REPLACEABLE:
-		pnode_printmopen(p);
-		fputs("Ar", stdout);
+		macro_open(f, "Ar");
 		break;
 	case NODE_SBR:
-		assert(p->newln);
-		puts(".br");
+		macro_line(f, "br");
 		break;
-	case NODE_SGMLTAG:
-		pnode_printmopen(p);
-		fputs("Li", stdout);
+	case NODE_TEXT:
+	case NODE_ESCAPE:
+		pnode_printtext(f, n);
 		break;
-	case NODE_STRUCTNAME:
-		pnode_printmopen(p);
-		fputs("Vt", stdout);
+	case NODE_TGROUP:
+		pnode_printtgroup(f, n);
 		break;
-	case NODE_TABLE:
-	case NODE_INFORMALTABLE:
-		assert(p->newln);
-		pnode_printtable(p, pn);
-		pnode_unlinksub(pn);
-		break;
-	case NODE_TEXT:
-		if (p->newln == 0)
-			putchar(' ');
-
-		bufclear(p);
-		bufappend(p, pn);
-
-		if (p->bsz == 0) {
-			assert(pn->real != pn->b);
+	case NODE_TITLE:
+		if (n->parent != NULL &&
+		    n->parent->node == NODE_BOOKINFO) {
+			macro_open(f, "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 (pn->parent != NULL &&
-		    pn->parent->node == NODE_OPTION &&
-		    *cp == '-')
-			cp++;
-		for (last = '\n'; *cp != '\0'; ) {
-			if (last == '\n') {
-				/* Consume all whitespace. */
-				if (isspace((unsigned char)*cp)) {
-					while (isspace((unsigned char)*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(f, n);
+		macro_nodeline(f, "Sy", n, 0);
+		pnode_unlinksub(n);
 		break;
-	case NODE_TITLE:
-		if (pn->parent->node == NODE_BOOKINFO) {
-			pnode_printmopen(p);
-			fputs("Nd", stdout);
-		}
-		break;
 	case NODE_TYPE:
-		pnode_printmopen(p);
-		fputs("Vt", stdout);
+		macro_open(f, "Vt");
 		break;
-	case NODE_USERINPUT:
-		pnode_printmopen(p);
-		fputs("Li", stdout);
-		break;
 	case NODE_VARIABLELIST:
-		assert(p->newln);
-		pnode_printvariablelist(p, pn);
-		pnode_unlinksub(pn);
+		pnode_printvariablelist(f, n);
 		break;
-	case NODE_VARLISTENTRY:
-		assert(p->newln);
-		pnode_printvarlistentry(p, pn);
-		break;
 	case NODE_VARNAME:
-		pnode_printmopen(p);
-		fputs("Va", stdout);
+		macro_open(f, "Va");
 		break;
 	default:
 		break;
 	}
 
-	TAILQ_FOREACH(pp, &pn->childq, child)
-		pnode_print(p, pp);
+	TAILQ_FOREACH(nc, &n->childq, child)
+		pnode_print(f, nc);
 
-	switch (pn->node) {
+	switch (n->node) {
+	case NODE_ESCAPE:
+	case NODE_TERM:
+	case NODE_TEXT:
+		/* Accept more arguments to the previous macro. */
+		return;
 	case NODE_INFORMALEQUATION:
-		if ( ! p->newln)
-			putchar('\n');
-		puts(".EN");
-		p->newln = 1;
+		macro_line(f, "EN");
 		break;
 	case NODE_INLINEEQUATION:
 		fputs("$ ", stdout);
-		p->newln = sv;
+		f->linestate = sv;
 		break;
+	case NODE_MEMBER:
+		if ((nn = TAILQ_NEXT(n, child)) != NULL &&
+		    nn->node != NODE_MEMBER)
+			nn = NULL;
+		switch (f->linestate) {
+		case LINE_TEXT:
+			if (nn != NULL)
+				print_text(f, ",", 0);
+			break;
+		case LINE_MACRO:
+			if (nn != NULL)
+				macro_addarg(f, ",", ARG_SPACE);
+			macro_close(f);
+			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))
+		if (TAILQ_EMPTY(&n->childq))
 			break;
 		fputs(" } ", stdout);
 		break;
-	case NODE_APPLICATION:
-	case NODE_ARG:
-	case NODE_AUTHOR:
-	case NODE_CITEREFENTRY:
-	case NODE_CODE:
-	case NODE_COMMAND:
-	case NODE_CONSTANT:
-	case NODE_EDITOR:
-	case NODE_EMAIL:
-	case NODE_EMPHASIS:
-	case NODE_ENVAR:
-	case NODE_FILENAME:
-	case NODE_FIRSTTERM:
-	case NODE_FUNCTION:
-	case NODE_FUNCSYNOPSISINFO:
-	case NODE_KEYSYM:
-	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);
-		break;
 	case NODE_QUOTE:
-		pnode_printmclose(p, sv);
-		sv = p->newln;
-		pnode_printmopen(p);
-		fputs("Qc", stdout);
-		pnode_printmclose(p, sv);
+		if (sv == LINE_NEW)
+			macro_close(f);
+		sv = f->linestate;
+		macro_open(f, "Qc");
+		if (sv == LINE_NEW)
+			macro_close(f);
 		break;
 	case NODE_REFNAME:
 		/*
@@ -1644,153 +1080,51 @@ pnode_print(struct parse *p, struct pnode *pn)
 		 * <refname> macros in sequence, then print out a
 		 * trailing comma before the newline.
 		 */
-		if (pn->parent != NULL &&
-		    pn->parent->node == NODE_REFNAMEDIV &&
-		    TAILQ_NEXT(pn, child) != NULL &&
-		    TAILQ_NEXT(pn, child)->node == NODE_REFNAME)
-			fputs(" ,", stdout);
-		pnode_printmclose(p, sv);
+		if (n->parent != NULL &&
+		    n->parent->node == NODE_REFNAMEDIV &&
+		    TAILQ_NEXT(n, child) != NULL &&
+		    TAILQ_NEXT(n, child)->node == NODE_REFNAME)
+			macro_addarg(f, ",", ARG_SPACE);
+		if (sv == LINE_NEW)
+			macro_close(f);
 		break;
 	case NODE_PREFACE:
 	case NODE_SECTION:
+	case NODE_APPENDIX:
+	case NODE_LEGALNOTICE:
 	case NODE_NOTE:
 	case NODE_TIP:
 	case NODE_CAUTION:
 	case NODE_WARNING:
-		p->level--;
+		f->level--;
 		break;
+	case NODE_BLOCKQUOTE:
 	case NODE_LITERALLAYOUT:
 	case NODE_PROGRAMLISTING:
 	case NODE_SCREEN:
-		assert(p->newln);
-		puts(".Ed");
-		p->newln = 1;
+	case NODE_SYNOPSIS:
+		macro_line(f, "Ed");
 		break;
 	case NODE_TITLE:
-		if (pn->parent->node == NODE_BOOKINFO) {
-			pnode_printmclose(p, 1);
-			puts(".Sh AUTHORS");
-		}
+		if (n->parent != NULL &&
+		    n->parent->node == NODE_BOOKINFO)
+			macro_line(f, "Sh AUTHORS");
 		break;
 	default:
 		break;
 	}
+	f->flags &= ~FMT_ARG;
 }
 
-/*
- * 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 ((rc = XML_Parse(xp, b, ssz, 0 == ssz)) == 0)
-			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 rc != 0 && p.stop == 0;
-	}
-
-	/* 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 = 1;
-
-	while ((ch = getopt(argc, argv, "W")) != -1)
-		switch (ch) {
-		case 'W':
-			warn = 1;
-			break;
-		default:
-			goto usage;
-		}
-
-	argc -= optind;
-	argv += optind;
-
-	if (argc > 1) {
-		fprintf(stderr, "%s: Too many arguments\n", argv[1]);
-		goto usage;
-	} else if (argc > 0)
-		fname = argv[0];
-
-	/* Read from stdin or a file. */
-	fd = strcmp(fname, "-") == 0 ?
-		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 (fd == -1)
-		perror(fname);
-	else if ((buf = malloc(4096)) == NULL)
-		perror(NULL);
-	else if ((xp = XML_ParserCreate(NULL)) == NULL)
-		perror(NULL);
-	else if (readfile(xp, fd, buf, 4096, fname))
-		rc = 0;
-
-	XML_ParserFree(xp);
-	free(buf);
-	if (fd != STDIN_FILENO)
-		close(fd);
-	return rc;
-
-usage:
-	fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname);
-	return 1;
+	formatter.level = 0;
+	formatter.linestate = LINE_NEW;
+	pnode_printprologue(&formatter, tree);
+	pnode_print(&formatter, tree->root);
+	if (formatter.linestate != LINE_NEW)
+		putchar('\n');
 }