===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.1
retrieving revision 1.51
diff -u -p -r1.1 -r1.51
--- mandoc/mdoc.c	2008/12/15 01:54:58	1.1
+++ mandoc/mdoc.c	2009/03/05 13:12:12	1.51
@@ -1,4 +1,4 @@
-/* $Id: mdoc.c,v 1.1 2008/12/15 01:54:58 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.51 2009/03/05 13:12:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,10 +26,24 @@
 
 #include "private.h"
 
-extern	int	macro_text(struct mdoc *, int, int, int *, char *);
-extern	int	macro_scoped_implicit(struct mdoc *, 
-			int, int, int *, char *);
+/*
+ * 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_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 *);
+
+static	struct mdoc_node *mdoc_node_alloc(const struct mdoc *);
+static	int		  mdoc_node_append(struct mdoc *, 
+				struct mdoc_node *);
+static	void		  mdoc_elem_free(struct mdoc_elem *);
+static	void		  mdoc_text_free(struct mdoc_text *);
+
+
 const	char *const __mdoc_macronames[MDOC_MAX] = {		 
 	"\\\"",		"Dd",		"Dt",		"Os",
 	"Sh",		"Ss",		"Pp",		"D1",
@@ -84,144 +98,26 @@ const	char *const __mdoc_argnames[MDOC_ARG_MAX] = {		 
 	"xsh5",			"xns5",			"xns5.2d2.0",
 	"xcurses4.2",		"susv2",		"susv3",
 	"svid4",		"filled",		"words",
+	"emphasis",		"symbolic",
 	};
 
-const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-	{ NULL, 0 }, /* \" */
-	{ NULL, 0 }, /* Dd */
-	{ NULL, 0 }, /* Dt */
-	{ NULL, 0 }, /* Os */
-	{ macro_scoped_implicit, 0 }, /* Sh */
-	{ macro_scoped_implicit, 0 }, /* Ss */ 
-	{ NULL, 0 }, /* Pp */ 
-	{ NULL, 0 }, /* D1 */
-	{ NULL, 0 }, /* Dl */
-	{ NULL, 0 }, /* Bd */
-	{ NULL, 0 }, /* Ed */
-	{ NULL, 0 }, /* Bl */
-	{ NULL, 0 }, /* El */
-	{ NULL, 0 }, /* It */
-	{ macro_text, MDOC_CALLABLE }, /* Ad */ 
-	{ NULL, 0 }, /* An */ 
-	{ macro_text, MDOC_CALLABLE }, /* Ar */
-	{ NULL, 0 }, /* Cd */
-	{ macro_text, MDOC_CALLABLE }, /* Cm */
-	{ macro_text, MDOC_CALLABLE }, /* Dv */ 
-	{ macro_text, MDOC_CALLABLE }, /* Er */ 
-	{ macro_text, MDOC_CALLABLE }, /* Ev */ 
-	{ NULL, 0 }, /* Ex */
-	{ macro_text, MDOC_CALLABLE }, /* Fa */ 
-	{ NULL, 0 }, /* Fd */ 
-	{ macro_text, MDOC_CALLABLE }, /* Fl */
-	{ NULL, 0 }, /* Fn */ 
-	{ macro_text, 0 }, /* Ft */ 
-	{ macro_text, MDOC_CALLABLE }, /* Ic */ 
-	{ NULL, 0 }, /* In */ 
-	{ macro_text, MDOC_CALLABLE }, /* Li */
-	{ NULL, 0 }, /* Nd */ 
-	{ NULL, 0 }, /* Nm */ 
-	{ NULL, 0 }, /* Op */
-	{ NULL, 0 }, /* Ot */
-	{ macro_text, MDOC_CALLABLE }, /* Pa */
-	{ NULL, 0 }, /* Rv */
-	{ NULL, 0 }, /* St */
-	{ macro_text, MDOC_CALLABLE }, /* Va */
-	{ macro_text, MDOC_CALLABLE }, /* Vt */ 
-	{ NULL, 0 }, /* Xr */
-	{ NULL, 0 }, /* %A */
-	{ NULL, 0 }, /* %B */
-	{ NULL, 0 }, /* %D */
-	{ NULL, 0 }, /* %I */
-	{ NULL, 0 }, /* %J */
-	{ NULL, 0 }, /* %N */
-	{ NULL, 0 }, /* %O */
-	{ NULL, 0 }, /* %P */
-	{ NULL, 0 }, /* %R */
-	{ NULL, 0 }, /* %T */
-	{ NULL, 0 }, /* %V */
-	{ NULL, 0 }, /* Ac */
-	{ NULL, 0 }, /* Ao */
-	{ NULL, 0 }, /* Aq */
-	{ NULL, 0 }, /* At */
-	{ NULL, 0 }, /* Bc */
-	{ NULL, 0 }, /* Bf */ 
-	{ NULL, 0 }, /* Bo */
-	{ NULL, 0 }, /* Bq */
-	{ NULL, 0 }, /* Bsx */
-	{ NULL, 0 }, /* Bx */
-	{ NULL, 0 }, /* Db */
-	{ NULL, 0 }, /* Dc */
-	{ NULL, 0 }, /* Do */
-	{ NULL, 0 }, /* Dq */
-	{ NULL, 0 }, /* Ec */
-	{ NULL, 0 }, /* Ef */
-	{ macro_text, MDOC_CALLABLE }, /* Em */ 
-	{ NULL, 0 }, /* Eo */
-	{ NULL, 0 }, /* Fx */
-	{ macro_text, 0 }, /* Ms */
-	{ NULL, 0 }, /* No */
-	{ NULL, 0 }, /* Ns */
-	{ NULL, 0 }, /* Nx */
-	{ NULL, 0 }, /* Ox */
-	{ NULL, 0 }, /* Pc */
-	{ NULL, 0 }, /* Pf */
-	{ NULL, 0 }, /* Po */
-	{ NULL, 0 }, /* Pq */
-	{ NULL, 0 }, /* Qc */
-	{ NULL, 0 }, /* Ql */
-	{ NULL, 0 }, /* Qo */
-	{ NULL, 0 }, /* Qq */
-	{ NULL, 0 }, /* Re */
-	{ NULL, 0 }, /* Rs */
-	{ NULL, 0 }, /* Sc */
-	{ NULL, 0 }, /* So */
-	{ NULL, 0 }, /* Sq */
-	{ NULL, 0 }, /* Sm */
-	{ NULL, 0 }, /* Sx */
-	{ NULL, 0 }, /* Sy */
-	{ macro_text, MDOC_CALLABLE }, /* Tn */
-	{ NULL, 0 }, /* Ux */
-	{ NULL, 0 }, /* Xc */
-	{ NULL, 0 }, /* Xo */
-	{ NULL, 0 }, /* Fo */ 
-	{ NULL, 0 }, /* Fc */ 
-	{ NULL, 0 }, /* Oo */
-	{ NULL, 0 }, /* Oc */
-	{ NULL, 0 }, /* Bk */
-	{ NULL, 0 }, /* Ek */
-	{ NULL, 0 }, /* Bt */
-	{ NULL, 0 }, /* Hf */
-	{ NULL, 0 }, /* Fr */
-	{ NULL, 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	void	 	 *xcalloc(size_t, size_t);
-static	char	 	 *xstrdup(const char *);
+const struct mdoc_node *
+mdoc_node(const struct mdoc *mdoc)
+{
 
-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 *);
-static	char		**paramdup(size_t, const char **);
-static	void		  paramfree(size_t, char **);
+	return(mdoc->first);
+}
 
-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 *);
 
-
-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);
 }
 
 
@@ -232,8 +128,14 @@ mdoc_free(struct mdoc *mdoc)
 	if (mdoc->first)
 		mdoc_node_freelist(mdoc->first);
 	if (mdoc->htab)
-		mdoc_hash_free(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);
+
 	free(mdoc);
 }
 
@@ -246,346 +148,426 @@ mdoc_alloc(void *data, const struct mdoc_cb *cb)
 	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->htab = mdoc_hash_alloc();
-	return(p);
-}
+	p->last = xcalloc(1, sizeof(struct mdoc_node));
+	p->last->type = MDOC_ROOT;
+	p->first = p->last;
 
+	p->next = MDOC_NEXT_CHILD;
+	p->htab = mdoc_tokhash_alloc();
 
-static void *
-xcalloc(size_t num, size_t sz)
-{
-	void		*p;
-
-	if (NULL == (p = calloc(num, sz)))
-		err(EXIT_FAILURE, "calloc");
 	return(p);
 }
 
 
-static char *
-xstrdup(const char *p)
+int
+mdoc_endparse(struct mdoc *mdoc)
 {
-	char		*pp;
 
-	if (NULL == (pp = strdup(p)))
-		err(EXIT_FAILURE, "strdup");
-	return(pp);
+	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);
 }
 
 
+/*
+ * Main line-parsing routine.  If the line is a macro-line (started with
+ * a '.' control character), then pass along to the parser, which parses
+ * subsequent macros until the end of line.  If normal text, simply
+ * append the entire line to the chain.
+ */
 int
-mdoc_parseln(struct mdoc *mdoc, char *buf)
+mdoc_parseln(struct mdoc *mdoc, int line, char *buf)
 {
 	int		  c, i;
 	char		  tmp[5];
 
-	if ('.' != *buf)  {
-		/* TODO. */
-		return(1); 
+	if (MDOC_HALT & mdoc->flags)
+		return(0);
+
+	mdoc->linetok = 0;
+
+	if ('.' != *buf) {
+		/*
+		 * Free-form text.  Not allowed in the prologue.
+		 */
+		if (SEC_PROLOGUE == mdoc->lastnamed)
+			return(mdoc_perr(mdoc, line, 0, 
+					"no text in prologue"));
+
+		if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
+			return(0);
+		mdoc->next = MDOC_NEXT_SIBLING;
+		return(1);
 	}
 
+	/*
+	 * Control-character detected.  Begin the parsing sequence.
+	 */
+
 	if (buf[1] && '\\' == buf[1])
 		if (buf[2] && '\"' == buf[2])
 			return(1);
 
 	i = 1;
-	while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp))
+	while (buf[i] && ! isspace((u_char)buf[i]) && 
+			i < (int)sizeof(tmp))
 		i++;
 
-	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 (i == (int)sizeof(tmp)) {
+		mdoc->flags |= MDOC_HALT;
+		return(mdoc_perr(mdoc, line, 1, "unknown macro"));
+	} else if (i <= 2) {
+		mdoc->flags |= MDOC_HALT;
+		return(mdoc_perr(mdoc, line, 1, "unknown macro"));
+	}
 
 	i--;
 
-	(void)memcpy(tmp, buf + 1, i);
+	(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));
+	if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) {
+		mdoc->flags |= MDOC_HALT;
+		return(mdoc_perr(mdoc, line, 1, "unknown macro"));
+	}
 
-	while (buf[i] && isspace(buf[i]))
+	while (buf[i] && isspace((u_char)buf[i]))
 		i++;
 
-	if (NULL == (mdoc_macros[c].fp)) {
-		(void)mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP);
+	if ( ! mdoc_macro(mdoc, c, line, 1, &i, buf)) {
+		mdoc->flags |= MDOC_HALT;
 		return(0);
-	} 
+	}
 
-	return((*mdoc_macros[c].fp)(mdoc, c, 1, &i, buf));
+	return(1);
 }
 
 
 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 *mdoc, int tok, 
+		int ln, int ppos, int *pos, char *buf)
 {
 
-	if (NULL == (mdoc_macros[tok].fp)) {
-		(void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP);
-		return(0);
-	} else if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-		(void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTCALL);
-		return(0);
-	}
+	assert(mdoc_macros[tok].fp);
 
-	return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf));
+	if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
+			SEC_PROLOGUE != mdoc->lastnamed)
+		return(mdoc_perr(mdoc, ln, ppos, "macro disallowed in document body"));
+	if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
+			SEC_PROLOGUE == mdoc->lastnamed)
+		return(mdoc_perr(mdoc, ln, ppos, "macro disallowed in document prologue"));
+	if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
+		return(mdoc_perr(mdoc, ln, ppos, "macro not callable"));
+	return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, 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;
+	const char	 *nn, *nt, *on, *ot, *act;
 
+	assert(mdoc->last);
+	assert(mdoc->first);
+	assert(MDOC_ROOT != p->type);
+
+	/* See if we exceed the suggest line-max. */
+
 	switch (p->type) {
 	case (MDOC_TEXT):
-		nn = "<text>";
-		nt = "text";
-		break;
-	case (MDOC_BODY):
-		nn = mdoc_macronames[p->data.body.tok];
-		nt = "body";
-		break;
+		/* FALLTHROUGH */
 	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;
+		/* FALLTHROUGH */
 	case (MDOC_BLOCK):
-		nn = mdoc_macronames[p->data.block.tok];
-		nt = "block";
+		mdoc->linetok++;
 		break;
+	default:
+		break;
 	}
 
-	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;
-	}
+	/* This sort-of works (re-opening of text macros...). */
+	if (mdoc->linetok > MDOC_LINEARG_SOFTMAX) 
+		if ( ! mdoc_nwarn(mdoc, p, WARN_COMPAT, 
+					"suggested %d tokens per line exceeded (has %d)",
+					MDOC_LINEARG_SOFTMAX, mdoc->linetok))
+			return(0);
 
-	switch (mdoc->last->type) {
-	case (MDOC_TEXT):
+	if (MDOC_TEXT == mdoc->last->type)
 		on = "<text>";
-		ot = "text";
+	else if (MDOC_ROOT == mdoc->last->type)
+		on = "<root>";
+	else
+		on = mdoc_macronames[mdoc->last->tok];
+
+	if (MDOC_TEXT == p->type)
+		nn = "<text>";
+	else if (MDOC_ROOT == p->type)
+		nn = "<root>";
+	else
+		nn = mdoc_macronames[p->tok];
+
+	ot = mdoc_type2a(mdoc->last->type);
+	nt = mdoc_type2a(p->type);
+
+	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_BODY):
-		on = mdoc_macronames[mdoc->last->data.body.tok];
-		ot = "body";
+	case (MDOC_NEXT_CHILD):
+		mdoc->last->child = p;
+		p->parent = mdoc->last;
+		act = "child";
 		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_BLOCK):
-		on = mdoc_macronames[mdoc->last->data.block.tok];
-		ot = "block";
-		break;
+	default:
+		abort();
+		/* NOTREACHED */
 	}
 
+	if ( ! mdoc_valid_pre(mdoc, p))
+		return(0);
+
 	switch (p->type) {
-	case (MDOC_BODY):
-		switch (mdoc->last->type) {
-		case (MDOC_BLOCK):
-			p->parent = mdoc->last;
-			mdoc->last->child = p;
-			act = "child";
-			break;
-		case (MDOC_HEAD):
-			p->parent = mdoc->last->parent;
-			mdoc->last->next = p;
-			act = "sibling";
-			break;
-		default:
-			abort();
-			/* NOTREACHED */
-		}
-		break;
 	case (MDOC_HEAD):
-		assert(mdoc->last->type == MDOC_BLOCK);
-		p->parent = mdoc->last;
-		mdoc->last->child = p;
-		act = "child";
+		assert(MDOC_BLOCK == p->parent->type);
+		p->parent->data.block.head = p;
 		break;
+	case (MDOC_TAIL):
+		assert(MDOC_BLOCK == p->parent->type);
+		p->parent->data.block.tail = p;
+		break;
+	case (MDOC_BODY):
+		assert(MDOC_BLOCK == p->parent->type);
+		p->parent->data.block.body = p;
+		break;
 	default:
-		switch (mdoc->last->type) {
-		case (MDOC_BODY):
-			/* FALLTHROUGH */
-		case (MDOC_HEAD):
-			p->parent = mdoc->last->parent;
-			mdoc->last->child = p;
-			act = "child";
-			break;
-		default:
-			p->parent = mdoc->last->parent;
-			mdoc->last->next = p;
-			act = "sibling";
-			break;
-		}
 		break;
 	}
 
-	mdoc_msg(mdoc, pos, "parse: %s `%s' %s %s `%s'", 
-			nt, nn, act, ot, on);
 	mdoc->last = p;
+	mdoc_msg(mdoc, "parse: %s `%s' %s of %s `%s'", 
+			nt, nn, act, ot, on);
+	return(1);
 }
 
 
-void
-mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, 
-		size_t paramsz, const char **params)
+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);
-	assert(mdoc->last->type == MDOC_BLOCK);
-	assert(mdoc->last->data.block.tok == tok);
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
+
+	p->line = line;
+	p->pos = pos;
+	p->type = MDOC_TAIL;
+	p->tok = tok;
+
+	return(mdoc_node_append(mdoc, p));
+}
+
+
+int
+mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+{
+	struct mdoc_node *p;
+
+	assert(mdoc->first);
+	assert(mdoc->last);
+
+	p = mdoc_node_alloc(mdoc);
+
+	p->line = line;
+	p->pos = pos;
 	p->type = MDOC_HEAD;
-	p->data.head.tok = tok;
-	p->data.head.sz = paramsz;
-	p->data.head.args = paramdup(paramsz, params);
+	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);
-	assert((mdoc->last->type == MDOC_BLOCK) ||
-			(mdoc->last->type == MDOC_HEAD));
-	if (mdoc->last->type == MDOC_BLOCK) 
-		assert(mdoc->last->data.block.tok == tok);
-	else
-		assert(mdoc->last->data.head.tok == tok);
 
-	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_ROOT;
+
+	return(mdoc_node_append(mdoc, p));
+}
+
+
+int
+mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
+		int tok, size_t argsz, const struct mdoc_arg *args)
+{
+	struct mdoc_node *p;
+
+	p = mdoc_node_alloc(mdoc);
+
+	p->pos = pos;
+	p->line = line;
 	p->type = MDOC_BLOCK;
-	p->data.block.tok = tok;
+	p->tok = tok;
 	p->data.block.argc = argsz;
 	p->data.block.argv = argdup(argsz, args);
 
-	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, 
-		size_t paramsz, const char **params)
+int
+mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
+		int tok, size_t argsz, const struct mdoc_arg *args)
 {
 	struct mdoc_node *p;
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
+
+	p->line = line;
+	p->pos = pos;
 	p->type = MDOC_ELEM;
-	p->data.elem.tok = tok;
-	p->data.elem.sz = paramsz;
-	p->data.elem.args = paramdup(paramsz, params);
+	p->tok = tok;
 	p->data.elem.argc = argsz;
 	p->data.elem.argv = argdup(argsz, args);
 
-	mdoc_node_append(mdoc, pos, p);
+	return(mdoc_node_append(mdoc, p));
 }
 
 
-void
-mdoc_word_alloc(struct mdoc *mdoc, int pos, const char *word)
+int
+mdoc_word_alloc(struct mdoc *mdoc, 
+		int line, int pos, const char *word)
 {
 	struct mdoc_node *p;
 
-	p = xcalloc(1, sizeof(struct mdoc_node));
+	p = mdoc_node_alloc(mdoc);
+
+	p->line = line;
+	p->pos = pos;
 	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)
 {
-	size_t		 i, j;
+	int		 i, j;
 
 	if (0 == sz)
 		return;
 
 	assert(p);
-	for (i = 0; i < sz; i++)
+	/* LINTED */
+	for (i = 0; i < (int)sz; i++)
 		if (p[i].sz > 0) {
 			assert(p[i].value);
-			for (j = 0; j < p[i].sz; j++)
+			/* LINTED */
+			for (j = 0; j < (int)p[i].sz; j++)
 				free(p[i].value[j]);
+			free(p[i].value);
 		}
 	free(p);
 }
@@ -595,7 +577,6 @@ static void
 mdoc_elem_free(struct mdoc_elem *p)
 {
 
-	paramfree(p->sz, p->args);
 	argfree(p->argc, p->argv);
 }
 
@@ -617,14 +598,6 @@ mdoc_text_free(struct mdoc_text *p)
 }
 
 
-static void
-mdoc_head_free(struct mdoc_head *p)
-{
-
-	paramfree(p->sz, p->args);
-}
-
-
 void
 mdoc_node_free(struct mdoc_node *p)
 {
@@ -639,9 +612,6 @@ mdoc_node_free(struct mdoc_node *p)
 	case (MDOC_BLOCK):
 		mdoc_block_free(&p->data.block);
 		break;
-	case (MDOC_HEAD):
-		mdoc_head_free(&p->data.head);
-		break;
 	default:
 		break;
 	}
@@ -650,7 +620,7 @@ mdoc_node_free(struct mdoc_node *p)
 }
 
 
-static void
+void
 mdoc_node_freelist(struct mdoc_node *p)
 {
 
@@ -667,20 +637,22 @@ int
 mdoc_find(const struct mdoc *mdoc, const char *key)
 {
 
-	return(mdoc_hash_find(mdoc->htab, key));
+	return(mdoc_tokhash_find(mdoc->htab, key));
 }
 
 
 static void
 argcpy(struct mdoc_arg *dst, const struct mdoc_arg *src)
 {
-	size_t		 i;
+	int		 i;
 
+	dst->line = src->line;
+	dst->pos = src->pos;
 	dst->arg = src->arg;
 	if (0 == (dst->sz = src->sz))
 		return;
 	dst->value = xcalloc(dst->sz, sizeof(char *));
-	for (i = 0; i < dst->sz; i++)
+	for (i = 0; i < (int)dst->sz; i++)
 		dst->value[i] = xstrdup(src->value[i]);
 }
 
@@ -689,46 +661,39 @@ static struct mdoc_arg *
 argdup(size_t argsz, const struct mdoc_arg *args)
 {
 	struct mdoc_arg	*pp;
-	size_t		 i;
+	int		 i;
 
 	if (0 == argsz)
 		return(NULL);
 
 	pp = xcalloc((size_t)argsz, sizeof(struct mdoc_arg));
-	for (i = 0; i < argsz; i++)
+	for (i = 0; i < (int)argsz; i++)
 		argcpy(&pp[i], &args[i]);
 
 	return(pp);
 }
 
 
-static void
-paramfree(size_t sz, char **p)
+/* FIXME: deprecate. */
+char *
+mdoc_node2a(struct mdoc_node *node)
 {
-	size_t		 i;
+	static char	 buf[64];
 
-	if (0 == sz)
-		return;
+	assert(node);
 
-	assert(p);
-	for (i = 0; i < sz; i++)
-		free(p[i]);
-	free(p);
+	buf[0] = 0;
+	(void)xstrlcat(buf, mdoc_type2a(node->type), 64);
+	if (MDOC_ROOT == node->type)
+		return(buf);
+	(void)xstrlcat(buf, " `", 64);
+	if (MDOC_TEXT == node->type)
+		(void)xstrlcat(buf, node->data.text.string, 64);
+	else
+		(void)xstrlcat(buf, mdoc_macronames[node->tok], 64);
+	(void)xstrlcat(buf, "'", 64);
+
+	return(buf);
 }
 
 
-static char **
-paramdup(size_t sz, const char **p)
-{
-	char		**pp;
-	size_t		  i;
-
-	if (0 == sz)
-		return(NULL);
-
-	pp = xcalloc(sz, sizeof(char *));
-	for (i = 0; i < sz; i++) 
-		pp[i] = xstrdup(p[i]);
-
-	return(pp);
-}