===================================================================
RCS file: /cvs/mandoc/tbl_layout.c,v
retrieving revision 1.5
retrieving revision 1.12
diff -u -p -r1.5 -r1.12
--- mandoc/tbl_layout.c	2011/01/01 22:19:15	1.5
+++ mandoc/tbl_layout.c	2011/01/07 14:59:52	1.12
@@ -1,4 +1,4 @@
-/*	$Id: tbl_layout.c,v 1.5 2011/01/01 22:19:15 kristaps Exp $ */
+/*	$Id: tbl_layout.c,v 1.12 2011/01/07 14:59:52 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -29,6 +29,12 @@ struct	tbl_phrase {
 	enum tbl_cellt	 key;
 };
 
+/*
+ * FIXME: we can make this parse a lot nicer by, when an error is
+ * encountered in a layout key, bailing to the next key (i.e. to the
+ * next whitespace then continuing).
+ */
+
 #define	KEYS_MAX	 11
 
 static	const struct tbl_phrase keys[KEYS_MAX] = {
@@ -45,18 +51,18 @@ static	const struct tbl_phrase keys[KEYS_MAX] = {
 	{ '|',		 TBL_CELL_VERT }
 };
 
-static	int		 mods(struct tbl *, struct tbl_cell *, 
+static	int		 mods(struct tbl_node *, struct tbl_cell *, 
 				int, const char *, int *);
-static	int		 cell(struct tbl *, struct tbl_row *, 
+static	int		 cell(struct tbl_node *, struct tbl_row *, 
 				int, const char *, int *);
-static	void		 row(struct tbl *, int, const char *, int *);
-static	struct tbl_cell *cell_alloc(struct tbl *, 
+static	void		 row(struct tbl_node *, int, const char *, int *);
+static	struct tbl_cell *cell_alloc(struct tbl_node *, 
 				struct tbl_row *, enum tbl_cellt);
 static	void		 head_adjust(const struct tbl_cell *, 
 				struct tbl_head *);
 
 static int
-mods(struct tbl *tbl, struct tbl_cell *cp, 
+mods(struct tbl_node *tbl, struct tbl_cell *cp, 
 		int ln, const char *p, int *pos)
 {
 	char		 buf[5];
@@ -84,6 +90,20 @@ mod:
 		break;
 	}
 
+	/* Throw away parenthesised expression. */
+
+	if ('(' == p[*pos]) {
+		(*pos)++;
+		while (p[*pos] && ')' != p[*pos])
+			(*pos)++;
+		if (')' == p[*pos]) {
+			(*pos)++;
+			goto mod;
+		}
+		TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+		return(0);
+	}
+
 	/* Parse numerical spacing from modifier string. */
 
 	if (isdigit((unsigned char)p[*pos])) {
@@ -126,6 +146,8 @@ mod:
 	case ('d'):
 		cp->flags |= TBL_CELL_BALIGN;
 		goto mod;
+	case ('w'):  /* XXX for now, ignore minimal column width */
+		goto mod;
 	case ('f'):
 		break;
 	case ('b'):
@@ -154,7 +176,7 @@ mod:
 }
 
 static int
-cell(struct tbl *tbl, struct tbl_row *rp, 
+cell(struct tbl_node *tbl, struct tbl_row *rp, 
 		int ln, const char *p, int *pos)
 {
 	int		 i;
@@ -171,9 +193,20 @@ cell(struct tbl *tbl, struct tbl_row *rp, 
 		return(0);
 	}
 
-	(*pos)++;
 	c = keys[i].key;
 
+	/*
+	 * If a span cell is found first, raise a warning and abort the
+	 * parse.  FIXME: recover from this somehow?
+	 */
+
+	if (NULL == rp->first && TBL_CELL_SPAN == c) {
+		TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+		return(0);
+	}
+
+	(*pos)++;
+
 	/* Extra check for the double-vertical. */
 
 	if (TBL_CELL_VERT == c && '|' == p[*pos]) {
@@ -197,7 +230,7 @@ cell(struct tbl *tbl, struct tbl_row *rp, 
 
 
 static void
-row(struct tbl *tbl, int ln, const char *p, int *pos)
+row(struct tbl_node *tbl, int ln, const char *p, int *pos)
 {
 	struct tbl_row	*rp;
 
@@ -248,7 +281,7 @@ cell:
 }
 
 int
-tbl_layout(struct tbl *tbl, int ln, const char *p)
+tbl_layout(struct tbl_node *tbl, int ln, const char *p)
 {
 	int		 pos;
 
@@ -260,7 +293,7 @@ tbl_layout(struct tbl *tbl, int ln, const char *p)
 }
 
 static struct tbl_cell *
-cell_alloc(struct tbl *tbl, struct tbl_row *rp, enum tbl_cellt pos)
+cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, enum tbl_cellt pos)
 {
 	struct tbl_cell	*p, *pp;
 	struct tbl_head	*h, *hp;
@@ -294,7 +327,7 @@ cell_alloc(struct tbl *tbl, struct tbl_row *rp, enum t
 	 * ones.
 	 */
 
-	h = pp ? pp->head->prev : tbl->first_head;
+	h = pp ? pp->head->next : tbl->first_head;
 
 	if (h) {
 		/* Re-use data header. */
@@ -319,9 +352,12 @@ cell_alloc(struct tbl *tbl, struct tbl_row *rp, enum t
 				(TBL_CELL_VERT == p->pos ||
 				 TBL_CELL_DVERT == p->pos)) {
 			hp = mandoc_calloc(1, sizeof(struct tbl_head));
+			hp->ident = tbl->opts.cols++;
 			hp->prev = h->prev;
 			if (h->prev)
 				h->prev->next = hp;
+			if (h == tbl->first_head)
+				tbl->first_head = hp;
 			h->prev = hp;
 			hp->next = h;
 			head_adjust(p, hp);
@@ -339,6 +375,7 @@ cell_alloc(struct tbl *tbl, struct tbl_row *rp, enum t
 	}
 
 	hp = mandoc_calloc(1, sizeof(struct tbl_head));
+	hp->ident = tbl->opts.cols++;
 
 	if (tbl->last_head) {
 		hp->prev = tbl->last_head;