===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.52
retrieving revision 1.57
diff -u -p -r1.52 -r1.57
--- mandoc/Attic/private.h	2009/01/01 20:40:16	1.52
+++ mandoc/Attic/private.h	2009/01/07 15:53:00	1.57
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.52 2009/01/01 20:40:16 kristaps Exp $ */
+/* $Id: private.h,v 1.57 2009/01/07 15:53:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -31,6 +31,7 @@ struct	mdoc {
 	struct mdoc_cb	  cb;
 	void		 *htab;
 	int		  flags;
+#define	MDOC_HALT	 (1 << 0)
 	enum mdoc_next	  next;
 	struct mdoc_node *last;
 	struct mdoc_node *first;
@@ -43,9 +44,11 @@ struct	mdoc_macro {
 	int	(*fp)(struct mdoc *, int, int, int *, char *);
 	int	  flags;
 #define	MDOC_CALLABLE	(1 << 0)
-#define	MDOC_EXPLICIT	(1 << 1)
-#define	MDOC_QUOTABLE	(1 << 2)
-#define	MDOC_PROLOGUE	(1 << 3)
+#define	MDOC_PARSED	(1 << 1)
+#define	MDOC_EXPLICIT	(1 << 2)
+#define	MDOC_QUOTABLE	(1 << 3)
+#define	MDOC_PROLOGUE	(1 << 4)
+#define	MDOC_NESTED	(1 << 5)
 };
 
 extern	const struct mdoc_macro *const mdoc_macros;
@@ -62,11 +65,11 @@ int		  mdoc_macro(struct mdoc *, int, int, int *, char
 int		  mdoc_find(const struct mdoc *, const char *);
 void		  mdoc_word_alloc(struct mdoc *, int, const char *);
 void		  mdoc_elem_alloc(struct mdoc *, int, int, 
-			size_t, const struct mdoc_arg *, 
-			size_t, const char **);
+			size_t, const struct mdoc_arg *);
 void		  mdoc_block_alloc(struct mdoc *, int, int, 
 			size_t, const struct mdoc_arg *);
 void		  mdoc_head_alloc(struct mdoc *, int, int);
+void		  mdoc_tail_alloc(struct mdoc *, int, int);
 void		  mdoc_body_alloc(struct mdoc *, int, int);
 void		  mdoc_node_free(struct mdoc_node *);
 void		  mdoc_sibling(struct mdoc *, int, struct mdoc_node **,
@@ -83,10 +86,10 @@ enum	mdoc_arch mdoc_atoarch(const char *);
 enum	mdoc_att  mdoc_atoatt(const char *);
 time_t		  mdoc_atotime(const char *);
 
-int		  mdoc_valid_post(struct mdoc *, int, int);
 int		  mdoc_valid_pre(struct mdoc *, int, int,
-			int, const char *[],
 			int, const struct mdoc_arg *);
+int		  mdoc_valid_post(struct mdoc *, int);
+int		  mdoc_action(struct mdoc *, int);
 
 int		  mdoc_argv(struct mdoc *, int, 
 			struct mdoc_arg *, int *, char *);
@@ -112,17 +115,15 @@ void	 	 *xcalloc(size_t, size_t);
 char	 	 *xstrdup(const char *);
 
 int		  macro_obsolete(MACRO_PROT_ARGS);
-int		  macro_constant_quoted(MACRO_PROT_ARGS);
-int		  macro_constant_obsolete(MACRO_PROT_ARGS);
-int		  macro_constant_argv(MACRO_PROT_ARGS);
 int		  macro_constant(MACRO_PROT_ARGS);
+int		  macro_constant_scoped(MACRO_PROT_ARGS);
 int		  macro_constant_delimited(MACRO_PROT_ARGS);
 int		  macro_text(MACRO_PROT_ARGS);
 int		  macro_scoped(MACRO_PROT_ARGS);
 int		  macro_close_explicit(MACRO_PROT_ARGS);
 int		  macro_scoped_line(MACRO_PROT_ARGS);
-int		  macro_scoped_pline(MACRO_PROT_ARGS);
 int		  macro_prologue(MACRO_PROT_ARGS);
+int		  macro_end(struct mdoc *);
 
 __END_DECLS