===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.214
retrieving revision 1.220
diff -u -p -r1.214 -r1.220
--- mandoc/html.c	2017/06/14 01:31:26	1.214
+++ mandoc/html.c	2017/09/06 16:24:25	1.220
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.214 2017/06/14 01:31:26 schwarze Exp $ */
+/*	$Id: html.c,v 1.220 2017/09/06 16:24:25 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -87,6 +87,7 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"math",	HTML_NLALL | HTML_INDENT},
 	{"mrow",	0},
 	{"mi",		0},
+	{"mn",		0},
 	{"mo",		0},
 	{"msup",	0},
 	{"msub",	0},
@@ -249,6 +250,8 @@ html_make_id(const struct roff_node *n)
 
 	buf = NULL;
 	deroff(&buf, n);
+	if (buf == NULL)
+		return NULL;
 
 	/* http://www.w3.org/TR/html5/dom.html#the-id-attribute */
 
@@ -452,7 +455,7 @@ print_encode(struct html *h, const char *p, const char
 		    (c > 0x7E && c < 0xA0))
 			c = 0xFFFD;
 		if (c > 0x7E) {
-			(void)snprintf(numbuf, sizeof(numbuf), "&#%d;", c);
+			(void)snprintf(numbuf, sizeof(numbuf), "&#x%.4X;", c);
 			print_word(h, numbuf);
 		} else if (print_escape(h, c) == 0)
 			print_byte(h, c);
@@ -515,7 +518,7 @@ print_otag(struct html *h, enum htmltag tag, const cha
 		print_indent(h);
 	else if ((h->flags & HTML_NOSPACE) == 0) {
 		if (h->flags & HTML_KEEP)
-			print_word(h, "&#160;");
+			print_word(h, "&#x00A0;");
 		else {
 			if (h->flags & HTML_PREKEEP)
 				h->flags |= HTML_KEEP;
@@ -622,25 +625,29 @@ print_otag(struct html *h, enum htmltag tag, const cha
 		case 'u':
 			su = va_arg(ap, struct roffsu *);
 			break;
-		case 'v':
-			i = va_arg(ap, int);
-			su = &mysu;
-			SCALE_VS_INIT(su, i);
-			break;
 		case 'w':
-			if ((arg2 = va_arg(ap, char *)) == NULL)
-				break;
-			su = &mysu;
-			a2width(arg2, su);
+			if ((arg2 = va_arg(ap, char *)) != NULL) {
+				su = &mysu;
+				a2width(arg2, su);
+			}
+			if (*fmt == '*') {
+				if (su != NULL && su->unit == SCALE_EN &&
+				    su->scale > 5.9 && su->scale < 6.1)
+					su = NULL;
+				fmt++;
+			}
 			if (*fmt == '+') {
-				/* Increase to make even bold text fit. */
-				su->scale *= 1.2;
-				/* Add padding. */
-				su->scale += 3.0;
+				if (su != NULL) {
+					/* Make even bold text fit. */
+					su->scale *= 1.2;
+					/* Add padding. */
+					su->scale += 3.0;
+				}
 				fmt++;
 			}
 			if (*fmt == '-') {
-				su->scale *= -1.0;
+				if (su != NULL)
+					su->scale *= -1.0;
 				fmt++;
 			}
 			break;
@@ -651,9 +658,6 @@ print_otag(struct html *h, enum htmltag tag, const cha
 		/* Second letter: style name. */
 
 		switch (*fmt++) {
-		case 'b':
-			attr = "margin-bottom";
-			break;
 		case 'h':
 			attr = "height";
 			break;
@@ -663,9 +667,6 @@ print_otag(struct html *h, enum htmltag tag, const cha
 		case 'l':
 			attr = "margin-left";
 			break;
-		case 't':
-			attr = "margin-top";
-			break;
 		case 'w':
 			attr = "width";
 			break;
@@ -778,7 +779,7 @@ print_text(struct html *h, const char *word)
 				h->flags |= HTML_KEEP;
 			print_endword(h);
 		} else
-			print_word(h, "&#160;");
+			print_word(h, "&#x00A0;");
 	}
 
 	assert(NULL == h->metaf);