Infrastructure for -T markdown tests.

[mandoc.git] / libroff.h

diff --git a/libroff.h b/libroff.h
index de4c21cb3cda3e4f45990629d06e87eebe61403a..897a55ae61cb6382d19616d92ac3de968941e52c 100644 (file)
--- a/libroff.h
+++ b/libroff.h
@@ -1,6 +1,7 @@
-/*     $Id: libroff.h,v 1.24 2011/07/21 23:30:39 kristaps Exp $ */
+/*     $Id: libroff.h,v 1.39 2015/11/07 14:01:16 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

+ * Copyright (c) 2014, 2015 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,10 +15,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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) */
 
 enum   tbl_part {
        TBL_PART_OPTS, /* in options (first line) */


@@ -31,27 +28,29 @@ struct      tbl_node {
        int               pos; /* invocation column */
        int               line; /* invocation line */
        enum tbl_part     part;
        int               pos; /* invocation column */
        int               line; /* invocation line */
        enum tbl_part     part;

-       struct tbl        opts;
+       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_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_head  *first_head;
-       struct tbl_head  *last_head;

        struct tbl_node  *next;
 };
 
 struct eqn_node {
        struct tbl_node  *next;
 };
 
 struct eqn_node {

-       struct eqn_def   *defs;
-       size_t            defsz;
-       char             *data;
-       size_t            rew;
-       size_t            cur;
-       size_t            sz;
-       struct eqn        eqn;
-       struct mparse    *parse;
-       struct eqn_node  *next;
+       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 eqn_def   *defs;   /* array of definitions */
+       char             *data;   /* source code of this equation */
+       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 */
+       int               gsize;  /* default point size */
+       int               delim;  /* in-line delimiters enabled */
+       char              odelim; /* in-line opening delimiter */
+       char              cdelim; /* in-line closing delimiter */

 };
 
 struct eqn_def {
 };
 
 struct eqn_def {


@@ -61,23 +60,20 @@ struct      eqn_def {
        size_t            valsz;
 };
 
        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 *);
 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 *);
+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 *);
 const struct tbl_span  *tbl_span(struct tbl_node *);

-void            tbl_end(struct tbl_node *);
+int             tbl_end(struct tbl_node **);

 struct eqn_node        *eqn_alloc(int, int, struct mparse *);
 struct eqn_node        *eqn_alloc(int, int, struct mparse *);

-enum rofferr    eqn_end(struct eqn_node *);
+enum rofferr    eqn_end(struct eqn_node **);

 void            eqn_free(struct eqn_node *);
 void            eqn_free(struct eqn_node *);

-enum rofferr    eqn_read(struct eqn_node **, int, 
+enum rofferr    eqn_read(struct eqn_node **, int,

                        const char *, int, int *);
                        const char *, int, int *);

-
-__END_DECLS
-
-#endif /*LIBROFF_H*/