===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.25
retrieving revision 1.30
diff -u -p -r1.25 -r1.30
--- mandoc/tbl_data.c	2012/05/27 17:54:54	1.25
+++ mandoc/tbl_data.c	2014/04/20 16:46:05	1.30
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.25 2012/05/27 17:54:54 schwarze Exp $ */
+/*	$Id: tbl_data.c,v 1.30 2014/04/20 16:46:05 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,16 +26,18 @@
 #include <time.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	int		 data(struct tbl_node *, struct tbl_span *, 
+static	int		 getdata(struct tbl_node *, struct tbl_span *,
 				int, const char *, int *);
-static	struct tbl_span	*newspan(struct tbl_node *, int, 
+static	struct tbl_span	*newspan(struct tbl_node *, int,
 				struct tbl_row *);
 
+
 static int
-data(struct tbl_node *tbl, struct tbl_span *dp, 
+getdata(struct tbl_node *tbl, struct tbl_span *dp,
 		int ln, const char *p, int *pos)
 {
 	struct tbl_dat	*dat;
@@ -48,7 +50,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 	else if (NULL == dp->last)
 		cp = dp->layout->first;
 
-	/* 
+	/*
 	 * Skip over spanners, since
 	 * we want to match data with data layout cells in the header.
 	 */
@@ -62,8 +64,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 	 */
 
 	if (NULL == cp) {
-		mandoc_msg(MANDOCERR_TBLEXTRADAT, 
-				tbl->parse, ln, *pos, NULL);
+		mandoc_msg(MANDOCERR_TBLEXTRADAT, tbl->parse,
+		    ln, *pos, NULL);
 		/* Skip to the end... */
 		while (p[*pos])
 			(*pos)++;
@@ -81,7 +83,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 			spans++;
 		else
 			break;
-	
+
 	dat->spans = spans;
 
 	if (dp->last) {
@@ -102,7 +104,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 
 	if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
 		tbl->part = TBL_PART_CDATA;
-		return(0);
+		return(1);
 	}
 
 	assert(*pos - sv >= 0);
@@ -126,21 +128,20 @@ data(struct tbl_node *tbl, struct tbl_span *dp, 
 		dat->pos = TBL_DATA_DATA;
 
 	if (TBL_CELL_HORIZ == dat->layout->pos ||
-			TBL_CELL_DHORIZ == dat->layout->pos ||
-			TBL_CELL_DOWN == dat->layout->pos)
+	    TBL_CELL_DHORIZ == dat->layout->pos ||
+	    TBL_CELL_DOWN == dat->layout->pos)
 		if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
-			mandoc_msg(MANDOCERR_TBLIGNDATA, 
-					tbl->parse, ln, sv, NULL);
+			mandoc_msg(MANDOCERR_TBLIGNDATA,
+			    tbl->parse, ln, sv, NULL);
 
 	return(1);
 }
 
-/* ARGSUSED */
 int
 tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 {
 	struct tbl_dat	*dat;
-	size_t	 	 sz;
+	size_t		 sz;
 	int		 pos;
 
 	pos = 0;
@@ -152,7 +153,7 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 		if (p[pos] == tbl->opts.tab) {
 			tbl->part = TBL_PART_DATA;
 			pos++;
-			return(data(tbl, tbl->last_span, ln, p, &pos));
+			return(getdata(tbl, tbl->last_span, ln, p, &pos));
 		} else if ('\0' == p[pos]) {
 			tbl->part = TBL_PART_DATA;
 			return(1);
@@ -171,9 +172,9 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 	} else
 		dat->string = mandoc_strdup(p);
 
-	if (TBL_CELL_DOWN == dat->layout->pos) 
-		mandoc_msg(MANDOCERR_TBLIGNDATA, 
-				tbl->parse, ln, pos, NULL);
+	if (TBL_CELL_DOWN == dat->layout->pos)
+		mandoc_msg(MANDOCERR_TBLIGNDATA, tbl->parse,
+		    ln, pos, NULL);
 
 	return(0);
 }
@@ -185,7 +186,7 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row
 
 	dp = mandoc_calloc(1, sizeof(struct tbl_span));
 	dp->line = line;
-	dp->tbl = &tbl->opts;
+	dp->opts = &tbl->opts;
 	dp->layout = rp;
 	dp->head = tbl->first_head;
 
@@ -215,7 +216,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 		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.  Lastly,
@@ -229,11 +230,11 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 			for (rp = tbl->last_span->layout->next;
 					rp && rp->first; rp = rp->next) {
 				switch (rp->first->pos) {
-				case (TBL_CELL_HORIZ):
+				case TBL_CELL_HORIZ:
 					dp = newspan(tbl, ln, rp);
 					dp->pos = TBL_SPAN_HORIZ;
 					continue;
-				case (TBL_CELL_DHORIZ):
+				case TBL_CELL_DHORIZ:
 					dp = newspan(tbl, ln, rp);
 					dp->pos = TBL_SPAN_DHORIZ;
 					continue;
@@ -267,7 +268,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
 	/* This returns 0 when TBL_PART_CDATA is entered. */
 
 	while ('\0' != p[pos])
-		if ( ! data(tbl, dp, ln, p, &pos))
+		if ( ! getdata(tbl, dp, ln, p, &pos))
 			return(0);
 
 	return(1);