===================================================================
RCS file: /cvs/mandoc/tbl_data.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- mandoc/tbl_data.c	2011/01/01 21:23:01	1.6
+++ mandoc/tbl_data.c	2011/01/02 10:10:57	1.8
@@ -1,4 +1,4 @@
-/*	$Id: tbl_data.c,v 1.6 2011/01/01 21:23:01 kristaps Exp $ */
+/*	$Id: tbl_data.c,v 1.8 2011/01/02 10:10:57 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -24,11 +24,11 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	void	data(struct tbl *, struct tbl_span *, 
+static	void	data(struct tbl_node *, struct tbl_span *, 
 			int, const char *, int *);
 
 void
-data(struct tbl *tbl, struct tbl_span *dp, 
+data(struct tbl_node *tbl, struct tbl_span *dp, 
 		int ln, const char *p, int *pos)
 {
 	struct tbl_dat	*dat;
@@ -52,6 +52,9 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
 	dat->layout = cp;
 
+	if (NULL == dat->layout)
+		TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+
 	if (dp->last) {
 		dp->last->next = dat;
 		dp->last = dat;
@@ -59,7 +62,7 @@ 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)++;
 
 	dat->string = mandoc_malloc(*pos - sv + 1);
@@ -82,7 +85,7 @@ data(struct tbl *tbl, struct tbl_span *dp, 
 }
 
 int
-tbl_data(struct tbl *tbl, int ln, const char *p)
+tbl_data(struct tbl_node *tbl, int ln, const char *p)
 {
 	struct tbl_span	*dp;
 	struct tbl_row	*rp;