=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.17 retrieving revision 1.22 diff -u -p -r1.17 -r1.22 --- mandoc/Attic/libroff.h 2011/01/25 12:24:27 1.17 +++ mandoc/Attic/libroff.h 2011/07/17 12:13:37 1.22 @@ -1,4 +1,4 @@ -/* $Id: libroff.h,v 1.17 2011/01/25 12:24:27 schwarze Exp $ */ +/* $Id: libroff.h,v 1.22 2011/07/17 12:13:37 kristaps Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * @@ -27,8 +27,7 @@ enum tbl_part { }; struct tbl_node { - mandocmsg msg; /* status messages */ - void *data; /* privdata for messages */ + struct mparse *parse; /* parse point */ int pos; /* invocation column */ int line; /* invocation line */ enum tbl_part part; @@ -43,10 +42,22 @@ struct tbl_node { struct tbl_node *next; }; -#define TBL_MSG(tblp, type, line, col) \ - (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL) +struct eqn_def { + char *key; + size_t keysz; + char *val; + size_t valsz; +}; -struct tbl_node *tbl_alloc(int, int, void *, mandocmsg); +struct eqn_node { + struct eqn_def *defs; + size_t defsz; + struct eqn eqn; + struct mparse *parse; + struct eqn_node *next; +}; + +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 *); @@ -57,6 +68,11 @@ 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 *); +void eqn_end(struct eqn_node *); +void eqn_free(struct eqn_node *); +enum rofferr eqn_read(struct eqn_node **, int, + const char *, int, int *); __END_DECLS