===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.283
retrieving revision 1.286
diff -u -p -r1.283 -r1.286
--- mandoc/mdoc_validate.c	2015/02/23 13:55:55	1.283
+++ mandoc/mdoc_validate.c	2015/04/18 16:06:41	1.286
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.283 2015/02/23 13:55:55 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.286 2015/04/18 16:06:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -8,9 +8,9 @@
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -31,16 +31,17 @@
 #include <string.h>
 #include <time.h>
 
-#include "mdoc.h"
-#include "mandoc.h"
 #include "mandoc_aux.h"
-#include "libmdoc.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"
 #include "libmandoc.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,
@@ -56,13 +57,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);
@@ -247,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,
@@ -292,20 +293,20 @@ 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;
 
 	switch (n->type) {
-	case MDOC_TEXT:
+	case ROFFT_TEXT:
 		if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd)
 			check_text(mdoc, n->line, n->pos, n->string);
 		/* FALLTHROUGH */
-	case MDOC_TBL:
+	case ROFFT_TBL:
 		/* FALLTHROUGH */
-	case MDOC_EQN:
+	case ROFFT_EQN:
 		/* FALLTHROUGH */
-	case MDOC_ROOT:
+	case ROFFT_ROOT:
 		return;
 	default:
 		break;
@@ -318,9 +319,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;
@@ -329,13 +330,13 @@ mdoc_valid_post(struct mdoc *mdoc)
 	n->flags |= MDOC_VALID | MDOC_ENDED;
 
 	switch (n->type) {
-	case MDOC_TEXT:
+	case ROFFT_TEXT:
 		/* FALLTHROUGH */
-	case MDOC_EQN:
+	case ROFFT_EQN:
 		/* FALLTHROUGH */
-	case MDOC_TBL:
+	case ROFFT_TBL:
 		break;
-	case MDOC_ROOT:
+	case ROFFT_ROOT:
 		post_root(mdoc);
 		break;
 	default:
@@ -361,7 +362,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;
 
@@ -374,7 +375,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;
 
@@ -383,7 +384,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;
 
@@ -398,13 +399,13 @@ 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 (MDOC_BLOCK != n->type)
+	if (n->type != ROFFT_BLOCK)
 		return;
 
 	for (node = mdoc->last->parent; node; node = node->parent)
-		if (MDOC_BLOCK == node->type)
+		if (node->type == ROFFT_BLOCK)
 			if (MDOC_Bd == node->tok)
 				break;
 
@@ -422,7 +423,7 @@ pre_bl(PRE_ARGS)
 	enum mdocargt	  mdoclt;
 	enum mdoc_list	  lt;
 
-	if (n->type != MDOC_BLOCK)
+	if (n->type != ROFFT_BLOCK)
 		return;
 
 	/*
@@ -605,7 +606,7 @@ pre_bd(PRE_ARGS)
 
 	pre_literal(mdoc, n);
 
-	if (n->type != MDOC_BLOCK)
+	if (n->type != ROFFT_BLOCK)
 		return;
 
 	for (i = 0; n->args && i < (int)n->args->argc; i++) {
@@ -718,7 +719,7 @@ static void
 pre_obsolete(PRE_ARGS)
 {
 
-	if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type)
+	if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
 		mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
 		    n->line, n->pos, mdoc_macronames[n->tok]);
 }
@@ -768,7 +769,7 @@ pre_dd(PRE_ARGS)
 static void
 post_bf(POST_ARGS)
 {
-	struct mdoc_node *np, *nch;
+	struct roff_node *np, *nch;
 	enum mdocargt	  arg;
 
 	/*
@@ -777,10 +778,10 @@ post_bf(POST_ARGS)
 	 */
 
 	np = mdoc->last;
-	if (MDOC_HEAD != np->type)
+	if (np->type != ROFFT_HEAD)
 		return;
 
-	assert(MDOC_BLOCK == np->parent->type);
+	assert(np->parent->type == ROFFT_BLOCK);
 	assert(MDOC_Bf == np->parent->tok);
 
 	/* Check the number of arguments. */
@@ -830,12 +831,12 @@ post_bf(POST_ARGS)
 static void
 post_lb(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 	const char		*stdlibname;
 	char			*libname;
 
 	n = mdoc->last->child;
-	assert(MDOC_TEXT == n->type);
+	assert(n->type == ROFFT_TEXT);
 
 	if (NULL == (stdlibname = mdoc_a2lib(n->string)))
 		mandoc_asprintf(&libname,
@@ -850,7 +851,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)
@@ -863,7 +864,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;
 
@@ -886,11 +887,11 @@ post_fn(POST_ARGS)
 static void
 post_fo(POST_ARGS)
 {
-	const struct mdoc_node	*n;
+	const struct roff_node	*n;
 
 	n = mdoc->last;
 
-	if (n->type != MDOC_HEAD)
+	if (n->type != ROFFT_HEAD)
 		return;
 
 	if (n->child == NULL) {
@@ -912,7 +913,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) {
@@ -933,7 +934,7 @@ post_fa(POST_ARGS)
 static void
 post_vt(POST_ARGS)
 {
-	const struct mdoc_node *n;
+	const struct roff_node *n;
 
 	/*
 	 * The Vt macro comes in both ELEM and BLOCK form, both of which
@@ -943,11 +944,11 @@ post_vt(POST_ARGS)
 	 * specifically the BODY, should only have TEXT children.
 	 */
 
-	if (MDOC_BODY != mdoc->last->type)
+	if (mdoc->last->type != ROFFT_BODY)
 		return;
 
 	for (n = mdoc->last->child; n; n = n->next)
-		if (MDOC_TEXT != n->type)
+		if (n->type != ROFFT_TEXT)
 			mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
 			    n->line, n->pos, mdoc_macronames[n->tok]);
 }
@@ -955,7 +956,7 @@ post_vt(POST_ARGS)
 static void
 post_nm(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
@@ -977,11 +978,11 @@ post_nm(POST_ARGS)
 static void
 post_nd(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
-	if (n->type != MDOC_BODY)
+	if (n->type != ROFFT_BODY)
 		return;
 
 	if (n->child == NULL)
@@ -994,11 +995,11 @@ post_nd(POST_ARGS)
 static void
 post_d1(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
-	if (n->type != MDOC_BODY)
+	if (n->type != ROFFT_BODY)
 		return;
 
 	if (n->child == NULL)
@@ -1011,11 +1012,11 @@ post_d1(POST_ARGS)
 static void
 post_literal(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
-	if (n->type != MDOC_BODY)
+	if (n->type != ROFFT_BODY)
 		return;
 
 	if (n->child == NULL)
@@ -1033,7 +1034,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
@@ -1045,7 +1046,7 @@ post_defaults(POST_ARGS)
 		return;
 
 	nn = mdoc->last;
-	mdoc->next = MDOC_NEXT_CHILD;
+	mdoc->next = ROFF_NEXT_CHILD;
 
 	switch (nn->tok) {
 	case MDOC_Ar:
@@ -1067,13 +1068,13 @@ 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->next = ROFF_NEXT_CHILD;
 		mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
 		mdoc->last = n;
 		return;
@@ -1086,7 +1087,7 @@ post_at(POST_ARGS)
 	 */
 
 	n = n->child;
-	assert(MDOC_TEXT == n->type);
+	assert(n->type == ROFFT_TEXT);
 	if (NULL == (std_att = mdoc_a2att(n->string))) {
 		mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
 		    n->line, n->pos, "At %s", n->string);
@@ -1101,7 +1102,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;
@@ -1118,7 +1119,7 @@ static void
 post_en(POST_ARGS)
 {
 
-	if (MDOC_BLOCK == mdoc->last->type)
+	if (mdoc->last->type == ROFFT_BLOCK)
 		mdoc->last->norm->Es = mdoc->last_es;
 }
 
@@ -1132,12 +1133,12 @@ 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 != MDOC_BLOCK)
+	if (nit->type != ROFFT_BLOCK)
 		return;
 
 	nbl = nit->parent->parent;
@@ -1184,7 +1185,7 @@ post_it(POST_ARGS)
 		assert(nit->head->child == NULL);
 
 		for (i = 0, nch = nit->child; nch; nch = nch->next)
-			if (nch->type == MDOC_BODY)
+			if (nch->type == ROFFT_BODY)
 				i++;
 
 		if (i < cols || i > cols + 1)
@@ -1200,7 +1201,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
@@ -1261,7 +1262,7 @@ void
 rewrite_macro2len(char **arg)
 {
 	size_t		  width;
-	enum mdoct	  tok;
+	int		  tok;
 
 	if (*arg == NULL)
 		return;
@@ -1279,7 +1280,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];
@@ -1298,13 +1299,13 @@ post_bl_block_tag(POST_ARGS)
 		if (MDOC_It != nn->tok)
 			continue;
 
-		assert(MDOC_BLOCK == nn->type);
+		assert(nn->type == ROFFT_BLOCK);
 		nn = nn->head->child;
 
 		if (nn == NULL)
 			break;
 
-		if (MDOC_TEXT == nn->type) {
+		if (nn->type == ROFFT_TEXT) {
 			sz = strlen(nn->string) + 1;
 			break;
 		}
@@ -1344,7 +1345,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;
 
@@ -1406,19 +1407,19 @@ 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) {
-	case MDOC_BLOCK:
+	case ROFFT_BLOCK:
 		post_bl_block(mdoc);
 		return;
-	case MDOC_HEAD:
+	case ROFFT_HEAD:
 		post_bl_head(mdoc);
 		return;
-	case MDOC_BODY:
+	case ROFFT_BODY:
 		break;
 	default:
 		return;
@@ -1489,11 +1490,11 @@ post_bl(POST_ARGS)
 static void
 post_bk(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	n = mdoc->last;
 
-	if (n->type == MDOC_BLOCK && n->body->child == NULL) {
+	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);
@@ -1501,9 +1502,9 @@ post_bk(POST_ARGS)
 }
 
 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;
 
@@ -1512,7 +1513,7 @@ post_sm(struct mdoc *mdoc)
 		return;
 	}
 
-	assert(nch->type == MDOC_TEXT);
+	assert(nch->type == ROFFT_TEXT);
 
 	if ( ! strcmp(nch->string, "on")) {
 		mdoc->flags &= ~MDOC_SMOFF;
@@ -1533,7 +1534,7 @@ post_sm(struct mdoc *mdoc)
 static void
 post_root(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 
 	/* Add missing prologue data. */
 
@@ -1573,13 +1574,13 @@ 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;
 	nch = n->child;
 
-	assert(MDOC_TEXT == nch->type);
+	assert(nch->type == ROFFT_TEXT);
 
 	if (NULL == (p = mdoc_a2st(nch->string))) {
 		mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
@@ -1594,12 +1595,12 @@ 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;
 
-	if (np->type != MDOC_BODY)
+	if (np->type != ROFFT_BODY)
 		return;
 
 	if (np->child == NULL) {
@@ -1688,11 +1689,11 @@ 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) {
-		if (nch->type != MDOC_TEXT)
+		if (nch->type != ROFFT_TEXT)
 			continue;
 		cp = nch->string;
 		if (*cp == '\0')
@@ -1721,10 +1722,10 @@ post_sh(POST_ARGS)
 	post_ignpar(mdoc);
 
 	switch (mdoc->last->type) {
-	case MDOC_HEAD:
+	case ROFFT_HEAD:
 		post_sh_head(mdoc);
 		break;
-	case MDOC_BODY:
+	case ROFFT_BODY:
 		switch (mdoc->lastsec)  {
 		case SEC_NAME:
 			post_sh_name(mdoc);
@@ -1747,7 +1748,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;
@@ -1785,7 +1786,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;
@@ -1830,7 +1831,7 @@ post_sh_see_also(POST_ARGS)
 			lastpunct = "none";
 			continue;
 		}
-		if (n->type != MDOC_TEXT)
+		if (n->type != ROFFT_TEXT)
 			break;
 		for (name = n->string; *name != '\0'; name++)
 			if (isalpha((const unsigned char)*name))
@@ -1845,7 +1846,7 @@ 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)
@@ -1866,10 +1867,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
@@ -1986,13 +1987,13 @@ post_sh_head(POST_ARGS)
 static void
 post_ignpar(POST_ARGS)
 {
-	struct mdoc_node *np;
+	struct roff_node *np;
 
 	switch (mdoc->last->type) {
-	case MDOC_HEAD:
+	case ROFFT_HEAD:
 		post_hyph(mdoc);
 		return;
-	case MDOC_BODY:
+	case ROFFT_BODY:
 		break;
 	default:
 		return;
@@ -2023,7 +2024,7 @@ pre_par(PRE_ARGS)
 
 	if (NULL == mdoc->last)
 		return;
-	if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type)
+	if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK)
 		return;
 
 	/*
@@ -2052,7 +2053,7 @@ pre_par(PRE_ARGS)
 static void
 post_par(POST_ARGS)
 {
-	struct mdoc_node *np;
+	struct roff_node *np;
 
 	np = mdoc->last;
 
@@ -2088,7 +2089,7 @@ pre_literal(PRE_ARGS)
 
 	pre_display(mdoc, n);
 
-	if (MDOC_BODY != n->type)
+	if (n->type != ROFFT_BODY)
 		return;
 
 	/*
@@ -2115,7 +2116,7 @@ pre_literal(PRE_ARGS)
 static void
 post_dd(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 	char		 *datestr;
 
 	if (mdoc->meta.date)
@@ -2144,7 +2145,7 @@ out:
 static void
 post_dt(POST_ARGS)
 {
-	struct mdoc_node *nn, *n;
+	struct roff_node *nn, *n;
 	const char	 *cp;
 	char		 *p;
 
@@ -2229,7 +2230,7 @@ out:
 static void
 post_bx(POST_ARGS)
 {
-	struct mdoc_node	*n;
+	struct roff_node	*n;
 
 	/*
 	 * Make `Bx's second argument always start with an uppercase
@@ -2249,7 +2250,7 @@ post_os(POST_ARGS)
 	struct utsname	  utsname;
 	static char	 *defbuf;
 #endif
-	struct mdoc_node *n;
+	struct roff_node *n;
 
 	n = mdoc->last;
 
@@ -2299,7 +2300,7 @@ out:
 static void
 post_ex(POST_ARGS)
 {
-	struct mdoc_node *n;
+	struct roff_node *n;
 
 	n = mdoc->last;
 
@@ -2312,25 +2313,25 @@ post_ex(POST_ARGS)
 		return;
 	}
 
-	mdoc->next = MDOC_NEXT_CHILD;
+	mdoc->next = ROFF_NEXT_CHILD;
 	mdoc_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);
 }
 
 static size_t
-macro2len(enum mdoct macro)
+macro2len(int macro)
 {
 
 	switch (macro) {