===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.65
retrieving revision 1.70
diff -u -p -r1.65 -r1.70
--- mandoc/tree.c	2015/04/18 16:06:41	1.65
+++ mandoc/tree.c	2017/01/10 12:53:08	1.70
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.65 2015/04/18 16:06:41 schwarze Exp $ */
+/*	$Id: tree.c,v 1.70 2017/01/10 12:53:08 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,14 +41,14 @@ void
 tree_mdoc(void *arg, const struct roff_man *mdoc)
 {
 
-	print_mdoc(mdoc_node(mdoc)->child, 0);
+	print_mdoc(mdoc->first->child, 0);
 }
 
 void
 tree_man(void *arg, const struct roff_man *man)
 {
 
-	print_man(man_node(man)->child, 0);
+	print_man(man->first->child, 0);
 }
 
 static void
@@ -74,16 +74,16 @@ print_mdoc(const struct roff_node *n, int indent)
 		t = "block";
 		break;
 	case ROFFT_HEAD:
-		t = "block-head";
+		t = "head";
 		break;
 	case ROFFT_BODY:
 		if (n->end)
 			t = "body-end";
 		else
-			t = "block-body";
+			t = "body";
 		break;
 	case ROFFT_TAIL:
-		t = "block-tail";
+		t = "tail";
 		break;
 	case ROFFT_ELEM:
 		t = "elem";
@@ -98,7 +98,6 @@ print_mdoc(const struct roff_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	switch (n->type) {
@@ -138,7 +137,6 @@ print_mdoc(const struct roff_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (n->span) {
@@ -161,9 +159,20 @@ print_mdoc(const struct roff_node *n, int indent)
 		}
 
 		putchar(' ');
+		if (MDOC_DELIMO & n->flags)
+			putchar('(');
 		if (MDOC_LINE & n->flags)
 			putchar('*');
-		printf("%d:%d\n", n->line, n->pos + 1);
+		printf("%d:%d", n->line, n->pos + 1);
+		if (MDOC_DELIMC & n->flags)
+			putchar(')');
+		if (MDOC_EOS & n->flags)
+			putchar('.');
+		if (NODE_NOSRC & n->flags)
+			printf(" NOSRC");
+		if (NODE_NOPRT & n->flags)
+			printf(" NOPRT");
+		putchar('\n');
 	}
 
 	if (n->eqn)
@@ -200,10 +209,10 @@ print_man(const struct roff_node *n, int indent)
 		t = "block";
 		break;
 	case ROFFT_HEAD:
-		t = "block-head";
+		t = "head";
 		break;
 	case ROFFT_BODY:
-		t = "block-body";
+		t = "body";
 		break;
 	case ROFFT_TBL:
 		break;
@@ -212,7 +221,6 @@ print_man(const struct roff_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	switch (n->type) {
@@ -220,11 +228,8 @@ print_man(const struct roff_node *n, int indent)
 		p = n->string;
 		break;
 	case ROFFT_ELEM:
-		/* FALLTHROUGH */
 	case ROFFT_BLOCK:
-		/* FALLTHROUGH */
 	case ROFFT_HEAD:
-		/* FALLTHROUGH */
 	case ROFFT_BODY:
 		p = man_macronames[n->tok];
 		break;
@@ -238,7 +243,6 @@ print_man(const struct roff_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (n->span) {
@@ -250,7 +254,10 @@ print_man(const struct roff_node *n, int indent)
 		printf("%s (%s) ", p, t);
 		if (MAN_LINE & n->flags)
 			putchar('*');
-		printf("%d:%d\n", n->line, n->pos + 1);
+		printf("%d:%d", n->line, n->pos + 1);
+		if (MAN_EOS & n->flags)
+			putchar('.');
+		putchar('\n');
 	}
 
 	if (n->eqn)
@@ -351,12 +358,10 @@ print_span(const struct tbl_span *sp, int indent)
 	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;