===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.15
retrieving revision 1.21
diff -u -p -r1.15 -r1.21
--- mandoc/tbl.c	2011/01/01 22:19:15	1.15
+++ mandoc/tbl.c	2011/01/04 15:02:00	1.21
@@ -1,4 +1,4 @@
-/*	$Id: tbl.c,v 1.15 2011/01/01 22:19:15 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.21 2011/01/04 15:02:00 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -26,7 +26,7 @@
 #include "libroff.h"
 
 enum rofferr
-tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs)
 {
 	int		 len;
 	const char	*cp;
@@ -52,7 +52,9 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o
 		return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
 	case (TBL_PART_LAYOUT):
 		return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
-	case (TBL_PART_DATA):
+	case (TBL_PART_CDATA):
+		return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+	default:
 		break;
 	}
 
@@ -63,25 +65,25 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o
 	return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 
-struct tbl *
+struct tbl_node *
 tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
 {
-	struct tbl	*p;
+	struct tbl_node	*p;
 
-	p = mandoc_calloc(1, sizeof(struct tbl));
+	p = mandoc_calloc(1, sizeof(struct tbl_node));
 	p->line = line;
 	p->pos = pos;
 	p->data = data;
 	p->msg = msg;
 	p->part = TBL_PART_OPTS;
-	p->tab = '\t';
-	p->linesize = 12;
-	p->decimal = '.';
+	p->opts.tab = '\t';
+	p->opts.linesize = 12;
+	p->opts.decimal = '.';
 	return(p);
 }
 
 void
-tbl_free(struct tbl *p)
+tbl_free(struct tbl_node *p)
 {
 	struct tbl_row	*rp;
 	struct tbl_cell	*cp;
@@ -120,8 +122,10 @@ tbl_free(struct tbl *p)
 }
 
 void
-tbl_restart(int line, int pos, struct tbl *tbl)
+tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
+	if (TBL_PART_CDATA == tbl->part)
+		TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
 
 	tbl->part = TBL_PART_LAYOUT;
 	tbl->line = line;
@@ -132,7 +136,7 @@ tbl_restart(int line, int pos, struct tbl *tbl)
 }
 
 const struct tbl_span *
-tbl_span(const struct tbl *tbl)
+tbl_span(const struct tbl_node *tbl)
 {
 
 	assert(tbl);
@@ -140,10 +144,16 @@ tbl_span(const struct tbl *tbl)
 }
 
 void
-tbl_end(struct tbl *tbl)
+tbl_end(struct tbl_node *tbl)
 {
 
 	if (NULL == tbl->first_span || NULL == tbl->first_span->first)
 		TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+
+	if (tbl->last_span)
+		tbl->last_span->flags |= TBL_SPAN_LAST;
+
+	if (TBL_PART_CDATA == tbl->part)
+		TBL_MSG(tbl, MANDOCERR_TBLBLOCK, tbl->line, tbl->pos);
 }