===================================================================
RCS file: /cvs/mandoc/man.h,v
retrieving revision 1.1
retrieving revision 1.5
diff -u -p -r1.1 -r1.5
--- mandoc/man.h	2009/03/23 14:22:11	1.1
+++ mandoc/man.h	2009/03/25 21:03:13	1.5
@@ -1,4 +1,4 @@
-/* $Id: man.h,v 1.1 2009/03/23 14:22:11 kristaps Exp $ */
+/* $Id: man.h,v 1.5 2009/03/25 21:03:13 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -40,23 +40,21 @@
 #define	MAN_R		 16
 #define	MAN_B		 17
 #define	MAN_I		 18
-#define	MAN_MAX	 	 19
+#define	MAN_IR		 19
+#define	MAN_MAX	 	 20
 
 enum	man_type {
 	MAN_TEXT,
 	MAN_ELEM,
-	MAN_HEAD,
-	MAN_BODY,
-	MAN_BLOCK,
 	MAN_ROOT
 };
 
 struct	man_meta {
 	int		 msec;
-	char		*vol;
 	time_t		 date;
+	char		*vol;
 	char		*title;
-	char		*os;
+	char		*source;
 };
 
 struct	man_node {
@@ -71,23 +69,28 @@ struct	man_node {
 #define	MAN_VALID	(1 << 0)
 #define	MAN_ACTED	(1 << 1)
 	enum man_type	 type;
-
-	struct man_node	*head;
-	struct man_node	*body;
 	char		*string;
 };
 
+#define	MAN_IGN_MACRO	 (1 << 0) /* Ignore unknown macros. */
+
 extern	const char *const *man_macronames;
 
+struct	man_cb {
+	int	(*man_warn)(void *, int, int, const char *);
+	int	(*man_err)(void *, int, int, const char *);
+};
+
 __BEGIN_DECLS
 
 struct	man;
 
 void	 	  man_free(struct man *);
-struct	man	 *man_alloc(void);
+struct	man	 *man_alloc(void *, int, const struct man_cb *);
 void		  man_reset(struct man *);
 int	 	  man_parseln(struct man *, int, char *buf);
 int		  man_endparse(struct man *);
+int		  man_valid_post(struct man *);
 
 const struct man_node *man_node(const struct man *);
 const struct man_meta *man_meta(const struct man *);