===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.63
retrieving revision 1.67
diff -u -p -r1.63 -r1.67
--- mandoc/tree.c	2015/04/02 21:36:51	1.63
+++ mandoc/tree.c	2015/09/26 00:54:04	1.67
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.63 2015/04/02 21:36:51 schwarze Exp $ */
+/*	$Id: tree.c,v 1.67 2015/09/26 00:54:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,27 +32,27 @@
 #include "main.h"
 
 static	void	print_box(const struct eqn_box *, int);
-static	void	print_man(const struct man_node *, int);
-static	void	print_mdoc(const struct mdoc_node *, int);
+static	void	print_man(const struct roff_node *, int);
+static	void	print_mdoc(const struct roff_node *, int);
 static	void	print_span(const struct tbl_span *, int);
 
 
 void
-tree_mdoc(void *arg, const struct mdoc *mdoc)
+tree_mdoc(void *arg, const struct roff_man *mdoc)
 {
 
-	print_mdoc(mdoc_node(mdoc)->child, 0);
+	print_mdoc(mdoc->first->child, 0);
 }
 
 void
-tree_man(void *arg, const struct man *man)
+tree_man(void *arg, const struct roff_man *man)
 {
 
-	print_man(man_node(man)->child, 0);
+	print_man(man->first->child, 0);
 }
 
 static void
-print_mdoc(const struct mdoc_node *n, int indent)
+print_mdoc(const struct roff_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i, j;
@@ -98,7 +98,6 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	switch (n->type) {
@@ -138,7 +137,6 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (n->span) {
@@ -176,7 +174,7 @@ print_mdoc(const struct mdoc_node *n, int indent)
 }
 
 static void
-print_man(const struct man_node *n, int indent)
+print_man(const struct roff_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i;
@@ -212,7 +210,6 @@ print_man(const struct man_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	switch (n->type) {
@@ -238,7 +235,6 @@ print_man(const struct man_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (n->span) {