===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.284
retrieving revision 1.295
diff -u -p -r1.284 -r1.295
--- mandoc/mdoc_validate.c	2015/04/02 21:36:50	1.284
+++ mandoc/mdoc_validate.c	2015/10/12 00:08:16	1.295
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.284 2015/04/02 21:36:50 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.295 2015/10/12 00:08:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -36,12 +36,13 @@
 #include "roff.h"
 #include "mdoc.h"
 #include "libmandoc.h"
+#include "roff_int.h"
 #include "libmdoc.h"
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 
-#define	PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
-#define	POST_ARGS struct mdoc *mdoc
+#define	PRE_ARGS  struct roff_man *mdoc, struct roff_node *n
+#define	POST_ARGS struct roff_man *mdoc
 
 enum	check_ineq {
 	CHECK_LT,
@@ -57,13 +58,13 @@ struct	valids {
 	v_post	 post;
 };
 
-static	void	 check_text(struct mdoc *, int, int, char *);
-static	void	 check_argv(struct mdoc *,
-			struct mdoc_node *, struct mdoc_argv *);
-static	void	 check_args(struct mdoc *, struct mdoc_node *);
-static	int	 child_an(const struct mdoc_node *);
-static	enum mdoc_sec	a2sec(const char *);
-static	size_t		macro2len(enum mdoct);
+static	void	 check_text(struct roff_man *, int, int, char *);
+static	void	 check_argv(struct roff_man *,
+			struct roff_node *, struct mdoc_argv *);
+static	void	 check_args(struct roff_man *, struct roff_node *);
+static	int	 child_an(const struct roff_node *);
+static	enum roff_sec	a2sec(const char *);
+static	size_t		macro2len(int);
 static	void	 rewrite_macro2len(char **);
 
 static	void	 post_an(POST_ARGS);
@@ -106,7 +107,6 @@ static	void	 post_sh_see_also(POST_ARGS);
 static	void	 post_sh_authors(POST_ARGS);
 static	void	 post_sm(POST_ARGS);
 static	void	 post_st(POST_ARGS);
-static	void	 post_vt(POST_ARGS);
 
 static	void	 pre_an(PRE_ARGS);
 static	void	 pre_bd(PRE_ARGS);
@@ -160,7 +160,7 @@ static	const struct valids mdoc_valids[MDOC_MAX] = {
 	{ pre_std, NULL },			/* Rv */
 	{ NULL, post_st },			/* St */
 	{ NULL, NULL },				/* Va */
-	{ NULL, post_vt },			/* Vt */
+	{ NULL, NULL },				/* Vt */
 	{ NULL, NULL },				/* Xr */
 	{ NULL, NULL },				/* %A */
 	{ NULL, post_hyph },			/* %B */ /* FIXME: can be used outside Rs/Re. */
@@ -248,7 +248,7 @@ static	const struct valids mdoc_valids[MDOC_MAX] = {
 
 #define	RSORD_MAX 14 /* Number of `Rs' blocks. */
 
-static	const enum mdoct rsord[RSORD_MAX] = {
+static	const int rsord[RSORD_MAX] = {
 	MDOC__A,
 	MDOC__T,
 	MDOC__B,
@@ -293,7 +293,7 @@ static	const char * const secnames[SEC__MAX] = {
 
 
 void
-mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
+mdoc_valid_pre(struct roff_man *mdoc, struct roff_node *n)
 {
 	v_pre	 p;
 
@@ -301,11 +301,9 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
 	case ROFFT_TEXT:
 		if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd)
 			check_text(mdoc, n->line, n->pos, n->string);
-		/* FALLTHROUGH */
+		return;
 	case ROFFT_TBL:
-		/* FALLTHROUGH */
 	case ROFFT_EQN:
-		/* FALLTHROUGH */
 	case ROFFT_ROOT:
 		return;
 	default:
@@ -319,9 +317,9 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
 }
 
 void
-mdoc_valid_post(struct mdoc *mdoc)
+mdoc_valid_post(struct roff_man *mdoc)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 	v_post p;
 
 	n = mdoc->last;
@@ -331,9 +329,7 @@ mdoc_valid_post(struct mdoc *mdoc)
 
 	switch (n->type) {
 	case ROFFT_TEXT:
-		/* FALLTHROUGH */
 	case ROFFT_EQN:
-		/* FALLTHROUGH */
 	case ROFFT_TBL:
 		break;
 	case ROFFT_ROOT:
@@ -362,7 +358,7 @@ mdoc_valid_post(struct mdoc *mdoc)
 }
 
 static void
-check_args(struct mdoc *mdoc, struct mdoc_node *n)
+check_args(struct roff_man *mdoc, struct roff_node *n)
 {
 	int		 i;
 
@@ -375,7 +371,7 @@ check_args(struct mdoc *mdoc, struct mdoc_node *n)
 }
 
 static void
-check_argv(struct mdoc *mdoc, struct mdoc_node *n, struct mdoc_argv *v)
+check_argv(struct roff_man *mdoc, struct roff_node *n, struct mdoc_argv *v)
 {
 	int		 i;
 
@@ -384,7 +380,7 @@ check_argv(struct mdoc *mdoc, struct mdoc_node *n, str
 }
 
 static void
-check_text(struct mdoc *mdoc, int ln, int pos, char *p)
+check_text(struct roff_man *mdoc, int ln, int pos, char *p)
 {
 	char		*cp;
 
@@ -399,7 +395,7 @@ check_text(struct mdoc *mdoc, int ln, int pos, char *p
 static void
 pre_display(PRE_ARGS)
 {
-	struct mdoc_node *node;
+	struct roff_node *node;
 
 	if (n->type != ROFFT_BLOCK)
 		return;
@@ -566,13 +562,9 @@ pre_bl(PRE_ARGS)
 			    n->line, n->pos, "Bl -tag");
 		break;
 	case LIST_column:
-		/* FALLTHROUGH */
 	case LIST_diag:
-		/* FALLTHROUGH */
 	case LIST_ohang:
-		/* FALLTHROUGH */
 	case LIST_inset:
-		/* FALLTHROUGH */
 	case LIST_item:
 		if (n->norm->Bl.width)
 			mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
@@ -580,9 +572,7 @@ pre_bl(PRE_ARGS)
 			    mdoc_argnames[mdoclt]);
 		break;
 	case LIST_bullet:
-		/* FALLTHROUGH */
 	case LIST_dash:
-		/* FALLTHROUGH */
 	case LIST_hyphen:
 		if (NULL == n->norm->Bl.width)
 			n->norm->Bl.width = "2n";
@@ -657,7 +647,6 @@ pre_bd(PRE_ARGS)
 			break;
 		default:
 			abort();
-			/* NOTREACHED */
 		}
 		if (DISP__NONE == dt)
 			continue;
@@ -769,7 +758,7 @@ pre_dd(PRE_ARGS)
 static void
 post_bf(POST_ARGS)
 {
-	struct mdoc_node *np, *nch;
+	struct roff_node *np, *nch;
 	enum mdocargt	  arg;
 
 	/*
@@ -831,7 +820,7 @@ post_bf(POST_ARGS)
 static void
 post_lb(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 	const char		*stdlibname;
 	char			*libname;
 
@@ -851,7 +840,7 @@ post_lb(POST_ARGS)
 static void
 post_eoln(POST_ARGS)
 {
-	const struct mdoc_node *n;
+	const struct roff_node *n;
 
 	n = mdoc->last;
 	if (n->child)
@@ -864,7 +853,7 @@ post_eoln(POST_ARGS)
 static void
 post_fname(POST_ARGS)
 {
-	const struct mdoc_node	*n;
+	const struct roff_node	*n;
 	const char		*cp;
 	size_t			 pos;
 
@@ -887,7 +876,7 @@ post_fn(POST_ARGS)
 static void
 post_fo(POST_ARGS)
 {
-	const struct mdoc_node	*n;
+	const struct roff_node	*n;
 
 	n = mdoc->last;
 
@@ -904,7 +893,7 @@ post_fo(POST_ARGS)
 		    n->child->next->line, n->child->next->pos,
 		    "Fo ... %s", n->child->next->string);
 		while (n->child != n->last)
-			mdoc_node_delete(mdoc, n->last);
+			roff_node_delete(mdoc, n->last);
 	}
 
 	post_fname(mdoc);
@@ -913,7 +902,7 @@ post_fo(POST_ARGS)
 static void
 post_fa(POST_ARGS)
 {
-	const struct mdoc_node *n;
+	const struct roff_node *n;
 	const char *cp;
 
 	for (n = mdoc->last->child; n != NULL; n = n->next) {
@@ -932,31 +921,9 @@ post_fa(POST_ARGS)
 }
 
 static void
-post_vt(POST_ARGS)
-{
-	const struct mdoc_node *n;
-
-	/*
-	 * The Vt macro comes in both ELEM and BLOCK form, both of which
-	 * have different syntaxes (yet more context-sensitive
-	 * behaviour).  ELEM types must have a child, which is already
-	 * guaranteed by the in_line parsing routine; BLOCK types,
-	 * specifically the BODY, should only have TEXT children.
-	 */
-
-	if (mdoc->last->type != ROFFT_BODY)
-		return;
-
-	for (n = mdoc->last->child; n; n = n->next)
-		if (n->type != ROFFT_TEXT)
-			mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
-			    n->line, n->pos, mdoc_macronames[n->tok]);
-}
-
-static void
 post_nm(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
@@ -968,7 +935,7 @@ post_nm(POST_ARGS)
 	if (NULL != mdoc->meta.name)
 		return;
 
-	mdoc_deroff(&mdoc->meta.name, n);
+	deroff(&mdoc->meta.name, n);
 
 	if (NULL == mdoc->meta.name)
 		mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
@@ -978,7 +945,7 @@ post_nm(POST_ARGS)
 static void
 post_nd(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
@@ -995,7 +962,7 @@ post_nd(POST_ARGS)
 static void
 post_d1(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
@@ -1012,7 +979,7 @@ post_d1(POST_ARGS)
 static void
 post_literal(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
@@ -1034,7 +1001,7 @@ post_literal(POST_ARGS)
 static void
 post_defaults(POST_ARGS)
 {
-	struct mdoc_node *nn;
+	struct roff_node *nn;
 
 	/*
 	 * The `Ar' defaults to "file ..." if no value is provided as an
@@ -1046,21 +1013,19 @@ post_defaults(POST_ARGS)
 		return;
 
 	nn = mdoc->last;
-	mdoc->next = MDOC_NEXT_CHILD;
+	mdoc->next = ROFF_NEXT_CHILD;
 
 	switch (nn->tok) {
 	case MDOC_Ar:
-		mdoc_word_alloc(mdoc, nn->line, nn->pos, "file");
-		mdoc_word_alloc(mdoc, nn->line, nn->pos, "...");
+		roff_word_alloc(mdoc, nn->line, nn->pos, "file");
+		roff_word_alloc(mdoc, nn->line, nn->pos, "...");
 		break;
 	case MDOC_Pa:
-		/* FALLTHROUGH */
 	case MDOC_Mt:
-		mdoc_word_alloc(mdoc, nn->line, nn->pos, "~");
+		roff_word_alloc(mdoc, nn->line, nn->pos, "~");
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 	mdoc->last = nn;
 }
@@ -1068,14 +1033,14 @@ post_defaults(POST_ARGS)
 static void
 post_at(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 	const char		*std_att;
 	char			*att;
 
 	n = mdoc->last;
 	if (n->child == NULL) {
-		mdoc->next = MDOC_NEXT_CHILD;
-		mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
+		mdoc->next = ROFF_NEXT_CHILD;
+		roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
 		mdoc->last = n;
 		return;
 	}
@@ -1102,7 +1067,7 @@ post_at(POST_ARGS)
 static void
 post_an(POST_ARGS)
 {
-	struct mdoc_node *np, *nch;
+	struct roff_node *np, *nch;
 
 	np = mdoc->last;
 	nch = np->child;
@@ -1133,9 +1098,9 @@ post_es(POST_ARGS)
 static void
 post_it(POST_ARGS)
 {
+	struct roff_node *nbl, *nit, *nch;
 	int		  i, cols;
 	enum mdoc_list	  lt;
-	struct mdoc_node *nbl, *nit, *nch;
 
 	nit = mdoc->last;
 	if (nit->type != ROFFT_BLOCK)
@@ -1146,13 +1111,9 @@ post_it(POST_ARGS)
 
 	switch (lt) {
 	case LIST_tag:
-		/* FALLTHROUGH */
 	case LIST_hang:
-		/* FALLTHROUGH */
 	case LIST_ohang:
-		/* FALLTHROUGH */
 	case LIST_inset:
-		/* FALLTHROUGH */
 	case LIST_diag:
 		if (nit->head->child == NULL)
 			mandoc_vmsg(MANDOCERR_IT_NOHEAD,
@@ -1161,11 +1122,8 @@ post_it(POST_ARGS)
 			    mdoc_argnames[nbl->args->argv[0].arg]);
 		break;
 	case LIST_bullet:
-		/* FALLTHROUGH */
 	case LIST_dash:
-		/* FALLTHROUGH */
 	case LIST_enum:
-		/* FALLTHROUGH */
 	case LIST_hyphen:
 		if (nit->body == NULL || nit->body->child == NULL)
 			mandoc_vmsg(MANDOCERR_IT_NOBODY,
@@ -1201,7 +1159,7 @@ post_it(POST_ARGS)
 static void
 post_bl_block(POST_ARGS)
 {
-	struct mdoc_node *n, *ni, *nc;
+	struct roff_node *n, *ni, *nc;
 
 	/*
 	 * These are fairly complicated, so we've broken them into two
@@ -1226,9 +1184,7 @@ post_bl_block(POST_ARGS)
 		while (NULL != nc) {
 			switch (nc->tok) {
 			case MDOC_Pp:
-				/* FALLTHROUGH */
 			case MDOC_Lp:
-				/* FALLTHROUGH */
 			case MDOC_br:
 				break;
 			default:
@@ -1246,7 +1202,7 @@ post_bl_block(POST_ARGS)
 				    mdoc->parse, nc->line, nc->pos,
 				    "%s before It",
 				    mdoc_macronames[nc->tok]);
-				mdoc_node_delete(mdoc, nc);
+				roff_node_delete(mdoc, nc);
 			} else
 				break;
 			nc = ni->body->last;
@@ -1262,13 +1218,13 @@ void
 rewrite_macro2len(char **arg)
 {
 	size_t		  width;
-	enum mdoct	  tok;
+	int		  tok;
 
 	if (*arg == NULL)
 		return;
 	else if ( ! strcmp(*arg, "Ds"))
 		width = 6;
-	else if ((tok = mdoc_hash_find(*arg)) == MDOC_MAX)
+	else if ((tok = mdoc_hash_find(*arg)) == TOKEN_NONE)
 		return;
 	else
 		width = macro2len(tok);
@@ -1280,7 +1236,7 @@ rewrite_macro2len(char **arg)
 static void
 post_bl_block_tag(POST_ARGS)
 {
-	struct mdoc_node *n, *nn;
+	struct roff_node *n, *nn;
 	size_t		  sz, ssz;
 	int		  i;
 	char		  buf[24];
@@ -1345,7 +1301,7 @@ post_bl_block_tag(POST_ARGS)
 static void
 post_bl_head(POST_ARGS)
 {
-	struct mdoc_node *nbl, *nh, *nch, *nnext;
+	struct roff_node *nbl, *nh, *nch, *nnext;
 	struct mdoc_argv *argv;
 	int		  i, j;
 
@@ -1357,7 +1313,7 @@ post_bl_head(POST_ARGS)
 		mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
 		    nch->line, nch->pos, "Bl ... %s", nch->string);
 		while (nch != NULL) {
-			mdoc_node_delete(mdoc, nch);
+			roff_node_delete(mdoc, nch);
 			nch = nh->child;
 		}
 		return;
@@ -1398,7 +1354,7 @@ post_bl_head(POST_ARGS)
 		argv->value[i++] = nch->string;
 		nch->string = NULL;
 		nnext = nch->next;
-		mdoc_node_delete(NULL, nch);
+		roff_node_delete(NULL, nch);
 	}
 	nh->nchild = 0;
 	nh->child = NULL;
@@ -1407,9 +1363,9 @@ post_bl_head(POST_ARGS)
 static void
 post_bl(POST_ARGS)
 {
-	struct mdoc_node	*nparent, *nprev; /* of the Bl block */
-	struct mdoc_node	*nblock, *nbody;  /* of the Bl */
-	struct mdoc_node	*nchild, *nnext;  /* of the Bl body */
+	struct roff_node	*nparent, *nprev; /* of the Bl block */
+	struct roff_node	*nblock, *nbody;  /* of the Bl */
+	struct roff_node	*nchild, *nnext;  /* of the Bl body */
 
 	nbody = mdoc->last;
 	switch (nbody->type) {
@@ -1490,21 +1446,21 @@ post_bl(POST_ARGS)
 static void
 post_bk(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
 	if (n->type == ROFFT_BLOCK && n->body->child == NULL) {
 		mandoc_msg(MANDOCERR_BLK_EMPTY,
 		    mdoc->parse, n->line, n->pos, "Bk");
-		mdoc_node_delete(mdoc, n);
+		roff_node_delete(mdoc, n);
 	}
 }
 
 static void
-post_sm(struct mdoc *mdoc)
+post_sm(struct roff_man *mdoc)
 {
-	struct mdoc_node	*nch;
+	struct roff_node	*nch;
 
 	nch = mdoc->last->child;
 
@@ -1534,7 +1490,7 @@ post_sm(struct mdoc *mdoc)
 static void
 post_root(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 
 	/* Add missing prologue data. */
 
@@ -1561,7 +1517,8 @@ post_root(POST_ARGS)
 	/* Check that we begin with a proper `Sh'. */
 
 	n = mdoc->first->child;
-	while (n != NULL && mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
+	while (n != NULL && n->tok != TOKEN_NONE &&
+	    mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
 		n = n->next;
 
 	if (n == NULL)
@@ -1574,7 +1531,7 @@ post_root(POST_ARGS)
 static void
 post_st(POST_ARGS)
 {
-	struct mdoc_node	 *n, *nch;
+	struct roff_node	 *n, *nch;
 	const char		 *p;
 
 	n = mdoc->last;
@@ -1585,7 +1542,7 @@ post_st(POST_ARGS)
 	if (NULL == (p = mdoc_a2st(nch->string))) {
 		mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
 		    nch->line, nch->pos, "St %s", nch->string);
-		mdoc_node_delete(mdoc, n);
+		roff_node_delete(mdoc, n);
 	} else {
 		free(nch->string);
 		nch->string = mandoc_strdup(p);
@@ -1595,7 +1552,7 @@ post_st(POST_ARGS)
 static void
 post_rs(POST_ARGS)
 {
-	struct mdoc_node *np, *nch, *next, *prev;
+	struct roff_node *np, *nch, *next, *prev;
 	int		  i, j;
 
 	np = mdoc->last;
@@ -1632,7 +1589,7 @@ post_rs(POST_ARGS)
 
 		/*
 		 * Remove this child from the chain.  This somewhat
-		 * repeats mdoc_node_unlink(), but since we're
+		 * repeats roff_node_unlink(), but since we're
 		 * just re-ordering, there's no need for the
 		 * full unlink process.
 		 */
@@ -1689,7 +1646,7 @@ post_rs(POST_ARGS)
 static void
 post_hyph(POST_ARGS)
 {
-	struct mdoc_node	*nch;
+	struct roff_node	*nch;
 	char			*cp;
 
 	for (nch = mdoc->last->child; nch != NULL; nch = nch->next) {
@@ -1748,7 +1705,7 @@ post_sh(POST_ARGS)
 static void
 post_sh_name(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 	int hasnm, hasnd;
 
 	hasnm = hasnd = 0;
@@ -1764,7 +1721,7 @@ post_sh_name(POST_ARGS)
 				mandoc_msg(MANDOCERR_NAMESEC_ND,
 				    mdoc->parse, n->line, n->pos, NULL);
 			break;
-		case MDOC_MAX:
+		case TOKEN_NONE:
 			if (hasnm)
 				break;
 			/* FALLTHROUGH */
@@ -1786,7 +1743,7 @@ post_sh_name(POST_ARGS)
 static void
 post_sh_see_also(POST_ARGS)
 {
-	const struct mdoc_node	*n;
+	const struct roff_node	*n;
 	const char		*name, *sec;
 	const char		*lastname, *lastsec, *lastpunct;
 	int			 cmp;
@@ -1846,13 +1803,13 @@ post_sh_see_also(POST_ARGS)
 }
 
 static int
-child_an(const struct mdoc_node *n)
+child_an(const struct roff_node *n)
 {
 
 	for (n = n->child; n != NULL; n = n->next)
 		if ((n->tok == MDOC_An && n->nchild) || child_an(n))
-			return(1);
-	return(0);
+			return 1;
+	return 0;
 }
 
 static void
@@ -1867,10 +1824,10 @@ post_sh_authors(POST_ARGS)
 static void
 post_sh_head(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 	const char	*goodsec;
 	char		*secname;
-	enum mdoc_sec	 sec;
+	enum roff_sec	 sec;
 
 	/*
 	 * Process a new section.  Sections are either "named" or
@@ -1881,7 +1838,7 @@ post_sh_head(POST_ARGS)
 
 	secname = NULL;
 	sec = SEC_CUSTOM;
-	mdoc_deroff(&secname, mdoc->last);
+	deroff(&secname, mdoc->last);
 	sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);
 
 	/* The NAME should be first. */
@@ -1960,7 +1917,6 @@ post_sh_head(POST_ARGS)
 		goodsec = "2, 3, 4, 9";
 		/* FALLTHROUGH */
 	case SEC_RETURN_VALUES:
-		/* FALLTHROUGH */
 	case SEC_LIBRARY:
 		if (*mdoc->meta.msec == '2')
 			break;
@@ -1987,7 +1943,7 @@ post_sh_head(POST_ARGS)
 static void
 post_ignpar(POST_ARGS)
 {
-	struct mdoc_node *np;
+	struct roff_node *np;
 
 	switch (mdoc->last->type) {
 	case ROFFT_HEAD:
@@ -2005,7 +1961,7 @@ post_ignpar(POST_ARGS)
 			    mdoc->parse, np->line, np->pos,
 			    "%s after %s", mdoc_macronames[np->tok],
 			    mdoc_macronames[mdoc->last->tok]);
-			mdoc_node_delete(mdoc, np);
+			roff_node_delete(mdoc, np);
 		}
 
 	if (NULL != (np = mdoc->last->last))
@@ -2014,7 +1970,7 @@ post_ignpar(POST_ARGS)
 			    np->line, np->pos, "%s at the end of %s",
 			    mdoc_macronames[np->tok],
 			    mdoc_macronames[mdoc->last->tok]);
-			mdoc_node_delete(mdoc, np);
+			roff_node_delete(mdoc, np);
 		}
 }
 
@@ -2047,13 +2003,13 @@ pre_par(PRE_ARGS)
 	    mdoc->last->line, mdoc->last->pos,
 	    "%s before %s", mdoc_macronames[mdoc->last->tok],
 	    mdoc_macronames[n->tok]);
-	mdoc_node_delete(mdoc, mdoc->last);
+	roff_node_delete(mdoc, mdoc->last);
 }
 
 static void
 post_par(POST_ARGS)
 {
-	struct mdoc_node *np;
+	struct roff_node *np;
 
 	np = mdoc->last;
 
@@ -2080,7 +2036,7 @@ post_par(POST_ARGS)
 	    mdoc->last->line, mdoc->last->pos,
 	    "%s after %s", mdoc_macronames[mdoc->last->tok],
 	    mdoc_macronames[np->tok]);
-	mdoc_node_delete(mdoc, mdoc->last);
+	roff_node_delete(mdoc, mdoc->last);
 }
 
 static void
@@ -2109,14 +2065,13 @@ pre_literal(PRE_ARGS)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 }
 
 static void
 post_dd(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 	char		 *datestr;
 
 	if (mdoc->meta.date)
@@ -2130,7 +2085,7 @@ post_dd(POST_ARGS)
 	}
 
 	datestr = NULL;
-	mdoc_deroff(&datestr, n);
+	deroff(&datestr, n);
 	if (mdoc->quick)
 		mdoc->meta.date = datestr;
 	else {
@@ -2139,13 +2094,13 @@ post_dd(POST_ARGS)
 		free(datestr);
 	}
 out:
-	mdoc_node_delete(mdoc, n);
+	roff_node_delete(mdoc, n);
 }
 
 static void
 post_dt(POST_ARGS)
 {
-	struct mdoc_node *nn, *n;
+	struct roff_node *nn, *n;
 	const char	 *cp;
 	char		 *p;
 
@@ -2224,13 +2179,13 @@ post_dt(POST_ARGS)
 		    nn->line, nn->pos, "Dt ... %s", nn->string);
 
 out:
-	mdoc_node_delete(mdoc, n);
+	roff_node_delete(mdoc, n);
 }
 
 static void
 post_bx(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	/*
 	 * Make `Bx's second argument always start with an uppercase
@@ -2250,7 +2205,7 @@ post_os(POST_ARGS)
 	struct utsname	  utsname;
 	static char	 *defbuf;
 #endif
-	struct mdoc_node *n;
+	struct roff_node *n;
 
 	n = mdoc->last;
 
@@ -2265,7 +2220,7 @@ post_os(POST_ARGS)
 
 	free(mdoc->meta.os);
 	mdoc->meta.os = NULL;
-	mdoc_deroff(&mdoc->meta.os, n);
+	deroff(&mdoc->meta.os, n);
 	if (mdoc->meta.os)
 		goto out;
 
@@ -2290,7 +2245,7 @@ post_os(POST_ARGS)
 #endif /*!OSNAME*/
 
 out:
-	mdoc_node_delete(mdoc, n);
+	roff_node_delete(mdoc, n);
 }
 
 /*
@@ -2300,7 +2255,7 @@ out:
 static void
 post_ex(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 
 	n = mdoc->last;
 
@@ -2313,112 +2268,112 @@ post_ex(POST_ARGS)
 		return;
 	}
 
-	mdoc->next = MDOC_NEXT_CHILD;
-	mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
+	mdoc->next = ROFF_NEXT_CHILD;
+	roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
 	mdoc->last = n;
 }
 
-static enum mdoc_sec
+static enum roff_sec
 a2sec(const char *p)
 {
 	int		 i;
 
 	for (i = 0; i < (int)SEC__MAX; i++)
 		if (secnames[i] && 0 == strcmp(p, secnames[i]))
-			return((enum mdoc_sec)i);
+			return (enum roff_sec)i;
 
-	return(SEC_CUSTOM);
+	return SEC_CUSTOM;
 }
 
 static size_t
-macro2len(enum mdoct macro)
+macro2len(int macro)
 {
 
 	switch (macro) {
 	case MDOC_Ad:
-		return(12);
+		return 12;
 	case MDOC_Ao:
-		return(12);
+		return 12;
 	case MDOC_An:
-		return(12);
+		return 12;
 	case MDOC_Aq:
-		return(12);
+		return 12;
 	case MDOC_Ar:
-		return(12);
+		return 12;
 	case MDOC_Bo:
-		return(12);
+		return 12;
 	case MDOC_Bq:
-		return(12);
+		return 12;
 	case MDOC_Cd:
-		return(12);
+		return 12;
 	case MDOC_Cm:
-		return(10);
+		return 10;
 	case MDOC_Do:
-		return(10);
+		return 10;
 	case MDOC_Dq:
-		return(12);
+		return 12;
 	case MDOC_Dv:
-		return(12);
+		return 12;
 	case MDOC_Eo:
-		return(12);
+		return 12;
 	case MDOC_Em:
-		return(10);
+		return 10;
 	case MDOC_Er:
-		return(17);
+		return 17;
 	case MDOC_Ev:
-		return(15);
+		return 15;
 	case MDOC_Fa:
-		return(12);
+		return 12;
 	case MDOC_Fl:
-		return(10);
+		return 10;
 	case MDOC_Fo:
-		return(16);
+		return 16;
 	case MDOC_Fn:
-		return(16);
+		return 16;
 	case MDOC_Ic:
-		return(10);
+		return 10;
 	case MDOC_Li:
-		return(16);
+		return 16;
 	case MDOC_Ms:
-		return(6);
+		return 6;
 	case MDOC_Nm:
-		return(10);
+		return 10;
 	case MDOC_No:
-		return(12);
+		return 12;
 	case MDOC_Oo:
-		return(10);
+		return 10;
 	case MDOC_Op:
-		return(14);
+		return 14;
 	case MDOC_Pa:
-		return(32);
+		return 32;
 	case MDOC_Pf:
-		return(12);
+		return 12;
 	case MDOC_Po:
-		return(12);
+		return 12;
 	case MDOC_Pq:
-		return(12);
+		return 12;
 	case MDOC_Ql:
-		return(16);
+		return 16;
 	case MDOC_Qo:
-		return(12);
+		return 12;
 	case MDOC_So:
-		return(12);
+		return 12;
 	case MDOC_Sq:
-		return(12);
+		return 12;
 	case MDOC_Sy:
-		return(6);
+		return 6;
 	case MDOC_Sx:
-		return(16);
+		return 16;
 	case MDOC_Tn:
-		return(10);
+		return 10;
 	case MDOC_Va:
-		return(12);
+		return 12;
 	case MDOC_Vt:
-		return(12);
+		return 12;
 	case MDOC_Xr:
-		return(10);
+		return 10;
 	default:
 		break;
 	};
-	return(0);
+	return 0;
 }