If a tbl(7) column contains both text cells and numeric cells,

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 1db24a613a3f02d07476824a53b513a422ce289a..ae1906ef735ac9b0020f9dc4b96f614b22cc7514 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_data.c,v 1.31 2014/04/23 16:08:33 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.45 2017/07/08 17:52:50 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2015, 2017 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


@@ -15,9 +15,9 @@
  * 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.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -30,67 +30,64 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
 #include "libmandoc.h"
 #include "libroff.h"
 

-static int              getdata(struct tbl_node *, struct tbl_span *,
+static void             getdata(struct tbl_node *, struct tbl_span *,

                                int, const char *, int *);
 static struct tbl_span *newspan(struct tbl_node *, int,
                                struct tbl_row *);
 
 
                                int, const char *, int *);
 static struct tbl_span *newspan(struct tbl_node *, int,
                                struct tbl_row *);
 
 

-static int
+static void

 getdata(struct tbl_node *tbl, struct tbl_span *dp,
                int ln, const char *p, int *pos)
 {
        struct tbl_dat  *dat;
        struct tbl_cell *cp;
 getdata(struct tbl_node *tbl, struct tbl_span *dp,
                int ln, const char *p, int *pos)
 {
        struct tbl_dat  *dat;
        struct tbl_cell *cp;

-       int              sv, spans;
-
-       cp = NULL;
-       if (dp->last && dp->last->layout)
-               cp = dp->last->layout->next;
-       else if (NULL == dp->last)
-               cp = dp->layout->first;
+       int              sv;

 
 

-       /*
-        * Skip over spanners, since
-        * we want to match data with data layout cells in the header.
-        */
+       /* Advance to the next layout cell, skipping spanners. */

 
 

-       while (cp && TBL_CELL_SPAN == cp->pos)
+       cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
+       while (cp != NULL && cp->pos == TBL_CELL_SPAN)

                cp = cp->next;
 
        /*
                cp = cp->next;
 
        /*

-        * Stop processing when we reach the end of the available layout
-        * cells.  This means that we have extra input.
+        * If the current layout row is out of cells, allocate
+        * a new cell if another row of the table has at least
+        * this number of columns, or discard the input if we
+        * are beyond the last column of the table as a whole.

         */
 
         */
 

-       if (NULL == cp) {
-               mandoc_msg(MANDOCERR_TBLEXTRADAT, tbl->parse,
-                   ln, *pos, NULL);
-               /* Skip to the end... */
-               while (p[*pos])
-                       (*pos)++;
-               return(1);
+       if (cp == NULL) {
+               if (dp->layout->last->col + 1 < dp->opts->cols) {
+                       cp = mandoc_calloc(1, sizeof(*cp));
+                       cp->pos = TBL_CELL_LEFT;
+                       dp->layout->last->next = cp;
+                       cp->col = dp->layout->last->col + 1;
+                       dp->layout->last = cp;
+               } else {
+                       mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
+                           ln, *pos, p + *pos);
+                       while (p[*pos])
+                               (*pos)++;
+                       return;
+               }

        }
 
        }
 

-       dat = mandoc_calloc(1, sizeof(struct tbl_dat));
+       dat = mandoc_calloc(1, sizeof(*dat));

        dat->layout = cp;
        dat->pos = TBL_DATA_NONE;
        dat->layout = cp;
        dat->pos = TBL_DATA_NONE;

-
-       assert(TBL_CELL_SPAN != cp->pos);
-
-       for (spans = 0, cp = cp->next; cp; cp = cp->next)
-               if (TBL_CELL_SPAN == cp->pos)
-                       spans++;
+       dat->spans = 0;
+       for (cp = cp->next; cp != NULL; cp = cp->next)
+               if (cp->pos == TBL_CELL_SPAN)
+                       dat->spans++;

                else
                        break;
 
                else
                        break;
 

-       dat->spans = spans;
-
-       if (dp->last) {
+       if (dp->last == NULL)
+               dp->first = dat;
+       else

                dp->last->next = dat;
                dp->last->next = dat;

-               dp->last = dat;
-       } else
-               dp->last = dp->first = dat;
+       dp->last = dat;

 
        sv = *pos;
        while (p[*pos] && p[*pos] != tbl->opts.tab)
 
        sv = *pos;
        while (p[*pos] && p[*pos] != tbl->opts.tab)


@@ -102,16 +99,12 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
         * until a standalone `T}', are included in our cell.
         */
 
         * until a standalone `T}', are included in our cell.
         */
 

-       if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
+       if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') {

                tbl->part = TBL_PART_CDATA;
                tbl->part = TBL_PART_CDATA;

-               return(1);
+               return;

        }
 
        }
 

-       assert(*pos - sv >= 0);
-
-       dat->string = mandoc_malloc((size_t)(*pos - sv + 1));
-       memcpy(dat->string, &p[sv], (size_t)(*pos - sv));
-       dat->string[*pos - sv] = '\0';
+       dat->string = mandoc_strndup(p + sv, *pos - sv);

 
        if (p[*pos])
                (*pos)++;
 
        if (p[*pos])
                (*pos)++;


@@ -127,24 +120,19 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
        else
                dat->pos = TBL_DATA_DATA;
 
        else
                dat->pos = TBL_DATA_DATA;
 

-       if (TBL_CELL_HORIZ == dat->layout->pos ||
-           TBL_CELL_DHORIZ == dat->layout->pos ||
-           TBL_CELL_DOWN == dat->layout->pos)
-               if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
-                       mandoc_msg(MANDOCERR_TBLIGNDATA,
-                           tbl->parse, ln, sv, NULL);
-
-       return(1);
+       if ((dat->layout->pos == TBL_CELL_HORIZ ||
+           dat->layout->pos == TBL_CELL_DHORIZ ||
+           dat->layout->pos == TBL_CELL_DOWN) &&
+           dat->pos == TBL_DATA_DATA && *dat->string != '\0')
+               mandoc_msg(MANDOCERR_TBLDATA_SPAN,
+                   tbl->parse, ln, sv, dat->string);

 }
 
 }
 

-int
-tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
+void
+tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)

 {
        struct tbl_dat  *dat;
        size_t           sz;
 {
        struct tbl_dat  *dat;
        size_t           sz;

-       int              pos;
-
-       pos = 0;

 
        dat = tbl->last_span->last;
 
 
        dat = tbl->last_span->last;
 


@@ -153,30 +141,31 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;

-                       return(getdata(tbl, tbl->last_span, ln, p, &pos));
-               } else if ('\0' == p[pos]) {
+                       while (p[pos] != '\0')
+                               getdata(tbl, tbl->last_span, ln, p, &pos);
+                       return;
+               } else if (p[pos] == '\0') {

                        tbl->part = TBL_PART_DATA;
                        tbl->part = TBL_PART_DATA;

-                       return(1);
+                       return;

                }
 
                /* Fallthrough: T} is part of a word. */
        }
 
        dat->pos = TBL_DATA_DATA;
                }
 
                /* Fallthrough: T} is part of a word. */
        }
 
        dat->pos = TBL_DATA_DATA;

+       dat->block = 1;

 
 

-       if (dat->string) {
-               sz = strlen(p) + strlen(dat->string) + 2;
+       if (dat->string != NULL) {
+               sz = strlen(p + pos) + strlen(dat->string) + 2;

                dat->string = mandoc_realloc(dat->string, sz);
                (void)strlcat(dat->string, " ", sz);
                dat->string = mandoc_realloc(dat->string, sz);
                (void)strlcat(dat->string, " ", sz);

-               (void)strlcat(dat->string, p, sz);
+               (void)strlcat(dat->string, p + pos, sz);

        } else
        } else

-               dat->string = mandoc_strdup(p);
-
-       if (TBL_CELL_DOWN == dat->layout->pos)
-               mandoc_msg(MANDOCERR_TBLIGNDATA, tbl->parse,
-                   ln, pos, NULL);
+               dat->string = mandoc_strdup(p + pos);

 
 

-       return(0);
+       if (dat->layout->pos == TBL_CELL_DOWN)
+               mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
+                   ln, pos, dat->string);

 }
 
 static struct tbl_span *
 }
 
 static struct tbl_span *


@@ -184,92 +173,69 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
 {
        struct tbl_span *dp;
 
 {
        struct tbl_span *dp;
 

-       dp = mandoc_calloc(1, sizeof(struct tbl_span));
+       dp = mandoc_calloc(1, sizeof(*dp));

        dp->line = line;
        dp->opts = &tbl->opts;
        dp->layout = rp;
        dp->line = line;
        dp->opts = &tbl->opts;
        dp->layout = rp;

-       dp->head = tbl->first_head;
+       dp->prev = tbl->last_span;

 
 

-       if (tbl->last_span) {
-               tbl->last_span->next = dp;
-               tbl->last_span = dp;
-       } else {
-               tbl->last_span = tbl->first_span = dp;
+       if (dp->prev == NULL) {
+               tbl->first_span = dp;

                tbl->current_span = NULL;
                tbl->current_span = NULL;

-               dp->flags |= TBL_SPAN_FIRST;
-       }
+       } else
+               dp->prev->next = dp;
+       tbl->last_span = dp;

 
 

-       return(dp);
+       return dp;

 }
 
 }
 

-int
-tbl_data(struct tbl_node *tbl, int ln, const char *p)
+void
+tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)

 {
 {

-       struct tbl_span *dp;

        struct tbl_row  *rp;
        struct tbl_row  *rp;

-       int              pos;
+       struct tbl_cell *cp;
+       struct tbl_span *sp;

 
 

-       pos = 0;
+       rp = (sp = tbl->last_span) == NULL ? tbl->first_row :
+           sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ?
+           sp->layout->next : sp->layout;

 
 

-       if ('\0' == p[pos]) {
-               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL);
-               return(0);
+       assert(rp != NULL);
+
+       if ( ! strcmp(p, "_")) {
+               sp = newspan(tbl, ln, rp);
+               sp->pos = TBL_SPAN_HORIZ;
+               return;
+       } else if ( ! strcmp(p, "=")) {
+               sp = newspan(tbl, ln, rp);
+               sp->pos = TBL_SPAN_DHORIZ;
+               return;

        }
 
        /*
        }
 
        /*

-        * Choose a layout row: take the one following the last parsed
-        * span's.  If that doesn't exist, use the last parsed span's.
-        * If there's no last parsed span, use the first row.  Lastly,
-        * if the last span was a horizontal line, use the same layout
-        * (it doesn't "consume" the layout).
+        * If the layout row contains nothing but horizontal lines,
+        * allocate an empty span for it and assign the current span
+        * to the next layout row accepting data.

         */
 
         */
 

-       if (tbl->last_span) {
-               assert(tbl->last_span->layout);
-               if (tbl->last_span->pos == TBL_SPAN_DATA) {
-                       for (rp = tbl->last_span->layout->next;
-                                       rp && rp->first; rp = rp->next) {
-                               switch (rp->first->pos) {
-                               case TBL_CELL_HORIZ:
-                                       dp = newspan(tbl, ln, rp);
-                                       dp->pos = TBL_SPAN_HORIZ;
-                                       continue;
-                               case TBL_CELL_DHORIZ:
-                                       dp = newspan(tbl, ln, rp);
-                                       dp->pos = TBL_SPAN_DHORIZ;
-                                       continue;
-                               default:
-                                       break;
-                               }
+       while (rp->next != NULL) {
+               if (rp->last->col + 1 < tbl->opts.cols)
+                       break;
+               for (cp = rp->first; cp != NULL; cp = cp->next)
+                       if (cp->pos != TBL_CELL_HORIZ &&
+                           cp->pos != TBL_CELL_DHORIZ)

                                break;
                                break;

-                       }
-               } else
-                       rp = tbl->last_span->layout;
-
-               if (NULL == rp)
-                       rp = tbl->last_span->layout;
-       } else
-               rp = tbl->first_row;
-
-       assert(rp);
-
-       dp = newspan(tbl, ln, rp);
-
-       if ( ! strcmp(p, "_")) {
-               dp->pos = TBL_SPAN_HORIZ;
-               return(1);
-       } else if ( ! strcmp(p, "=")) {
-               dp->pos = TBL_SPAN_DHORIZ;
-               return(1);
+               if (cp != NULL)
+                       break;
+               sp = newspan(tbl, ln, rp);
+               sp->pos = TBL_SPAN_DATA;
+               rp = rp->next;

        }
 
        }
 

-       dp->pos = TBL_SPAN_DATA;
-
-       /* This returns 0 when TBL_PART_CDATA is entered. */
-
-       while ('\0' != p[pos])
-               if ( ! getdata(tbl, dp, ln, p, &pos))
-                       return(0);
+       /* Process a real data row. */

 
 

-       return(1);
+       sp = newspan(tbl, ln, rp);
+       sp->pos = TBL_SPAN_DATA;
+       while (p[pos] != '\0')
+               getdata(tbl, sp, ln, p, &pos);

 }
 }