===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.20
retrieving revision 1.22
diff -u -p -r1.20 -r1.22
--- mandoc/tbl.c	2011/01/03 13:59:21	1.20
+++ mandoc/tbl.c	2011/01/25 12:24:27	1.22
@@ -1,6 +1,7 @@
-/*	$Id: tbl.c,v 1.20 2011/01/03 13:59:21 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.22 2011/01/25 12:24:27 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -52,7 +53,9 @@ tbl_read(struct tbl_node *tbl, int ln, const char *p, 
 		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;
 	}
 
@@ -122,6 +125,8 @@ tbl_free(struct tbl_node *p)
 void
 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,11 +137,16 @@ tbl_restart(int line, int pos, struct tbl_node *tbl)
 }
 
 const struct tbl_span *
-tbl_span(const struct tbl_node *tbl)
+tbl_span(struct tbl_node *tbl)
 {
+	struct tbl_span	 *span;
 
 	assert(tbl);
-	return(tbl->last_span);
+	span = tbl->current_span ? tbl->current_span->next
+				 : tbl->first_span;
+	if (span)
+		tbl->current_span = span;
+	return(span);
 }
 
 void
@@ -148,5 +158,8 @@ tbl_end(struct tbl_node *tbl)
 
 	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);
 }