===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.1
retrieving revision 1.11
diff -u -p -r1.1 -r1.11
--- mandoc/tbl_data.c	2010/12/29 16:44:23	1.1
+++ mandoc/tbl_data.c	2011/01/04 15:02:00	1.11
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.1 2010/12/29 16:44:23 kristaps Exp $ */
+/*	$Id: tbl_data.c,v 1.11 2011/01/04 15:02:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,29 +14,50 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "mandoc.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	void	data(struct tbl *, struct tbl_span *, 
+static	int	data(struct tbl_node *, struct tbl_span *, 
 			int, const char *, int *);
 
-void
-data(struct tbl *tbl, struct tbl_span *dp, 
+static int
+data(struct tbl_node *tbl, struct tbl_span *dp, 
 		int ln, const char *p, int *pos)
 {
 	struct tbl_dat	*dat;
+	struct tbl_cell	*cp;
 	int		 sv;
 
-	/* FIXME: warn about losing data contents if cell is HORIZ. */
+	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;
+
 	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
+	dat->layout = cp;
+	dat->pos = TBL_DATA_NONE;
 
+	if (NULL == dat->layout)
+		TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+
 	if (dp->last) {
 		dp->last->next = dat;
 		dp->last = dat;
@@ -44,9 +65,20 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 		dp->last = dp->first = dat;
 
 	sv = *pos;
-	while (p[*pos] && p[*pos] != tbl->tab)
+	while (p[*pos] && p[*pos] != tbl->opts.tab)
 		(*pos)++;
 
+	/*
+	 * Check for a continued-data scope opening.  This consists of a
+	 * trailing `T{' at the end of the line.  Subsequent lines,
+	 * until a standalone `T}', are included in our cell.
+	 */
+
+	if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
+		tbl->part = TBL_PART_CDATA;
+		return(0);
+	}
+
 	dat->string = mandoc_malloc(*pos - sv + 1);
 	memcpy(dat->string, &p[sv], *pos - sv);
 	dat->string[*pos - sv] = '\0';
@@ -54,43 +86,110 @@ 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;
+
+	if (NULL == dat->layout)
+		return(1);
+
+	if (TBL_CELL_HORIZ == dat->layout->pos ||
+			TBL_CELL_DHORIZ == dat->layout->pos)
+		if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
+			TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv);
+
+	return(1);
 }
 
-struct tbl_span *
-tbl_data(struct tbl *tbl, int ln, const char *p)
+int
+tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 {
+	struct tbl_dat	*dat;
+	size_t	 	 sz;
+
+	if (0 == strcmp(p, "T}")) {
+		tbl->part = TBL_PART_DATA;
+		return(1);
+	}
+
+	dat = tbl->last_span->last;
+	dat->pos = TBL_DATA_DATA;
+
+	if (dat->string) {
+		sz = strlen(p) + strlen(dat->string) + 2;
+		dat->string = mandoc_realloc(dat->string, sz);
+		strlcat(dat->string, " ", sz);
+		strlcat(dat->string, p, sz);
+	} else
+		dat->string = mandoc_strdup(p);
+
+	return(0);
+}
+
+int
+tbl_data(struct tbl_node *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(NULL);
+		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->tbl = &tbl->opts;
+	dp->layout = rp;
+	dp->head = tbl->first_head;
 
+	if (tbl->last_span) {
+		tbl->last_span->next = dp;
+		tbl->last_span = dp;
+	} else {
+		tbl->last_span = tbl->first_span = dp;
+		dp->flags |= TBL_SPAN_FIRST;
+	}
+
 	if ( ! strcmp(p, "_")) {
-		dp->flags |= TBL_SPAN_HORIZ;
-		return(dp);
+		dp->pos = TBL_SPAN_HORIZ;
+		return(1);
 	} else if ( ! strcmp(p, "=")) {
-		dp->flags |= TBL_SPAN_DHORIZ;
-		return(dp);
+		dp->pos = TBL_SPAN_DHORIZ;
+		return(1);
 	}
 
+	dp->pos = TBL_SPAN_DATA;
+
+	/* This returns 0 when TBL_PART_CDATA is entered. */
+
 	while ('\0' != p[pos])
-		data(tbl, dp, ln, p, &pos);
+		if ( ! data(tbl, dp, ln, p, &pos))
+			return(0);
 
-	return(dp);
+	return(1);
 }