===================================================================
RCS file: /cvs/mandoc/tbl_html.c,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- mandoc/tbl_html.c	2011/01/04 10:29:41	1.1
+++ mandoc/tbl_html.c	2011/01/11 14:12:01	1.6
@@ -1,4 +1,4 @@
-/*	$Id: tbl_html.c,v 1.1 2011/01/04 10:29:41 kristaps Exp $ */
+/*	$Id: tbl_html.c,v 1.6 2011/01/11 14:12:01 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,46 +27,108 @@
 #include "out.h"
 #include "html.h"
 
+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)
+{
+
+	return(strlen(p));
+}
+
 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 tag	*tt;
+	struct htmlpair	 tag;
+	struct roffsu	 su;
+	struct roffcol	*col;
 
+	/* Inhibit printing of spaces: we do padding ourselves. */
+
+	h->flags |= HTML_NONOSPACE;
+	h->flags |= HTML_NOSPACE;
+
+	/* First pass: calculate widths. */
+
+	if (TBL_SPAN_FIRST & sp->flags) {
+		h->tbl.len = html_tbl_len;
+		h->tbl.slen = html_tbl_strlen;
+		tblcalc(&h->tbl, sp);
+	}
+
 	switch (sp->pos) {
 	case (TBL_SPAN_HORIZ):
 		/* FALLTHROUGH */
 	case (TBL_SPAN_DHORIZ):
-		return;
-	default:
 		break;
-	}
+	default:
+		PAIR_CLASS_INIT(&tag, "tbl");
+		print_otag(h, TAG_TABLE, 1, &tag);
+		print_otag(h, TAG_TR, 0, NULL);
 
-	/* Inhibit printing of spaces: we do padding ourselves. */
+		/* Iterate over template headers. */
 
-	h->flags |= HTML_NONOSPACE;
-	h->flags |= HTML_NOSPACE;
+		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;
+			}
 
-	print_otag(h, TAG_TABLE, 0, NULL);
-	print_otag(h, TAG_TR, 0, NULL);
+			/*
+			 * For the time being, use the simplest possible
+			 * table styling: setting the widths of data
+			 * columns.
+			 */
 
-	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;
+			col = &h->tbl.cols[hp->ident];
+			SCALE_HS_INIT(&su, col->width);
+			bufcat_su(h, "width", &su);
+			PAIR_STYLE_INIT(&tag, h);
+			tt = print_otag(h, TAG_TD, 1, &tag);
+
+			if (dp) {
+				switch (dp->layout->pos) {
+				case (TBL_CELL_DOWN):
+					break;
+				default:
+					if (NULL == dp->string)
+						break;
+					print_text(h, dp->string);
+					break;
+				}
+				dp = dp->next;
+			}
+
+			print_tagq(h, tt);
 		}
-		tt = print_otag(h, TAG_TD, 0, NULL);
-		if (dp) {
-			print_text(h, dp->string);
-			dp = dp->next;
-		}
-		print_tagq(h, tt);
+		break;
 	}
+
 	h->flags &= ~HTML_NONOSPACE;
+
+	/* Close out column specifiers on the last span. */
+
+	if (TBL_SPAN_LAST & sp->flags) {
+		assert(h->tbl.cols);
+		free(h->tbl.cols);
+		h->tbl.cols = NULL;
+	}
 }