===================================================================
RCS file: /cvs/mandoc/libmdoc.h,v
retrieving revision 1.41
retrieving revision 1.50
diff -u -p -r1.41 -r1.50
--- mandoc/libmdoc.h	2010/05/12 08:41:17	1.41
+++ mandoc/libmdoc.h	2010/05/24 12:05:04	1.50
@@ -1,4 +1,4 @@
-/*	$Id: libmdoc.h,v 1.41 2010/05/12 08:41:17 kristaps Exp $ */
+/*	$Id: libmdoc.h,v 1.50 2010/05/24 12:05:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,11 +26,14 @@ enum	mdoc_next {
 
 struct	mdoc {
 	void		 *data;
-	struct mdoc_cb	  cb;
+	mandocmsg	  msg;
 	int		  flags;
-#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. */
+#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 */
+#define	MDOC_NEWLINE	 (1 << 3) /* first macro/text in a line */
+#define	MDOC_PHRASELIT	 (1 << 4) /* literal within a partila phrase */
+#define	MDOC_PPHRASE	 (1 << 5) /* within a partial phrase */
 	int		  pflags;
 	enum mdoc_next	  next;
 	struct mdoc_node *last;
@@ -40,63 +43,6 @@ struct	mdoc {
 	enum mdoc_sec	  lastsec;
 };
 
-enum	merr {
-	ETAILWS = 0,
-	EQUOTPARM,
-	EQUOTTERM,
-	EARGVAL,	
-	EBODYPROL,
-	EPROLBODY,
-	ETEXTPROL,
-	ENOBLANK,
-	ETOOLONG,
-	EESCAPE,
-	EPRINT,
-	ENODAT,
-	ENOPROLOGUE,
-	ELINE,
-	EATT,
-	ENAME,
-	ELISTTYPE,
-	EDISPTYPE,
-	EMULTIDISP,
-	EMULTILIST,
-	ESECNAME,
-	ENAMESECINC,
-	EARGREP,
-	EBOOL,
-	ECOLMIS,
-	ENESTDISP,
-	EMISSWIDTH,
-	EWRONGMSEC,
-	ESECOOO,
-	ESECREP,
-	EBADSTAND,
-	ENOMULTILINE,
-	EMULTILINE,
-	ENOLINE,
-	EPROLOOO,
-	EPROLREP,
-	EBADMSEC,
-	EBADSEC,
-	EFONT,
-	EBADDATE,
-	ENUMFMT,
-	ENOWIDTH,
-	EUTSNAME,
-	EOBS,
-	EIMPBRK,
-	EIGNE,
-	EOPEN,
-	EQUOTPHR,
-	ENOCTX,
-	ELIB,
-	EBADCHILD,
-	ENOTYPE,
-	EBADCOMMENT,
-	MERRMAX
-};
-
 #define	MACRO_PROT_ARGS	struct mdoc *m, enum mdoct tok, \
 			int line, int ppos, int *pos, char *buf
 
@@ -129,23 +75,23 @@ enum	margverr {
 	ARGV_WORD
 };
 
+enum	mdelim {
+	DELIM_NONE = 0,
+	DELIM_OPEN,
+	DELIM_MIDDLE,
+	DELIM_CLOSE
+};
+
 extern	const struct mdoc_macro *const mdoc_macros;
 
 __BEGIN_DECLS
 
-#define		  mdoc_perr(m, l, p, t) \
-		  mdoc_err((m), (l), (p), 1, (t))
-#define		  mdoc_pwarn(m, l, p, t) \
-		  mdoc_err((m), (l), (p), 0, (t))
-#define		  mdoc_nerr(m, n, t) \
-		  mdoc_err((m), (n)->line, (n)->pos, 1, (t))
-#define		  mdoc_nwarn(m, n, t) \
-		  mdoc_err((m), (n)->line, (n)->pos, 0, (t))
-
-int		  mdoc_err(struct mdoc *, int, int, int, enum merr);
-int		  mdoc_verr(struct mdoc *, int, int, const char *, ...);
-int		  mdoc_vwarn(struct mdoc *, int, int, const char *, ...);
-
+#define		  mdoc_pmsg(m, l, p, t) \
+		  (*(m)->msg)((t), (m)->data, (l), (p), NULL)
+#define		  mdoc_nmsg(m, n, t) \
+		  (*(m)->msg)((t), (m)->data, (n)->line, (n)->pos, NULL)
+int		  mdoc_vmsg(struct mdoc *, enum mandocerr, 
+			int, int, const char *, ...);
 int		  mdoc_macro(MACRO_PROT_ARGS);
 int		  mdoc_word_alloc(struct mdoc *, 
 			int, int, const char *);
@@ -159,8 +105,8 @@ int		  mdoc_body_alloc(struct mdoc *, int, int, enum m
 void		  mdoc_node_delete(struct mdoc *, struct mdoc_node *);
 void		  mdoc_hash_init(void);
 enum mdoct	  mdoc_hash_find(const char *);
-int		  mdoc_iscdelim(char);
-int		  mdoc_isdelim(const char *);
+enum mdelim	  mdoc_iscdelim(char);
+enum mdelim	  mdoc_isdelim(const char *);
 size_t		  mdoc_isescape(const char *);
 enum	mdoc_sec  mdoc_str2sec(const char *);
 time_t		  mdoc_atotime(const char *);
@@ -175,7 +121,7 @@ int		  mdoc_valid_pre(struct mdoc *, 
 			const struct mdoc_node *);
 int		  mdoc_valid_post(struct mdoc *);
 int		  mdoc_action_pre(struct mdoc *, 
-			const struct mdoc_node *);
+			struct mdoc_node *);
 int		  mdoc_action_post(struct mdoc *);
 enum margverr	  mdoc_argv(struct mdoc *, int, enum mdoct,
 			struct mdoc_arg **, int *, char *);
@@ -185,9 +131,9 @@ enum margserr	  mdoc_args(struct mdoc *, int,
 			int *, char *, enum mdoct, char **);
 enum margserr	  mdoc_zargs(struct mdoc *, int, 
 			int *, char *, int, char **);
-#define	ARGS_DELIM	(1 << 1)	/* See args(). */
-#define	ARGS_TABSEP	(1 << 2)	/* See args(). */
-#define	ARGS_NOWARN	(1 << 3)	/* See args(). */
+#define	ARGS_DELIM	(1 << 1)
+#define	ARGS_TABSEP	(1 << 2)
+#define	ARGS_NOWARN	(1 << 3)
 
 int		  mdoc_macroend(struct mdoc *);