===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.13
retrieving revision 1.20
diff -u -p -r1.13 -r1.20
--- mandoc/tree.c	2009/06/10 20:18:44	1.13
+++ mandoc/tree.c	2010/05/17 22:11:42	1.20
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.13 2009/06/10 20:18:44 kristaps Exp $ */
+/*	$Id: tree.c,v 1.20 2010/05/17 22:11:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,35 +14,39 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 
+#include "mandoc.h"
 #include "mdoc.h"
 #include "man.h"
+#include "main.h"
 
 static	void	print_mdoc(const struct mdoc_node *, int);
 static	void	print_man(const struct man_node *, int);
 
 
 /* ARGSUSED */
-int
+void
 tree_mdoc(void *arg, const struct mdoc *mdoc)
 {
 
 	print_mdoc(mdoc_node(mdoc), 0);
-	return(1);
 }
 
 
 /* ARGSUSED */
-int
+void
 tree_man(void *arg, const struct man *man)
 {
 
 	print_man(man_node(man), 0);
-	return(1);
 }
 
 
@@ -163,6 +167,15 @@ print_man(const struct man_node *n, int indent)
 	case (MAN_TEXT):
 		t = "text";
 		break;
+	case (MAN_BLOCK):
+		t = "block";
+		break;
+	case (MAN_HEAD):
+		t = "block-head";
+		break;
+	case (MAN_BODY):
+		t = "block-body";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -173,6 +186,12 @@ print_man(const struct man_node *n, int indent)
 		p = n->string;
 		break;
 	case (MAN_ELEM):
+		/* FALLTHROUGH */
+	case (MAN_BLOCK):
+		/* FALLTHROUGH */
+	case (MAN_HEAD):
+		/* FALLTHROUGH */
+	case (MAN_BODY):
 		p = man_macronames[n->tok];
 		break;
 	case (MAN_ROOT):