===================================================================
RCS file: /cvs/mandoc/tbl_layout.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- mandoc/tbl_layout.c	2011/01/02 12:04:23	1.7
+++ mandoc/tbl_layout.c	2011/01/04 23:48:39	1.10
@@ -1,4 +1,4 @@
-/*	$Id: tbl_layout.c,v 1.7 2011/01/02 12:04:23 kristaps Exp $ */
+/*	$Id: tbl_layout.c,v 1.10 2011/01/04 23:48:39 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -126,6 +126,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'):
@@ -294,7 +296,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
 	 * ones.
 	 */
 
-	h = pp ? pp->head->prev : tbl->first_head;
+	h = pp ? pp->head->next : tbl->first_head;
 
 	if (h) {
 		/* Re-use data header. */
@@ -319,6 +321,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
 				(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;
@@ -341,6 +344,7 @@ cell_alloc(struct tbl_node *tbl, struct tbl_row *rp, e
 	}
 
 	hp = mandoc_calloc(1, sizeof(struct tbl_head));
+	hp->ident = tbl->opts.cols++;
 
 	if (tbl->last_head) {
 		hp->prev = tbl->last_head;