===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.15
retrieving revision 1.26
diff -u -p -r1.15 -r1.26
--- mandoc/libman.h	2009/07/24 20:22:24	1.15
+++ mandoc/libman.h	2010/03/23 21:50:43	1.26
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.15 2009/07/24 20:22:24 kristaps Exp $ */
+/*	$Id: libman.h,v 1.26 2010/03/23 21:50:43 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,11 +27,13 @@ enum	man_next {
 struct	man {
 	void		*data;
 	struct man_cb	 cb;
-	void		*htab;
 	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_ILINE	(1 << 3) /* Ignored in next-line scope. */
+#define	MAN_LITERAL	(1 << 4) /* Literal input. */
 	enum man_next	 next;
 	struct man_node	*last;
 	struct man_node	*first;
@@ -40,19 +42,41 @@ struct	man {
 
 enum	merr {
 	WNPRINT = 0,
-	WNMEM,
 	WMSEC,
 	WDATE,
 	WLNSCOPE,
+	WLNSCOPE2,
 	WTSPACE,
 	WTQUOTE,
 	WNODATA,
 	WNOTITLE,
 	WESCAPE,
 	WNUMFMT,
+	WHEADARGS,
+	WBODYARGS,
+	WNHEADARGS,
+	WMACROFORM,
+	WEXITSCOPE,
+	WNOSCOPE,
+	WOLITERAL,
+	WNLITERAL,
 	WERRMAX
 };
 
+#define	MACRO_PROT_ARGS	  struct man *m, enum mant 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)	/* See blk_imp(). */
+#define	MAN_FSCOPED	 (1 << 2)	/* See blk_imp(). */
+#define	MAN_NSCOPED	 (1 << 3)	/* See in_line_eoln(). */
+};
+
+extern	const struct man_macro *const man_macros;
+
 __BEGIN_DECLS
 
 #define		  man_perr(m, l, p, t) \
@@ -64,21 +88,30 @@ __BEGIN_DECLS
 #define		  man_nwarn(m, n, t) \
 		  man_err((m), (n)->line, (n)->pos, 0, (t))
 
-int		  man_err(struct man *, int, int, int, enum merr);
 int		  man_word_alloc(struct man *, int, int, const char *);
-int		  man_elem_alloc(struct man *, int, int, int);
+int		  man_block_alloc(struct man *, int, int, enum mant);
+int		  man_head_alloc(struct man *, int, int, enum mant);
+int		  man_body_alloc(struct man *, int, int, enum mant);
+int		  man_elem_alloc(struct man *, int, int, enum mant);
 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 *);
+void		  man_node_unlink(struct man *, struct man_node *);
+void		  man_hash_init(void);
+enum	mant	  man_hash_find(const char *);
 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