This one needs config.h too, if only for __BEGIN_DECLS.

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index 9d52f1141f4db6a6f88ddda71b39140a866da8d8..3be667995b99bd6226301b224d2af43842ec19db 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_data.c,v 1.38 2015/01/30 04:11:50 schwarze Exp $ */
+/*     $Id: tbl_data.c,v 1.40 2015/04/19 20:35:20 schwarze Exp $ */

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


@@ -132,7 +132,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p, int pos)
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;
                if (p[pos] == tbl->opts.tab) {
                        tbl->part = TBL_PART_DATA;
                        pos++;

-                       getdata(tbl, tbl->last_span, ln, p, &pos);
+                       while (p[pos] != '\0')
+                               getdata(tbl, tbl->last_span, ln, p, &pos);

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


@@ -173,7 +174,6 @@ newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
        if (dp->prev == NULL) {
                tbl->first_span = dp;
                tbl->current_span = NULL;
        if (dp->prev == NULL) {
                tbl->first_span = dp;
                tbl->current_span = NULL;

-               dp->flags |= TBL_SPAN_FIRST;

        } else
                dp->prev->next = dp;
        tbl->last_span = dp;
        } else
                dp->prev->next = dp;
        tbl->last_span = dp;