===================================================================
RCS file: /cvs/mandoc/tbl_html.c,v
retrieving revision 1.15
retrieving revision 1.17
diff -u -p -r1.15 -r1.17
--- mandoc/tbl_html.c	2015/01/30 04:11:50	1.15
+++ mandoc/tbl_html.c	2015/10/06 18:32:20	1.17
@@ -1,6 +1,7 @@
-/*	$Id: tbl_html.c,v 1.15 2015/01/30 04:11:50 schwarze Exp $ */
+/*	$Id: tbl_html.c,v 1.17 2015/10/06 18:32:20 schwarze Exp $ */
 /*
  * 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
@@ -36,14 +37,14 @@ static size_t
 html_tbl_len(size_t sz, void *arg)
 {
 
-	return(sz);
+	return sz;
 }
 
 static size_t
 html_tbl_strlen(const char *p, void *arg)
 {
 
-	return(strlen(p));
+	return strlen(p);
 }
 
 static void
@@ -54,7 +55,7 @@ html_tblopen(struct html *h, const struct tbl_span *sp
 	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);
@@ -132,7 +133,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;