===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.45
retrieving revision 1.50
diff -u -p -r1.45 -r1.50
--- mandoc/mandoc.h	2011/01/03 13:59:21	1.45
+++ mandoc/mandoc.h	2011/01/10 14:40:30	1.50
@@ -1,6 +1,6 @@
-/*	$Id: mandoc.h,v 1.45 2011/01/03 13:59:21 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.50 2011/01/10 14:40:30 kristaps Exp $ */
 /*
- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -75,6 +75,7 @@ enum	mandocerr {
 
 	/* related to missing macro arguments */
 	MANDOCERR_MACROEMPTY, /* skipping empty macro */
+	MANDOCERR_ARGCWARN, /* argument count wrong */
 	MANDOCERR_DISPTYPE, /* missing display type */
 	MANDOCERR_LISTFIRST, /* list type must come first */
 	MANDOCERR_NOWIDTHARG, /* tag lists require a width argument */
@@ -99,9 +100,6 @@ enum	mandocerr {
 	MANDOCERR_BADESCAPE, /* unknown escape sequence */
 	MANDOCERR_BADQUOTE, /* unterminated quoted string */
 
-	/* related to tables */
-	MANDOCERR_TBLEXTRADAT, /* extra data cells */
-
 	MANDOCERR_ERROR, /* ===== start of errors ===== */
 
 	/* related to tables */
@@ -110,6 +108,9 @@ enum	mandocerr {
 	MANDOCERR_TBLLAYOUT, /* bad table layout */
 	MANDOCERR_TBLNOLAYOUT, /* no table layout cells specified */
 	MANDOCERR_TBLNODATA, /* no table data cells specified */
+	MANDOCERR_TBLIGNDATA, /* ignore data in cell */
+	MANDOCERR_TBLBLOCK, /* data block still open */
+	MANDOCERR_TBLEXTRADAT, /* ignoring extra data cells */
 
 	MANDOCERR_ROFFLOOP, /* input stack limit exceeded, infinite loop? */
 	MANDOCERR_BADCHAR, /* skipping bad character */
@@ -149,7 +150,6 @@ struct	tbl {
 	char		  tab; /* cell-separator */
 	char		  decimal; /* decimal point */
 	int		  linesize;
-	char		  delims[2]; /* FIXME: deprecate */
 	int		  opts;
 #define	TBL_OPT_CENTRE	 (1 << 0)
 #define	TBL_OPT_EXPAND	 (1 << 1)
@@ -222,6 +222,7 @@ struct	tbl_row {
 };
 
 enum	tbl_datt {
+	TBL_DATA_NONE,
 	TBL_DATA_DATA,
 	TBL_DATA_HORIZ,
 	TBL_DATA_DHORIZ,
@@ -235,6 +236,7 @@ enum	tbl_datt {
  */
 struct	tbl_dat {
 	struct tbl_cell	 *layout; /* layout cell: CAN BE NULL */
+	int		  spans; /* how many spans follow */
 	struct tbl_dat	 *next;
 	char		 *string;
 	enum tbl_datt	  pos;