Don't let .Ta creep into an already-closed list; same as for .It.

[mandoc.git] / tbl_html.c

diff --git a/tbl_html.c b/tbl_html.c
index 68d3f9c534a8b5ca3152a97d95ee3c6312a7126f..1de1bb8bdc9d8c07df95027dd98fe15932e49529 100644 (file)
--- a/tbl_html.c
+++ b/tbl_html.c
@@ -1,6 +1,6 @@
-/*     $Id: tbl_html.c,v 1.7 2011/01/13 14:30:13 kristaps Exp $ */
+/*     $Id: tbl_html.c,v 1.13 2014/10/14 02:16:06 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,9 +14,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <stdio.h>
@@ -31,15 +31,14 @@ static      void     html_tblopen(struct html *, const struct tbl_span *);
 static size_t   html_tbl_len(size_t, void *);
 static size_t   html_tbl_strlen(const char *, void *);
 
-/* ARGSUSED */
+
 static size_t
 html_tbl_len(size_t sz, void *arg)
 {
-       
+
        return(sz);
 }
 
-/* ARGSUSED */
 static size_t
 html_tbl_strlen(const char *p, void *arg)
 {
@@ -58,7 +57,7 @@ html_tblopen(struct html *h, const struct tbl_span *sp)
        if (TBL_SPAN_FIRST & sp->flags) {
                h->tbl.len = html_tbl_len;
                h->tbl.slen = html_tbl_strlen;
-               tblcalc(&h->tbl, sp);
+               tblcalc(&h->tbl, sp, 0);
        }
 
        assert(NULL == h->tblt);
@@ -107,9 +106,9 @@ print_tbl(struct html *h, const struct tbl_span *sp)
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        switch (sp->pos) {
-       case (TBL_SPAN_HORIZ):
+       case TBL_SPAN_HORIZ:
                /* FALLTHROUGH */
-       case (TBL_SPAN_DHORIZ):
+       case TBL_SPAN_DHORIZ:
                PAIR_INIT(&tag, ATTR_COLSPAN, "0");
                print_otag(h, TAG_TD, 1, &tag);
                break;
@@ -119,20 +118,12 @@ print_tbl(struct html *h, const struct tbl_span *sp)
                        print_stagq(h, tt);
                        print_otag(h, TAG_TD, 0, NULL);
 
-                       switch (hp->pos) {
-                       case (TBL_HEAD_VERT):
-                               /* FALLTHROUGH */
-                       case (TBL_HEAD_DVERT):
-                               continue;
-                       case (TBL_HEAD_DATA):
-                               if (NULL == dp)
-                                       break;
-                               if (TBL_CELL_DOWN != dp->layout->pos)
-                                       if (dp->string)
-                                               print_text(h, dp->string);
-                               dp = dp->next;
+                       if (NULL == dp)
                                break;
-                       }
+                       if (TBL_CELL_DOWN != dp->layout->pos)
+                               if (dp->string)
+                                       print_text(h, dp->string);
+                       dp = dp->next;
                }
                break;
        }