===================================================================
RCS file: /cvs/mandoc/man.h,v
retrieving revision 1.25
retrieving revision 1.39
diff -u -p -r1.25 -r1.39
--- mandoc/man.h	2010/03/23 21:50:43	1.25
+++ mandoc/man.h	2010/06/27 15:52:41	1.39
@@ -1,6 +1,6 @@
-/*	$Id: man.h,v 1.25 2010/03/23 21:50:43 kristaps Exp $ */
+/*	$Id: man.h,v 1.39 2010/06/27 15:52:41 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -55,7 +55,8 @@ enum	mant {
 	MAN_Sp,
 	MAN_Vb,
 	MAN_Ve,
-	MAN_MAX,
+	MAN_AT,
+	MAN_MAX
 };
 
 enum	man_type {
@@ -68,8 +69,9 @@ enum	man_type {
 };
 
 struct	man_meta {
-	int		 msec;
+	char		*msec;
 	time_t		 date;
+	char		*rawdate;
 	char		*vol;
 	char		*title;
 	char		*source;
@@ -87,6 +89,7 @@ struct	man_node {
 	int		 flags;
 #define	MAN_VALID	(1 << 0)
 #define	MAN_ACTED	(1 << 1)
+#define	MAN_EOS		(1 << 2)
 	enum man_type	 type;
 	char		*string;
 	struct man_node	*head;
@@ -94,24 +97,18 @@ struct	man_node {
 };
 
 #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 *, int, const struct man_cb *);
+struct	man	 *man_alloc(const struct regset *, void *, int, mandocmsg);
 void		  man_reset(struct man *);
-int	 	  man_parseln(struct man *, int, char *buf);
+int	 	  man_parseln(struct man *, int, char *, int);
 int		  man_endparse(struct man *);
 
 const struct man_node *man_node(const struct man *);