===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.42
retrieving revision 1.57
diff -u -p -r1.42 -r1.57
--- mandoc/Attic/private.h	2008/12/15 03:13:01	1.42
+++ mandoc/Attic/private.h	2009/01/07 15:53:00	1.57
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.42 2008/12/15 03:13:01 kristaps Exp $ */
+/* $Id: private.h,v 1.57 2009/01/07 15:53:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -21,13 +21,21 @@
 
 #include "mdoc.h"
 
+enum	mdoc_next {
+	MDOC_NEXT_SIBLING = 0,
+	MDOC_NEXT_CHILD
+};
+
 struct	mdoc {
 	void		 *data;
 	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;
-
+	struct mdoc_meta  meta;
 	enum mdoc_sec	  sec_lastn;
 	enum mdoc_sec	  sec_last;
 };
@@ -36,11 +44,18 @@ 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_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;
 
+#define	MACRO_PROT_ARGS	struct mdoc *mdoc, int tok, \
+			int ppos, int *pos, char *buf
+
 __BEGIN_DECLS
 
 int		  mdoc_err(struct mdoc *, int, int, enum mdoc_err);
@@ -50,20 +65,65 @@ 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, size_t, const char **);
+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 **,
 			struct mdoc_node **, struct mdoc_node *);
-void		 *mdoc_hash_alloc(void);
-int		  mdoc_hash_find(const void *, const char *);
-void		  mdoc_hash_free(void *);
+void		 *mdoc_tokhash_alloc(void);
+int		  mdoc_tokhash_find(const void *, const char *);
+void		  mdoc_tokhash_free(void *);
 int		  mdoc_isdelim(const char *);
+int		  mdoc_iscdelim(char);
+enum	mdoc_sec  mdoc_atosec(size_t, const char **);
+enum	mdoc_msec mdoc_atomsec(const char *);
+enum	mdoc_vol  mdoc_atovol(const char *);
+enum	mdoc_arch mdoc_atoarch(const char *);
+enum	mdoc_att  mdoc_atoatt(const char *);
+time_t		  mdoc_atotime(const char *);
+
+int		  mdoc_valid_pre(struct mdoc *, int, int,
+			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 *);
+#define	ARGV_ERROR	(-1)
+#define	ARGV_EOLN	(0)
+#define	ARGV_ARG	(1)
+#define	ARGV_WORD	(2)
+void		  mdoc_argv_free(int, struct mdoc_arg *);
+int		  mdoc_args(struct mdoc *, int,
+			int *, char *, int, char **);
+#define	ARGS_ERROR	(-1)
+#define	ARGS_EOLN	(0)
+#define	ARGS_WORD	(1)
+#define	ARGS_PUNCT	(2)
+
+#define	ARGS_QUOTED	(1 << 0)
+#define	ARGS_DELIM	(1 << 1)
+
+int	  	  xstrlcat(char *, const char *, size_t);
+int	  	  xstrlcpy(char *, const char *, size_t);
+int	  	  xstrcmp(const char *, const char *);
+void	 	 *xcalloc(size_t, size_t);
+char	 	 *xstrdup(const char *);
+
+int		  macro_obsolete(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_prologue(MACRO_PROT_ARGS);
+int		  macro_end(struct mdoc *);
 
 __END_DECLS