===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.258
retrieving revision 1.260
diff -u -p -r1.258 -r1.260
--- mandoc/mdoc_html.c	2017/01/20 23:51:00	1.258
+++ mandoc/mdoc_html.c	2017/01/21 02:09:51	1.260
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.258 2017/01/20 23:51:00 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.260 2017/01/21 02:09:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -574,7 +574,7 @@ mdoc_nd_pre(MDOC_ARGS)
 	/* XXX: this tag in theory can contain block elements. */
 
 	print_text(h, "\\(em");
-	print_otag(h, TAG_SPAN, "c", "desc");
+	print_otag(h, TAG_SPAN, "c", "Nd");
 	return 1;
 }
 
@@ -663,7 +663,7 @@ mdoc_ar_pre(MDOC_ARGS)
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
-	print_otag(h, TAG_SPAN, "c", "unix");
+	print_otag(h, TAG_SPAN, "c", "Ux");
 	return 1;
 }
 
@@ -725,8 +725,10 @@ mdoc_it_pre(MDOC_ARGS)
 		case ROFFT_HEAD:
 			return 0;
 		case ROFFT_BODY:
-			print_otag(h, TAG_LI, "csvt", cattr,
-			    !bl->norm->Bl.comp);
+			if (bl->norm->Bl.comp)
+				print_otag(h, TAG_LI, "csvt", cattr, 0);
+			else
+				print_otag(h, TAG_LI, "c", cattr);
 			break;
 		default:
 			break;
@@ -739,8 +741,10 @@ mdoc_it_pre(MDOC_ARGS)
 	case LIST_tag:
 		switch (n->type) {
 		case ROFFT_HEAD:
-			print_otag(h, TAG_DT, "csvt", cattr,
-			    !bl->norm->Bl.comp);
+			if (bl->norm->Bl.comp)
+				print_otag(h, TAG_DT, "csvt", cattr, 0);
+			else
+				print_otag(h, TAG_DT, "c", cattr);
 			if (type == LIST_diag)
 				print_otag(h, TAG_B, "c", cattr);
 			break;
@@ -760,8 +764,10 @@ mdoc_it_pre(MDOC_ARGS)
 		case ROFFT_HEAD:
 			break;
 		case ROFFT_BODY:
-			print_otag(h, TAG_TD, "csvt", cattr,
-			    !bl->norm->Bl.comp);
+			if (bl->norm->Bl.comp)
+				print_otag(h, TAG_TD, "csvt", cattr, 0);
+			else
+				print_otag(h, TAG_TD, "c", cattr);
 			break;
 		default:
 			print_otag(h, TAG_TR, "c", cattr);
@@ -851,10 +857,9 @@ mdoc_bl_pre(MDOC_ARGS)
 	}
 
 	if (n->norm->Bl.offs)
-		print_otag(h, elemtype, "csvtvbwl", cattr, 0, 0,
-		    n->norm->Bl.offs);
+		print_otag(h, elemtype, "cswl", cattr, n->norm->Bl.offs);
 	else
-		print_otag(h, elemtype, "csvtvb", cattr, 0, 0);
+		print_otag(h, elemtype, "c", cattr);
 
 	return 1;
 }
@@ -870,7 +875,7 @@ mdoc_ex_pre(MDOC_ARGS)
 static int
 mdoc_em_pre(MDOC_ARGS)
 {
-	print_otag(h, TAG_SPAN, "c", "emph");
+	print_otag(h, TAG_I, "c", "Em");
 	return 1;
 }
 
@@ -1439,9 +1444,9 @@ mdoc_bf_pre(MDOC_ARGS)
 		return 1;
 
 	if (FONT_Em == n->norm->Bf.font)
-		cattr = "emph";
+		cattr = "Em";
 	else if (FONT_Sy == n->norm->Bf.font)
-		cattr = "symb";
+		cattr = "Sy";
 	else if (FONT_Li == n->norm->Bf.font)
 		cattr = "Li";
 	else
@@ -1495,7 +1500,7 @@ mdoc_rs_pre(MDOC_ARGS)
 static int
 mdoc_no_pre(MDOC_ARGS)
 {
-	print_otag(h, TAG_SPAN, "c", "none");
+	print_otag(h, TAG_SPAN, "c", "No");
 	return 1;
 }
 
@@ -1509,7 +1514,7 @@ mdoc_li_pre(MDOC_ARGS)
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
-	print_otag(h, TAG_SPAN, "c", "symb");
+	print_otag(h, TAG_B, "c", "Sy");
 	return 1;
 }