===================================================================
RCS file: /cvs/mandoc/libman.h,v
retrieving revision 1.19
retrieving revision 1.25
diff -u -p -r1.19 -r1.25
--- mandoc/libman.h	2009/08/21 12:32:38	1.19
+++ mandoc/libman.h	2010/03/22 14:03:03	1.25
@@ -1,4 +1,4 @@
-/*	$Id: libman.h,v 1.19 2009/08/21 12:32:38 kristaps Exp $ */
+/*	$Id: libman.h,v 1.25 2010/03/22 14:03:03 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,13 +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_ELINE	(1 << 1) 	/* Next-line element scope. */
-#define	MAN_BLINE	(1 << 2) 	/* Next-line block scope. */
-#define	MAN_LITERAL	(1 << 3)	/* Literal input. */
+#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;
@@ -42,10 +42,10 @@ struct	man {
 
 enum	merr {
 	WNPRINT = 0,
-	WNMEM,
 	WMSEC,
 	WDATE,
 	WLNSCOPE,
+	WLNSCOPE2,
 	WTSPACE,
 	WTQUOTE,
 	WNODATA,
@@ -55,7 +55,6 @@ enum	merr {
 	WHEADARGS,
 	WBODYARGS,
 	WNHEADARGS,
-	WMACRO,
 	WMACROFORM,
 	WEXITSCOPE,
 	WNOSCOPE,
@@ -71,7 +70,9 @@ struct	man_macro {
 	int		(*fp)(MACRO_PROT_ARGS);
 	int		  flags;
 #define	MAN_SCOPED	 (1 << 0)
-#define	MAN_EXPLICIT	 (1 << 1)
+#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;
@@ -94,9 +95,9 @@ 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_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);
+int		  man_hash_find(const char *);
 int		  man_macroend(struct man *);
 int		  man_args(struct man *, int, int *, char *, char **);
 #define	ARGS_ERROR	(-1)