Fix a regression caused by mdoc_term.c 1.214 / mdoc_html.c 1.148:

[mandoc.git] / tbl_data.c

diff --git a/tbl_data.c b/tbl_data.c
index c7bca6499d03cf3d0cbcb106614489597f4841f1..70da2311d48688d8bf208c962b3d97e31ea3acc2 100644 (file)
--- a/tbl_data.c
+++ b/tbl_data.c
@@ -1,6 +1,7 @@
-/*     $Id: tbl_data.c,v 1.16 2011/01/10 14:40:30 kristaps Exp $ */
+/*     $Id: tbl_data.c,v 1.22 2011/02/06 22:02:58 kristaps Exp $ */
 /*
- * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011 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
@@ -28,8 +29,10 @@
 #include "libmandoc.h"
 #include "libroff.h"
 
-static int     data(struct tbl_node *, struct tbl_span *, 
-                       int, const char *, int *);
+static int              data(struct tbl_node *, struct tbl_span *, 
+                               int, const char *, int *);
+static struct tbl_span *newspan(struct tbl_node *, int, 
+                               struct tbl_row *);
 
 static int
 data(struct tbl_node *tbl, struct tbl_span *dp, 
@@ -122,7 +125,8 @@ data(struct tbl_node *tbl, struct tbl_span *dp,
                dat->pos = TBL_DATA_DATA;
 
        if (TBL_CELL_HORIZ == dat->layout->pos ||
-                       TBL_CELL_DHORIZ == dat->layout->pos)
+                       TBL_CELL_DHORIZ == dat->layout->pos ||
+                       TBL_CELL_DOWN == dat->layout->pos)
                if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
                        TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, sv);
 
@@ -140,7 +144,6 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
        pos = 0;
 
        dat = tbl->last_span->last;
-       dat->pos = TBL_DATA_DATA;
 
        if (p[pos] == 'T' && p[pos + 1] == '}') {
                pos += 2;
@@ -156,6 +159,8 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
                /* Fallthrough: T} is part of a word. */
        }
 
+       dat->pos = TBL_DATA_DATA;
+
        if (dat->string) {
                sz = strlen(p) + strlen(dat->string) + 2;
                dat->string = mandoc_realloc(dat->string, sz);
@@ -164,9 +169,35 @@ tbl_cdata(struct tbl_node *tbl, int ln, const char *p)
        } else
                dat->string = mandoc_strdup(p);
 
+       if (TBL_CELL_DOWN == dat->layout->pos) 
+               TBL_MSG(tbl, MANDOCERR_TBLIGNDATA, ln, pos);
+
        return(0);
 }
 
+static struct tbl_span *
+newspan(struct tbl_node *tbl, int line, struct tbl_row *rp)
+{
+       struct tbl_span *dp;
+
+       dp = mandoc_calloc(1, sizeof(struct tbl_span));
+       dp->line = line;
+       dp->tbl = &tbl->opts;
+       dp->layout = rp;
+       dp->head = tbl->first_head;
+
+       if (tbl->last_span) {
+               tbl->last_span->next = dp;
+               tbl->last_span = dp;
+       } else {
+               tbl->last_span = tbl->first_span = dp;
+               tbl->current_span = NULL;
+               dp->flags |= TBL_SPAN_FIRST;
+       }
+
+       return(dp);
+}
+
 int
 tbl_data(struct tbl_node *tbl, int ln, const char *p)
 {
@@ -187,33 +218,38 @@ tbl_data(struct tbl_node *tbl, int ln, const char *p)
         * 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).
-        *
-        * In the end, this can be NULL!
         */
 
        if (tbl->last_span) {
                assert(tbl->last_span->layout);
-               if (tbl->last_span->pos == TBL_SPAN_DATA)
-                       rp = tbl->last_span->layout->next;
-               else
+               if (tbl->last_span->pos == TBL_SPAN_DATA) {
+                       for (rp = tbl->last_span->layout->next;
+                                       rp && rp->first; 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 (NULL == rp)
                        rp = tbl->last_span->layout;
        } else
                rp = tbl->first_row;
 
-       dp = mandoc_calloc(1, sizeof(struct tbl_span));
-       dp->tbl = &tbl->opts;
-       dp->layout = rp;
-       dp->head = tbl->first_head;
+       assert(rp);
 
-       if (tbl->last_span) {
-               tbl->last_span->next = dp;
-               tbl->last_span = dp;
-       } else {
-               tbl->last_span = tbl->first_span = dp;
-               dp->flags |= TBL_SPAN_FIRST;
-       }
+       dp = newspan(tbl, ln, rp);
 
        if ( ! strcmp(p, "_")) {
                dp->pos = TBL_SPAN_HORIZ;