===================================================================
RCS file: /cvs/mandoc/Attic/libroff.h,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- mandoc/Attic/libroff.h	2010/12/29 16:44:23	1.7
+++ mandoc/Attic/libroff.h	2010/12/31 14:52:41	1.10
@@ -1,4 +1,4 @@
-/*	$Id: libroff.h,v 1.7 2010/12/29 16:44:23 kristaps Exp $ */
+/*	$Id: libroff.h,v 1.10 2010/12/31 14:52:41 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -61,6 +61,7 @@ struct	tbl_row {
 };
 
 struct	tbl_dat {
+	struct tbl_cell	 *layout; /* layout cell: CAN BE NULL */
 	struct tbl_dat	 *next;
 	char		 *string;
 	int		  flags;
@@ -71,11 +72,13 @@ struct	tbl_dat {
 };
 
 struct	tbl_span {
+	struct tbl_row	 *layout; /* layout row: CAN BE NULL */
 	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 {
@@ -94,8 +97,11 @@ 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;
+	struct tbl	 *next;
 };
 
 #define	TBL_MSG(tblp, type, line, col) \
@@ -108,7 +114,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 *);
-struct tbl_span	*tbl_data(struct tbl *, int, const char *);
+int		 tbl_data(struct tbl *, int, const char *);
 
 __END_DECLS