===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- mandoc/tbl.c	2010/12/31 18:19:43	1.11
+++ mandoc/tbl.c	2011/01/01 22:19:15	1.15
@@ -1,4 +1,4 @@
-/*	$Id: tbl.c,v 1.11 2010/12/31 18:19:43 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.15 2011/01/01 22:19:15 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -56,19 +56,21 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o
 		break;
 	}
 
-	/* 
-	 * FIXME: allow the original string to slip through for the time
-	 * being. 
+	/*
+	 * This only returns zero if the line is empty, so we ignore it
+	 * and continue on.
 	 */
-	return(tbl_data(tbl, ln, p) ? ROFF_CONT : ROFF_ERR);
+	return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 
 struct tbl *
-tbl_alloc(void *data, const mandocmsg msg)
+tbl_alloc(int pos, int line, void *data, const mandocmsg msg)
 {
 	struct tbl	*p;
 
 	p = mandoc_calloc(1, sizeof(struct tbl));
+	p->line = line;
+	p->pos = pos;
 	p->data = data;
 	p->msg = msg;
 	p->part = TBL_PART_OPTS;
@@ -85,9 +87,9 @@ tbl_free(struct tbl *p)
 	struct tbl_cell	*cp;
 	struct tbl_span	*sp;
 	struct tbl_dat	*dp;
+	struct tbl_head	*hp;
 
-	while (p->first_row) {
-		rp = p->first_row;
+	while (NULL != (rp = p->first_row)) {
 		p->first_row = rp->next;
 		while (rp->first) {
 			cp = rp->first;
@@ -97,8 +99,7 @@ tbl_free(struct tbl *p)
 		free(rp);
 	}
 
-	while (p->first_span) {
-		sp = p->first_span;
+	while (NULL != (sp = p->first_span)) {
 		p->first_span = sp->next;
 		while (sp->first) {
 			dp = sp->first;
@@ -110,14 +111,24 @@ tbl_free(struct tbl *p)
 		free(sp);
 	}
 
+	while (NULL != (hp = p->first_head)) {
+		p->first_head = hp->next;
+		free(hp);
+	}
+
 	free(p);
 }
 
 void
-tbl_restart(struct tbl *tbl)
+tbl_restart(int line, int pos, struct tbl *tbl)
 {
 
 	tbl->part = TBL_PART_LAYOUT;
+	tbl->line = line;
+	tbl->pos = pos;
+
+	if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+		TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
 }
 
 const struct tbl_span *
@@ -127,3 +138,12 @@ tbl_span(const struct tbl *tbl)
 	assert(tbl);
 	return(tbl->last_span);
 }
+
+void
+tbl_end(struct tbl *tbl)
+{
+
+	if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+		TBL_MSG(tbl, MANDOCERR_TBLNODATA, tbl->line, tbl->pos);
+}
+