=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.23 retrieving revision 1.29 diff -u -p -r1.23 -r1.29 --- mandoc/Attic/libroff.h 2011/07/21 10:24:35 1.23 +++ mandoc/Attic/libroff.h 2014/04/20 16:46:04 1.29 @@ -1,4 +1,4 @@ -/* $Id: libroff.h,v 1.23 2011/07/21 10:24:35 kristaps Exp $ */ +/* $Id: libroff.h,v 1.29 2014/04/20 16:46:04 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; @@ -46,8 +46,10 @@ 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 mparse *parse; struct eqn_node *next; @@ -64,17 +66,17 @@ 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); +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 *); 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 *); +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, +enum rofferr eqn_read(struct eqn_node **, int, const char *, int, int *); __END_DECLS