===================================================================
RCS file: /cvs/mandoc/Attic/private.h,v
retrieving revision 1.69
retrieving revision 1.78
diff -u -p -r1.69 -r1.78
--- mandoc/Attic/private.h	2009/01/19 17:51:33	1.69
+++ mandoc/Attic/private.h	2009/02/22 14:31:08	1.78
@@ -1,4 +1,4 @@
-/* $Id: private.h,v 1.69 2009/01/19 17:51:33 kristaps Exp $ */
+/* $Id: private.h,v 1.78 2009/02/22 14:31:08 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -30,21 +30,26 @@ struct	mdoc {
 	void		 *data;
 	struct mdoc_cb	  cb;
 	void		 *htab;
+	int		  linetok;
 	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;
+	enum mdoc_sec	  lastnamed;
+	enum mdoc_sec	  lastsec;
 };
 
 
-/* FIXME: it's 9 (this isn't used properly). */
+/* Hard-limit of macro arguments. */
 
-#define	MDOC_LINEARG_MAX 12
+#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
 
@@ -54,10 +59,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_NOKEEP	 (1 << 6)
+#define	MDOC_PROLOGUE	 (1 << 3)
 };
 
 #define	mdoc_nwarn(mdoc, node, type, fmt, ...) \
@@ -122,7 +124,6 @@ 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);
 enum	mdoc_sec  mdoc_atosec(const char *);
 enum	mdoc_msec mdoc_atomsec(const char *);
@@ -152,15 +153,14 @@ int		  mdoc_args(struct mdoc *, int,
 #define	ARGS_EOLN	(0)
 #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	  	  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);
 char	 	 *xstrdup(const char *);