===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -p -r1.8 -r1.12
--- mandoc/libmdoc.h	2009/06/15 09:55:43	1.8
+++ mandoc/libmdoc.h	2009/07/06 09:21:24	1.12
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.8 2009/06/15 09:55:43 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.12 2009/07/06 09:21:24 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -29,8 +29,9 @@ struct	mdoc {
 	struct mdoc_cb	  cb;
 	void		 *htab;
 	int		  flags;
-#define	MDOC_HALT	 (1 << 0)
-#define	MDOC_LITERAL	 (1 << 1)
+#define	MDOC_HALT	 (1 << 0)	/* Error in parse. Halt. */
+#define	MDOC_LITERAL	 (1 << 1)	/* In a literal scope. */
+#define	MDOC_PBODY	 (1 << 2)	/* In the document body. */
 	int		  pflags;
 	enum mdoc_next	  next;
 	struct mdoc_node *last;
@@ -61,24 +62,15 @@ __BEGIN_DECLS
 
 /* 
  * When GCC2 is deprecated, most of these can be reverted to #define
- * as mdoc_vmsg using __VA_ARGS__.  Until then, use real functions.
+ * as mdoc_vXXX using __VA_ARGS__.  Until then, use real functions.
  */
-int		  mdoc_vwarn(struct mdoc *, int, int, 
-			enum mdoc_warn, const char *, ...);
-void		  mdoc_vmsg(struct mdoc *, int, int, 
-			const char *, ...);
-int		  mdoc_verr(struct mdoc *, int, int, 
-			const char *, ...);
-int		  mdoc_nwarn(struct mdoc *, const struct mdoc_node *,
-			enum mdoc_warn, const char *, ...);
+int		  mdoc_vwarn(struct mdoc *, int, int, const char *, ...);
+int		  mdoc_verr(struct mdoc *, int, int, const char *, ...);
 int		  mdoc_nerr(struct mdoc *, const struct mdoc_node *,
 			const char *, ...);
-int		  mdoc_warn(struct mdoc *, enum mdoc_warn, const char *, ...);
+int		  mdoc_warn(struct mdoc *, const char *, ...);
 int		  mdoc_err(struct mdoc *, const char *, ...);
-void		  mdoc_msg(struct mdoc *, const char *, ...);
-void		  mdoc_pmsg(struct mdoc *, int, int, const char *, ...);
-int		  mdoc_pwarn(struct mdoc *, int, int,
-			enum mdoc_warn,const char *, ...);
+int		  mdoc_pwarn(struct mdoc *, int, int, const char *, ...);
 int		  mdoc_perr(struct mdoc *, int, int, const char *, ...);
 int		  mdoc_macro(MACRO_PROT_ARGS);
 int		  mdoc_word_alloc(struct mdoc *,