===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.27
retrieving revision 1.30
diff -u -p -r1.27 -r1.30
--- mandoc/tree.c	2011/01/01 14:09:21	1.27
+++ mandoc/tree.c	2011/01/02 20:34:05	1.30
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.27 2011/01/01 14:09:21 kristaps Exp $ */
+/*	$Id: tree.c,v 1.30 2011/01/02 20:34:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -30,6 +30,7 @@
 
 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 *, int);
 
 
 /* ARGSUSED */
@@ -58,7 +59,6 @@ print_mdoc(const struct mdoc_node *n, int indent)
 	size_t		  argc, sz;
 	char		**params;
 	struct mdoc_argv *argv;
-	const struct tbl_dat *dp;
 
 	argv = NULL;
 	argc = sz = 0;
@@ -136,18 +136,13 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		/* NOTREACHED */
 	}
 
-	for (i = 0; i < indent; i++)
-		putchar('\t');
-
 	if (n->span) {
 		assert(NULL == p);
-		printf("tbl: ");
-		for (dp = n->span->first; dp; dp = dp->next) {
-			printf("[%s]", dp->string);
-			if (dp->next)
-				putchar(' ');
-		}
+		print_span(n->span, indent);
 	} else {
+		for (i = 0; i < indent; i++)
+			putchar('\t');
+
 		printf("%s (%s)", p, t);
 
 		for (i = 0; i < (int)argc; i++) {
@@ -180,7 +175,6 @@ print_man(const struct man_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i;
-	const struct tbl_dat *dp;
 
 	switch (n->type) {
 	case (MAN_ROOT):
@@ -234,19 +228,14 @@ print_man(const struct man_node *n, int indent)
 		/* NOTREACHED */
 	}
 
-	for (i = 0; i < indent; i++)
-		putchar('\t');
-
 	if (n->span) {
 		assert(NULL == p);
-		printf("tbl: ");
-		for (dp = n->span->first; dp; dp = dp->next) {
-			printf("[%s]", dp->string);
-			if (dp->next)
-				putchar(' ');
-		}
-	} else 
+		print_span(n->span, indent);
+	} else {
+		for (i = 0; i < indent; i++)
+			putchar('\t');
 		printf("%s (%s) %d:%d", p, t, n->line, n->pos);
+	}
 
 	putchar('\n');
 
@@ -254,4 +243,60 @@ print_man(const struct man_node *n, int indent)
 		print_man(n->child, indent + 1);
 	if (n->next)
 		print_man(n->next, indent);
+}
+
+static void
+print_span(const struct tbl_span *sp, int indent)
+{
+	const struct tbl_dat *dp;
+	const struct tbl_head *hp;
+	int		 i;
+
+	if (TBL_SPAN_FIRST & sp->flags) {
+		for (i = 0; i < indent; i++)
+			putchar('\t');
+		printf("tbl-head: ");
+		for (hp = sp->head; hp; hp = hp->next) {
+			printf("[%d]", hp->width);
+			if (hp->next)
+				putchar(' ');
+		}
+		putchar('\n');
+	}
+
+	for (i = 0; i < indent; i++)
+		putchar('\t');
+
+	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(' ');
+	}
 }