===================================================================
RCS file: /cvs/mandoc/tbl_html.c,v
retrieving revision 1.12
retrieving revision 1.14
diff -u -p -r1.12 -r1.14
--- mandoc/tbl_html.c	2014/08/10 23:54:41	1.12
+++ mandoc/tbl_html.c	2015/01/30 02:09:04	1.14
@@ -1,4 +1,4 @@
-/*	$Id: tbl_html.c,v 1.12 2014/08/10 23:54:41 schwarze Exp $ */
+/*	$Id: tbl_html.c,v 1.14 2015/01/30 02:09:04 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -54,10 +54,10 @@ html_tblopen(struct html *h, const struct tbl_span *sp
 	struct roffsu	 su;
 	struct roffcol	*col;
 
-	if (TBL_SPAN_FIRST & sp->flags) {
+	if (sp->flags & TBL_SPAN_FIRST) {
 		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);
@@ -95,7 +95,7 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 
 	/* Inhibit printing of spaces: we do padding ourselves. */
 
-	if (NULL == h->tblt)
+	if (h->tblt == NULL)
 		html_tblopen(h, sp);
 
 	assert(h->tblt);
@@ -118,10 +118,10 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 			print_stagq(h, tt);
 			print_otag(h, TAG_TD, 0, NULL);
 
-			if (NULL == dp)
+			if (dp == NULL)
 				break;
-			if (TBL_CELL_DOWN != dp->layout->pos)
-				if (dp->string)
+			if (dp->layout->pos != TBL_CELL_DOWN)
+				if (dp->string != NULL)
 					print_text(h, dp->string);
 			dp = dp->next;
 		}
@@ -132,7 +132,7 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 
 	h->flags &= ~HTML_NONOSPACE;
 
-	if (TBL_SPAN_LAST & sp->flags) {
+	if (sp->flags & TBL_SPAN_LAST) {
 		assert(h->tbl.cols);
 		free(h->tbl.cols);
 		h->tbl.cols = NULL;