===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.66
retrieving revision 1.69
diff -u -p -r1.66 -r1.69
--- mandoc/libmdoc.h	2011/03/17 09:22:39	1.66
+++ mandoc/libmdoc.h	2011/03/20 16:02:05	1.69
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.66 2011/03/17 09:22:39 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.69 2011/03/20 16:02:05 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -25,9 +25,8 @@ enum	mdoc_next {
 };
 
 struct	mdoc {
-	void		 *data; /* private application data */
-	mandocmsg	  msg; /* message callback */
-	int		  flags;
+	struct mparse	 *parse; /* parse pointer */
+	int		  flags; /* parse flags */
 #define	MDOC_HALT	 (1 << 0) /* error in parse: halt */
 #define	MDOC_LITERAL	 (1 << 1) /* in a literal scope */
 #define	MDOC_PBODY	 (1 << 2) /* in the document body */
@@ -86,11 +85,9 @@ extern	const struct mdoc_macro *const mdoc_macros;
 __BEGIN_DECLS
 
 #define		  mdoc_pmsg(m, l, p, t) \
-		  (*(m)->msg)((t), (m)->data, (l), (p), NULL)
+		  mandoc_msg((t), (m)->parse, (l), (p), NULL)
 #define		  mdoc_nmsg(m, n, t) \
-		  (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
-int		  mdoc_vmsg(struct mdoc *, enum mandocerr, 
-			int, int, const char *, ...);
+		  mandoc_msg((t), (m)->parse, (n)->line, (n)->pos, NULL)
 int		  mdoc_macro(MACRO_PROT_ARGS);
 int		  mdoc_word_alloc(struct mdoc *, 
 			int, int, const char *);
@@ -107,9 +104,6 @@ int		  mdoc_endbody_alloc(struct mdoc *m, int line, in
 void		  mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 void		  mdoc_hash_init(void);
 enum mdoct	  mdoc_hash_find(const char *);
-size_t		  mdoc_isescape(const char *);
-time_t		  mdoc_atotime(const char *);
-size_t		  mdoc_macro2len(enum mdoct);
 const char	 *mdoc_a2att(const char *);
 const char	 *mdoc_a2lib(const char *);
 const char	 *mdoc_a2st(const char *);