=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.20 retrieving revision 1.28 diff -u -p -r1.20 -r1.28 --- mandoc/Attic/libroff.h 2011/03/20 16:02:05 1.20 +++ mandoc/Attic/libroff.h 2013/05/31 21:37:17 1.28 @@ -1,4 +1,4 @@ -/* $Id: libroff.h,v 1.20 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: libroff.h,v 1.28 2013/05/31 21:37:17 schwarze Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * @@ -31,7 +31,7 @@ struct tbl_node { 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; @@ -43,10 +43,25 @@ struct tbl_node { }; struct eqn_node { + struct eqn_def *defs; + size_t defsz; + char *data; + size_t rew; + size_t cur; + size_t sz; + int gsize; struct eqn eqn; - struct eqn_node *next; + struct mparse *parse; + struct eqn_node *next; }; +struct eqn_def { + char *key; + size_t keysz; + char *val; + 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 *); @@ -57,11 +72,12 @@ 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 *); const struct tbl_span *tbl_span(struct tbl_node *); -void tbl_end(struct tbl_node *); -struct eqn_node *eqn_alloc(int, int); -void eqn_end(struct eqn_node *); +void tbl_end(struct tbl_node **); +struct eqn_node *eqn_alloc(const char *, int, int, struct mparse *); +enum rofferr 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