===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.44
retrieving revision 1.46
diff -u -p -r1.44 -r1.46
--- mandoc/mandoc.h	2011/01/02 12:04:23	1.44
+++ mandoc/mandoc.h	2011/01/03 23:53:51	1.46
@@ -1,6 +1,6 @@
-/*	$Id: mandoc.h,v 1.44 2011/01/02 12:04:23 kristaps Exp $ */
+/*	$Id: mandoc.h,v 1.46 2011/01/03 23:53:51 schwarze 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 */
@@ -149,7 +150,7 @@ struct	tbl {
 	char		  tab; /* cell-separator */
 	char		  decimal; /* decimal point */
 	int		  linesize;
-	char		  delims[2];
+	char		  delims[2]; /* FIXME: deprecate */
 	int		  opts;
 #define	TBL_OPT_CENTRE	 (1 << 0)
 #define	TBL_OPT_EXPAND	 (1 << 1)
@@ -158,6 +159,7 @@ struct	tbl {
 #define	TBL_OPT_ALLBOX	 (1 << 4)
 #define	TBL_OPT_NOKEEP	 (1 << 5)
 #define	TBL_OPT_NOSPACE	 (1 << 6)
+	int		  cols; /* number of columns */
 };
 
 enum	tbl_headt {
@@ -173,8 +175,7 @@ enum	tbl_headt {
  */
 struct	tbl_head {
 	enum tbl_headt	  pos;
-	int		  width; /* width of cell in fixed chars */
-	int		  decimal; /* decimal point position */
+	int		  ident; /* 0 <= unique id < cols */
 	struct tbl_head	 *next;
 	struct tbl_head	 *prev;
 };