===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -p -r1.246 -r1.247
--- mandoc/term.c	2015/04/02 23:48:20	1.246
+++ mandoc/term.c	2015/04/04 17:47:18	1.247
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.246 2015/04/02 23:48:20 schwarze Exp $ */
+/*	$Id: term.c,v 1.247 2015/04/04 17:47:18 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -619,8 +619,7 @@ void
 term_setwidth(struct termp *p, const char *wstr)
 {
 	struct roffsu	 su;
-	size_t		 width;
-	int		 iop;
+	int		 iop, width;
 
 	iop = 0;
 	width = 0;
@@ -831,11 +830,12 @@ term_vspan(const struct termp *p, const struct roffsu 
 	return(ri < 66 ? ri : 1);
 }
 
+/*
+ * Convert a scaling width to basic units, rounding down.
+ */
 int
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
-	double		 v;
 
-	v = (*p->hspan)(p, su);
-	return(v > 0.0 ? v + 0.0005 : v - 0.0005);
+	return((*p->hspan)(p, su));
 }