===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.187
retrieving revision 1.191
diff -u -p -r1.187 -r1.191
--- mandoc/html.c	2015/09/26 00:54:03	1.187
+++ mandoc/html.c	2015/10/13 22:59:54	1.191
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.187 2015/09/26 00:54:03 schwarze Exp $ */
+/*	$Id: html.c,v 1.191 2015/10/13 22:59:54 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -130,22 +130,20 @@ 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;
 	if (outopts->fragment)
 		h->oflags |= HTML_FRAGMENT;
 
-	return(h);
+	return h;
 }
 
 void
@@ -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;
@@ -281,13 +278,10 @@ html_strlen(const char *cp)
 		cp++;
 		switch (mandoc_escape(&cp, NULL, NULL)) {
 		case ESCAPE_ERROR:
-			return(sz);
+			return sz;
 		case ESCAPE_UNICODE:
-			/* FALLTHROUGH */
 		case ESCAPE_NUMBERED:
-			/* FALLTHROUGH */
 		case ESCAPE_SPECIAL:
-			/* FALLTHROUGH */
 		case ESCAPE_OVERSTRIKE:
 			if (skip)
 				skip = 0;
@@ -301,7 +295,7 @@ html_strlen(const char *cp)
 			break;
 		}
 	}
-	return(sz);
+	return sz;
 }
 
 static int
@@ -322,17 +316,17 @@ 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:
-		return(0);
+		return 0;
 	}
-	return(1);
+	return 1;
 }
 
 static int
@@ -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;
@@ -432,7 +421,7 @@ print_encode(struct html *h, const char *p, int norecu
 			putchar(c);
 	}
 
-	return(nospace);
+	return nospace;
 }
 
 static void
@@ -494,7 +483,7 @@ print_otag(struct html *h, enum htmltag tag,
 	if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags)
 		putchar('\n');
 
-	return(t);
+	return t;
 }
 
 static void