===================================================================
RCS file: /cvs/mandoc/tbl_html.c,v
retrieving revision 1.3
retrieving revision 1.18
diff -u -p -r1.3 -r1.18
--- mandoc/tbl_html.c	2011/01/05 13:00:11	1.3
+++ mandoc/tbl_html.c	2015/10/12 00:08:16	1.18
@@ -1,6 +1,7 @@
-/*	$Id: tbl_html.c,v 1.3 2011/01/05 13:00:11 kristaps Exp $ */
+/*	$Id: tbl_html.c,v 1.18 2015/10/12 00:08:16 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2015 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
@@ -14,10 +15,10 @@
  * 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>
 #include <stdlib.h>
@@ -27,50 +28,115 @@
 #include "out.h"
 #include "html.h"
 
+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 *);
+
+
+static size_t
+html_tbl_len(size_t sz, void *arg)
+{
+
+	return sz;
+}
+
+static size_t
+html_tbl_strlen(const char *p, void *arg)
+{
+
+	return strlen(p);
+}
+
+static void
+html_tblopen(struct html *h, const struct tbl_span *sp)
+{
+	struct htmlpair	 tag;
+	struct roffsu	 su;
+	struct roffcol	*col;
+	int		 ic;
+
+	if (h->tbl.cols == NULL) {
+		h->tbl.len = html_tbl_len;
+		h->tbl.slen = html_tbl_strlen;
+		tblcalc(&h->tbl, sp, 0);
+	}
+
+	assert(NULL == h->tblt);
+	PAIR_CLASS_INIT(&tag, "tbl");
+	h->tblt = print_otag(h, TAG_TABLE, 1, &tag);
+
+	for (ic = 0; ic < sp->opts->cols; ic++) {
+		bufinit(h);
+		col = h->tbl.cols + ic;
+		SCALE_HS_INIT(&su, col->width);
+		bufcat_su(h, "width", &su);
+		PAIR_STYLE_INIT(&tag, h);
+		print_otag(h, TAG_COL, 1, &tag);
+	}
+
+	print_otag(h, TAG_TBODY, 0, NULL);
+}
+
 void
+print_tblclose(struct html *h)
+{
+
+	assert(h->tblt);
+	print_tagq(h, h->tblt);
+	h->tblt = NULL;
+}
+
+void
 print_tbl(struct html *h, const struct tbl_span *sp)
 {
-	const struct tbl_head *hp;
 	const struct tbl_dat *dp;
-	struct tag	*tt;
 	struct htmlpair	 tag;
+	struct tag	*tt;
+	int		 ic;
 
-	switch (sp->pos) {
-	case (TBL_SPAN_HORIZ):
-		/* FALLTHROUGH */
-	case (TBL_SPAN_DHORIZ):
-		return;
-	default:
-		break;
-	}
-
 	/* Inhibit printing of spaces: we do padding ourselves. */
 
+	if (h->tblt == NULL)
+		html_tblopen(h, sp);
+
+	assert(h->tblt);
+
 	h->flags |= HTML_NONOSPACE;
 	h->flags |= HTML_NOSPACE;
 
-	PAIR_CLASS_INIT(&tag, "tbl");
+	tt = print_otag(h, TAG_TR, 0, NULL);
 
-	print_otag(h, TAG_TABLE, 1, &tag);
-	print_otag(h, TAG_TR, 0, NULL);
+	switch (sp->pos) {
+	case TBL_SPAN_HORIZ:
+	case TBL_SPAN_DHORIZ:
+		PAIR_INIT(&tag, ATTR_COLSPAN, "0");
+		print_otag(h, TAG_TD, 1, &tag);
+		break;
+	default:
+		dp = sp->first;
+		for (ic = 0; ic < sp->opts->cols; ic++) {
+			print_stagq(h, tt);
+			print_otag(h, TAG_TD, 0, NULL);
 
-	dp = sp->first;
-	for (hp = sp->head; hp; hp = hp->next) {
-		switch (hp->pos) {
-		case (TBL_HEAD_VERT):
-			/* FALLTHROUGH */
-		case (TBL_HEAD_DVERT):
-			continue;
-		case (TBL_HEAD_DATA):
-			break;
-		}
-		tt = print_otag(h, TAG_TD, 0, NULL);
-		if (dp) {
-			if (dp->string)
-				print_text(h, dp->string);
+			if (dp == NULL || dp->layout->col > ic)
+				continue;
+			if (dp->layout->pos != TBL_CELL_DOWN)
+				if (dp->string != NULL)
+					print_text(h, dp->string);
 			dp = dp->next;
 		}
-		print_tagq(h, tt);
+		break;
 	}
+
+	print_tagq(h, tt);
+
 	h->flags &= ~HTML_NONOSPACE;
+
+	if (sp->next == NULL) {
+		assert(h->tbl.cols);
+		free(h->tbl.cols);
+		h->tbl.cols = NULL;
+		print_tblclose(h);
+	}
+
 }