===================================================================
RCS file: /cvs/mandoc/Attic/libroff.h,v
retrieving revision 1.31
retrieving revision 1.42
diff -u -p -r1.31 -r1.42
--- mandoc/Attic/libroff.h	2014/10/25 14:35:37	1.31
+++ mandoc/Attic/libroff.h	2017/07/08 17:52:49	1.42
@@ -1,7 +1,7 @@
-/*	$Id: libroff.h,v 1.31 2014/10/25 14:35:37 schwarze Exp $ */
+/*	$Id: libroff.h,v 1.42 2017/07/08 17:52:49 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -15,11 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifndef LIBROFF_H
-#define LIBROFF_H
 
-__BEGIN_DECLS
-
 enum	tbl_part {
 	TBL_PART_OPTS, /* in options (first line) */
 	TBL_PART_LAYOUT, /* describing layout */
@@ -38,21 +34,19 @@ struct	tbl_node {
 	struct tbl_span	 *first_span;
 	struct tbl_span	 *current_span;
 	struct tbl_span	 *last_span;
-	struct tbl_head	 *first_head;
-	struct tbl_head	 *last_head;
 	struct tbl_node	 *next;
 };
 
 struct	eqn_node {
-	struct eqn	  eqn;    /* syntax tree of this equation */
 	struct mparse	 *parse;  /* main parser, for error reporting */
-	struct eqn_node  *next;   /* singly linked list of equations */
+	struct roff_node *node;   /* syntax tree of this equation */
 	struct eqn_def	 *defs;   /* array of definitions */
 	char		 *data;   /* source code of this equation */
+	char		 *start;  /* first byte of the current token */
+	char		 *end;	  /* first byte of the next token */
 	size_t		  defsz;  /* number of definitions */
 	size_t		  sz;     /* length of the source code */
-	size_t		  cur;    /* parse point in the source code */
-	size_t		  rew;    /* beginning of the current token */
+	size_t		  toksz;  /* length of the current token */
 	int		  gsize;  /* default point size */
 	int		  delim;  /* in-line delimiters enabled */
 	char		  odelim; /* in-line opening delimiter */
@@ -66,23 +60,21 @@ struct	eqn_def {
 	size_t		  valsz;
 };
 
+
 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 *);
-enum rofferr	 tbl_read(struct tbl_node *, int, const char *, int);
-int		 tbl_option(struct tbl_node *, int, const char *);
-int		 tbl_layout(struct tbl_node *, int, const char *);
-int		 tbl_data(struct tbl_node *, int, const char *);
-int		 tbl_cdata(struct tbl_node *, int, const char *);
+void		 tbl_read(struct tbl_node *, int, const char *, int);
+void		 tbl_option(struct tbl_node *, int, const char *, int *);
+void		 tbl_layout(struct tbl_node *, int, const char *, int);
+void		 tbl_data(struct tbl_node *, int, const char *, int);
+void		 tbl_cdata(struct tbl_node *, int, const char *, int);
 const struct tbl_span	*tbl_span(struct tbl_node *);
-void		 tbl_end(struct tbl_node **);
-struct eqn_node	*eqn_alloc(int, int, struct mparse *);
-enum rofferr	 eqn_end(struct eqn_node **);
+int		 tbl_end(struct tbl_node *);
+struct eqn_node	*eqn_alloc(struct mparse *);
+void		 eqn_box_free(struct eqn_box *);
 void		 eqn_free(struct eqn_node *);
-enum rofferr	 eqn_read(struct eqn_node **, int,
-			const char *, int, int *);
-
-__END_DECLS
-
-#endif /*LIBROFF_H*/
+void		 eqn_parse(struct eqn_node *);
+void		 eqn_read(struct eqn_node *, const char *);
+void		 eqn_reset(struct eqn_node *);