=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.15 retrieving revision 1.19 diff -u -p -r1.15 -r1.19 --- mandoc/Attic/libroff.h 2011/01/02 10:10:57 1.15 +++ mandoc/Attic/libroff.h 2011/02/09 09:05:52 1.19 @@ -1,6 +1,6 @@ -/* $Id: libroff.h,v 1.15 2011/01/02 10:10:57 kristaps Exp $ */ +/* $Id: libroff.h,v 1.19 2011/02/09 09:05:52 kristaps Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -22,7 +22,8 @@ __BEGIN_DECLS enum tbl_part { TBL_PART_OPTS, /* in options (first line) */ TBL_PART_LAYOUT, /* describing layout */ - TBL_PART_DATA /* creating data rows */ + TBL_PART_DATA, /* creating data rows */ + TBL_PART_CDATA /* continue previous row */ }; struct tbl_node { @@ -35,12 +36,18 @@ struct tbl_node { 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 eqn eqn; + struct eqn_node *next; +}; + #define TBL_MSG(tblp, type, line, col) \ (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL) @@ -52,8 +59,13 @@ enum rofferr tbl_read(struct tbl_node *, int, const 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 *); -const struct tbl_span *tbl_span(const struct tbl_node *); +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 eqn_free(struct eqn_node *); +enum rofferr eqn_read(struct eqn_node **, int, const char *, int); __END_DECLS