===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- mandoc/tbl.c	2010/12/29 16:44:23	1.8
+++ mandoc/tbl.c	2010/12/31 18:19:43	1.11
@@ -1,4 +1,4 @@
-/*	$Id: tbl.c,v 1.8 2010/12/29 16:44:23 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.11 2010/12/31 18:19:43 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)
 {
 	int		 len;
 	const char	*cp;
-	struct tbl_dat	*dp;
-	struct tbl_span	*sp;
 
 	cp = &p[offs];
 	len = (int)strlen(cp);
@@ -91,18 +56,11 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o
 		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);
+	/* 
+	 * FIXME: allow the original string to slip through for the time
+	 * being. 
+	 */
+	return(tbl_data(tbl, ln, p) ? ROFF_CONT : ROFF_ERR);
 }
 
 struct tbl *
@@ -113,31 +71,59 @@ tbl_alloc(void *data, const mandocmsg msg)
 	p = mandoc_calloc(1, sizeof(struct tbl));
 	p->data = data;
 	p->msg = msg;
-	tbl_init(p);
+	p->part = TBL_PART_OPTS;
+	p->tab = '\t';
+	p->linesize = 12;
+	p->decimal = '.';
 	return(p);
 }
 
 void
 tbl_free(struct tbl *p)
 {
+	struct tbl_row	*rp;
+	struct tbl_cell	*cp;
+	struct tbl_span	*sp;
+	struct tbl_dat	*dp;
 
-	tbl_clear(p);
-	free(p);
-}
+	while (p->first_row) {
+		rp = p->first_row;
+		p->first_row = rp->next;
+		while (rp->first) {
+			cp = rp->first;
+			rp->first = cp->next;
+			free(cp);
+		}
+		free(rp);
+	}
 
-void
-tbl_reset(struct tbl *tbl)
-{
+	while (p->first_span) {
+		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);
+	}
 
-	tbl_clear(tbl);
-	tbl_init(tbl);
+	free(p);
 }
 
 void
 tbl_restart(struct tbl *tbl)
 {
 
-	tbl_clear(tbl);
 	tbl->part = TBL_PART_LAYOUT;
 }
 
+const struct tbl_span *
+tbl_span(const struct tbl *tbl)
+{
+
+	assert(tbl);
+	return(tbl->last_span);
+}