===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.10
retrieving revision 1.21
diff -u -p -r1.10 -r1.21
--- mandoc/tree.c	2009/03/23 15:20:51	1.10
+++ mandoc/tree.c	2010/06/19 20:46:28	1.21
@@ -1,49 +1,57 @@
-/* $Id: tree.c,v 1.10 2009/03/23 15:20:51 kristaps Exp $ */
+/*	$Id: tree.c,v 1.21 2010/06/19 20:46:28 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR 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 OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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
+ * 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	tree_mdoc(const struct mdoc_node *, int);
-static	void	tree_man(const struct man_node *, int);
+static	void	print_mdoc(const struct mdoc_node *, int);
+static	void	print_man(const struct man_node *, int);
 
 
 /* ARGSUSED */
-int
-tree_run(void *arg, const struct man *man,
-		const struct mdoc *mdoc)
+void
+tree_mdoc(void *arg, const struct mdoc *mdoc)
 {
 
-	if (man)
-		tree_man(man_node(man), 0);
-	if (mdoc)
-		tree_mdoc(mdoc_node(mdoc), 0);
-	return(1);
+	print_mdoc(mdoc_node(mdoc), 0);
 }
 
 
+/* ARGSUSED */
+void
+tree_man(void *arg, const struct man *man)
+{
+
+	print_man(man_node(man), 0);
+}
+
+
 static void
-tree_mdoc(const struct mdoc_node *n, int indent)
+print_mdoc(const struct mdoc_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i, j;
@@ -137,14 +145,14 @@ tree_mdoc(const struct mdoc_node *n, int indent)
 	(void)printf(" %d:%d\n", n->line, n->pos);
 
 	if (n->child)
-		tree_mdoc(n->child, indent + 1);
+		print_mdoc(n->child, indent + 1);
 	if (n->next)
-		tree_mdoc(n->next, indent);
+		print_mdoc(n->next, indent);
 }
 
 
 static void
-tree_man(const struct man_node *n, int indent)
+print_man(const struct man_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i;
@@ -159,6 +167,15 @@ tree_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 */
@@ -169,6 +186,12 @@ tree_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):
@@ -184,7 +207,7 @@ tree_man(const struct man_node *n, int indent)
 	(void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
 
 	if (n->child)
-		tree_man(n->child, indent + 1);
+		print_man(n->child, indent + 1);
 	if (n->next)
-		tree_man(n->next, indent);
+		print_man(n->next, indent);
 }