===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.30
retrieving revision 1.36
diff -u -p -r1.30 -r1.36
--- mandoc/tree.c	2011/01/02 20:34:05	1.30
+++ mandoc/tree.c	2011/02/09 09:18:15	1.36
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.30 2011/01/02 20:34:05 kristaps Exp $ */
+/*	$Id: tree.c,v 1.36 2011/02/09 09:18:15 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -92,6 +92,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
 	case (MDOC_TBL):
 		t = "tbl";
 		break;
+	case (MDOC_EQN):
+		t = "eqn";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -128,6 +131,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		break;
 	case (MDOC_TBL):
 		break;
+	case (MDOC_EQN):
+		p = n->eqn->data;
+		break;
 	case (MDOC_ROOT):
 		p = "root";
 		break;
@@ -198,6 +204,9 @@ print_man(const struct man_node *n, int indent)
 	case (MAN_TBL):
 		t = "tbl";
 		break;
+	case (MAN_EQN):
+		t = "eqn";
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -223,6 +232,9 @@ print_man(const struct man_node *n, int indent)
 		break;
 	case (MAN_TBL):
 		break;
+	case (MAN_EQN):
+		p = n->eqn->data;
+		break;
 	default:
 		abort();
 		/* NOTREACHED */
@@ -249,26 +261,11 @@ 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('-');
@@ -295,8 +292,14 @@ print_span(const struct tbl_span *sp, int indent)
 		default:
 			break;
 		}
-		printf("[%s%s]", dp->string, dp->layout ?  "" : "*");
-		if (dp->next)
-			putchar(' ');
+		printf("[\"%s\"", dp->string ? dp->string : "");
+		if (dp->spans)
+			printf("(%d)", dp->spans);
+		if (NULL == dp->layout)
+			putchar('*');
+		putchar(']');
+		putchar(' ');
 	}
+
+	printf("(tbl) %d:1", sp->line);
 }