===================================================================
RCS file: /cvs/mandoc/tbl.c,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- mandoc/tbl.c	2010/12/29 01:16:57	1.5
+++ mandoc/tbl.c	2010/12/30 09:34:07	1.9
@@ -1,4 +1,4 @@
-/*	$Id: tbl.c,v 1.5 2010/12/29 01:16:57 kristaps Exp $ */
+/*	$Id: tbl.c,v 1.9 2010/12/30 09:34:07 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -31,7 +31,38 @@ static	void		 tbl_clear(struct tbl *);
 static void
 tbl_clear(struct tbl *tbl)
 {
+	struct tbl_row	*rp;
+	struct tbl_cell	*cp;
+	struct tbl_span	*sp;
+	struct tbl_dat	*dp;
 
+	while (tbl->first_row) {
+		rp = tbl->first_row;
+		tbl->first_row = rp->next;
+		while (rp->first) {
+			cp = rp->first;
+			rp->first = cp->next;
+			free(cp);
+		}
+		free(rp);
+	}
+
+	tbl->last_row = NULL;
+
+	while (tbl->first_span) {
+		sp = tbl->first_span;
+		tbl->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->last_span = NULL;
 }
 
 static void
@@ -69,11 +100,17 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int o
 	switch (tbl->part) {
 	case (TBL_PART_OPTS):
 		return(tbl_option(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
-	default:
+	case (TBL_PART_LAYOUT):
+		return(tbl_layout(tbl, ln, p) ? ROFF_IGN : ROFF_ERR);
+	case (TBL_PART_DATA):
 		break;
 	}
-	
-	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 *
@@ -81,7 +118,7 @@ tbl_alloc(void *data, const mandocmsg msg)
 {
 	struct tbl	*p;
 
-	p = mandoc_malloc(sizeof(struct tbl));
+	p = mandoc_calloc(1, sizeof(struct tbl));
 	p->data = data;
 	p->msg = msg;
 	tbl_init(p);
@@ -102,5 +139,12 @@ tbl_reset(struct tbl *tbl)
 
 	tbl_clear(tbl);
 	tbl_init(tbl);
+}
+
+void
+tbl_restart(struct tbl *tbl)
+{
+
+	tbl->part = TBL_PART_LAYOUT;
 }