===================================================================
RCS file: /cvs/mandoc/Attic/libroff.h,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -p -r1.9 -r1.15
--- mandoc/Attic/libroff.h	2010/12/30 10:26:00	1.9
+++ mandoc/Attic/libroff.h	2011/01/02 10:10:57	1.15
@@ -1,4 +1,4 @@
-/*	$Id: libroff.h,v 1.9 2010/12/30 10:26:00 kristaps Exp $ */
+/*	$Id: libroff.h,v 1.15 2011/01/02 10:10:57 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -25,95 +25,35 @@ enum	tbl_part {
 	TBL_PART_DATA  /* creating data rows */
 };
 
-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_cell	 *layout; /* layout cell: CAN BE NULL */
-	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_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 {
+struct	tbl_node {
 	mandocmsg	  msg; /* status messages */
 	void		 *data; /* privdata for messages */
+	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;
 	struct tbl_row	 *first_row;
 	struct tbl_row	 *last_row;
 	struct tbl_span	 *first_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 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 tbl_node	*tbl_alloc(int, int, void *, mandocmsg);
+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 *);
+const struct tbl_span *tbl_span(const struct tbl_node *);
+void		 tbl_end(struct tbl_node *);
 
 __END_DECLS