===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.40
retrieving revision 1.59
diff -u -p -r1.40 -r1.59
--- mandoc/mdoc.h	2009/03/08 18:02:36	1.40
+++ mandoc/mdoc.h	2009/06/16 19:45:51	1.59
@@ -1,24 +1,24 @@
-/* $Id: mdoc.h,v 1.40 2009/03/08 18:02:36 kristaps Exp $ */
+/*	$Id: mdoc.h,v 1.59 2009/06/16 19:45:51 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * 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 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 MDOC_H
 #define MDOC_H
 
+#include <time.h>
+
 /*
  * This library implements a validating scanner/parser for ``mdoc'' roff
  * macro documents, a.k.a. BSD manual page documents.  The mdoc.c file
@@ -29,9 +29,7 @@
 
 /* What follows is a list of ALL possible macros. */
 
-/* TODO: Brq et al. */
-
-#define	MDOC___	 	 0
+#define	MDOC_Ap		 0
 #define	MDOC_Dd		 1
 #define	MDOC_Dt		 2
 #define	MDOC_Os		 3
@@ -138,7 +136,18 @@
 #define	MDOC_Fr		 104
 #define	MDOC_Ud		 105
 #define	MDOC_Lb		 106
-#define	MDOC_MAX	 107
+#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. */
 
@@ -167,7 +176,8 @@
 #define	MDOC_Words	 22
 #define	MDOC_Emphasis	 23
 #define	MDOC_Symbolic	 24
-#define	MDOC_ARG_MAX	 25
+#define	MDOC_Nested	 25
+#define	MDOC_ARG_MAX	 26
 
 /* Warnings are either syntax or groff-compatibility. */
 enum	mdoc_warn {
@@ -262,10 +272,11 @@ struct	mdoc_node {
 
 #define	MDOC_IGN_SCOPE	 (1 << 0) /* Ignore scope violations. */
 #define	MDOC_IGN_ESCAPE	 (1 << 1) /* Ignore bad escape sequences. */
+#define	MDOC_IGN_MACRO	 (1 << 2) /* Ignore unknown macros. */
+#define	MDOC_IGN_CHARS	 (1 << 3) /* Ignore disallowed chars. */
 
 /* 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 *);
@@ -287,8 +298,8 @@ void	 	  mdoc_free(struct mdoc *);
 /* Allocate a new parser instance. */
 struct	mdoc	 *mdoc_alloc(void *, int, const struct mdoc_cb *);
 
-/* Set parse options. */
-void		  mdoc_setflags(struct mdoc *, int);
+/* Gets system ready for another parse. */
+int		  mdoc_reset(struct mdoc *);
 
 /* Parse a single line in a stream (boolean retval). */
 int	 	  mdoc_parseln(struct mdoc *, int, char *buf);
@@ -307,8 +318,6 @@ int		  mdoc_endparse(struct mdoc *);
 const char	 *mdoc_a2att(const char *);
 const char	 *mdoc_a2lib(const char *);
 const char	 *mdoc_a2st(const char *);
-
-int		  mdoc_isdelim(const char *);
 
 __END_DECLS