===================================================================
RCS file: /cvs/mandoc/man.h,v
retrieving revision 1.2
retrieving revision 1.15
diff -u -p -r1.2 -r1.15
--- mandoc/man.h	2009/03/23 15:20:51	1.2
+++ mandoc/man.h	2009/07/04 09:01:55	1.15
@@ -1,27 +1,25 @@
-/* $Id: man.h,v 1.2 2009/03/23 15:20:51 kristaps Exp $ */
+/*	$Id: man.h,v 1.15 2009/07/04 09:01:55 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 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 copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #ifndef MAN_H
 #define MAN_H
 
 #include <time.h>
 
-#define	MAN___	 	 0
+#define	MAN_br	 	 0
 #define	MAN_TH		 1
 #define	MAN_SH		 2
 #define	MAN_SS		 3
@@ -41,7 +39,10 @@
 #define	MAN_B		 17
 #define	MAN_I		 18
 #define	MAN_IR		 19
-#define	MAN_MAX	 	 20
+#define	MAN_RI		 20
+#define	MAN_na		 21
+#define	MAN_i		 22
+#define	MAN_MAX	 	 23
 
 enum	man_type {
 	MAN_TEXT,
@@ -51,10 +52,10 @@ enum	man_type {
 
 struct	man_meta {
 	int		 msec;
-	char		*vol;
 	time_t		 date;
+	char		*vol;
 	char		*title;
-	char		*os;
+	char		*source;
 };
 
 struct	man_node {
@@ -62,6 +63,7 @@ struct	man_node {
 	struct man_node	*child;
 	struct man_node	*next;
 	struct man_node	*prev;
+	int		 nchild;
 	int		 line;
 	int		 pos;
 	int		 tok;
@@ -72,17 +74,27 @@ struct	man_node {
 	char		*string;
 };
 
+#define	MAN_IGN_MACRO	 (1 << 0)
+#define	MAN_IGN_CHARS	 (1 << 1)
+#define	MAN_IGN_ESCAPE	 (1 << 2)
+
 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);
-void		  man_reset(struct man *);
+struct	man	 *man_alloc(void *, int, const struct man_cb *);
+int		  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 *);