===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.38
retrieving revision 1.40
diff -u -p -r1.38 -r1.40
--- mandoc/mandoc.h	2010/12/31 18:19:43	1.38
+++ mandoc/mandoc.h	2011/01/01 17:10:20	1.40
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.38 2010/12/31 18:19:43 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.40 2011/01/01 17:10:20 kristaps Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -105,6 +105,7 @@ enum	mandocerr {
 	MANDOCERR_TBLOPT, /* bad table option */
 	MANDOCERR_TBLLAYOUT, /* bad table layout */
 	MANDOCERR_TBLNOLAYOUT, /* no table layout cells specified */
+	MANDOCERR_TBLNODATA, /* no table data cells specified */
 	MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
 	MANDOCERR_BADCHAR, /* skipping bad character */
 	MANDOCERR_NOTEXT, /* skipping text before the first section header */
@@ -180,6 +181,14 @@ struct	tbl_row {
 	struct tbl_cell	 *last;
 };
 
+enum	tbl_datt {
+	TBL_DATA_DATA,
+	TBL_DATA_HORIZ,
+	TBL_DATA_DHORIZ,
+	TBL_DATA_NHORIZ,
+	TBL_DATA_NDHORIZ
+};
+
 /*
  * A cell within a row of data.  The "string" field contains the actual
  * string value that's in the cell.  The rest is layout.
@@ -188,13 +197,15 @@ 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)
+	enum tbl_datt	  pos;
 };
 
+enum	tbl_spant {
+	TBL_SPAN_DATA, /* span consists of data */
+	TBL_SPAN_HORIZ, /* span is horizontal line */
+	TBL_SPAN_DHORIZ /* span is double horizontal line */
+};
+
 /*
  * A row of data in a table.
  */
@@ -202,9 +213,7 @@ 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)
+	enum tbl_spant	  pos;
 	struct tbl_span	 *next;
 };