=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.8 retrieving revision 1.33 diff -u -p -r1.8 -r1.33 --- mandoc/Attic/libroff.h 2010/12/30 09:34:06 1.8 +++ mandoc/Attic/libroff.h 2014/12/01 08:05:52 1.33 @@ -1,6 +1,7 @@ -/* $Id: libroff.h,v 1.8 2010/12/30 09:34:06 kristaps Exp $ */ +/* $Id: libroff.h,v 1.33 2014/12/01 08:05:52 schwarze Exp $ */ /* - * Copyright (c) 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,105 +15,70 @@ * 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) */ TBL_PART_LAYOUT, /* describing layout */ - TBL_PART_DATA /* creating data rows */ + TBL_PART_DATA, /* creating data rows */ + TBL_PART_CDATA /* continue previous row */ }; -enum tbl_cellt { - TBL_CELL_CENTRE, /* c, C */ - TBL_CELL_RIGHT, /* r, R */ - TBL_CELL_LEFT, /* l, L */ - TBL_CELL_NUMBER, /* n, N */ - TBL_CELL_SPAN, /* s, S */ - TBL_CELL_LONG, /* a, A */ - TBL_CELL_DOWN, /* ^ */ - TBL_CELL_HORIZ, /* _, - */ - TBL_CELL_DHORIZ, /* = */ - TBL_CELL_VERT, /* | */ - TBL_CELL_DVERT, /* || */ - TBL_CELL_MAX -}; - -struct tbl_cell { - struct tbl_cell *next; - enum tbl_cellt pos; - int spacing; - int flags; -#define TBL_CELL_TALIGN (1 << 0) /* t, T */ -#define TBL_CELL_BALIGN (1 << 1) /* d, D */ -#define TBL_CELL_BOLD (1 << 2) /* fB, B, b */ -#define TBL_CELL_ITALIC (1 << 3) /* fI, I, i */ -#define TBL_CELL_EQUAL (1 << 4) /* e, E */ -#define TBL_CELL_UP (1 << 5) /* u, U */ -#define TBL_CELL_WIGN (1 << 6) /* z, Z */ -}; - -struct tbl_row { - struct tbl_row *next; - struct tbl_cell *first; - struct tbl_cell *last; -}; - -struct tbl_dat { - struct tbl_dat *next; - char *string; - int flags; -#define TBL_DATA_HORIZ (1 << 0) -#define TBL_DATA_DHORIZ (1 << 1) -#define TBL_DATA_NHORIZ (1 << 2) -#define TBL_DATA_NDHORIZ (1 << 3) -}; - -struct tbl_span { - struct tbl_dat *first; - struct tbl_dat *last; - int flags; -#define TBL_SPAN_HORIZ (1 << 0) -#define TBL_SPAN_DHORIZ (1 << 1) - struct tbl_span *next; -}; - -struct tbl { - mandocmsg msg; /* status messages */ - void *data; /* privdata for messages */ +struct tbl_node { + struct mparse *parse; /* parse point */ + int pos; /* invocation column */ + int line; /* invocation line */ enum tbl_part part; - char tab; /* cell-separator */ - char decimal; /* decimal point */ - int linesize; - char delims[2]; - int opts; -#define TBL_OPT_CENTRE (1 << 0) -#define TBL_OPT_EXPAND (1 << 1) -#define TBL_OPT_BOX (1 << 2) -#define TBL_OPT_DBOX (1 << 3) -#define TBL_OPT_ALLBOX (1 << 4) -#define TBL_OPT_NOKEEP (1 << 5) -#define TBL_OPT_NOSPACE (1 << 6) + 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_head *first_head; + struct tbl_head *last_head; + struct tbl_node *next; }; -#define TBL_MSG(tblp, type, line, col) \ - (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL) +struct eqn_node { + 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 tbl *tbl_alloc(void *, mandocmsg); -void tbl_restart(struct tbl *); -void tbl_free(struct tbl *); -void tbl_reset(struct tbl *); -enum rofferr tbl_read(struct tbl *, int, const char *, int); -int tbl_option(struct tbl *, int, const char *); -int tbl_layout(struct tbl *, int, const char *); -int tbl_data(struct tbl *, int, const char *); +struct eqn_def { + char *key; + size_t keysz; + char *val; + size_t valsz; +}; -__END_DECLS +__BEGIN_DECLS -#endif /*LIBROFF_H*/ +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 *); +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 eqn_free(struct eqn_node *); +enum rofferr eqn_read(struct eqn_node **, int, + const char *, int, int *); + +__END_DECLS