]> git.cameronkatri.com Git - mandoc.git/blobdiff - tbl.c
tiny update
[mandoc.git] / tbl.c
diff --git a/tbl.c b/tbl.c
index 7e5389d47149555b8af371760acbffeb0ff096d1..036a117752c25cf2bc67c8007774f180274021d8 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.1 2010/12/28 10:51:03 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.46 2018/12/14 06:33:14 schwarze Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
+#include <sys/types.h>
+
 #include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "mandoc_aux.h"
 #include "mandoc.h"
-#include "roff.h"
+#include "tbl.h"
 #include "libmandoc.h"
-#include "libroff.h"
-
-enum   tbl_part {
-       TBL_PART_OPTS, /* in options (first line) */
-       TBL_PART_LAYOUT, /* describing layout */
-       TBL_PART_DATA  /* creating data rows */
-};
-
+#include "tbl_parse.h"
+#include "tbl_int.h"
 
-struct tbl {
-       enum tbl_part    part;
-};
 
-static void             tbl_init(struct tbl *);
-static void             tbl_clear(struct tbl *);
-
-static void
-tbl_clear(struct tbl *tbl)
+void
+tbl_read(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
-
+       const char      *cp;
+       int              active;
+
+       /*
+        * In the options section, proceed to the layout section
+        * after a semicolon, or right away if there is no semicolon.
+        * Ignore semicolons in arguments.
+        */
+
+       if (tbl->part == TBL_PART_OPTS) {
+               tbl->part = TBL_PART_LAYOUT;
+               active = 1;
+               for (cp = p + pos; *cp != '\0'; cp++) {
+                       switch (*cp) {
+                       case '(':
+                               active = 0;
+                               continue;
+                       case ')':
+                               active = 1;
+                               continue;
+                       case ';':
+                               if (active)
+                                       break;
+                               continue;
+                       default:
+                               continue;
+                       }
+                       break;
+               }
+               if (*cp == ';') {
+                       tbl_option(tbl, ln, p, &pos);
+                       if (p[pos] == '\0')
+                               return;
+               }
+       }
+
+       /* Process the other section types.  */
+
+       switch (tbl->part) {
+       case TBL_PART_LAYOUT:
+               tbl_layout(tbl, ln, p, pos);
+               break;
+       case TBL_PART_CDATA:
+               tbl_cdata(tbl, ln, p, pos);
+               break;
+       default:
+               tbl_data(tbl, ln, p, pos);
+               break;
+       }
 }
 
-static void
-tbl_init(struct tbl *tbl)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct tbl_node *last_tbl)
 {
+       struct tbl_node *tbl;
 
+       tbl = mandoc_calloc(1, sizeof(*tbl));
+       if (last_tbl != NULL)
+               last_tbl->next = tbl;
+       tbl->line = line;
+       tbl->pos = pos;
        tbl->part = TBL_PART_OPTS;
+       tbl->opts.tab = '\t';
+       tbl->opts.decimal = '.';
+       return tbl;
 }
 
-enum rofferr
-tbl_read(struct tbl *tbl, int ln, const char *p, int offs)
+void
+tbl_free(struct tbl_node *tbl)
 {
-       int              len;
-       const char      *cp;
-
-       cp = &p[offs];
-       len = (int)strlen(cp);
-
-       if (len && TBL_PART_OPTS == tbl->part)
-               if (';' != cp[len - 1])
-                       tbl->part = TBL_PART_LAYOUT;
-       
-       return(1);
+       struct tbl_node *old_tbl;
+       struct tbl_row  *rp;
+       struct tbl_cell *cp;
+       struct tbl_span *sp;
+       struct tbl_dat  *dp;
+
+       while (tbl != NULL) {
+               while ((rp = tbl->first_row) != NULL) {
+                       tbl->first_row = rp->next;
+                       while (rp->first != NULL) {
+                               cp = rp->first;
+                               rp->first = cp->next;
+                               free(cp->wstr);
+                               free(cp);
+                       }
+                       free(rp);
+               }
+               while ((sp = tbl->first_span) != NULL) {
+                       tbl->first_span = sp->next;
+                       while (sp->first != NULL) {
+                               dp = sp->first;
+                               sp->first = dp->next;
+                               free(dp->string);
+                               free(dp);
+                       }
+                       free(sp);
+               }
+               old_tbl = tbl;
+               tbl = tbl->next;
+               free(old_tbl);
+       }
 }
 
-struct tbl *
-tbl_alloc(void)
+void
+tbl_restart(int line, int pos, struct tbl_node *tbl)
 {
-       struct tbl      *p;
+       if (tbl->part == TBL_PART_CDATA)
+               mandoc_msg(MANDOCERR_TBLDATA_BLK, line, pos, "T&");
 
-       p = mandoc_malloc(sizeof(struct tbl));
-       tbl_init(p);
-       return(p);
+       tbl->part = TBL_PART_LAYOUT;
+       tbl->line = line;
+       tbl->pos = pos;
 }
 
-void
-tbl_free(struct tbl *p)
+struct tbl_span *
+tbl_span(struct tbl_node *tbl)
 {
+       struct tbl_span  *span;
 
-       tbl_clear(p);
-       free(p);
+       span = tbl->current_span ? tbl->current_span->next
+                                : tbl->first_span;
+       if (span != NULL)
+               tbl->current_span = span;
+       return span;
 }
 
-void
-tbl_reset(struct tbl *tbl)
+int
+tbl_end(struct tbl_node *tbl, int still_open)
 {
-
-       tbl_clear(tbl);
-       tbl_init(tbl);
+       struct tbl_span *sp;
+
+       if (still_open)
+               mandoc_msg(MANDOCERR_BLK_NOEND, tbl->line, tbl->pos, "TS");
+       else if (tbl->part == TBL_PART_CDATA)
+               mandoc_msg(MANDOCERR_TBLDATA_BLK, tbl->line, tbl->pos, "TE");
+
+       sp = tbl->first_span;
+       while (sp != NULL && sp->first == NULL)
+               sp = sp->next;
+       if (sp == NULL) {
+               mandoc_msg(MANDOCERR_TBLDATA_NONE, tbl->line, tbl->pos, NULL);
+               return 0;
+       }
+       return 1;
 }