===================================================================
RCS file: /cvs/mandoc/term_ascii.c,v
retrieving revision 1.26
retrieving revision 1.28
diff -u -p -r1.26 -r1.28
--- mandoc/term_ascii.c	2014/07/27 21:52:16	1.26
+++ mandoc/term_ascii.c	2014/08/10 23:54:41	1.28
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.26 2014/07/27 21:52:16 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.28 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,21 +15,19 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
 #ifdef USE_WCHAR
-# include <locale.h>
+#include <locale.h>
 #endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #ifdef USE_WCHAR
-# include <wchar.h>
+#include <wchar.h>
 #endif
 
 #include "mandoc.h"
@@ -238,22 +236,22 @@ ascii_hspan(const struct termp *p, const struct roffsu
 
 	switch (su->unit) {
 	case SCALE_CM:
-		r = 4 * su->scale;
+		r = su->scale * 4.0;
 		break;
 	case SCALE_IN:
-		r = 10 * su->scale;
+		r = su->scale * 10.0;
 		break;
 	case SCALE_PC:
-		r = (10 * su->scale) / 6;
+		r = (su->scale * 10.0) / 6.0;
 		break;
 	case SCALE_PT:
-		r = (10 * su->scale) / 72;
+		r = (su->scale * 10.0) / 72.0;
 		break;
 	case SCALE_MM:
-		r = su->scale / 1000;
+		r = su->scale / 1000.0;
 		break;
 	case SCALE_VS:
-		r = su->scale * 2 - 1;
+		r = su->scale * 2.0 - 1.0;
 		break;
 	default:
 		r = su->scale;