needs mandoc_aux, too

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index f53e1099520564ebb22fa6c8f48d52dd77786e6f..dfb85bd27cdac7c5147be61bebd5d48ab3c6af7c 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl_data.c,v 1.14 2011/01/07 14:59:52 kristaps Exp $ */
+/*     $Id: tbl_data.c,v 1.29 2014/03/23 11:25:26 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 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


@@ -25,19 +26,22 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

+#include "mandoc_aux.h"

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

-static int     data(struct tbl_node *, struct tbl_span *, 
-                       int, const char *, int *);
+static int              getdata(struct tbl_node *, struct tbl_span *, 
+                               int, const char *, int *);
+static struct tbl_span *newspan(struct tbl_node *, int, 
+                               struct tbl_row *);

 
 static int
 
 static int

-data(struct tbl_node *tbl, struct tbl_span *dp, 
+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 ln, const char *p, int *pos)
 {
        struct tbl_dat  *dat;
        struct tbl_cell *cp;

-       int              sv;
+       int              sv, spans;

 
        cp = NULL;
        if (dp->last && dp->last->layout)
 
        cp = NULL;
        if (dp->last && dp->last->layout)


@@ -46,21 +50,40 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                cp = dp->layout->first;
 
        /* 
                cp = dp->layout->first;
 
        /* 

-        * Skip over spanners and vertical lines to data formats, since
+        * Skip over spanners, since

         * we want to match data with data layout cells in the header.
         */
 
         * we want to match data with data layout cells in the header.
         */
 

-       while (cp && (TBL_CELL_VERT == cp->pos || 
-                               TBL_CELL_DVERT == cp->pos ||
-                               TBL_CELL_SPAN == cp->pos))
+       while (cp && TBL_CELL_SPAN == cp->pos)

                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 (NULL == cp) {
+               mandoc_msg(MANDOCERR_TBLEXTRADAT, 
+                               tbl->parse, ln, *pos, NULL);
+               /* Skip to the end... */
+               while (p[*pos])
+                       (*pos)++;
+               return(1);
+       }
+

        dat = mandoc_calloc(1, sizeof(struct tbl_dat));
        dat->layout = cp;
        dat->pos = TBL_DATA_NONE;
 
        dat = mandoc_calloc(1, sizeof(struct tbl_dat));
        dat->layout = cp;
        dat->pos = TBL_DATA_NONE;
 

-       if (NULL == dat->layout)
-               TBL_MSG(tbl, MANDOCERR_TBLEXTRADAT, ln, *pos);
+       assert(TBL_CELL_SPAN != cp->pos);
+
+       for (spans = 0, cp = cp->next; cp; cp = cp->next)
+               if (TBL_CELL_SPAN == cp->pos)
+                       spans++;
+               else
+                       break;
+       
+       dat->spans = spans;

 
        if (dp->last) {
                dp->last->next = dat;
 
        if (dp->last) {
                dp->last->next = dat;


@@ -80,11 +103,13 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
 
        if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
                tbl->part = TBL_PART_CDATA;
 
        if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
                tbl->part = TBL_PART_CDATA;

-               return(0);
+               return(1);

        }
 
        }
 

-       dat->string = mandoc_malloc(*pos - sv + 1);
-       memcpy(dat->string, &p[sv], *pos - sv);
+       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';
 
        if (p[*pos])
        dat->string[*pos - sv] = '\0';
 
        if (p[*pos])


@@ -101,13 +126,12 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
        else
                dat->pos = TBL_DATA_DATA;
 
        else
                dat->pos = TBL_DATA_DATA;
 

-       if (NULL == dat->layout)
-               return(1);
-

        if (TBL_CELL_HORIZ == dat->layout->pos ||
        if (TBL_CELL_HORIZ == dat->layout->pos ||

-                       TBL_CELL_DHORIZ == dat->layout->pos)
+                       TBL_CELL_DHORIZ == dat->layout->pos ||
+                       TBL_CELL_DOWN == dat->layout->pos)

                if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
                if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)

-                       TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv);
+                       mandoc_msg(MANDOCERR_TBLIGNDATA, 
+                                       tbl->parse, ln, sv, NULL);

 
        return(1);
 }
 
        return(1);
 }


@@ -123,14 +147,13 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
        pos = 0;
 
        dat = tbl->last_span->last;
        pos = 0;
 
        dat = tbl->last_span->last;

-       dat->pos = TBL_DATA_DATA;

 
        if (p[pos] == 'T' && p[pos + 1] == '}') {
                pos += 2;
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;
 
        if (p[pos] == 'T' && p[pos + 1] == '}') {
                pos += 2;
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;

-                       return(data(tbl, tbl->last_span, ln, p, &pos));
+                       return(getdata(tbl, tbl->last_span, ln, p, &pos));

                } else if ('\0' == p[pos]) {
                        tbl->part = TBL_PART_DATA;
                        return(1);
                } else if ('\0' == p[pos]) {
                        tbl->part = TBL_PART_DATA;
                        return(1);


@@ -139,6 +162,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
                /* Fallthrough: T} is part of a word. */
        }
 
                /* Fallthrough: T} is part of a word. */
        }
 

+       dat->pos = TBL_DATA_DATA;
+

        if (dat->string) {
                sz = strlen(p) + strlen(dat->string) + 2;
                dat->string = mandoc_realloc(dat->string, sz);
        if (dat->string) {
                sz = strlen(p) + strlen(dat->string) + 2;
                dat->string = mandoc_realloc(dat->string, sz);


@@ -147,9 +172,36 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
        } else
                dat->string = mandoc_strdup(p);
 
        } else
                dat->string = mandoc_strdup(p);
 

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

        return(0);
 }
 
        return(0);
 }
 

+static struct tbl_span *
+newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
+{
+       struct tbl_span *dp;
+
+       dp = mandoc_calloc(1, sizeof(struct tbl_span));
+       dp->line = line;
+       dp->opts = &tbl->opts;
+       dp->layout = rp;
+       dp->head = tbl->first_head;
+
+       if (tbl->last_span) {
+               tbl->last_span->next = dp;
+               tbl->last_span = dp;
+       } else {
+               tbl->last_span = tbl->first_span = dp;
+               tbl->current_span = NULL;
+               dp->flags |= TBL_SPAN_FIRST;
+       }
+
+       return(dp);
+}
+

 int
 tbl_data(struct tbl_node *tbl, int ln, const char *p)
 {
 int
 tbl_data(struct tbl_node *tbl, int ln, const char *p)
 {


@@ -160,37 +212,48 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
        pos = 0;
 
        if ('\0' == p[pos]) {
        pos = 0;
 
        if ('\0' == p[pos]) {

-               TBL_MSG(tbl, MANDOCERR_TBL, ln, pos);
+               mandoc_msg(MANDOCERR_TBL, tbl->parse, ln, pos, NULL);

                return(0);
        }
 
        /* 
         * Choose a layout row: take the one following the last parsed
         * span's.  If that doesn't exist, use the last parsed span's.
                return(0);
        }
 
        /* 
         * 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.  This can
-        * be NULL!
+        * 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 (tbl->last_span) {
                assert(tbl->last_span->layout);
         */
 
        if (tbl->last_span) {
                assert(tbl->last_span->layout);

-               rp = tbl->last_span->layout->next;
+               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;
+                               }
+                               break;
+                       }
+               } else
+                       rp = tbl->last_span->layout;
+

                if (NULL == rp)
                        rp = tbl->last_span->layout;
        } else
                rp = tbl->first_row;
 
                if (NULL == rp)
                        rp = tbl->last_span->layout;
        } else
                rp = tbl->first_row;
 

-       dp = mandoc_calloc(1, sizeof(struct tbl_span));
-       dp->tbl = &tbl->opts;
-       dp->layout = rp;
-       dp->head = tbl->first_head;
+       assert(rp);

 
 

-       if (tbl->last_span) {
-               tbl->last_span->next = dp;
-               tbl->last_span = dp;
-       } else {
-               tbl->last_span = tbl->first_span = dp;
-               dp->flags |= TBL_SPAN_FIRST;
-       }
+       dp = newspan(tbl, ln, rp);

 
        if ( ! strcmp(p, "_")) {
                dp->pos = TBL_SPAN_HORIZ;
 
        if ( ! strcmp(p, "_")) {
                dp->pos = TBL_SPAN_HORIZ;


@@ -205,7 +268,7 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
        /* This returns 0 when TBL_PART_CDATA is entered. */
 
        while ('\0' != p[pos])
        /* This returns 0 when TBL_PART_CDATA is entered. */
 
        while ('\0' != p[pos])

-               if ( ! data(tbl, dp, ln, p, &pos))
+               if ( ! getdata(tbl, dp, ln, p, &pos))

                        return(0);
 
        return(1);
                        return(0);
 
        return(1);