===================================================================
RCS file: /cvs/mandoc/mandoc.h,v
retrieving revision 1.38
retrieving revision 1.50
diff -u -p -r1.38 -r1.50
--- mandoc/mandoc.h	2010/12/31 18:19:43	1.38
+++ mandoc/mandoc.h	2011/01/10 14:40:30	1.50
@@ -1,6 +1,6 @@
-/*	$Id: mandoc.h,v 1.38 2010/12/31 18:19:43 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 */
@@ -101,10 +102,16 @@ enum	mandocerr {
 
 	MANDOCERR_ERROR, /* ===== start of errors ===== */
 
+	/* related to tables */
 	MANDOCERR_TBL, /* bad table syntax */
 	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_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 */
 	MANDOCERR_NOTEXT, /* skipping text before the first section header */
@@ -139,6 +146,39 @@ enum	mandocerr {
 	MANDOCERR_MAX
 };
 
+struct	tbl {
+	char		  tab; /* cell-separator */
+	char		  decimal; /* decimal point */
+	int		  linesize;
+	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)
+	int		  cols; /* number of columns */
+};
+
+enum	tbl_headt {
+	TBL_HEAD_DATA, /* plug in data from tbl_dat */
+	TBL_HEAD_VERT, /* vertical spacer */
+	TBL_HEAD_DVERT  /* double-vertical spacer */
+};
+
+/*
+ * The head of a table specifies all of its columns.  When formatting a
+ * tbl_span, iterate over these and plug in data from the tbl_span when
+ * appropriate, using tbl_cell as a guide to placement.
+ */
+struct	tbl_head {
+	enum tbl_headt	  pos;
+	int		  ident; /* 0 <= unique id < cols */
+	struct tbl_head	 *next;
+	struct tbl_head	 *prev;
+};
+
 enum	tbl_cellt {
 	TBL_CELL_CENTRE, /* c, C */
 	TBL_CELL_RIGHT, /* r, R */
@@ -169,6 +209,7 @@ struct	tbl_cell {
 #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_head	 *head;
 };
 
 /*
@@ -180,31 +221,46 @@ struct	tbl_row {
 	struct tbl_cell	 *last;
 };
 
+enum	tbl_datt {
+	TBL_DATA_NONE,
+	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.
  */
 struct	tbl_dat {
 	struct tbl_cell	 *layout; /* layout cell: CAN BE NULL */
+	int		  spans; /* how many spans follow */
 	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.
  */
 struct	tbl_span {
+	struct tbl	 *tbl;
+	struct tbl_head	 *head;
 	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)
+#define	TBL_SPAN_FIRST	 (1 << 0)
+#define	TBL_SPAN_LAST	 (1 << 1)
+	enum tbl_spant	  pos;
 	struct tbl_span	 *next;
 };