===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.18
retrieving revision 1.29
diff -u -p -r1.18 -r1.29
--- mandoc/tree.c	2009/10/30 18:53:09	1.18
+++ mandoc/tree.c	2011/01/01 22:27:08	1.29
@@ -1,6 +1,6 @@
-/*	$Id: tree.c,v 1.18 2009/10/30 18:53:09 kristaps Exp $ */
+/*	$Id: tree.c,v 1.29 2011/01/01 22:27:08 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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
@@ -14,17 +14,23 @@
  * 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 <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);
+static	void	print_span(const struct tbl_span *);
 
 
 /* ARGSUSED */
@@ -69,7 +75,10 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		t = "block-head";
 		break;
 	case (MDOC_BODY):
-		t = "block-body";
+		if (n->end)
+			t = "body-end";
+		else
+			t = "block-body";
 		break;
 	case (MDOC_TAIL):
 		t = "block-tail";
@@ -80,11 +89,16 @@ print_mdoc(const struct mdoc_node *n, int indent)
 	case (MDOC_TEXT):
 		t = "text";
 		break;
+	case (MDOC_TBL):
+		t = "tbl";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
+	p = NULL;
+
 	switch (n->type) {
 	case (MDOC_TEXT):
 		p = n->string;
@@ -112,6 +126,8 @@ print_mdoc(const struct mdoc_node *n, int indent)
 			argc = n->args->argc;
 		}
 		break;
+	case (MDOC_TBL):
+		break;
 	case (MDOC_ROOT):
 		p = "root";
 		break;
@@ -121,24 +137,32 @@ print_mdoc(const struct mdoc_node *n, int indent)
 	}
 
 	for (i = 0; i < indent; i++)
-		(void)printf("    ");
-	(void)printf("%s (%s)", p, t);
+		putchar('\t');
 
-	for (i = 0; i < (int)argc; i++) {
-		(void)printf(" -%s", mdoc_argnames[argv[i].arg]);
-		if (argv[i].sz > 0)
-			(void)printf(" [");
-		for (j = 0; j < (int)argv[i].sz; j++)
-			(void)printf(" [%s]", argv[i].value[j]);
-		if (argv[i].sz > 0)
-			(void)printf(" ]");
-	}
+	if (n->span) {
+		assert(NULL == p);
+		print_span(n->span);
+	} else {
+		printf("%s (%s)", p, t);
 
-	for (i = 0; i < (int)sz; i++)
-		(void)printf(" [%s]", params[i]);
+		for (i = 0; i < (int)argc; i++) {
+			printf(" -%s", mdoc_argnames[argv[i].arg]);
+			if (argv[i].sz > 0)
+				printf(" [");
+			for (j = 0; j < (int)argv[i].sz; j++)
+				printf(" [%s]", argv[i].value[j]);
+			if (argv[i].sz > 0)
+				printf(" ]");
+		}
+		
+		for (i = 0; i < (int)sz; i++)
+			printf(" [%s]", params[i]);
 
-	(void)printf(" %d:%d\n", n->line, n->pos);
+		printf(" %d:%d", n->line, n->pos);
+	}
 
+	putchar('\n');
+
 	if (n->child)
 		print_mdoc(n->child, indent + 1);
 	if (n->next)
@@ -171,11 +195,16 @@ print_man(const struct man_node *n, int indent)
 	case (MAN_BODY):
 		t = "block-body";
 		break;
+	case (MAN_TBL):
+		t = "tbl";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
+	p = NULL;
+
 	switch (n->type) {
 	case (MAN_TEXT):
 		p = n->string;
@@ -192,17 +221,65 @@ print_man(const struct man_node *n, int indent)
 	case (MAN_ROOT):
 		p = "root";
 		break;
+	case (MAN_TBL):
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
 	for (i = 0; i < indent; i++)
-		(void)printf("    ");
-	(void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
+		putchar('\t');
 
+	if (n->span) {
+		assert(NULL == p);
+		print_span(n->span);
+	} else
+		printf("%s (%s) %d:%d", p, t, n->line, n->pos);
+
+	putchar('\n');
+
 	if (n->child)
 		print_man(n->child, indent + 1);
 	if (n->next)
 		print_man(n->next, indent);
+}
+
+static void
+print_span(const struct tbl_span *sp)
+{
+	const struct tbl_dat *dp;
+
+	printf("tbl: ");
+
+	switch (sp->pos) {
+	case (TBL_SPAN_HORIZ):
+		putchar('-');
+		return;
+	case (TBL_SPAN_DHORIZ):
+		putchar('=');
+		return;
+	default:
+		break;
+	}
+
+	for (dp = sp->first; dp; dp = dp->next) {
+		switch (dp->pos) {
+		case (TBL_DATA_HORIZ):
+			/* FALLTHROUGH */
+		case (TBL_DATA_NHORIZ):
+			putchar('-');
+			continue;
+		case (TBL_DATA_DHORIZ):
+			/* FALLTHROUGH */
+		case (TBL_DATA_NDHORIZ):
+			putchar('=');
+			continue;
+		default:
+			break;
+		}
+		printf("[%s%s]", dp->string, dp->layout ?  "" : "*");
+		if (dp->next)
+			putchar(' ');
+	}
 }