Switch on tbl rows being added to the parse stream. Here we go!

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 44e80aa65a404956c7a97c8a2b4725c6c2bafe52..65e1d87e2f897fe5897d18581cb0fff15d47bd4d 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl.c,v 1.9 2010/12/30 09:34:07 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.12 2011/01/01 13:37:40 kristaps Exp $ */
 /*
  * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -25,56 +25,6 @@
 #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;
-       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
-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)
 {
@@ -106,11 +56,11 @@ tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
                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 *
@@ -121,24 +71,46 @@ 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
@@ -148,3 +120,10 @@ tbl_restart(struct tbl *tbl)
        tbl->part = TBL_PART_LAYOUT;
 }
 
+const struct tbl_span *
+tbl_span(const struct tbl *tbl)
+{
+
+       assert(tbl);
+       return(tbl->last_span);
+}