===================================================================
RCS file: /cvs/mandoc/mdoc.h,v
retrieving revision 1.3
retrieving revision 1.20
diff -u -p -r1.3 -r1.20
--- mandoc/mdoc.h	2008/12/17 17:18:38	1.3
+++ mandoc/mdoc.h	2009/01/12 12:52:21	1.20
@@ -1,4 +1,4 @@
-/* $Id: mdoc.h,v 1.3 2008/12/17 17:18:38 kristaps Exp $ */
+/* $Id: mdoc.h,v 1.20 2009/01/12 12:52:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -19,7 +19,7 @@
 #ifndef MDOC_H
 #define MDOC_H
 
-#define	MDOC_LINEARG_MAX 9
+#define	MDOC_LINEARG_MAX 12
 
 #define	MDOC___	 	 0
 #define	MDOC_Dd		 1
@@ -189,33 +189,84 @@
 #define MDOC_svid4	 57
 #define	MDOC_Filled	 58
 #define	MDOC_Words	 59
-#define	MDOC_ARG_MAX	 60
+#define	MDOC_Emphasis	 60
+#define	MDOC_Symbolic	 61
+#define	MDOC_ARG_MAX	 62
 
 enum 	mdoc_err {
-	ERR_SYNTAX_QUOTE,
+	ERR_SYNTAX_QUOTE, /* NOTUSED */
+	ERR_SYNTAX_UNQUOTE,
+	ERR_SYNTAX_NOPUNCT,
 	ERR_SYNTAX_WS,
-	ERR_SYNTAX_ARGS,
+	ERR_SYNTAX_ARG,
+	ERR_SYNTAX_ARGFORM,
+	ERR_SYNTAX_ARGVAL,
+	ERR_SYNTAX_ARGBAD,
+	ERR_SYNTAX_ARGMISS,
+	ERR_SYNTAX_ARGMANY,
 	ERR_MACRO_NOTSUP,
 	ERR_MACRO_NOTCALL,
 	ERR_SCOPE_BREAK,
+	ERR_SCOPE_NOCTX,
+	ERR_SCOPE_NONEST,
 	ERR_SEC_PROLOGUE,
 	ERR_SEC_NPROLOGUE,
 	ERR_SEC_PROLOGUE_OO,
 	ERR_SEC_PROLOGUE_REP,
 	ERR_SEC_NAME,
+	ERR_ARGS_EQ0,
+	ERR_ARGS_EQ1,
 	ERR_ARGS_GE1,
-	ERR_ARGS_MANY
+	ERR_ARGS_LE2,
+	ERR_ARGS_LE8,
+	ERR_ARGS_MANY,
+	ERR_SYNTAX_CHILDBAD,
+	ERR_SYNTAX_PARENTBAD,
+	ERR_SYNTAX_CHILDHEAD,
+	ERR_SYNTAX_CHILDBODY,
+	ERR_SYNTAX_EMPTYBODY,
+	ERR_SYNTAX_EMPTYHEAD,
+	ERR_SYNTAX_NOTEXT
 };
 
+enum	mdoc_att {
+	ATT_DEFAULT = 0,
+	ATT_v1,
+	ATT_v2,
+	ATT_v3,
+	ATT_v4,
+	ATT_v5,
+	ATT_v6,
+	ATT_v7,
+	ATT_32v,
+	ATT_V1,
+	ATT_V2,
+	ATT_V3,
+	ATT_V4
+};
+
 enum	mdoc_warn {
 	WARN_SYNTAX_WS_EOLN,
 	WARN_SYNTAX_MACLIKE,
+	WARN_SYNTAX_ARGLIKE,
+	WARN_SYNTAX_QUOTED,
+	WARN_SYNTAX_EMPTYHEAD,
+	WARN_SYNTAX_EMPTYBODY,
+	WARN_SYNTAX_NOBODY,
+	WARN_IGN_AFTER_BLK,
+	WARN_IGN_BEFORE_BLK,
+	WARN_IGN_OBSOLETE,
 	WARN_SEC_OO,
-	WARN_ARGS_GE1
+	WARN_SEC_REP,
+	WARN_ARGS_GE1,
+	WARN_ARGS_EQ0,
+	WARN_COMPAT_TROFF
 };
 
 struct	mdoc_arg {
 	int	  	  arg;
+	int		  line;
+	int		  pos;
 	size_t		  sz;
 	char		**value;
 };
@@ -224,8 +275,10 @@ enum	mdoc_type {
 	MDOC_TEXT,
 	MDOC_ELEM,
 	MDOC_HEAD,
+	MDOC_TAIL,
 	MDOC_BODY,
-	MDOC_BLOCK
+	MDOC_BLOCK,
+	MDOC_ROOT
 };
 
 enum	mdoc_msec {
@@ -320,6 +373,8 @@ struct	mdoc_meta {
 	time_t		  date;
 #define	META_TITLE_SZ	 (64)
 	char		  title[META_TITLE_SZ];
+#define	META_OS_SZ	 (64)
+	char		  os[META_OS_SZ];
 };
 
 struct	mdoc_text {
@@ -327,25 +382,16 @@ struct	mdoc_text {
 };
 
 struct	mdoc_block {
-	int		  tok;
 	size_t		  argc;
 	struct mdoc_arg	 *argv;
+	struct mdoc_node *head;
+	struct mdoc_node *body;
+	struct mdoc_node *tail;
 };
 
-struct	mdoc_head {
-	size_t		  sz;
-	char		**args;
-	int		  tok;
-};
-
-struct	mdoc_body {
-	int		  tok;
-};
-
 struct	mdoc_elem {
 	size_t		  sz;
 	char		**args;
-	int		  tok;
 	size_t		  argc;
 	struct mdoc_arg	 *argv;
 };
@@ -353,8 +399,6 @@ struct	mdoc_elem {
 union	mdoc_data {
 	struct mdoc_text  text;
 	struct mdoc_elem  elem;
-	struct mdoc_body  body;
-	struct mdoc_head  head;
 	struct mdoc_block block;
 };
 
@@ -362,6 +406,10 @@ struct	mdoc_node {
 	struct mdoc_node *parent;
 	struct mdoc_node *child;
 	struct mdoc_node *next;
+	struct mdoc_node *prev;
+	int		  line;
+	int		  pos;
+	int		  tok;
 	enum mdoc_type	  type;
 	union mdoc_data	  data;
 };
@@ -369,7 +417,7 @@ struct	mdoc_node {
 struct	mdoc_cb {
 	int	(*mdoc_err)(void *, int, int, enum mdoc_err);
 	int	(*mdoc_warn)(void *, int, int, enum mdoc_warn);
-	void	(*mdoc_msg)(void *, int, const char *);
+	void	(*mdoc_msg)(void *, int, int, const char *);
 };
 
 extern	const char *const *mdoc_macronames;
@@ -381,9 +429,10 @@ struct	mdoc;
 
 void	 	  mdoc_free(struct mdoc *);
 struct	mdoc	 *mdoc_alloc(void *data, const struct mdoc_cb *);
-int	 	  mdoc_parseln(struct mdoc *, char *buf);
+int	 	  mdoc_parseln(struct mdoc *, int, char *buf);
 const struct mdoc_node
 		 *mdoc_result(struct mdoc *);
+int		  mdoc_endparse(struct mdoc *);
 
 __END_DECLS