===================================================================
RCS file: /cvs/mandoc/tree.c,v
retrieving revision 1.52
retrieving revision 1.55
diff -u -p -r1.52 -r1.55
--- mandoc/tree.c	2014/04/20 16:46:05	1.52
+++ mandoc/tree.c	2014/09/28 11:32:33	1.55
@@ -1,4 +1,4 @@
-/*	$Id: tree.c,v 1.52 2014/04/20 16:46:05 schwarze Exp $ */
+/*	$Id: tree.c,v 1.55 2014/09/28 11:32:33 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,10 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
+
 #include <assert.h>
 #include <limits.h>
 #include <stdio.h>
@@ -160,7 +160,7 @@ print_mdoc(const struct mdoc_node *n, int indent)
 		putchar(' ');
 		if (MDOC_LINE & n->flags)
 			putchar('*');
-		printf("%d:%d", n->line, n->pos);
+		printf("%d:%d", n->line, n->pos + 1);
 		if (n->lastline != n->line)
 			printf("-%d", n->lastline);
 		putchar('\n');
@@ -250,7 +250,7 @@ print_man(const struct man_node *n, int indent)
 		printf("%s (%s) ", p, t);
 		if (MAN_LINE & n->flags)
 			putchar('*');
-		printf("%d:%d\n", n->line, n->pos);
+		printf("%d:%d\n", n->line, n->pos + 1);
 	}
 
 	if (n->child)
@@ -290,7 +290,7 @@ print_box(const struct eqn_box *ep, int indent)
 	}
 
 	assert(t);
-	printf("%s(%d, %d, %d, %d, %d, \"%s\", \"%s\") %s\n",
+	printf("%s(size=%d, pos=%d, font=%d, mark=%d, pile=%d, l=\"%s\", r=\"%s\") %s\n",
 	    t, EQN_DEFSIZE == ep->size ? 0 : ep->size,
 	    ep->pos, ep->font, ep->mark, ep->pile,
 	    ep->left ? ep->left : "",