Place mandoc.css into the public domain.

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 2502672184f49bc70eae1ca88ee8f9232c57a251..577da6a1e4d3c48616924f33d570de56ba5df40e 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_data.c,v 1.42 2017/06/08 18:11:22 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.47 2018/11/25 21:17:34 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, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2015, 2017, 2018 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


@@ -40,10 +40,20 @@ static void
 getdata(struct tbl_node *tbl, struct tbl_span *dp,
                int ln, const char *p, int *pos)
 {
 getdata(struct tbl_node *tbl, struct tbl_span *dp,
                int ln, const char *p, int *pos)
 {

-       struct tbl_dat  *dat;
+       struct tbl_dat  *dat, *pdat;

        struct tbl_cell *cp;
        struct tbl_cell *cp;

+       struct tbl_span *pdp;

        int              sv;
 
        int              sv;
 

+       /*
+        * Determine the length of the string in the cell
+        * and advance the parse point to the end of the cell.
+        */
+
+       sv = *pos;
+       while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab)
+               (*pos)++;
+

        /* Advance to the next layout cell, skipping spanners. */
 
        cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
        /* Advance to the next layout cell, skipping spanners. */
 
        cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;


@@ -51,39 +61,82 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                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 (cp == NULL) {
         */
 
        if (cp == NULL) {

-               mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
-                   ln, *pos, p + *pos);
-               /* Skip to the end... */
-               while (p[*pos])
-                       (*pos)++;
-               return;
+               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, sv, p + sv);
+                       while (p[*pos] != '\0')
+                               (*pos)++;
+                       return;
+               }

        }
 
        }
 

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

        dat->layout = cp;
        dat->layout = cp;

+       dat->next = NULL;
+       dat->string = NULL;
+       dat->hspans = 0;
+       dat->vspans = 0;
+       dat->block = 0;

        dat->pos = TBL_DATA_NONE;
        dat->pos = TBL_DATA_NONE;

-       dat->spans = 0;
+
+       /*
+        * Increment the number of vertical spans in a data cell above,
+        * if this cell vertically extends one or more cells above.
+        * The iteration must be done over data rows,
+        * not over layout rows, because one layout row
+        * can be reused for more than one data row.
+        */
+
+       if (cp->pos == TBL_CELL_DOWN ||
+           (*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) {
+               pdp = dp;
+               while ((pdp = pdp->prev) != NULL) {
+                       pdat = pdp->first;
+                       while (pdat != NULL &&
+                           pdat->layout->col < dat->layout->col)
+                               pdat = pdat->next;
+                       if (pdat == NULL)
+                               break;
+                       if (pdat->layout->pos != TBL_CELL_DOWN &&
+                           strcmp(pdat->string, "\\^") != 0) {
+                               pdat->vspans++;
+                               break;
+                       }
+               }
+       }
+
+       /*
+        * Count the number of horizontal spans to the right of this cell.
+        * This is purely a matter of the layout, independent of the data.
+        */
+

        for (cp = cp->next; cp != NULL; cp = cp->next)
                if (cp->pos == TBL_CELL_SPAN)
        for (cp = cp->next; cp != NULL; cp = cp->next)
                if (cp->pos == TBL_CELL_SPAN)

-                       dat->spans++;
+                       dat->hspans++;

                else
                        break;
 
                else
                        break;
 

+       /* Append the new data cell to the data row. */
+

        if (dp->last == NULL)
                dp->first = dat;
        else
                dp->last->next = dat;
        dp->last = dat;
 
        if (dp->last == NULL)
                dp->first = dat;
        else
                dp->last->next = dat;
        dp->last = dat;
 

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

        /*
         * Check for a continued-data scope opening.  This consists of a
         * trailing `T{' at the end of the line.  Subsequent lines,
        /*
         * Check for a continued-data scope opening.  This consists of a
         * trailing `T{' at the end of the line.  Subsequent lines,


@@ -97,7 +150,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 
        dat->string = mandoc_strndup(p + sv, *pos - sv);
 
 
        dat->string = mandoc_strndup(p + sv, *pos - sv);
 

-       if (p[*pos])
+       if (p[*pos] != '\0')

                (*pos)++;
 
        if ( ! strcmp(dat->string, "_"))
                (*pos)++;
 
        if ( ! strcmp(dat->string, "_"))


@@ -119,7 +172,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                    tbl->parse, ln, sv, dat->string);
 }
 
                    tbl->parse, ln, sv, dat->string);
 }
 

-int
+void

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


@@ -134,10 +187,10 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
                        pos++;
                        while (p[pos] != '\0')
                                getdata(tbl, tbl->last_span, ln, p, &pos);
                        pos++;
                        while (p[pos] != '\0')
                                getdata(tbl, tbl->last_span, ln, p, &pos);

-                       return 1;
+                       return;

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

-                       return 1;
+                       return;

                }
 
                /* Fallthrough: T} is part of a word. */
                }
 
                /* Fallthrough: T} is part of a word. */


@@ -157,8 +210,6 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
        if (dat->layout->pos == TBL_CELL_DOWN)
                mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
                    ln, pos, dat->string);
        if (dat->layout->pos == TBL_CELL_DOWN)
                mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
                    ln, pos, dat->string);

-
-       return 0;

 }
 
 static struct tbl_span *
 }
 
 static struct tbl_span *


@@ -185,58 +236,50 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
 void
 tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
 {
 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;

+       struct tbl_cell *cp;
+       struct tbl_span *sp;

 
 

-       /*
-        * 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 (tbl->last_span != NULL) {
-               if (tbl->last_span->pos == TBL_SPAN_DATA) {
-                       for (rp = tbl->last_span->layout->next;
-                            rp != NULL && rp->first != NULL;
-                            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 (rp == NULL)
-                       rp = tbl->last_span->layout;
-       } else
-               rp = tbl->first_row;
-
-       assert(rp);
+       rp = (sp = tbl->last_span) == NULL ? tbl->first_row :
+           sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ?
+           sp->layout->next : sp->layout;

 
 

-       dp = newspan(tbl, ln, rp);
+       assert(rp != NULL);

 
        if ( ! strcmp(p, "_")) {
 
        if ( ! strcmp(p, "_")) {

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

                return;
        } else if ( ! strcmp(p, "=")) {
                return;
        } else if ( ! strcmp(p, "=")) {

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

                return;
        }
 
                return;
        }
 

-       dp->pos = TBL_SPAN_DATA;
+       /*
+        * 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.
+        */
+
+       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;
+               if (cp != NULL)
+                       break;
+               sp = newspan(tbl, ln, rp);
+               sp->pos = TBL_SPAN_DATA;
+               rp = rp->next;
+       }
+
+       /* Process a real data row. */

 
 

+       sp = newspan(tbl, ln, rp);
+       sp->pos = TBL_SPAN_DATA;

        while (p[pos] != '\0')
        while (p[pos] != '\0')

-               getdata(tbl, dp, ln, p, &pos);
+               getdata(tbl, sp, ln, p, &pos);

 }
 }