delete the two pairs of extra blank lines from expected man(7) terminal

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 577da6a1e4d3c48616924f33d570de56ba5df40e..cfc489bb4547ca4818327f31399d85237e2d5e1f 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,7 +1,7 @@
-/*     $Id: tbl_data.c,v 1.47 2018/11/25 21:17:34 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.55 2021/05/18 13:22:43 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-2019,2021 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 *);
@@ -43,6 +46,7 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
        struct tbl_dat  *dat, *pdat;
        struct tbl_cell *cp;
        struct tbl_span *pdp;
+       const char      *ccp;
        int              sv;
 
        /*
@@ -51,8 +55,11 @@ getdata(struct tbl_node *tbl, struct tbl_span *dp,
         */
 
        sv = *pos;
-       while (p[*pos] != '\0' && p[*pos] != tbl->opts.tab)
-               (*pos)++;
+       ccp = p + sv;
+       while (*ccp != '\0' && *ccp != tbl->opts.tab)
+               if (*ccp++ == '\\')
+                       mandoc_escape(&ccp, NULL, NULL);
+       *pos = ccp - p;
 
        /* Advance to the next layout cell, skipping spanners. */
 
@@ -71,12 +78,13 @@ 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, sv, p + sv);
+                       mandoc_msg(MANDOCERR_TBLDATA_EXTRA,
+                           ln, sv, "%s", p + sv);
                        while (p[*pos] != '\0')
                                (*pos)++;
                        return;
@@ -169,7 +177,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
@@ -208,8 +216,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 *
@@ -240,20 +248,34 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p, int pos)
        struct tbl_cell *cp;
        struct tbl_span *sp;
 
-       rp = (sp = tbl->last_span) == NULL ? tbl->first_row :
-           sp->pos == TBL_SPAN_DATA && sp->layout->next != NULL ?
-           sp->layout->next : sp->layout;
-
+       for (sp = tbl->last_span; sp != NULL; sp = sp->prev)
+               if (sp->pos == TBL_SPAN_DATA)
+                       break;
+       rp = sp == NULL ? tbl->first_row :
+           sp->layout->next == NULL ? sp->layout : sp->layout->next;
        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;
+               }
        }
 
        /*