===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.8
retrieving revision 1.21
diff -u -p -r1.8 -r1.21
--- mandoc/tbl.c	2010/12/29 16:44:23	1.8
+++ mandoc/tbl.c	2011/01/04 15:02:00	1.21
@@ -1,4 +1,4 @@
-/*	$Id: tbl.c,v 1.8 2010/12/29 16:44:23 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>
  *
@@ -25,46 +25,11 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
-static	void		 tbl_init(struct tbl *);
-static	void		 tbl_clear(struct tbl *);
-
-static void
-tbl_clear(struct tbl *tbl)
-{
-	struct tbl_row	*rp;
-	struct tbl_cell	*cp;
-
-	while (tbl->first) {
-		rp = tbl->first;
-		tbl->first = rp->next;
-		while (rp->first) {
-			cp = rp->first;
-			rp->first = cp->next;
-			free(cp);
-		}
-		free(rp);
-	}
-
-	tbl->last = NULL;
-}
-
-static void
-tbl_init(struct tbl *tbl)
-{
-
-	tbl->part = TBL_PART_OPTS;
-	tbl->tab = '\t';
-	tbl->linesize = 12;
-	tbl->decimal = '.';
-}
-
 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;
-	struct tbl_dat	*dp;
-	struct tbl_span	*sp;
 
 	cp = &p[offs];
 	len = (int)strlen(cp);
@@ -87,57 +52,108 @@ 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;
 	}
 
-	/* XXX: throw away data for now. */
-	if (NULL != (sp = tbl_data(tbl, ln, p))) {
-		while (NULL != (dp = sp->first)) {
-			sp->first = sp->first->next;
-			if (dp->string)
-				free(dp->string);
-			free(dp);
-		}
-		free(sp);
-	}
-	
-	return(ROFF_CONT);
+	/*
+	 * This only returns zero if the line is empty, so we ignore it
+	 * and continue on.
+	 */
+	return(tbl_data(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
 }
 
-struct tbl *
-tbl_alloc(void *data, const mandocmsg msg)
+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;
-	tbl_init(p);
+	p->part = TBL_PART_OPTS;
+	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;
+	struct tbl_span	*sp;
+	struct tbl_dat	*dp;
+	struct tbl_head	*hp;
 
-	tbl_clear(p);
+	while (NULL != (rp = p->first_row)) {
+		p->first_row = rp->next;
+		while (rp->first) {
+			cp = rp->first;
+			rp->first = cp->next;
+			free(cp);
+		}
+		free(rp);
+	}
+
+	while (NULL != (sp = p->first_span)) {
+		p->first_span = sp->next;
+		while (sp->first) {
+			dp = sp->first;
+			sp->first = dp->next;
+			if (dp->string)
+				free(dp->string);
+			free(dp);
+		}
+		free(sp);
+	}
+
+	while (NULL != (hp = p->first_head)) {
+		p->first_head = hp->next;
+		free(hp);
+	}
+
 	free(p);
 }
 
 void
-tbl_reset(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_clear(tbl);
-	tbl_init(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 *
+tbl_span(const struct tbl_node *tbl)
+{
+
+	assert(tbl);
+	return(tbl->last_span);
+}
+
 void
-tbl_restart(struct tbl *tbl)
+tbl_end(struct tbl_node *tbl)
 {
 
-	tbl_clear(tbl);
-	tbl->part = TBL_PART_LAYOUT;
+	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);
 }