===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.27
retrieving revision 1.41
diff -u -p -r1.27 -r1.41
--- mandoc/tree.c	2011/01/01 14:09:21	1.27
+++ mandoc/tree.c	2011/07/21 13:37:04	1.41
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.27 2011/01/01 14:09:21 kristaps Exp $ */
+/*	$Id: tree.c,v 1.41 2011/07/21 13:37:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -28,8 +28,10 @@
 #include "man.h"
 #include "main.h"
 
-static	void	print_mdoc(const struct mdoc_node *, int);
+static	void	print_box(const struct eqn_box *, int);
 static	void	print_man(const struct man_node *, int);
+static	void	print_mdoc(const struct mdoc_node *, int);
+static	void	print_span(const struct tbl_span *, int);
 
 
 /* ARGSUSED */
@@ -58,11 +60,11 @@ 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;
 	params = NULL;
+	t = p = NULL;
 
 	switch (n->type) {
 	case (MDOC_ROOT):
@@ -90,15 +92,14 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		t = "text";
 		break;
 	case (MDOC_TBL):
-		t = "tbl";
+		/* FALLTHROUGH */
+	case (MDOC_EQN):
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	p = NULL;
-
 	switch (n->type) {
 	case (MDOC_TEXT):
 		p = n->string;
@@ -127,6 +128,8 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		}
 		break;
 	case (MDOC_TBL):
+		/* FALLTHROUGH */
+	case (MDOC_EQN):
 		break;
 	case (MDOC_ROOT):
 		p = "root";
@@ -136,18 +139,16 @@ 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(' ');
-		}
+		assert(NULL == p && NULL == t);
+		print_span(n->span, indent);
+	} else if (n->eqn) {
+		assert(NULL == p && NULL == t);
+		print_box(n->eqn->root, indent);
 	} else {
+		for (i = 0; i < indent; i++)
+			putchar('\t');
+
 		printf("%s (%s)", p, t);
 
 		for (i = 0; i < (int)argc; i++) {
@@ -163,11 +164,9 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		for (i = 0; i < (int)sz; i++)
 			printf(" [%s]", params[i]);
 
-		printf(" %d:%d", n->line, n->pos);
+		printf(" %d:%d\n", n->line, n->pos);
 	}
 
-	putchar('\n');
-
 	if (n->child)
 		print_mdoc(n->child, indent + 1);
 	if (n->next)
@@ -180,8 +179,9 @@ print_man(const struct man_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i;
-	const struct tbl_dat *dp;
 
+	t = p = NULL;
+
 	switch (n->type) {
 	case (MAN_ROOT):
 		t = "root";
@@ -201,16 +201,18 @@ print_man(const struct man_node *n, int indent)
 	case (MAN_BODY):
 		t = "block-body";
 		break;
+	case (MAN_TAIL):
+		t = "block-tail";
+		break;
 	case (MAN_TBL):
-		t = "tbl";
+		/* FALLTHROUGH */
+	case (MAN_EQN):
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	p = NULL;
-
 	switch (n->type) {
 	case (MAN_TEXT):
 		p = n->string;
@@ -221,6 +223,8 @@ print_man(const struct man_node *n, int indent)
 		/* FALLTHROUGH */
 	case (MAN_HEAD):
 		/* FALLTHROUGH */
+	case (MAN_TAIL):
+		/* FALLTHROUGH */
 	case (MAN_BODY):
 		p = man_macronames[n->tok];
 		break;
@@ -228,30 +232,107 @@ print_man(const struct man_node *n, int indent)
 		p = "root";
 		break;
 	case (MAN_TBL):
+		/* FALLTHROUGH */
+	case (MAN_EQN):
 		break;
 	default:
 		abort();
 		/* 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 
-		printf("%s (%s) %d:%d", p, t, n->line, n->pos);
+		assert(NULL == p && NULL == t);
+		print_span(n->span, indent);
+	} else if (n->eqn) {
+		assert(NULL == p && NULL == t);
+		print_box(n->eqn->root, indent);
+	} else {
+		for (i = 0; i < indent; i++)
+			putchar('\t');
+		printf("%s (%s) %d:%d\n", 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_box(const struct eqn_box *ep, int indent)
+{
+	int		 i;
+
+	if (NULL == ep)
+		return;
+	for (i = 0; i < indent; i++)
+		putchar('\t');
+
+	switch (ep->type) {
+	case (EQN_ROOT):
+		printf("eqn-root(%d, %d)\n", 
+				ep->font, ep->mark);
+		print_box(ep->child, indent + 1);
+		break;
+	case (EQN_SUBEXPR):
+		printf("eqn-subxpr(%d, %d)\n", 
+				ep->font, ep->mark);
+		print_box(ep->child, indent + 1);
+		break;
+	case (EQN_TEXT):
+		printf("eqn-text(%d, %d): [%s]\n", 
+				ep->font, ep->mark, ep->text);
+		break;
+	default:
+		break;
+	}
+
+	print_box(ep->next, indent);
+}
+
+static void
+print_span(const struct tbl_span *sp, int indent)
+{
+	const struct tbl_dat *dp;
+	int		 i;
+
+	for (i = 0; i < indent; i++)
+		putchar('\t');
+
+	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\"", dp->string ? dp->string : "");
+		if (dp->spans)
+			printf("(%d)", dp->spans);
+		if (NULL == dp->layout)
+			putchar('*');
+		putchar(']');
+		putchar(' ');
+	}
+
+	printf("(tbl) %d:1\n", sp->line);
 }