===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.262
retrieving revision 1.265
diff -u -p -r1.262 -r1.265
--- mandoc/mdoc_html.c	2017/01/28 18:43:00	1.262
+++ mandoc/mdoc_html.c	2017/02/05 18:15:39	1.265
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.262 2017/01/28 18:43:00 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.265 2017/02/05 18:15:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -349,7 +349,7 @@ print_mdoc_node(MDOC_ARGS)
 		return;
 
 	child = 1;
-	t = h->tags.head;
+	t = h->tag;
 	n->flags &= ~NODE_ENDED;
 
 	switch (n->type) {
@@ -389,7 +389,7 @@ print_mdoc_node(MDOC_ARGS)
 		 */
 		if (h->tblt != NULL) {
 			print_tblclose(h);
-			t = h->tags.head;
+			t = h->tag;
 		}
 		assert(h->tblt == NULL);
 		if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
@@ -428,7 +428,6 @@ mdoc_root_post(MDOC_ARGS)
 	struct tag	*t, *tt;
 
 	t = print_otag(h, TAG_TABLE, "c", "foot");
-	print_otag(h, TAG_TBODY, "");
 	tt = print_otag(h, TAG_TR, "");
 
 	print_otag(h, TAG_TD, "c", "foot-date");
@@ -459,7 +458,6 @@ mdoc_root_pre(MDOC_ARGS)
 		    meta->title, meta->msec);
 
 	t = print_otag(h, TAG_TABLE, "c", "head");
-	print_otag(h, TAG_TBODY, "");
 	tt = print_otag(h, TAG_TR, "");
 
 	print_otag(h, TAG_TD, "c", "head-ltitle");
@@ -507,22 +505,18 @@ mdoc_sh_pre(MDOC_ARGS)
 	char	*id;
 
 	switch (n->type) {
-	case ROFFT_BLOCK:
-		return 1;
+	case ROFFT_HEAD:
+		id = make_id(n);
+		print_otag(h, TAG_H1, "ci", "Sh", id);
+		free(id);
+		break;
 	case ROFFT_BODY:
 		if (n->sec == SEC_AUTHORS)
 			h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
-		return 1;
+		break;
 	default:
 		break;
 	}
-
-	if ((id = make_id(n)) != NULL) {
-		print_otag(h, TAG_H1, "ci", "Sh", id);
-		free(id);
-	} else
-		print_otag(h, TAG_H1, "c", "Sh");
-
 	return 1;
 }
 
@@ -534,12 +528,9 @@ mdoc_ss_pre(MDOC_ARGS)
 	if (n->type != ROFFT_HEAD)
 		return 1;
 
-	if ((id = make_id(n)) != NULL) {
-		print_otag(h, TAG_H2, "ci", "Ss", id);
-		free(id);
-	} else
-		print_otag(h, TAG_H2, "c", "Ss");
-
+	id = make_id(n);
+	print_otag(h, TAG_H2, "ci", "Ss", id);
+	free(id);
 	return 1;
 }
 
@@ -581,6 +572,7 @@ mdoc_nd_pre(MDOC_ARGS)
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
+	struct tag	*t;
 	int		 len;
 
 	switch (n->type) {
@@ -609,9 +601,10 @@ mdoc_nm_pre(MDOC_ARGS)
 	if (len == 0 && meta->name != NULL)
 		len = html_strlen(meta->name);
 
+	t = print_otag(h, TAG_COLGROUP, "");
 	print_otag(h, TAG_COL, "shw", len);
 	print_otag(h, TAG_COL, "");
-	print_otag(h, TAG_TBODY, "");
+	print_tagq(h, t);
 	print_otag(h, TAG_TR, "");
 	return 1;
 }
@@ -749,11 +742,8 @@ mdoc_it_pre(MDOC_ARGS)
 				print_otag(h, TAG_B, "c", cattr);
 			break;
 		case ROFFT_BODY:
-			if (bl->norm->Bl.width == NULL)
-				print_otag(h, TAG_DD, "c", cattr);
-			else
-				print_otag(h, TAG_DD, "cswl", cattr,
-				    bl->norm->Bl.width);
+			print_otag(h, TAG_DD, "cswl", cattr,
+			    bl->norm->Bl.width);
 			break;
 		default:
 			break;
@@ -765,22 +755,16 @@ mdoc_it_pre(MDOC_ARGS)
 			if (h->style != NULL && !bl->norm->Bl.comp &&
 			    (n->parent->prev == NULL ||
 			     n->parent->prev->body->child != NULL)) {
-				if (bl->norm->Bl.width == NULL)
-					t = print_otag(h, TAG_DT, "c", cattr);
-				else
-					t = print_otag(h, TAG_DT, "csWl",
-					    cattr, bl->norm->Bl.width);
+				t = print_otag(h, TAG_DT, "csWl",
+				    cattr, bl->norm->Bl.width);
 				print_text(h, "\\ ");
 				print_tagq(h, t);
 				t = print_otag(h, TAG_DD, "c", cattr);
 				print_text(h, "\\ ");
 				print_tagq(h, t);
 			}
-			if (bl->norm->Bl.width == NULL)
-				print_otag(h, TAG_DT, "c", cattr);
-			else
-				print_otag(h, TAG_DT, "csWl", cattr,
-				    bl->norm->Bl.width);
+			print_otag(h, TAG_DT, "csWl", cattr,
+			    bl->norm->Bl.width);
 			break;
 		case ROFFT_BODY:
 			if (n->child == NULL) {
@@ -817,6 +801,7 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
+	struct tag	*t;
 	struct mdoc_bl	*bl;
 	const char	*cattr;
 	size_t		 i;
@@ -824,13 +809,11 @@ mdoc_bl_pre(MDOC_ARGS)
 
 	bl = &n->norm->Bl;
 
-	if (n->type == ROFFT_BODY) {
-		if (bl->type == LIST_column)
-			print_otag(h, TAG_TBODY, "");
+	switch (n->type) {
+	case ROFFT_BODY:
 		return 1;
-	}
 
-	if (n->type == ROFFT_HEAD) {
+	case ROFFT_HEAD:
 		if (bl->type != LIST_column || bl->ncols == 0)
 			return 0;
 
@@ -841,10 +824,15 @@ mdoc_bl_pre(MDOC_ARGS)
 		 * screen and we want to preserve that behaviour.
 		 */
 
+		t = print_otag(h, TAG_COLGROUP, "");
 		for (i = 0; i < bl->ncols - 1; i++)
 			print_otag(h, TAG_COL, "sww", bl->cols[i]);
 		print_otag(h, TAG_COL, "swW", bl->cols[i]);
+		print_tagq(h, t);
 		return 0;
+
+	default:
+		break;
 	}
 
 	switch (bl->type) {
@@ -885,10 +873,7 @@ mdoc_bl_pre(MDOC_ARGS)
 		cattr = "Bl-tag";
 		if (bl->offs)
 			print_otag(h, TAG_DIV, "cswl", cattr, bl->offs);
-		if (bl->width == NULL)
-			print_otag(h, TAG_DL, "c", cattr);
-		else
-			print_otag(h, TAG_DL, "cswl", cattr, bl->width);
+		print_otag(h, TAG_DL, "cswl", cattr, bl->width);
 		return 1;
 	case LIST_column:
 		elemtype = TAG_TABLE;
@@ -897,12 +882,7 @@ mdoc_bl_pre(MDOC_ARGS)
 	default:
 		abort();
 	}
-
-	if (bl->offs)
-		print_otag(h, elemtype, "cswl", cattr, bl->offs);
-	else
-		print_otag(h, elemtype, "c", cattr);
-
+	print_otag(h, elemtype, "cswl", cattr, bl->offs);
 	return 1;
 }
 
@@ -940,12 +920,9 @@ mdoc_sx_pre(MDOC_ARGS)
 {
 	char	*id;
 
-	if ((id = make_id(n)) != NULL) {
-		print_otag(h, TAG_A, "chR", "Sx", id);
-		free(id);
-	} else
-		print_otag(h, TAG_A, "c", "Sx");
-
+	id = make_id(n);
+	print_otag(h, TAG_A, "chR", "Sx", id);
+	free(id);
 	return 1;
 }