===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.56
retrieving revision 1.59
diff -u -p -r1.56 -r1.59
--- mandoc/mdoc.h	2009/04/12 19:45:26	1.56
+++ mandoc/mdoc.h	2009/06/16 19:45:51	1.59
@@ -1,6 +1,6 @@
-/*	$Id: mdoc.h,v 1.56 2009/04/12 19:45:26 kristaps Exp $ */
+/*	$Id: mdoc.h,v 1.59 2009/06/16 19:45:51 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,7 +29,7 @@
 
 /* What follows is a list of ALL possible macros. */
 
-#define	MDOC___	 	 0
+#define	MDOC_Ap		 0
 #define	MDOC_Dd		 1
 #define	MDOC_Dt		 2
 #define	MDOC_Os		 3
@@ -136,19 +136,18 @@
 #define	MDOC_Fr		 104
 #define	MDOC_Ud		 105
 #define	MDOC_Lb		 106
-#define	MDOC_Ap		 107
-#define	MDOC_Lp		 108
-#define	MDOC_Lk		 109
-#define	MDOC_Mt		 110
-#define	MDOC_Brq	 111
-#define	MDOC_Bro	 112
-#define	MDOC_Brc	 113
-#define	MDOC__C	 	 114
-#define	MDOC_Es	 	 115
-#define	MDOC_En	 	 116
-#define	MDOC_Dx	 	 117
-#define	MDOC__Q	 	 118
-#define	MDOC_MAX	 119
+#define	MDOC_Lp		 107
+#define	MDOC_Lk		 108
+#define	MDOC_Mt		 109
+#define	MDOC_Brq	 110
+#define	MDOC_Bro	 111
+#define	MDOC_Brc	 112
+#define	MDOC__C	 	 113
+#define	MDOC_Es	 	 114
+#define	MDOC_En	 	 115
+#define	MDOC_Dx	 	 116
+#define	MDOC__Q	 	 117
+#define	MDOC_MAX	 118
 
 /* What follows is a list of ALL possible macro arguments. */
 
@@ -278,7 +277,6 @@ struct	mdoc_node {
 
 /* Call-backs for parse messages. */
 struct	mdoc_cb {
-	void	(*mdoc_msg)(void *, int, int, const char *);
 	int	(*mdoc_err)(void *, int, int, const char *);
 	int	(*mdoc_warn)(void *, int, int, 
 			enum mdoc_warn, const char *);