===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.25
retrieving revision 1.28
diff -u -p -r1.25 -r1.28
--- mandoc/libman.h	2010/03/22 14:03:03	1.25
+++ mandoc/libman.h	2010/03/27 10:04:56	1.28
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.25 2010/03/22 14:03:03 kristaps Exp $ */
+/*	$Id: libman.h,v 1.28 2010/03/27 10:04:56 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -60,10 +60,13 @@ enum	merr {
 	WNOSCOPE,
 	WOLITERAL,
 	WNLITERAL,
+	WROFFNEST,
+	WROFFSCOPE,
+	WTITLECASE,
 	WERRMAX
 };
 
-#define	MACRO_PROT_ARGS	  struct man *m, int tok, int line, \
+#define	MACRO_PROT_ARGS	  struct man *m, enum mant tok, int line, \
 			  int ppos, int *pos, char *buf
 
 struct	man_macro {
@@ -73,6 +76,7 @@ struct	man_macro {
 #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(). */
+#define	MAN_NOCLOSE	 (1 << 4)	/* See blk_exp(). */
 };
 
 extern	const struct man_macro *const man_macros;
@@ -89,15 +93,13 @@ __BEGIN_DECLS
 		  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_node_unlink(struct man *, struct man_node *);
+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_delete(struct man *, struct man_node *);
 void		  man_hash_init(void);
-int		  man_hash_find(const char *);
+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)
@@ -111,7 +113,8 @@ 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 *);
+int		  man_unscope(struct man *, 
+			const struct man_node *, enum merr);
 
 __END_DECLS