=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.4 retrieving revision 1.13 diff -u -p -r1.4 -r1.13 --- mandoc/Attic/libroff.h 2010/12/29 01:18:23 1.4 +++ mandoc/Attic/libroff.h 2011/01/01 16:10:40 1.13 @@ -1,4 +1,4 @@ -/* $Id: libroff.h,v 1.4 2010/12/29 01:18:23 kristaps Exp $ */ +/* $Id: libroff.h,v 1.13 2011/01/01 16:10:40 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -26,11 +26,13 @@ enum tbl_part { }; struct tbl { - mandocmsg msg; /* status messages */ - void *data; /* privdata for messages */ + mandocmsg msg; /* status messages */ + void *data; /* privdata for messages */ enum tbl_part part; char tab; /* cell-separator */ char decimal; /* decimal point */ + int pos; /* invocation column */ + int line; /* invocation line */ int linesize; char delims[2]; int opts; @@ -41,16 +43,26 @@ struct tbl { #define TBL_OPT_ALLBOX (1 << 4) #define TBL_OPT_NOKEEP (1 << 5) #define TBL_OPT_NOSPACE (1 << 6) + struct tbl_row *first_row; + struct tbl_row *last_row; + struct tbl_span *first_span; + struct tbl_span *last_span; + struct tbl *next; }; #define TBL_MSG(tblp, type, line, col) \ (*(tblp)->msg)((type), (tblp)->data, (line), (col), NULL) -struct tbl *tbl_alloc(void *, mandocmsg); +struct tbl *tbl_alloc(int, int, void *, mandocmsg); +void tbl_restart(int, int, 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 *); +const struct tbl_span *tbl_span(const struct tbl *); +void tbl_end(struct tbl *); __END_DECLS