===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.38
retrieving revision 1.51
diff -u -p -r1.38 -r1.51
--- mandoc/mdoc.h	2009/03/08 11:41:22	1.38
+++ mandoc/mdoc.h	2009/03/21 09:42:07	1.51
@@ -1,4 +1,4 @@
-/* $Id: mdoc.h,v 1.38 2009/03/08 11:41:22 kristaps Exp $ */
+/* $Id: mdoc.h,v 1.51 2009/03/21 09:42:07 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,6 +19,8 @@
 #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
@@ -136,7 +138,19 @@
 #define	MDOC_Fr		 104
 #define	MDOC_Ud		 105
 #define	MDOC_Lb		 106
-#define	MDOC_MAX	 107
+#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
 
 /* What follows is a list of ALL possible macro arguments. */
 
@@ -165,7 +179,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 {
@@ -249,6 +264,8 @@ struct	mdoc_node {
 #define	MDOC_ACTED	 (1 << 1)
 	enum mdoc_type	  type;
 	enum mdoc_sec	  sec;
+
+	/* FIXME: union/struct this with #defines. */
 	struct mdoc_arg	 *args; 	/* BLOCK/ELEM */
 	struct mdoc_node *head;		/* BLOCK */
 	struct mdoc_node *body;		/* BLOCK */
@@ -256,7 +273,9 @@ struct	mdoc_node {
 	char		 *string;	/* TEXT */
 };
 
-#define	MDOC_IGN_SCOPE	 (1 << 0)
+#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. */
 
 /* Call-backs for parse messages. */
 struct	mdoc_cb {
@@ -280,10 +299,10 @@ struct	mdoc;
 void	 	  mdoc_free(struct mdoc *);
 
 /* Allocate a new parser instance. */
-struct	mdoc	 *mdoc_alloc(void *data, const struct mdoc_cb *);
+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. */
+void		  mdoc_reset(struct mdoc *);
 
 /* Parse a single line in a stream (boolean retval). */
 int	 	  mdoc_parseln(struct mdoc *, int, char *buf);