=================================================================== RCS file: /cvs/mandoc/Attic/libroff.h,v retrieving revision 1.6 retrieving revision 1.8 diff -u -p -r1.6 -r1.8 --- mandoc/Attic/libroff.h 2010/12/29 14:53:31 1.6 +++ mandoc/Attic/libroff.h 2010/12/30 09:34:06 1.8 @@ -1,4 +1,4 @@ -/* $Id: libroff.h,v 1.6 2010/12/29 14:53:31 kristaps Exp $ */ +/* $Id: libroff.h,v 1.8 2010/12/30 09:34:06 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -60,6 +60,25 @@ struct tbl_row { 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 */ @@ -76,8 +95,10 @@ struct tbl { #define TBL_OPT_ALLBOX (1 << 4) #define TBL_OPT_NOKEEP (1 << 5) #define TBL_OPT_NOSPACE (1 << 6) - struct tbl_row *first; - struct tbl_row *last; + struct tbl_row *first_row; + struct tbl_row *last_row; + struct tbl_span *first_span; + struct tbl_span *last_span; }; #define TBL_MSG(tblp, type, line, col) \ @@ -90,6 +111,7 @@ 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 *); __END_DECLS