===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.188
retrieving revision 1.192
diff -u -p -r1.188 -r1.192
--- mandoc/html.c	2015/10/06 18:32:19	1.188
+++ mandoc/html.c	2016/01/04 12:45:29	1.192
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.188 2015/10/06 18:32:19 schwarze Exp $ */
+/*	$Id: html.c,v 1.192 2016/01/04 12:45:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -130,15 +130,13 @@ static	void	 print_attr(struct html *, const char *, c
 
 
 void *
-html_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+html_alloc(const struct manoutput *outopts)
 {
 	struct html	*h;
 
 	h = mandoc_calloc(1, sizeof(struct html));
 
 	h->tags.head = NULL;
-	h->symtab = mchars;
-
 	h->style = outopts->style;
 	h->base_man = outopts->man;
 	h->base_includes = outopts->includes;
@@ -218,7 +216,6 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 		font = HTMLFONT_BI;
 		break;
 	case ESCAPE_FONT:
-		/* FALLTHROUGH */
 	case ESCAPE_FONTROMAN:
 		font = HTMLFONT_NONE;
 		break;
@@ -283,11 +280,8 @@ html_strlen(const char *cp)
 		case ESCAPE_ERROR:
 			return sz;
 		case ESCAPE_UNICODE:
-			/* FALLTHROUGH */
 		case ESCAPE_NUMBERED:
-			/* FALLTHROUGH */
 		case ESCAPE_SPECIAL:
-			/* FALLTHROUGH */
 		case ESCAPE_OVERSTRIKE:
 			if (skip)
 				skip = 0;
@@ -322,11 +316,11 @@ print_escape(char c)
 		printf("&quot;");
 		break;
 	case ASCII_NBRSP:
-		putchar('-');
+		printf("&nbsp;");
 		break;
 	case ASCII_HYPH:
 		putchar('-');
-		/* FALLTHROUGH */
+		break;
 	case ASCII_BREAK:
 		break;
 	default:
@@ -371,15 +365,10 @@ print_encode(struct html *h, const char *p, int norecu
 
 		switch (esc) {
 		case ESCAPE_FONT:
-			/* FALLTHROUGH */
 		case ESCAPE_FONTPREV:
-			/* FALLTHROUGH */
 		case ESCAPE_FONTBOLD:
-			/* FALLTHROUGH */
 		case ESCAPE_FONTITALIC:
-			/* FALLTHROUGH */
 		case ESCAPE_FONTBI:
-			/* FALLTHROUGH */
 		case ESCAPE_FONTROMAN:
 			if (0 == norecurse)
 				print_metaf(h, esc);
@@ -407,7 +396,7 @@ print_encode(struct html *h, const char *p, int norecu
 				continue;
 			break;
 		case ESCAPE_SPECIAL:
-			c = mchars_spec2cp(h->symtab, seq, len);
+			c = mchars_spec2cp(seq, len);
 			if (c <= 0)
 				continue;
 			break;
@@ -731,8 +720,8 @@ void
 bufcat_id(struct html *h, const char *src)
 {
 
-	/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
+	/* Cf. <http://www.w3.org/TR/html5/dom.html#the-id-attribute>. */
 
-	while ('\0' != *src)
-		bufcat_fmt(h, "%.2x", *src++);
+	for (; '\0' != *src; src++)
+		bufncat(h, *src == ' ' ? "_" : src, 1);
 }