===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.102
retrieving revision 1.105
diff -u -p -r1.102 -r1.105
--- mandoc/man.c	2011/03/07 01:35:51	1.102
+++ mandoc/man.c	2011/03/22 14:33:05	1.105
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.102 2011/03/07 01:35:51 schwarze Exp $ */
+/*	$Id: man.c,v 1.105 2011/03/22 14:33:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
@@ -95,15 +96,14 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(struct regset *regs, void *data, mandocmsg msg)
+man_alloc(struct regset *regs, struct mparse *parse)
 {
 	struct man	*p;
 
 	p = mandoc_calloc(1, sizeof(struct man));
 
 	man_hash_init();
-	p->data = data;
-	p->msg = msg;
+	p->parse = parse;
 	p->regs = regs;
 
 	man_alloc1(p);
@@ -521,7 +521,8 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 
 	tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX;
 	if (MAN_MAX == tok) {
-		man_vmsg(m, MANDOCERR_MACRO, ln, ppos, "%s", buf + ppos - 1);
+		mandoc_vmsg(MANDOCERR_MACRO, m->parse, ln, 
+				ppos, "%s", buf + ppos - 1);
 		return(1);
 	}
 
@@ -554,8 +555,8 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 		if (MAN_NSCOPED & man_macros[n->tok].flags)
 			n = n->parent;
 
-		man_vmsg(m, MANDOCERR_LINESCOPE, n->line, n->pos,
-				"%s", man_macronames[n->tok]);
+		mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, 
+				n->pos, "%s", man_macronames[n->tok]);
 
 		man_node_delete(m, n);
 		m->flags &= ~MAN_ELINE;
@@ -620,21 +621,6 @@ err:	/* Error out. */
 	m->flags |= MAN_HALT;
 	return(0);
 }
-
-
-int
-man_vmsg(struct man *man, enum mandocerr t, 
-		int ln, int pos, const char *fmt, ...)
-{
-	char		 buf[256];
-	va_list		 ap;
-
-	va_start(ap, fmt);
-	vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-	va_end(ap);
-	return((*man->msg)(t, man->data, ln, pos, buf));
-}
-
 
 /*
  * Unlink a node from its context.  If "m" is provided, the last parse