adjust test framework to not require a tty

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 9339465e5449b57d8ca9e427dd82ee90d04d2bb0..93198484ebc46daa997a995b5ee50e8e2b2828d8 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_data.c,v 1.46 2018/11/25 19:24:20 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.53 2020/01/11 20:48:18 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2015,2017,2018,2019 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
@@ -21,14 +21,17 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "mandoc.h"
 #include "mandoc_aux.h"
+#include "mandoc.h"
+#include "tbl.h"
 #include "libmandoc.h"
-#include "libroff.h"
+#include "tbl_int.h"
 
 static void             getdata(struct tbl_node *, struct tbl_span *,
                                int, const char *, int *);
@@ -45,6 +48,15 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
        struct tbl_span *pdp;
        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;
@@ -62,13 +74,14 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                if (dp->layout->last->col + 1 < dp->opts->cols) {
                        cp = mandoc_calloc(1, sizeof(*cp));
                        cp->pos = TBL_CELL_LEFT;
+                       cp->spacing = SIZE_MAX;
                        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])
+                       mandoc_msg(MANDOCERR_TBLDATA_EXTRA,
+                           ln, sv, "%s", p + sv);
+                       while (p[*pos] != '\0')
                                (*pos)++;
                        return;
                }
@@ -91,7 +104,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
         * can be reused for more than one data row.
         */
 
-       if (cp->pos == TBL_CELL_DOWN) {
+       if (cp->pos == TBL_CELL_DOWN ||
+           (*pos - sv == 2 && p[sv] == '\\' && p[sv + 1] == '^')) {
                pdp = dp;
                while ((pdp = pdp->prev) != NULL) {
                        pdat = pdp->first;
@@ -100,7 +114,8 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                                pdat = pdat->next;
                        if (pdat == NULL)
                                break;
-                       if (pdat->layout->pos != TBL_CELL_DOWN) {
+                       if (pdat->layout->pos != TBL_CELL_DOWN &&
+                           strcmp(pdat->string, "\\^") != 0) {
                                pdat->vspans++;
                                break;
                        }
@@ -126,10 +141,6 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
                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,
@@ -143,7 +154,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
 
        dat->string = mandoc_strndup(p + sv, *pos - sv);
 
-       if (p[*pos])
+       if (p[*pos] != '\0')
                (*pos)++;
 
        if ( ! strcmp(dat->string, "_"))
@@ -162,7 +173,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
            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);
+                   ln, sv, "%s", dat->string);
 }
 
 void
@@ -201,8 +212,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
                dat->string = mandoc_strdup(p + pos);
 
        if (dat->layout->pos == TBL_CELL_DOWN)
-               mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
-                   ln, pos, dat->string);
+               mandoc_msg(MANDOCERR_TBLDATA_SPAN,
+                   ln, pos, "%s", dat->string);
 }
 
 static struct tbl_span *
@@ -239,14 +250,27 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
 
        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;
+       if (p[1] == '\0') {
+               switch (p[0]) {
+               case '.':
+                       /*
+                        * Empty request lines must be handled here
+                        * and cannot be discarded in roff_parseln()
+                        * because in the layout section, they
+                        * are significant and end the layout.
+                        */
+                       return;
+               case '_':
+                       sp = newspan(tbl, ln, rp);
+                       sp->pos = TBL_SPAN_HORIZ;
+                       return;
+               case '=':
+                       sp = newspan(tbl, ln, rp);
+                       sp->pos = TBL_SPAN_DHORIZ;
+                       return;
+               default:
+                       break;
+               }
        }
 
        /*