===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.47
retrieving revision 1.50
diff -u -p -r1.47 -r1.50
--- mandoc/term_ascii.c	2015/07/17 22:38:29	1.47
+++ mandoc/term_ascii.c	2015/10/12 00:08:16	1.50
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.47 2015/07/17 22:38:29 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.50 2015/10/12 00:08:16 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -115,28 +115,28 @@ ascii_init(enum termenc enc, const struct mchars *mcha
 	if (outopts->synopsisonly)
 		p->synopsisonly = 1;
 
-	return(p);
+	return p;
 }
 
 void *
 ascii_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
 
-	return(ascii_init(TERMENC_ASCII, mchars, outopts));
+	return ascii_init(TERMENC_ASCII, mchars, outopts);
 }
 
 void *
 utf8_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
 
-	return(ascii_init(TERMENC_UTF8, mchars, outopts));
+	return ascii_init(TERMENC_UTF8, mchars, outopts);
 }
 
 void *
 locale_alloc(const struct mchars *mchars, const struct manoutput *outopts)
 {
 
-	return(ascii_init(TERMENC_LOCALE, mchars, outopts));
+	return ascii_init(TERMENC_LOCALE, mchars, outopts);
 }
 
 static void
@@ -176,7 +176,7 @@ static size_t
 ascii_width(const struct termp *p, int c)
 {
 
-	return(1);
+	return 1;
 }
 
 void
@@ -246,7 +246,6 @@ ascii_hspan(const struct termp *p, const struct roffsu
 		r = su->scale * 0.24;
 		break;
 	case SCALE_VS:
-		/* FALLTHROUGH */
 	case SCALE_PC:
 		r = su->scale * 40.0;
 		break;
@@ -254,15 +253,13 @@ ascii_hspan(const struct termp *p, const struct roffsu
 		r = su->scale * 10.0 / 3.0;
 		break;
 	case SCALE_EN:
-		/* FALLTHROUGH */
 	case SCALE_EM:
 		r = su->scale * 24.0;
 		break;
 	default:
 		abort();
-		/* NOTREACHED */
 	}
-	return(r > 0.0 ? r + 0.01 : r - 0.01);
+	return r > 0.0 ? r + 0.01 : r - 0.01;
 }
 
 const char *
@@ -337,8 +334,8 @@ ascii_uc2str(int uc)
 
 	assert(uc >= 0);
 	if ((size_t)uc < sizeof(tab)/sizeof(tab[0]))
-		return(tab[uc]);
-	return(mchars_uc2str(uc));
+		return tab[uc];
+	return mchars_uc2str(uc);
 }
 
 #if HAVE_WCHAR
@@ -352,7 +349,7 @@ locale_width(const struct termp *p, int c)
 	rc = wcwidth(c);
 	if (rc < 0)
 		rc = 0;
-	return(rc);
+	return rc;
 }
 
 static void