In .Bl -column, if some of the column width declarations are given

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 70da2311d48688d8bf208c962b3d97e31ea3acc2..1db24a613a3f02d07476824a53b513a422ce289a 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.22 2011/02/06 22:02:58 kristaps Exp $ */
+/*     $Id: tbl_data.c,v 1.31 2014/04/23 16:08:33 schwarze Exp $ */

 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -26,16 +26,18 @@
 #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 *, 
+static int              getdata(struct tbl_node *, struct tbl_span *,

                                int, const char *, int *);
                                int, const char *, int *);

-static struct tbl_span *newspan(struct tbl_node *, int, 
+static struct tbl_span *newspan(struct tbl_node *, int,

                                struct tbl_row *);
 
                                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;
                int ln, const char *p, int *pos)
 {
        struct tbl_dat  *dat;


@@ -48,14 +50,12 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
        else if (NULL == dp->last)
                cp = dp->layout->first;
 
        else if (NULL == dp->last)
                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;
 
        /*


@@ -64,7 +64,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
         */
 
        if (NULL == cp) {
         */
 
        if (NULL == cp) {

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

                /* Skip to the end... */
                while (p[*pos])
                        (*pos)++;
                /* Skip to the end... */
                while (p[*pos])
                        (*pos)++;


@@ -82,7 +83,7 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                        spans++;
                else
                        break;
                        spans++;
                else
                        break;

-       
+

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


@@ -103,11 +104,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])


@@ -125,20 +128,20 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                dat->pos = TBL_DATA_DATA;
 
        if (TBL_CELL_HORIZ == dat->layout->pos ||
                dat->pos = TBL_DATA_DATA;
 
        if (TBL_CELL_HORIZ == dat->layout->pos ||

-                       TBL_CELL_DHORIZ == dat->layout->pos ||
-                       TBL_CELL_DOWN == 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);
 }
 

-/* ARGSUSED */

 int
 tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 {
        struct tbl_dat  *dat;
 int
 tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
 {
        struct tbl_dat  *dat;

-       size_t           sz;
+       size_t           sz;

        int              pos;
 
        pos = 0;
        int              pos;
 
        pos = 0;


@@ -150,7 +153,7 @@ 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(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);


@@ -164,13 +167,14 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
        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);

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

        } else
                dat->string = mandoc_strdup(p);
 
        } else
                dat->string = mandoc_strdup(p);
 

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

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


@@ -182,7 +186,7 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
 
        dp = mandoc_calloc(1, sizeof(struct tbl_span));
        dp->line = line;
 
        dp = mandoc_calloc(1, sizeof(struct tbl_span));
        dp->line = line;

-       dp->tbl = &tbl->opts;
+       dp->opts = &tbl->opts;

        dp->layout = rp;
        dp->head = tbl->first_head;
 
        dp->layout = rp;
        dp->head = tbl->first_head;
 


@@ -208,11 +212,11 @@ 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);
        }
 
                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.  Lastly,
         * 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,


@@ -226,11 +230,11 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
                        for (rp = tbl->last_span->layout->next;
                                        rp && rp->first; rp = rp->next) {
                                switch (rp->first->pos) {
                        for (rp = tbl->last_span->layout->next;
                                        rp && rp->first; rp = rp->next) {
                                switch (rp->first->pos) {

-                               case (TBL_CELL_HORIZ):
+                               case TBL_CELL_HORIZ:

                                        dp = newspan(tbl, ln, rp);
                                        dp->pos = TBL_SPAN_HORIZ;
                                        continue;
                                        dp = newspan(tbl, ln, rp);
                                        dp->pos = TBL_SPAN_HORIZ;
                                        continue;

-                               case (TBL_CELL_DHORIZ):
+                               case TBL_CELL_DHORIZ:

                                        dp = newspan(tbl, ln, rp);
                                        dp->pos = TBL_SPAN_DHORIZ;
                                        continue;
                                        dp = newspan(tbl, ln, rp);
                                        dp->pos = TBL_SPAN_DHORIZ;
                                        continue;


@@ -264,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);