===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.71
retrieving revision 1.87
diff -u -p -r1.71 -r1.87
--- mandoc/Attic/private.h	2009/01/20 13:05:28	1.71
+++ mandoc/Attic/private.h	2009/03/08 19:28:09	1.87
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.71 2009/01/20 13:05:28 kristaps Exp $ */
+/* $Id: private.h,v 1.87 2009/03/08 19:28:09 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -33,24 +33,16 @@ struct	mdoc {
 	int		  linetok;
 	int		  flags;
 #define	MDOC_HALT	 (1 << 0)
-#define	MDOC_BODYPARSE	 (1 << 1)
+	int		  pflags;
 	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;
+	enum mdoc_sec	  lastnamed;
+	enum mdoc_sec	  lastsec;
 };
 
 
-/* Hard-limit of macro arguments. */
-
-#define	MDOC_LINEARG_MAX 9
-
-/* Suggested limit of macro arguments. */
-
-#define	MDOC_LINEARG_SOFTMAX 9
-
 #define	MACRO_PROT_ARGS	struct mdoc *mdoc, int tok, int line, \
 			int ppos, int *pos, char *buf
 
@@ -60,9 +52,7 @@ struct	mdoc_macro {
 #define	MDOC_CALLABLE	 (1 << 0)
 #define	MDOC_PARSED	 (1 << 1)
 #define	MDOC_EXPLICIT	 (1 << 2)
-#define	MDOC_QUOTABLE	 (1 << 3)
-#define	MDOC_PROLOGUE	 (1 << 4)
-#define	MDOC_TABSEP	 (1 << 5)
+#define	MDOC_PROLOGUE	 (1 << 3)
 };
 
 #define	mdoc_nwarn(mdoc, node, type, fmt, ...) \
@@ -109,13 +99,12 @@ int		  mdoc_verr(struct mdoc *, int, int, 
 			const char *, ...);
 
 int		  mdoc_macro(MACRO_PROT_ARGS);
-int		  mdoc_find(const struct mdoc *, const char *);
 int		  mdoc_word_alloc(struct mdoc *, 
 			int, int, const char *);
 int		  mdoc_elem_alloc(struct mdoc *, int, int, 
-			int, size_t, const struct mdoc_arg *);
+			int, struct mdoc_arg *);
 int		  mdoc_block_alloc(struct mdoc *, int, int, 
-			int, size_t, const struct mdoc_arg *);
+			int, struct mdoc_arg *);
 int		  mdoc_root_alloc(struct mdoc *);
 int		  mdoc_head_alloc(struct mdoc *, int, int, int);
 int		  mdoc_tail_alloc(struct mdoc *, int, int, int);
@@ -127,30 +116,30 @@ void		  mdoc_sibling(struct mdoc *, int, struct mdoc_n
 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);
+size_t		  mdoc_isescape(const char *);
 enum	mdoc_sec  mdoc_atosec(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 *);
+size_t		  mdoc_macro2len(int);
 
-char		 *mdoc_type2a(enum mdoc_type);
-char		 *mdoc_node2a(struct mdoc_node *);
+const char	 *mdoc_a2arch(const char *);
+const char	 *mdoc_a2vol(const char *);
+const char	 *mdoc_a2msec(const char *);
 
-int		  mdoc_valid_pre(struct mdoc *, struct mdoc_node *);
+int		  mdoc_valid_pre(struct mdoc *, 
+			const struct mdoc_node *);
 int		  mdoc_valid_post(struct mdoc *);
 int		  mdoc_action_pre(struct mdoc *, struct mdoc_node *);
 int		  mdoc_action_post(struct mdoc *);
 
-int		  mdoc_argv(struct mdoc *, int, int, 
-			struct mdoc_arg *, int *, char *);
+int		  mdoc_argv(struct mdoc *, int, 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 *);
+void		  mdoc_argv_free(struct mdoc_arg *);
 int		  mdoc_args(struct mdoc *, int,
 			int *, char *, int, char **);
 #define	ARGS_ERROR	(-1)
@@ -158,27 +147,17 @@ int		  mdoc_args(struct mdoc *, int,
 #define	ARGS_WORD	(1)
 #define	ARGS_PUNCT	(2)
 #define	ARGS_QWORD	(3)
+#define	ARGS_PHRASE	(4)
 
-#define	ARGS_QUOTED	(1 << 0)
-#define	ARGS_DELIM	(1 << 1)
-#define	ARGS_TABSEP	(1 << 2)
-
-int		  xstrlcats(char *, const struct mdoc_node *, size_t);
+int		  xstrlcpys(char *, const struct mdoc_node *, size_t);
 int	  	  xstrlcat(char *, const char *, size_t);
 int	  	  xstrlcpy(char *, const char *, size_t);
 int	  	  xstrcmp(const char *, const char *);
+int	  	  xstrncmp(const char *, const char *, size_t);
 void	 	 *xcalloc(size_t, size_t);
+void	 	 *xrealloc(void *, 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_scoped_close(MACRO_PROT_ARGS);
-int		  macro_scoped_line(MACRO_PROT_ARGS);
-int		  macro_prologue(MACRO_PROT_ARGS);
 int		  macro_end(struct mdoc *);
 
 __END_DECLS