===================================================================
RCS file: /cvs/mandoc/tbl_layout.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- mandoc/tbl_layout.c	2011/01/07 14:59:52	1.12
+++ mandoc/tbl_layout.c	2011/01/10 15:31:00	1.15
@@ -1,4 +1,4 @@
-/*	$Id: tbl_layout.c,v 1.12 2011/01/07 14:59:52 kristaps Exp $ */
+/*	$Id: tbl_layout.c,v 1.15 2011/01/10 15:31:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -122,7 +122,7 @@ mod:
 		}
 
 		*pos += i;
-		cp->spacing = atoi(buf);
+		cp->spacing = (size_t)atoi(buf);
 
 		goto mod;
 		/* NOTREACHED */
@@ -130,7 +130,7 @@ mod:
 
 	/* TODO: GNU has many more extensions. */
 
-	switch (tolower(p[(*pos)++])) {
+	switch (tolower((unsigned char)p[(*pos)++])) {
 	case ('z'):
 		cp->flags |= TBL_CELL_WIGN;
 		goto mod;
@@ -160,7 +160,7 @@ mod:
 		return(0);
 	}
 
-	switch (tolower(p[(*pos)++])) {
+	switch (tolower((unsigned char)p[(*pos)++])) {
 	case ('b'):
 		cp->flags |= TBL_CELL_BOLD;
 		goto mod;
@@ -185,7 +185,7 @@ cell(struct tbl_node *tbl, struct tbl_row *rp, 
 	/* Parse the column position (`r', `R', `|', ...). */
 
 	for (i = 0; i < KEYS_MAX; i++)
-		if (tolower(p[*pos]) == keys[i].name)
+		if (tolower((unsigned char)p[*pos]) == keys[i].name)
 			break;
 
 	if (KEYS_MAX == i) {
@@ -197,12 +197,27 @@ cell(struct tbl_node *tbl, struct tbl_row *rp, 
 
 	/*
 	 * If a span cell is found first, raise a warning and abort the
-	 * parse.  FIXME: recover from this somehow?
+	 * parse.  If a span cell is found and the last layout element
+	 * isn't a "normal" layout, bail.
+	 *
+	 * FIXME: recover from this somehow?
 	 */
 
-	if (NULL == rp->first && TBL_CELL_SPAN == c) {
-		TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
-		return(0);
+	if (TBL_CELL_SPAN == c) {
+		if (NULL == rp->first) {
+			TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+			return(0);
+		} else if (rp->last)
+			switch (rp->last->pos) {
+			case (TBL_CELL_VERT):
+			case (TBL_CELL_DVERT):
+			case (TBL_CELL_HORIZ):
+			case (TBL_CELL_DHORIZ):
+				TBL_MSG(tbl, MANDOCERR_TBLLAYOUT, ln, *pos);
+				return(0);
+			default:
+				break;
+			}
 	}
 
 	(*pos)++;