Multiple parser and formatter fixes for line drawing in tbl(7).

[mandoc.git] / tbl.c

diff --git a/tbl.c b/tbl.c
index 15581b029d7689564912357fafe6d496b79dba47..bd8fc99cdb7f29082d52d237f4826800b588321f 100644 (file)
--- a/tbl.c
+++ b/tbl.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl.c,v 1.10 2010/12/31 14:52:41 kristaps Exp $ */
+/*     $Id: tbl.c,v 1.34 2015/01/27 05:21:45 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,6 +15,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 <assert.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -21,74 +26,92 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "roff.h"
+#include "mandoc_aux.h"

 #include "libmandoc.h"
 #include "libroff.h"
 
 #include "libmandoc.h"
 #include "libroff.h"
 

+

 enum rofferr
 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;
        const char      *cp;

-
-       cp = &p[offs];
-       len = (int)strlen(cp);
+       int              active;

 
        /*
 
        /*

-        * If we're in the options section and we don't have a
-        * terminating semicolon, assume we've moved directly into the
-        * layout section.  No need to report a warning: this is,
-        * apparently, standard behaviour.
+        * 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_OPTS == tbl->part && len)
-               if (';' != cp[len - 1])
-                       tbl->part = TBL_PART_LAYOUT;
+       if (tbl->part == TBL_PART_OPTS) {
+               tbl->part = TBL_PART_LAYOUT;
+               active = 1;
+               for (cp = p; *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);
+                       if (*(p = cp + 1) == '\0')
+                               return(ROFF_IGN);
+               }
+       }

 
 

-       /* Now process each logical section of the table.  */
+       /* Process the other section types.  */

 
        switch (tbl->part) {
 
        switch (tbl->part) {

-       case (TBL_PART_OPTS):
-               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_LAYOUT:
+               tbl_layout(tbl, ln, p);
+               return(ROFF_IGN);
+       case TBL_PART_CDATA:
+               return(tbl_cdata(tbl, ln, p) ? ROFF_TBL : ROFF_IGN);
+       default:

                break;
        }
 
                break;
        }
 

-       /* 
-        * FIXME: allow the original string to slip through for the time
-        * being. 
-        */
-       return(tbl_data(tbl, ln, p) ? ROFF_CONT : ROFF_ERR);
+       tbl_data(tbl, ln, p);
+       return(ROFF_TBL);

 }
 
 }
 

-struct tbl *
-tbl_alloc(void *data, const mandocmsg msg)
+struct tbl_node *
+tbl_alloc(int pos, int line, struct mparse *parse)

 {
 {

-       struct tbl      *p;
-
-       p = mandoc_calloc(1, sizeof(struct tbl));
-       p->data = data;
-       p->msg = msg;
-       p->part = TBL_PART_OPTS;
-       p->tab = '\t';
-       p->linesize = 12;
-       p->decimal = '.';
-       return(p);
+       struct tbl_node *tbl;
+
+       tbl = mandoc_calloc(1, sizeof(struct tbl_node));
+       tbl->line = line;
+       tbl->pos = pos;
+       tbl->parse = parse;
+       tbl->part = TBL_PART_OPTS;
+       tbl->opts.tab = '\t';
+       tbl->opts.decimal = '.';
+       return(tbl);

 }
 
 void
 }
 
 void

-tbl_free(struct tbl *p)
+tbl_free(struct tbl_node *tbl)

 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;
 {
        struct tbl_row  *rp;
        struct tbl_cell *cp;
        struct tbl_span *sp;
        struct tbl_dat  *dp;

+       struct tbl_head *hp;

 
 

-       while (p->first_row) {
-               rp = p->first_row;
-               p->first_row = rp->next;
+       while (NULL != (rp = tbl->first_row)) {
+               tbl->first_row = rp->next;

                while (rp->first) {
                        cp = rp->first;
                        rp->first = cp->next;
                while (rp->first) {
                        cp = rp->first;
                        rp->first = cp->next;


@@ -97,9 +120,8 @@ tbl_free(struct tbl *p)
                free(rp);
        }
 
                free(rp);
        }
 

-       while (p->first_span) {
-               sp = p->first_span;
-               p->first_span = sp->next;
+       while (NULL != (sp = tbl->first_span)) {
+               tbl->first_span = sp->next;

                while (sp->first) {
                        dp = sp->first;
                        sp->first = dp->next;
                while (sp->first) {
                        dp = sp->first;
                        sp->first = dp->next;


@@ -110,13 +132,63 @@ tbl_free(struct tbl *p)
                free(sp);
        }
 
                free(sp);
        }
 

-       free(p);
+       while (NULL != (hp = tbl->first_head)) {
+               tbl->first_head = hp->next;
+               free(hp);
+       }
+
+       free(tbl);

 }
 
 void
 }
 
 void

-tbl_restart(struct tbl *tbl)
+tbl_restart(int line, int pos, struct tbl_node *tbl)

 {
 {

+       if (TBL_PART_CDATA == tbl->part)
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+                   tbl->line, tbl->pos, NULL);

 
        tbl->part = TBL_PART_LAYOUT;
 
        tbl->part = TBL_PART_LAYOUT;

+       tbl->line = line;
+       tbl->pos = pos;
+
+       if (NULL == tbl->first_span || NULL == tbl->first_span->first)
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                   tbl->line, tbl->pos, NULL);

 }
 
 }
 

+const struct tbl_span *
+tbl_span(struct tbl_node *tbl)
+{
+       struct tbl_span  *span;
+
+       assert(tbl);
+       span = tbl->current_span ? tbl->current_span->next
+                                : tbl->first_span;
+       if (span)
+               tbl->current_span = span;
+       return(span);
+}
+
+void
+tbl_end(struct tbl_node **tblp)
+{
+       struct tbl_node *tbl;
+       struct tbl_span *sp;
+
+       tbl = *tblp;
+       *tblp = NULL;
+
+       sp = tbl->first_span;
+       while (sp != NULL && sp->first == NULL)
+               sp = sp->next;
+       if (sp == NULL)
+               mandoc_msg(MANDOCERR_TBLNODATA, tbl->parse,
+                   tbl->line, tbl->pos, NULL);
+
+       if (tbl->last_span)
+               tbl->last_span->flags |= TBL_SPAN_LAST;
+
+       if (TBL_PART_CDATA == tbl->part)
+               mandoc_msg(MANDOCERR_TBLBLOCK, tbl->parse,
+                   tbl->line, tbl->pos, NULL);
+}