===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.2
retrieving revision 1.6
diff -u -p -r1.2 -r1.6
--- mandoc/tbl_data.c	2010/12/30 09:34:07	1.2
+++ mandoc/tbl_data.c	2011/01/01 21:23:01	1.6
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.2 2010/12/30 09:34:07 kristaps Exp $ */
+/*	$Id: tbl_data.c,v 1.6 2011/01/01 21:23:01 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -18,6 +18,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "mandoc.h"
 #include "libmandoc.h"
@@ -31,11 +32,25 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 		int ln, const char *p, int *pos)
 {
 	struct tbl_dat	*dat;
+	struct tbl_cell	*cp;
 	int		 sv;
 
+	cp = NULL;
+	if (dp->last && dp->last->layout)
+		cp = dp->last->layout->next;
+	else if (NULL == dp->last)
+		cp = dp->layout->first;
+
+	/* Skip over spanners to data formats. */
+
+	while (cp && (TBL_CELL_VERT == cp->pos || 
+				TBL_CELL_DVERT == cp->pos))
+		cp = cp->next;
+
 	/* FIXME: warn about losing data contents if cell is HORIZ. */
 
 	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
+	dat->layout = cp;
 
 	if (dp->last) {
 		dp->last->next = dat;
@@ -54,32 +69,49 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 	if (p[*pos])
 		(*pos)++;
 
-	/* XXX: do the strcmps, then malloc(). */
-
 	if ( ! strcmp(dat->string, "_"))
-		dat->flags |= TBL_DATA_HORIZ;
+		dat->pos = TBL_DATA_HORIZ;
 	else if ( ! strcmp(dat->string, "="))
-		dat->flags |= TBL_DATA_DHORIZ;
+		dat->pos = TBL_DATA_DHORIZ;
 	else if ( ! strcmp(dat->string, "\\_"))
-		dat->flags |= TBL_DATA_NHORIZ;
+		dat->pos = TBL_DATA_NHORIZ;
 	else if ( ! strcmp(dat->string, "\\="))
-		dat->flags |= TBL_DATA_NDHORIZ;
+		dat->pos = TBL_DATA_NDHORIZ;
+	else
+		dat->pos = TBL_DATA_DATA;
 }
 
 int
 tbl_data(struct tbl *tbl, int ln, const char *p)
 {
 	struct tbl_span	*dp;
+	struct tbl_row	*rp;
 	int		 pos;
 
 	pos = 0;
 
 	if ('\0' == p[pos]) {
 		TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
-		return(1);
+		return(0);
 	}
 
+	/* 
+	 * Choose a layout row: take the one following the last parsed
+	 * span's.  If that doesn't exist, use the last parsed span's.
+	 * If there's no last parsed span, use the first row.  This can
+	 * be NULL!
+	 */
+
+	if (tbl->last_span) {
+		assert(tbl->last_span->layout);
+		rp = tbl->last_span->layout->next;
+		if (NULL == rp)
+			rp = tbl->last_span->layout;
+	} else
+		rp = tbl->first_row;
+
 	dp = mandoc_calloc(1, sizeof(struct tbl_span));
+	dp->layout = rp;
 
 	if (tbl->last_span) {
 		tbl->last_span->next = dp;
@@ -88,12 +120,14 @@ tbl_data(struct tbl *tbl, int ln, const char *p)
 		tbl->last_span = tbl->first_span = dp;
 
 	if ( ! strcmp(p, "_")) {
-		dp->flags |= TBL_SPAN_HORIZ;
+		dp->pos = TBL_SPAN_HORIZ;
 		return(1);
 	} else if ( ! strcmp(p, "=")) {
-		dp->flags |= TBL_SPAN_DHORIZ;
+		dp->pos = TBL_SPAN_DHORIZ;
 		return(1);
 	}
+
+	dp->pos = TBL_SPAN_DATA;
 
 	while ('\0' != p[pos])
 		data(tbl, dp, ln, p, &pos);