===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.20
retrieving revision 1.32
diff -u -p -r1.20 -r1.32
--- mandoc/tree.c	2010/05/17 22:11:42	1.20
+++ mandoc/tree.c	2011/01/10 14:40:30	1.32
@@ -1,6 +1,6 @@
-/*	$Id: tree.c,v 1.20 2010/05/17 22:11:42 kristaps Exp $ */
+/*	$Id: tree.c,v 1.32 2011/01/10 14:40:30 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
@@ -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 */
@@ -74,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";
@@ -85,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;
@@ -117,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;
@@ -125,25 +136,33 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		/* NOTREACHED */
 	}
 
-	for (i = 0; i < indent; i++)
-		(void)printf("    ");
-	(void)printf("%s (%s)", p, t);
+	if (n->span) {
+		assert(NULL == p);
+		print_span(n->span, indent);
+	} else {
+		for (i = 0; i < indent; i++)
+			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(" ]");
-	}
+		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)
@@ -176,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;
@@ -197,17 +221,74 @@ 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);
+	if (n->span) {
+		assert(NULL == p);
+		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');
+
 	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, int indent)
+{
+	const struct tbl_dat *dp;
+	int		 i;
+
+	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\"", dp->string ? dp->string : "");
+		if (dp->spans)
+			printf("(%d)", dp->spans);
+		if (NULL == dp->layout)
+			putchar('*');
+		putchar(']');
+		if (dp->next)
+			putchar(' ');
+	}
 }