===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.225
retrieving revision 1.228
diff -u -p -r1.225 -r1.228
--- mandoc/term.c	2014/08/01 19:25:52	1.225
+++ mandoc/term.c	2014/08/18 21:07:53	1.228
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.225 2014/08/01 19:25:52 schwarze Exp $ */
+/*	$Id: term.c,v 1.228 2014/08/18 21:07:53 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
  * 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>
 
@@ -222,7 +220,7 @@ term_flushln(struct termp *p)
 				break;
 			if (' ' == p->buf[i]) {
 				j = i;
-				while (' ' == p->buf[i])
+				while (i < p->col && ' ' == p->buf[i])
 					i++;
 				dv = (i - j) * (*p->width)(p, ' ');
 				vbl += dv;
@@ -793,7 +791,7 @@ term_vspan(const struct termp *p, const struct roffsu 
 
 	if (r < 0.0)
 		r = 0.0;
-	return((size_t)r);
+	return((size_t)(r + 0.0005));
 }
 
 size_t
@@ -804,5 +802,5 @@ term_hspan(const struct termp *p, const struct roffsu 
 	v = (*p->hspan)(p, su);
 	if (v < 0.0)
 		v = 0.0;
-	return((size_t)v);
+	return((size_t)(v + 0.0005));
 }