===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.44
retrieving revision 1.51
diff -u -p -r1.44 -r1.51
--- mandoc/Attic/private.h	2008/12/23 05:30:49	1.44
+++ mandoc/Attic/private.h	2008/12/30 19:06:03	1.51
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.44 2008/12/23 05:30:49 kristaps Exp $ */
+/* $Id: private.h,v 1.51 2008/12/30 19:06:03 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -37,6 +37,7 @@ struct	mdoc_macro {
 	int	  flags;
 #define	MDOC_CALLABLE	(1 << 0)
 #define	MDOC_EXPLICIT	(1 << 1)
+#define	MDOC_QUOTABLE	(1 << 2)
 };
 
 extern	const struct mdoc_macro *const mdoc_macros;
@@ -67,26 +68,48 @@ 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_argv_lookup(int, const char *);
-int		  mdoc_argv_parse(struct mdoc *, int, 
-			int, struct mdoc_arg *, int *, char *);
+int		  mdoc_valid(struct mdoc *, int, int,
+			int, const char *[],
+			int, const struct mdoc_arg *);
+
+int		  mdoc_argv(struct mdoc *, int, 
+			struct mdoc_arg *, int *, char *);
 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_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_delimited(MACRO_PROT_ARGS);
 int		  macro_text(MACRO_PROT_ARGS);
 int		  macro_scoped_implicit(MACRO_PROT_ARGS);
 int		  macro_scoped_explicit(MACRO_PROT_ARGS);
+int		  macro_scoped_line(MACRO_PROT_ARGS);
+int		  macro_scoped_pline(MACRO_PROT_ARGS);
 int		  macro_prologue_ddate(MACRO_PROT_ARGS);
 int		  macro_prologue_dtitle(MACRO_PROT_ARGS);
 int		  macro_prologue_os(MACRO_PROT_ARGS);