Cleanup, no functional change:

[mandoc.git] / libroff.h

diff --git a/libroff.h b/libroff.h
index 08ed1f7925d2332837650cb424ec248e1fad8fd7..9cb0c3a96da4d3a3753a9c3faaeca4d570596a34 100644 (file)
--- a/libroff.h
+++ b/libroff.h
@@ -1,7 +1,7 @@
-/*     $Id: libroff.h,v 1.38 2015/01/30 04:11:50 schwarze Exp $ */
+/*     $Id: libroff.h,v 1.43 2018/12/13 02:06:07 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 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
@@ -16,37 +16,16 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-enum   tbl_part {
-       TBL_PART_OPTS, /* in options (first line) */
-       TBL_PART_LAYOUT, /* describing layout */
-       TBL_PART_DATA, /* creating data rows */
-       TBL_PART_CDATA /* continue previous row */
-};
-
-struct tbl_node {
-       struct mparse    *parse; /* parse point */
-       int               pos; /* invocation column */
-       int               line; /* invocation line */
-       enum tbl_part     part;
-       struct tbl_opts   opts;
-       struct tbl_row   *first_row;
-       struct tbl_row   *last_row;
-       struct tbl_span  *first_span;
-       struct tbl_span  *current_span;
-       struct tbl_span  *last_span;
-       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 */
@@ -60,23 +39,10 @@ struct      eqn_def {
        size_t            valsz;
 };
 
-__BEGIN_DECLS
 
-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);
-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);
-int             tbl_cdata(struct tbl_node *, int, const char *, int);
-const struct tbl_span  *tbl_span(struct tbl_node *);
-int             tbl_end(struct tbl_node **);
-struct eqn_node        *eqn_alloc(int, int, struct mparse *);
-enum rofferr    eqn_end(struct eqn_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
+void            eqn_parse(struct eqn_node *);
+void            eqn_read(struct eqn_node *, const char *);
+void            eqn_reset(struct eqn_node *);