===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.18
retrieving revision 1.57
diff -u -p -r1.18 -r1.57
--- mandoc/mdoc.c	2009/01/05 17:57:08	1.18
+++ mandoc/mdoc.c	2009/03/08 20:57:35	1.57
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.18 2009/01/05 17:57:08 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.57 2009/03/08 20:57:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,6 +26,20 @@
 
 #include "private.h"
 
+/*
+ * Main caller in the libmdoc library.  This begins the parsing routine,
+ * handles allocation of data, and so forth.  Most of the "work" is done
+ * in macro.c and validate.c.
+ */
+
+static	struct mdoc_node *mdoc_node_alloc(const struct mdoc *);
+static	int		  mdoc_node_append(struct mdoc *, 
+				struct mdoc_node *);
+
+static	int		  parsetext(struct mdoc *, int, char *);
+static	int		  parsemacro(struct mdoc *, int, char *);
+
+
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"\\\"",		"Dd",		"Dt",		"Os",
 	"Sh",		"Ss",		"Pp",		"D1",
@@ -56,7 +70,8 @@ const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"Tn",		"Ux",		"Xc",		"Xo",
 	"Fo",		"Fc",		"Oo",		"Oc",
 	"Bk",		"Ek",		"Bt",		"Hf",
-	"Fr",		"Ud",
+	"Fr",		"Ud",		"Lb",		"Ap",
+	"Lp"
 	};
 
 const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
@@ -67,153 +82,27 @@ const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
 	"tag",			"diag",			"hang",		 
 	"ohang",		"inset",		"column",	 
 	"width",		"compact",		"std",	 
-	"p1003.1-88",		"p1003.1-90",		"p1003.1-96",
-	"p1003.1-2001",		"p1003.1-2004",		"p1003.1",
-	"p1003.1b",		"p1003.1b-93",		"p1003.1c-95",
-	"p1003.1g-2000",	"p1003.2-92",		"p1387.2-95",
-	"p1003.2",		"p1387.2",		"isoC-90",
-	"isoC-amd1",		"isoC-tcor1",		"isoC-tcor2",
-	"isoC-99",		"ansiC",		"ansiC-89",
-	"ansiC-99",		"ieee754",		"iso8802-3",
-	"xpg3",			"xpg4",			"xpg4.2",
-	"xpg4.3",		"xbd5",			"xcu5",
-	"xsh5",			"xns5",			"xns5.2d2.0",
-	"xcurses4.2",		"susv2",		"susv3",
-	"svid4",		"filled",		"words",
-	"emphasis",		"symbolic",
+	"filled",		"words",		"emphasis",
+	"symbolic"
 	};
 
-const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-	{ NULL, 0 }, /* \" */
-	{ macro_prologue, MDOC_PROLOGUE }, /* Dd */
-	{ macro_prologue, MDOC_PROLOGUE }, /* Dt */
-	{ macro_prologue, MDOC_PROLOGUE }, /* Os */
-	{ macro_scoped, 0 }, /* Sh */
-	{ macro_scoped, 0 }, /* Ss */ 
-	{ macro_text, 0 }, /* Pp */ 
-	{ macro_scoped_line, 0 }, /* D1 */
-	{ macro_scoped_line, 0 }, /* Dl */
-	{ macro_scoped, MDOC_EXPLICIT }, /* Bd */
-	{ macro_close_explicit, 0 }, /* Ed */
-	{ macro_scoped, MDOC_EXPLICIT }, /* Bl */
-	{ macro_close_explicit, 0 }, /* El */
-	{ macro_scoped, MDOC_NESTED }, /* It */
-	{ macro_text, MDOC_CALLABLE }, /* Ad */ 
-	{ macro_constant, 0 }, /* An */ 
-	{ macro_text, MDOC_CALLABLE }, /* Ar */
-	{ macro_constant, MDOC_QUOTABLE }, /* Cd */
-	{ macro_text, MDOC_CALLABLE }, /* Cm */
-	{ macro_text, MDOC_CALLABLE }, /* Dv */ 
-	{ macro_text, MDOC_CALLABLE }, /* Er */ 
-	{ macro_text, MDOC_CALLABLE }, /* Ev */ 
-	{ macro_constant, 0 }, /* Ex */
-	{ macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fa */ 
-	{ macro_constant, 0 }, /* Fd */ 
-	{ macro_text, MDOC_CALLABLE }, /* Fl */
-	{ macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fn */ 
-	{ macro_text, 0 }, /* Ft */ 
-	{ macro_text, MDOC_CALLABLE }, /* Ic */ 
-	{ macro_constant, 0 }, /* In */ 
-	{ macro_text, MDOC_CALLABLE }, /* Li */
-	{ macro_constant, 0 }, /* Nd */ 
-	{ macro_text, MDOC_CALLABLE }, /* Nm */ 
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Op */
-	{ macro_obsolete, 0 }, /* Ot */
-	{ macro_text, MDOC_CALLABLE }, /* Pa */
-	{ macro_constant, 0 }, /* Rv */
-	{ macro_constant, 0 }, /* St */
-	{ macro_text, MDOC_CALLABLE }, /* Va */
-	{ macro_text, MDOC_CALLABLE }, /* Vt */ 
-	{ macro_text, MDOC_CALLABLE }, /* Xr */
-	{ macro_constant, MDOC_QUOTABLE }, /* %A */
-	{ macro_constant, MDOC_QUOTABLE }, /* %B */
-	{ macro_constant, MDOC_QUOTABLE }, /* %D */
-	{ macro_constant, MDOC_QUOTABLE }, /* %I */
-	{ macro_constant, MDOC_QUOTABLE }, /* %J */
-	{ macro_constant, MDOC_QUOTABLE }, /* %N */
-	{ macro_constant, MDOC_QUOTABLE }, /* %O */
-	{ macro_constant, MDOC_QUOTABLE }, /* %P */
-	{ macro_constant, MDOC_QUOTABLE }, /* %R */
-	{ macro_constant, MDOC_QUOTABLE }, /* %T */
-	{ macro_constant, MDOC_QUOTABLE }, /* %V */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Ac */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Ao */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Aq */
-	{ macro_constant, 0 }, /* At */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Bc */
-	{ macro_scoped, MDOC_EXPLICIT }, /* Bf */ 
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Bo */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Bq */
-	{ macro_constant_delimited, 0 }, /* Bsx */
-	{ macro_constant_delimited, 0 }, /* Bx */
-	{ macro_constant, 0 }, /* Db */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Dc */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Do */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Dq */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Ec */
-	{ macro_close_explicit, 0 }, /* Ef */
-	{ macro_text, MDOC_CALLABLE }, /* Em */ 
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Eo */
-	{ macro_constant_delimited, 0 }, /* Fx */
-	{ macro_text, 0 }, /* Ms */
-	{ macro_constant_delimited, MDOC_CALLABLE }, /* No */
-	{ macro_constant_delimited, MDOC_CALLABLE }, /* Ns */
-	{ macro_constant_delimited, 0 }, /* Nx */
-	{ macro_constant_delimited, 0 }, /* Ox */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Pc */
-	{ macro_constant, 0 }, /* Pf */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Po */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Pq */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Qc */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Ql */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Qo */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Qq */
-	{ macro_close_explicit, 0 }, /* Re */
-	{ macro_scoped, MDOC_EXPLICIT }, /* Rs */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Sc */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* So */
-	{ macro_scoped_line, MDOC_CALLABLE }, /* Sq */
-	{ macro_constant, 0 }, /* Sm */
-	{ macro_text, MDOC_CALLABLE }, /* Sx */
-	{ macro_text, MDOC_CALLABLE }, /* Sy */
-	{ macro_text, MDOC_CALLABLE }, /* Tn */
-	{ macro_constant_delimited, 0 }, /* Ux */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Xc */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Xo */
-	{ macro_scoped, MDOC_EXPLICIT }, /* Fo */ /* XXX - supposed to be (but isn't) callable. */
-	{ macro_close_explicit, 0 }, /* Fc */ /* XXX - supposed to be (but isn't) callable. */
-	{ macro_constant_scoped, MDOC_CALLABLE }, /* Oo */
-	{ macro_close_explicit, MDOC_CALLABLE }, /* Oc */
-	{ macro_scoped, MDOC_EXPLICIT }, /* Bk */
-	{ macro_close_explicit, 0 }, /* Ek */
-	{ macro_constant, 0 }, /* Bt */
-	{ macro_constant, 0 }, /* Hf */
-	{ macro_obsolete, 0 }, /* Fr */
-	{ macro_constant, 0 }, /* Ud */
-};
-
 const	char * const *mdoc_macronames = __mdoc_macronames;
 const	char * const *mdoc_argnames = __mdoc_argnames;
-const	struct mdoc_macro * const mdoc_macros = __mdoc_macros;
 
 
-static	struct mdoc_arg	 *argdup(size_t, const struct mdoc_arg *);
-static	void		  argfree(size_t, struct mdoc_arg *);
-static	void	  	  argcpy(struct mdoc_arg *, 
-				const struct mdoc_arg *);
+const struct mdoc_node *
+mdoc_node(const struct mdoc *mdoc)
+{
 
-static	void		  mdoc_node_freelist(struct mdoc_node *);
-static	void		  mdoc_node_append(struct mdoc *, int, 
-				struct mdoc_node *);
-static	void		  mdoc_elem_free(struct mdoc_elem *);
-static	void		  mdoc_text_free(struct mdoc_text *);
+	return(mdoc->first);
+}
 
 
-const struct mdoc_node *
-mdoc_result(struct mdoc *mdoc)
+const struct mdoc_meta *
+mdoc_meta(const struct mdoc *mdoc)
 {
 
-	return(mdoc->first);
+	return(&mdoc->meta);
 }
 
 
@@ -225,364 +114,339 @@ mdoc_free(struct mdoc *mdoc)
 		mdoc_node_freelist(mdoc->first);
 	if (mdoc->htab)
 		mdoc_tokhash_free(mdoc->htab);
-	
+	if (mdoc->meta.title)
+		free(mdoc->meta.title);
+	if (mdoc->meta.os)
+		free(mdoc->meta.os);
+	if (mdoc->meta.name)
+		free(mdoc->meta.name);
+	if (mdoc->meta.arch)
+		free(mdoc->meta.arch);
+	if (mdoc->meta.vol)
+		free(mdoc->meta.vol);
+
 	free(mdoc);
 }
 
 
 struct mdoc *
-mdoc_alloc(void *data, const struct mdoc_cb *cb)
+mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
 {
 	struct mdoc	*p;
 
 	p = xcalloc(1, sizeof(struct mdoc));
 
 	p->data = data;
-	(void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
+	if (cb)
+		(void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 
+	p->last = xcalloc(1, sizeof(struct mdoc_node));
+	p->last->type = MDOC_ROOT;
+	p->first = p->last;
+	p->pflags = pflags;
+	p->next = MDOC_NEXT_CHILD;
 	p->htab = mdoc_tokhash_alloc();
+
 	return(p);
 }
 
 
 int
-mdoc_parseln(struct mdoc *mdoc, char *buf)
+mdoc_endparse(struct mdoc *mdoc)
 {
-	int		  c, i;
-	char		  tmp[5];
 
-	if ('.' != *buf) {
-		if (SEC_PROLOGUE == mdoc->sec_lastn)
-			return(mdoc_err(mdoc, -1, 0, ERR_SYNTAX_NOTEXT));
-		mdoc_word_alloc(mdoc, 0, buf);
-		mdoc->next = MDOC_NEXT_SIBLING;
+	if (MDOC_HALT & mdoc->flags)
+		return(0);
+	if (NULL == mdoc->first)
 		return(1);
+
+	assert(mdoc->last);
+	if ( ! macro_end(mdoc)) {
+		mdoc->flags |= MDOC_HALT;
+		return(0);
 	}
+	return(1);
+}
 
-	if (buf[1] && '\\' == buf[1])
-		if (buf[2] && '\"' == buf[2])
-			return(1);
 
-	i = 1;
-	while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp))
-		i++;
+/*
+ * Main parse routine.  Parses a single line -- really just hands off to
+ * the macro or text parser.
+ */
+int
+mdoc_parseln(struct mdoc *m, int ln, char *buf)
+{
 
-	if (i == (int)sizeof(tmp))
-		return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP));
-	else if (i <= 2)
-		return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP));
+	/* If in error-mode, then we parse no more. */
 
-	i--;
+	if (MDOC_HALT & m->flags)
+		return(0);
 
-	(void)memcpy(tmp, buf + 1, (size_t)i);
-	tmp[i++] = 0;
-
-	if (MDOC_MAX == (c = mdoc_find(mdoc, tmp)))
-		return(mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP));
-
-	while (buf[i] && isspace(buf[i]))
-		i++;
-
-	return(mdoc_macro(mdoc, c, 1, &i, buf));
+	return('.' == *buf ? parsemacro(m, ln, buf) :
+			parsetext(m, ln, buf));
 }
 
 
 void
-mdoc_msg(struct mdoc *mdoc, int pos, const char *fmt, ...)
+mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
 {
-	va_list		 ap;
-	char		 buf[256];
+	char		  buf[256];
+	va_list		  ap;
 
 	if (NULL == mdoc->cb.mdoc_msg)
 		return;
 
 	va_start(ap, fmt);
-	(void)vsnprintf(buf, sizeof(buf), fmt, ap);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
 	va_end(ap);
-
-	(*mdoc->cb.mdoc_msg)(mdoc->data, pos, buf);
+	(*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf);
 }
 
 
 int
-mdoc_err(struct mdoc *mdoc, int tok, int pos, enum mdoc_err type)
+mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
+		const char *fmt, ...)
 {
+	char		 buf[256];
+	va_list		 ap;
 
 	if (NULL == mdoc->cb.mdoc_err)
 		return(0);
-	return((*mdoc->cb.mdoc_err)(mdoc->data, tok, pos, type));
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
 }
 
 
 int
-mdoc_warn(struct mdoc *mdoc, int tok, int pos, enum mdoc_warn type)
+mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
+		enum mdoc_warn type, const char *fmt, ...)
 {
+	char		 buf[256];
+	va_list		 ap;
 
 	if (NULL == mdoc->cb.mdoc_warn)
 		return(0);
-	return((*mdoc->cb.mdoc_warn)(mdoc->data, tok, pos, type));
+
+	va_start(ap, fmt);
+	(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+	va_end(ap);
+	return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));
 }
 
 
 int
-mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf)
+mdoc_macro(struct mdoc *m, int tok, 
+		int ln, int pp, int *pos, char *buf)
 {
 
-	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
-			SEC_PROLOGUE == mdoc->sec_lastn)
-		return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+	/* FIXME - these should happen during validation. */
 
-	if (NULL == (mdoc_macros[tok].fp)) {
-		(void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP);
-		return(0);
-	}
+	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
+			SEC_PROLOGUE != m->lastnamed)
+		return(mdoc_perr(m, ln, pp, 
+				"disallowed in document body"));
 
-	if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-		(void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTCALL);
-		return(0);
-	}
+	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
+			SEC_PROLOGUE == m->lastnamed)
+		return(mdoc_perr(m, ln, pp, 
+				"disallowed in prologue"));
 
-	return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf));
+	if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
+		return(mdoc_perr(m, ln, pp, "not callable"));
+
+	return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
 
 
-static void
-mdoc_node_append(struct mdoc *mdoc, int pos, struct mdoc_node *p)
+static int
+mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
 {
-	const char	 *nn, *on, *nt, *ot, *act;
 
-	switch (p->type) {
-	case (MDOC_TEXT):
-		nn = p->data.text.string;
-		nt = "text";
-		break;
-	case (MDOC_BODY):
-		nn = mdoc_macronames[p->data.body.tok];
-		nt = "body";
-		break;
-	case (MDOC_ELEM):
-		nn = mdoc_macronames[p->data.elem.tok];
-		nt = "elem";
-		break;
-	case (MDOC_HEAD):
-		nn = mdoc_macronames[p->data.head.tok];
-		nt = "head";
-		break;
-	case (MDOC_TAIL):
-		nn = mdoc_macronames[p->data.tail.tok];
-		nt = "tail";
-		break;
-	case (MDOC_BLOCK):
-		nn = mdoc_macronames[p->data.block.tok];
-		nt = "block";
-		break;
-	default:
-		abort();
-		/* NOTREACHED */
-	}
+	assert(mdoc->last);
+	assert(mdoc->first);
+	assert(MDOC_ROOT != p->type);
 
-	if (NULL == mdoc->first) {
-		assert(NULL == mdoc->last);
-		mdoc->first = p;
-		mdoc->last = p;
-		mdoc_msg(mdoc, pos, "parse: root %s `%s'", nt, nn);
-		return;
-	}
-
-	switch (mdoc->last->type) {
-	case (MDOC_TEXT):
-		on = "<text>";
-		ot = "text";
-		break;
-	case (MDOC_BODY):
-		on = mdoc_macronames[mdoc->last->data.body.tok];
-		ot = "body";
-		break;
-	case (MDOC_ELEM):
-		on = mdoc_macronames[mdoc->last->data.elem.tok];
-		ot = "elem";
-		break;
-	case (MDOC_HEAD):
-		on = mdoc_macronames[mdoc->last->data.head.tok];
-		ot = "head";
-		break;
-	case (MDOC_TAIL):
-		on = mdoc_macronames[mdoc->last->data.tail.tok];
-		ot = "tail";
-		break;
-	case (MDOC_BLOCK):
-		on = mdoc_macronames[mdoc->last->data.block.tok];
-		ot = "block";
-		break;
-	default:
-		abort();
-		/* NOTREACHED */
-	}
-
 	switch (mdoc->next) {
 	case (MDOC_NEXT_SIBLING):
 		mdoc->last->next = p;
 		p->prev = mdoc->last;
 		p->parent = mdoc->last->parent;
-		act = "sibling";
 		break;
 	case (MDOC_NEXT_CHILD):
 		mdoc->last->child = p;
 		p->parent = mdoc->last;
-		act = "child";
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	mdoc_msg(mdoc, pos, "parse: %s `%s' %s of %s `%s'", 
-			nt, nn, act, ot, on);
+	if ( ! mdoc_valid_pre(mdoc, p))
+		return(0);
 
+	switch (p->type) {
+	case (MDOC_HEAD):
+		assert(MDOC_BLOCK == p->parent->type);
+		p->parent->head = p;
+		break;
+	case (MDOC_TAIL):
+		assert(MDOC_BLOCK == p->parent->type);
+		p->parent->tail = p;
+		break;
+	case (MDOC_BODY):
+		assert(MDOC_BLOCK == p->parent->type);
+		p->parent->body = p;
+		break;
+	default:
+		break;
+	}
+
 	mdoc->last = p;
+	return(1);
 }
 
 
-void
-mdoc_tail_alloc(struct mdoc *mdoc, int pos, int tok)
+static struct mdoc_node *
+mdoc_node_alloc(const struct mdoc *mdoc)
 {
 	struct mdoc_node *p;
 
+	p = xcalloc(1, sizeof(struct mdoc_node));
+	p->sec = mdoc->lastsec;
+
+	return(p);
+}
+
+
+int
+mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+{
+	struct mdoc_node *p;
+
 	assert(mdoc->first);
 	assert(mdoc->last);
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
 
+	p->line = line;
+	p->pos = pos;
 	p->type = MDOC_TAIL;
-	p->data.tail.tok = tok;
+	p->tok = tok;
 
-	mdoc_node_append(mdoc, pos, p);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-void
-mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok)
+int
+mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok)
 {
 	struct mdoc_node *p;
 
 	assert(mdoc->first);
 	assert(mdoc->last);
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
 
+	p->line = line;
+	p->pos = pos;
 	p->type = MDOC_HEAD;
-	p->data.head.tok = tok;
+	p->tok = tok;
 
-	mdoc_node_append(mdoc, pos, p);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-void
-mdoc_body_alloc(struct mdoc *mdoc, int pos, int tok)
+int
+mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok)
 {
 	struct mdoc_node *p;
 
 	assert(mdoc->first);
 	assert(mdoc->last);
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
 
+	p->line = line;
+	p->pos = pos;
 	p->type = MDOC_BODY;
-	p->data.body.tok = tok;
+	p->tok = tok;
 
-	mdoc_node_append(mdoc, pos, p);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-void
-mdoc_block_alloc(struct mdoc *mdoc, int pos, int tok,
-		size_t argsz, const struct mdoc_arg *args)
+int
+mdoc_root_alloc(struct mdoc *mdoc)
 {
 	struct mdoc_node *p;
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
 
-	p->type = MDOC_BLOCK;
-	p->data.block.tok = tok;
-	p->data.block.argc = argsz;
-	p->data.block.argv = argdup(argsz, args);
+	p->type = MDOC_ROOT;
 
-	mdoc_node_append(mdoc, pos, p);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-void
-mdoc_elem_alloc(struct mdoc *mdoc, int pos, int tok, 
-		size_t argsz, const struct mdoc_arg *args)
+int
+mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
+		int tok, struct mdoc_arg *args)
 {
 	struct mdoc_node *p;
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
-	p->type = MDOC_ELEM;
-	p->data.elem.tok = tok;
-	p->data.elem.argc = argsz;
-	p->data.elem.argv = argdup(argsz, args);
+	p = mdoc_node_alloc(mdoc);
 
-	mdoc_node_append(mdoc, pos, p);
-}
+	p->pos = pos;
+	p->line = line;
+	p->type = MDOC_BLOCK;
+	p->tok = tok;
+	p->args = args;
 
+	if (args)
+		(args->refcnt)++;
 
-void
-mdoc_word_alloc(struct mdoc *mdoc, int pos, const char *word)
-{
-	struct mdoc_node *p;
-
-	p = xcalloc(1, sizeof(struct mdoc_node));
-	p->type = MDOC_TEXT;
-	p->data.text.string = xstrdup(word);
-
-	mdoc_node_append(mdoc, pos, p);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-static void
-argfree(size_t sz, struct mdoc_arg *p)
+int
+mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
+		int tok, struct mdoc_arg *args)
 {
-	int		 i, j;
+	struct mdoc_node *p;
 
-	if (0 == sz)
-		return;
+	p = mdoc_node_alloc(mdoc);
 
-	assert(p);
-	/* LINTED */
-	for (i = 0; i < (int)sz; i++)
-		if (p[i].sz > 0) {
-			assert(p[i].value);
-			/* LINTED */
-			for (j = 0; j < (int)p[i].sz; j++)
-				free(p[i].value[j]);
-		}
-	free(p);
-}
+	p->line = line;
+	p->pos = pos;
+	p->type = MDOC_ELEM;
+	p->tok = tok;
+	p->args = args;
 
+	if (args)
+		(args->refcnt)++;
 
-static void
-mdoc_elem_free(struct mdoc_elem *p)
-{
-
-	argfree(p->argc, p->argv);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-static void
-mdoc_block_free(struct mdoc_block *p)
+int
+mdoc_word_alloc(struct mdoc *mdoc, 
+		int line, int pos, const char *word)
 {
+	struct mdoc_node *p;
 
-	argfree(p->argc, p->argv);
-}
+	p = mdoc_node_alloc(mdoc);
 
+	p->line = line;
+	p->pos = pos;
+	p->type = MDOC_TEXT;
+	p->string = xstrdup(word);
 
-static void
-mdoc_text_free(struct mdoc_text *p)
-{
-
-	if (p->string)
-		free(p->string);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
@@ -590,25 +454,15 @@ void
 mdoc_node_free(struct mdoc_node *p)
 {
 
-	switch (p->type) {
-	case (MDOC_TEXT):
-		mdoc_text_free(&p->data.text);
-		break;
-	case (MDOC_ELEM):
-		mdoc_elem_free(&p->data.elem);
-		break;
-	case (MDOC_BLOCK):
-		mdoc_block_free(&p->data.block);
-		break;
-	default:
-		break;
-	}
-
+	if (p->string)
+		free(p->string);
+	if (p->args)
+		mdoc_argv_free(p->args);
 	free(p);
 }
 
 
-static void
+void
 mdoc_node_freelist(struct mdoc_node *p)
 {
 
@@ -621,41 +475,80 @@ mdoc_node_freelist(struct mdoc_node *p)
 }
 
 
-int
-mdoc_find(const struct mdoc *mdoc, const char *key)
+/*
+ * Parse free-form text, that is, a line that does not begin with the
+ * control character.
+ */
+static int
+parsetext(struct mdoc *mdoc, int line, char *buf)
 {
 
-	return(mdoc_tokhash_find(mdoc->htab, key));
+	if (SEC_PROLOGUE == mdoc->lastnamed)
+		return(mdoc_perr(mdoc, line, 0,
+			"text disallowed in prologue"));
+
+	if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
+		return(0);
+
+	mdoc->next = MDOC_NEXT_SIBLING;
+	return(1);
 }
 
 
-static void
-argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src)
+/*
+ * Parse a macro line, that is, a line beginning with the control
+ * character.
+ */
+int
+parsemacro(struct mdoc *m, int ln, char *buf)
 {
-	int		 i;
+	int		  i, c;
+	char		  mac[5];
 
-	dst->arg = src->arg;
-	if (0 == (dst->sz = src->sz))
-		return;
-	dst->value = xcalloc(dst->sz, sizeof(char *));
-	for (i = 0; i < (int)dst->sz; i++)
-		dst->value[i] = xstrdup(src->value[i]);
-}
+	/* Comments are quickly ignored. */
 
+	if (buf[1] && '\\' == buf[1])
+		if (buf[2] && '\"' == buf[2])
+			return(1);
 
-static struct mdoc_arg *
-argdup(size_t argsz, const struct mdoc_arg *args)
-{
-	struct mdoc_arg	*pp;
-	int		 i;
+	/* Copy the first word into a nil-terminated buffer. */
 
-	if (0 == argsz)
-		return(NULL);
+	for (i = 1; i < 5; i++) {
+		if (0 == (mac[i - 1] = buf[i]))
+			break;
+		else if (isspace((unsigned char)buf[i]))
+			break;
+	}
 
-	pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg));
-	for (i = 0; i < (int)argsz; i++)
-		argcpy(&pp[i], &args[i]);
+	/* FIXME: be able to skip unknown macro lines! */
 
-	return(pp);
-}
+	mac[i - 1] = 0;
 
+	if (i == 5 || i <= 2) {
+		(void)mdoc_perr(m, ln, 1, "unknown macro: %s%s", 
+				mac, i == 5 ? "..." : "");
+		goto err;
+	} 
+	
+	if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {
+		(void)mdoc_perr(m, ln, 1, "unknown macro: %s", mac);
+		goto err;
+	}
+
+	/* The macro is sane.  Jump to the next word. */
+
+	while (buf[i] && isspace((unsigned char)buf[i]))
+		i++;
+
+	/* Begin recursive parse sequence. */
+
+	if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
+		goto err;
+
+	return(1);
+
+err:	/* Error out. */
+
+	m->flags |= MDOC_HALT;
+	return(0);
+}