===================================================================
RCS file: /cvs/mandoc/tbl_html.c,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- mandoc/tbl_html.c	2017/06/08 18:11:22	1.21
+++ mandoc/tbl_html.c	2018/11/24 23:03:18	1.25
@@ -1,7 +1,7 @@
-/*	$Id: tbl_html.c,v 1.21 2017/06/08 18:11:22 schwarze Exp $ */
+/*	$Id: tbl_html.c,v 1.25 2018/11/24 23:03:18 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017, 2018 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
@@ -49,6 +49,9 @@ html_tbl_strlen(const char *p, void *arg)
 static size_t
 html_tbl_sulen(const struct roffsu *su, void *arg)
 {
+	if (su->scale < 0.0)
+		return 0;
+
 	switch (su->unit) {
 	case SCALE_FS:  /* 2^16 basic units */
 		return su->scale * 65536.0 / 24.0;
@@ -76,23 +79,14 @@ html_tbl_sulen(const struct roffsu *su, void *arg)
 static void
 html_tblopen(struct html *h, const struct tbl_span *sp)
 {
-	struct tag	*t;
-	int		 ic;
-
 	if (h->tbl.cols == NULL) {
 		h->tbl.len = html_tbl_len;
 		h->tbl.slen = html_tbl_strlen;
 		h->tbl.sulen = html_tbl_sulen;
-		tblcalc(&h->tbl, sp, 0);
+		tblcalc(&h->tbl, sp, 0, 0);
 	}
-
 	assert(NULL == h->tblt);
 	h->tblt = print_otag(h, TAG_TABLE, "c", "tbl");
-
-	t = print_otag(h, TAG_COLGROUP, "");
-	for (ic = 0; ic < sp->opts->cols; ic++)
-		print_otag(h, TAG_COL, "shw", h->tbl.cols[ic].width);
-	print_tagq(h, t);
 }
 
 void
@@ -109,6 +103,7 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 {
 	const struct tbl_dat *dp;
 	struct tag	*tt;
+	const char	*halign, *valign;
 	int		 ic;
 
 	/* Inhibit printing of spaces: we do padding ourselves. */
@@ -132,10 +127,40 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 		dp = sp->first;
 		for (ic = 0; ic < sp->opts->cols; ic++) {
 			print_stagq(h, tt);
-			print_otag(h, TAG_TD, "");
-
-			if (dp == NULL || dp->layout->col > ic)
+			if (dp == NULL || dp->layout->col > ic) {
+				print_otag(h, TAG_TD, "");
 				continue;
+			}
+			switch (dp->layout->pos) {
+			case TBL_CELL_CENTRE:
+				halign = "center";
+				break;
+			case TBL_CELL_RIGHT:
+			case TBL_CELL_NUMBER:
+				halign = "right";
+				break;
+			default:
+				halign = NULL;
+				break;
+			}
+			if (dp->layout->flags & TBL_CELL_TALIGN)
+				valign = "top";
+			else if (dp->layout->flags & TBL_CELL_BALIGN)
+				valign = "bottom";
+			else
+				valign = NULL;
+			if (halign == NULL && valign == NULL)
+				print_otag(h, TAG_TD, "");
+			else if (halign == NULL)
+				print_otag(h, TAG_TD, "s",
+				    "vertical-align", valign);
+			else if (valign == NULL)
+				print_otag(h, TAG_TD, "s",
+				    "text-align", halign);
+			else
+				print_otag(h, TAG_TD, "ss",
+				    "vertical-align", valign,
+				    "text-align", halign);
 			if (dp->layout->pos != TBL_CELL_DOWN)
 				if (dp->string != NULL)
 					print_text(h, dp->string);
@@ -154,5 +179,4 @@ print_tbl(struct html *h, const struct tbl_span *sp)
 		h->tbl.cols = NULL;
 		print_tblclose(h);
 	}
-
 }