prevent the skipvsp flag from creeping past actual text

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index 40abb42f198ccc89360ebc5efd53f4385548fc0f..e7940381d203d6fa5b5e6b4f4b3dbac7dddc8d03 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,4 +1,4 @@
-/*     $Id: tbl_html.c,v 1.14 2015/01/30 02:09:04 schwarze Exp $ */
+/*     $Id: tbl_html.c,v 1.16 2015/01/30 17:32:16 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -49,12 +49,12 @@ html_tbl_strlen(const char *p, void *arg)
 static void
 html_tblopen(struct html *h, const struct tbl_span *sp)
 {
-       const struct tbl_head *hp;
        struct htmlpair  tag;
        struct roffsu    su;
        struct roffcol  *col;
+       int              ic;
 
-       if (sp->flags & TBL_SPAN_FIRST) {
+       if (h->tbl.cols == NULL) {
                h->tbl.len = html_tbl_len;
                h->tbl.slen = html_tbl_strlen;
                tblcalc(&h->tbl, sp, 0);
@@ -64,9 +64,9 @@ html_tblopen(struct html *h, const struct tbl_span *sp)
        PAIR_CLASS_INIT(&tag, "tbl");
        h->tblt = print_otag(h, TAG_TABLE, 1, &tag);
 
-       for (hp = sp->head; hp; hp = hp->next) {
+       for (ic = 0; ic < sp->opts->cols; ic++) {
                bufinit(h);
-               col = &h->tbl.cols[hp->ident];
+               col = h->tbl.cols + ic;
                SCALE_HS_INIT(&su, col->width);
                bufcat_su(h, "width", &su);
                PAIR_STYLE_INIT(&tag, h);
@@ -88,10 +88,10 @@ print_tblclose(struct html *h)
 void
 print_tbl(struct html *h, const struct tbl_span *sp)
 {
-       const struct tbl_head *hp;
        const struct tbl_dat *dp;
        struct htmlpair  tag;
        struct tag      *tt;
+       int              ic;
 
        /* Inhibit printing of spaces: we do padding ourselves. */
 
@@ -114,12 +114,12 @@ print_tbl(struct html *h, const struct tbl_span *sp)
                break;
        default:
                dp = sp->first;
-               for (hp = sp->head; hp; hp = hp->next) {
+               for (ic = 0; ic < sp->opts->cols; ic++) {
                        print_stagq(h, tt);
                        print_otag(h, TAG_TD, 0, NULL);
 
-                       if (dp == NULL)
-                               break;
+                       if (dp == NULL || dp->layout->col > ic)
+                               continue;
                        if (dp->layout->pos != TBL_CELL_DOWN)
                                if (dp->string != NULL)
                                        print_text(h, dp->string);
@@ -132,7 +132,7 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 
        h->flags &= ~HTML_NONOSPACE;
 
-       if (sp->flags & TBL_SPAN_LAST) {
+       if (sp->next == NULL) {
                assert(h->tbl.cols);
                free(h->tbl.cols);
                h->tbl.cols = NULL;