===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.7
retrieving revision 1.13
diff -u -p -r1.7 -r1.13
--- mandoc/tbl_data.c	2011/01/01 22:27:08	1.7
+++ mandoc/tbl_data.c	2011/01/07 13:20:58	1.13
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.7 2011/01/01 22:27:08 kristaps Exp $ */
+/*	$Id: tbl_data.c,v 1.13 2011/01/07 13:20:58 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,6 +14,10 @@
  * 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>
@@ -24,11 +28,11 @@
 #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;
@@ -41,16 +45,19 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 	else if (NULL == dp->last)
 		cp = dp->layout->first;
 
-	/* Skip over spanners to data formats. */
+	/* 
+	 * Skip over spanners and vertical lines to data formats, since
+	 * we want to match data with data layout cells in the header.
+	 */
 
 	while (cp && (TBL_CELL_VERT == cp->pos || 
-				TBL_CELL_DVERT == cp->pos))
+				TBL_CELL_DVERT == cp->pos ||
+				TBL_CELL_SPAN == 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;
+	dat->pos = TBL_DATA_NONE;
 
 	if (NULL == dat->layout)
 		TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
@@ -62,9 +69,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';
@@ -82,11 +100,47 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 		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);
 }
 
+/* ARGSUSED */
 int
-tbl_data(struct tbl *tbl, int ln, const char *p)
+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;
@@ -114,13 +168,17 @@ tbl_data(struct tbl *tbl, int ln, const char *p)
 		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
+	} else {
 		tbl->last_span = tbl->first_span = dp;
+		dp->flags |= TBL_SPAN_FIRST;
+	}
 
 	if ( ! strcmp(p, "_")) {
 		dp->pos = TBL_SPAN_HORIZ;
@@ -132,8 +190,11 @@ tbl_data(struct tbl *tbl, int ln, const char *p)
 
 	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(1);
 }