===================================================================
RCS file: /cvs/mandoc/Attic/libroff.h,v
retrieving revision 1.18
retrieving revision 1.22
diff -u -p -r1.18 -r1.22
--- mandoc/Attic/libroff.h	2011/02/06 20:36:36	1.18
+++ mandoc/Attic/libroff.h	2011/07/17 12:13:37	1.22
@@ -1,4 +1,4 @@
-/*	$Id: libroff.h,v 1.18 2011/02/06 20:36:36 kristaps Exp $ */
+/*	$Id: libroff.h,v 1.22 2011/07/17 12:13:37 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -27,8 +27,7 @@ enum	tbl_part {
 };
 
 struct	tbl_node {
-	mandocmsg	  msg; /* status messages */
-	void		 *data; /* privdata for messages */
+	struct mparse	 *parse; /* parse point */
 	int		  pos; /* invocation column */
 	int		  line; /* invocation line */
 	enum tbl_part	  part;
@@ -43,17 +42,22 @@ struct	tbl_node {
 	struct tbl_node	 *next;
 };
 
+struct	eqn_def {
+	char		 *key;
+	size_t		  keysz;
+	char		 *val;
+	size_t		  valsz;
+};
+
 struct	eqn_node {
-	int		  pos; /* invocation column */
-	int		  line; /* invocation line */
+	struct eqn_def	 *defs;
+	size_t		  defsz;
 	struct eqn	  eqn;
-	struct eqn_node	 *next;
+	struct mparse	 *parse;
+	struct eqn_node  *next;
 };
 
-#define	TBL_MSG(tblp, type, line, col) \
-	(*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL)
-
-struct tbl_node	*tbl_alloc(int, int, void *, mandocmsg);
+struct tbl_node	*tbl_alloc(int, int, struct mparse *);
 void		 tbl_restart(int, int, struct tbl_node *);
 void		 tbl_free(struct tbl_node *);
 void		 tbl_reset(struct tbl_node *);
@@ -64,10 +68,11 @@ int		 tbl_data(struct tbl_node *, int, const char *);
 int		 tbl_cdata(struct tbl_node *, int, const char *);
 const struct tbl_span	*tbl_span(struct tbl_node *);
 void		 tbl_end(struct tbl_node *);
-struct eqn_node	*eqn_alloc(int, int);
+struct eqn_node	*eqn_alloc(int, int, struct mparse *);
 void		 eqn_end(struct eqn_node *);
 void		 eqn_free(struct eqn_node *);
-enum rofferr 	 eqn_read(struct eqn_node **, int, const char *, int);
+enum rofferr 	 eqn_read(struct eqn_node **, int, 
+			const char *, int, int *);
 
 __END_DECLS