Tiny bits in place for tbl horizontal spans. This will wait for the next

release to be implemented in full.

1 files changed, 18 insertions, 1 deletions

diff --git a/tbl_layout.c b/tbl_layout.c
index 2fc153ea..20c774bc 100644
--- a/tbl_layout.c
+++ b/tbl_layout.c
@@ -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] = {
@@ -173,9 +179,20 @@ cell(struct tbl_node *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]) {