===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.8
retrieving revision 1.19
diff -u -p -r1.8 -r1.19
--- mandoc/libman.h	2009/04/12 19:45:26	1.8
+++ mandoc/libman.h	2009/08/21 12:32:38	1.19
@@ -1,6 +1,6 @@
-/*	$Id: libman.h,v 1.8 2009/04/12 19:45:26 kristaps Exp $ */
+/*	$Id: libman.h,v 1.19 2009/08/21 12:32:38 kristaps Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 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
@@ -31,29 +31,86 @@ struct	man {
 	int		 pflags;
 	int		 flags;
 #define	MAN_HALT	(1 << 0)
-#define	MAN_NLINE	(1 << 1)
+#define	MAN_ELINE	(1 << 1) 	/* Next-line element scope. */
+#define	MAN_BLINE	(1 << 2) 	/* Next-line block scope. */
+#define	MAN_LITERAL	(1 << 3)	/* Literal input. */
 	enum man_next	 next;
 	struct man_node	*last;
 	struct man_node	*first;
 	struct man_meta	 meta;
 };
 
+enum	merr {
+	WNPRINT = 0,
+	WNMEM,
+	WMSEC,
+	WDATE,
+	WLNSCOPE,
+	WTSPACE,
+	WTQUOTE,
+	WNODATA,
+	WNOTITLE,
+	WESCAPE,
+	WNUMFMT,
+	WHEADARGS,
+	WBODYARGS,
+	WNHEADARGS,
+	WMACRO,
+	WMACROFORM,
+	WEXITSCOPE,
+	WNOSCOPE,
+	WOLITERAL,
+	WNLITERAL,
+	WERRMAX
+};
+
+#define	MACRO_PROT_ARGS	  struct man *m, int tok, int line, \
+			  int ppos, int *pos, char *buf
+
+struct	man_macro {
+	int		(*fp)(MACRO_PROT_ARGS);
+	int		  flags;
+#define	MAN_SCOPED	 (1 << 0)
+#define	MAN_EXPLICIT	 (1 << 1)
+};
+
+extern	const struct man_macro *const man_macros;
+
 __BEGIN_DECLS
 
+#define		  man_perr(m, l, p, t) \
+		  man_err((m), (l), (p), 1, (t))
+#define		  man_pwarn(m, l, p, t) \
+		  man_err((m), (l), (p), 0, (t))
+#define		  man_nerr(m, n, t) \
+		  man_err((m), (n)->line, (n)->pos, 1, (t))
+#define		  man_nwarn(m, n, t) \
+		  man_err((m), (n)->line, (n)->pos, 0, (t))
+
 int		  man_word_alloc(struct man *, int, int, const char *);
+int		  man_block_alloc(struct man *, int, int, int);
+int		  man_head_alloc(struct man *, int, int, int);
+int		  man_body_alloc(struct man *, int, int, int);
 int		  man_elem_alloc(struct man *, int, int, int);
 void		  man_node_free(struct man_node *);
 void		  man_node_freelist(struct man_node *);
 void		 *man_hash_alloc(void);
-int		  man_macro(struct man *, int, 
-			int, int, int *, char *);
 int		  man_hash_find(const void *, const char *);
 void		  man_hash_free(void *);
 int		  man_macroend(struct man *);
+int		  man_args(struct man *, int, int *, char *, char **);
+#define	ARGS_ERROR	(-1)
+#define	ARGS_EOLN	(0)
+#define	ARGS_WORD	(1)
+#define	ARGS_QWORD	(1)
+int		  man_err(struct man *, int, int, int, enum merr);
 int		  man_vwarn(struct man *, int, int, const char *, ...);
 int		  man_verr(struct man *, int, int, const char *, ...);
 int		  man_valid_post(struct man *);
+int		  man_valid_pre(struct man *, const struct man_node *);
 int		  man_action_post(struct man *);
+int		  man_action_pre(struct man *, struct man_node *);
+int		  man_unscope(struct man *, const struct man_node *);
 
 __END_DECLS