===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.66
retrieving revision 1.68
diff -u -p -r1.66 -r1.68
--- mandoc/tree.c	2015/04/18 17:53:21	1.66
+++ mandoc/tree.c	2015/09/26 12:55:16	1.68
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.66 2015/04/18 17:53:21 schwarze Exp $ */
+/*	$Id: tree.c,v 1.68 2015/09/26 12:55:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -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,16 @@ 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('.');
+		putchar('\n');
 	}
 
 	if (n->eqn)
@@ -200,10 +205,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 +217,6 @@ print_man(const struct roff_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	switch (n->type) {
@@ -238,7 +242,6 @@ print_man(const struct roff_node *n, int indent)
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (n->span) {
@@ -250,7 +253,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)