===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.186
retrieving revision 1.190
diff -u -p -r1.186 -r1.190
--- mandoc/html.c	2015/03/27 21:33:20	1.186
+++ mandoc/html.c	2015/10/12 00:15:31	1.190
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.186 2015/03/27 21:33:20 schwarze Exp $ */
+/*	$Id: html.c,v 1.190 2015/10/12 00:15:31 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -145,7 +145,7 @@ html_alloc(const struct mchars *mchars, const struct m
 	if (outopts->fragment)
 		h->oflags |= HTML_FRAGMENT;
 
-	return(h);
+	return h;
 }
 
 void
@@ -218,13 +218,11 @@ print_metaf(struct html *h, enum mandoc_esc deco)
 		font = HTMLFONT_BI;
 		break;
 	case ESCAPE_FONT:
-		/* FALLTHROUGH */
 	case ESCAPE_FONTROMAN:
 		font = HTMLFONT_NONE;
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
 
 	if (h->metaf) {
@@ -282,13 +280,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;
@@ -302,7 +297,7 @@ html_strlen(const char *cp)
 			break;
 		}
 	}
-	return(sz);
+	return sz;
 }
 
 static int
@@ -323,17 +318,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
@@ -372,15 +367,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);
@@ -433,7 +423,7 @@ print_encode(struct html *h, const char *p, int norecu
 			putchar(c);
 	}
 
-	return(nospace);
+	return nospace;
 }
 
 static void
@@ -495,7 +485,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