===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.37
retrieving revision 1.51
diff -u -p -r1.37 -r1.51
--- mandoc/tree.c	2011/03/23 12:33:01	1.37
+++ mandoc/tree.c	2014/03/08 15:50:41	1.51
@@ -1,6 +1,7 @@
-/*	$Id: tree.c,v 1.37 2011/03/23 12:33:01 kristaps Exp $ */
+/*	$Id: tree.c,v 1.51 2014/03/08 15:50:41 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,6 +20,7 @@
 #endif
 
 #include <assert.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -28,8 +30,9 @@
 #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);
 
 
@@ -56,13 +59,12 @@ print_mdoc(const struct mdoc_node *n, int indent)
 {
 	const char	 *p, *t;
 	int		  i, j;
-	size_t		  argc, sz;
-	char		**params;
+	size_t		  argc;
 	struct mdoc_argv *argv;
 
 	argv = NULL;
-	argc = sz = 0;
-	params = NULL;
+	argc = 0;
+	t = p = NULL;
 
 	switch (n->type) {
 	case (MDOC_ROOT):
@@ -90,18 +92,14 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		t = "text";
 		break;
 	case (MDOC_TBL):
-		t = "tbl";
-		break;
+		/* FALLTHROUGH */
 	case (MDOC_EQN):
-		t = "eqn";
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	p = NULL;
-
 	switch (n->type) {
 	case (MDOC_TEXT):
 		p = n->string;
@@ -130,9 +128,8 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		}
 		break;
 	case (MDOC_TBL):
-		break;
+		/* FALLTHROUGH */
 	case (MDOC_EQN):
-		p = n->eqn->data;
 		break;
 	case (MDOC_ROOT):
 		p = "root";
@@ -143,8 +140,11 @@ print_mdoc(const struct mdoc_node *n, int indent)
 	}
 
 	if (n->span) {
-		assert(NULL == p);
+		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');
@@ -160,15 +160,16 @@ print_mdoc(const struct mdoc_node *n, int indent)
 			if (argv[i].sz > 0)
 				printf(" ]");
 		}
-		
-		for (i = 0; i < (int)sz; i++)
-			printf(" [%s]", params[i]);
 
-		printf(" %d:%d", n->line, n->pos);
+		putchar(' ');
+		if (MDOC_LINE & n->flags)
+			putchar('*');
+		printf("%d:%d", n->line, n->pos);
+		if (n->lastline != n->line)
+			printf("-%d", n->lastline);
+		putchar('\n');
 	}
 
-	putchar('\n');
-
 	if (n->child)
 		print_mdoc(n->child, indent + 1);
 	if (n->next)
@@ -182,6 +183,8 @@ print_man(const struct man_node *n, int indent)
 	const char	 *p, *t;
 	int		  i;
 
+	t = p = NULL;
+
 	switch (n->type) {
 	case (MAN_ROOT):
 		t = "root";
@@ -205,18 +208,14 @@ print_man(const struct man_node *n, int indent)
 		t = "block-tail";
 		break;
 	case (MAN_TBL):
-		t = "tbl";
-		break;
+		/* FALLTHROUGH */
 	case (MAN_EQN):
-		t = "eqn";
 		break;
 	default:
 		abort();
 		/* NOTREACHED */
 	}
 
-	p = NULL;
-
 	switch (n->type) {
 	case (MAN_TEXT):
 		p = n->string;
@@ -236,9 +235,8 @@ print_man(const struct man_node *n, int indent)
 		p = "root";
 		break;
 	case (MAN_TBL):
-		break;
+		/* FALLTHROUGH */
 	case (MAN_EQN):
-		p = n->eqn->data;
 		break;
 	default:
 		abort();
@@ -246,16 +244,20 @@ print_man(const struct man_node *n, int indent)
 	}
 
 	if (n->span) {
-		assert(NULL == p);
+		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", p, t, n->line, n->pos);
+		printf("%s (%s) ", p, t);
+		if (MAN_LINE & n->flags)
+			putchar('*');
+		printf("%d:%d\n", n->line, n->pos);
 	}
 
-	putchar('\n');
-
 	if (n->child)
 		print_man(n->child, indent + 1);
 	if (n->next)
@@ -263,6 +265,48 @@ print_man(const struct man_node *n, int indent)
 }
 
 static void
+print_box(const struct eqn_box *ep, int indent)
+{
+	int		 i;
+	const char	*t;
+
+	if (NULL == ep)
+		return;
+	for (i = 0; i < indent; i++)
+		putchar('\t');
+
+	t = NULL;
+	switch (ep->type) {
+	case (EQN_ROOT):
+		t = "eqn-root";
+		break;
+	case (EQN_LIST):
+		t = "eqn-list";
+		break;
+	case (EQN_SUBEXPR):
+		t = "eqn-expr";
+		break;
+	case (EQN_TEXT):
+		t = "eqn-text";
+		break;
+	case (EQN_MATRIX):
+		t = "eqn-matrix";
+		break;
+	}
+
+	assert(t);
+	printf("%s(%d, %d, %d, %d, %d, \"%s\", \"%s\") %s\n", 
+		t, EQN_DEFSIZE == ep->size ? 0 : ep->size,
+		ep->pos, ep->font, ep->mark, ep->pile, 
+		ep->left ? ep->left : "",
+		ep->right ? ep->right : "",
+		ep->text ? ep->text : "");
+
+	print_box(ep->first, indent + 1);
+	print_box(ep->next, indent);
+}
+
+static void
 print_span(const struct tbl_span *sp, int indent)
 {
 	const struct tbl_dat *dp;
@@ -306,5 +350,5 @@ print_span(const struct tbl_span *sp, int indent)
 		putchar(' ');
 	}
 
-	printf("(tbl) %d:1", sp->line);
+	printf("(tbl) %d:1\n", sp->line);
 }