===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.174
retrieving revision 1.176
diff -u -p -r1.174 -r1.176
--- mandoc/term.c	2010/10/02 15:15:55	1.174
+++ mandoc/term.c	2011/01/04 13:14:26	1.176
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.174 2010/10/02 15:15:55 schwarze Exp $ */
+/*	$Id: term.c,v 1.176 2011/01/04 13:14:26 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -146,7 +146,7 @@ term_flushln(struct termp *p)
 	 * an indentation, but can be, for tagged lists or columns, a
 	 * small set of values. 
 	 */
-	assert  (p->rmargin > p->offset);
+	assert  (p->rmargin >= p->offset);
 	dv     = p->rmargin - p->offset;
 	maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
 	dv     = p->maxrmargin - p->offset;
@@ -677,6 +677,12 @@ term_strlen(const struct termp *p, const char *cp)
 			if (rhs)
 				for (i = 0; i < rsz; i++)
 					sz += (*p->width)(p, *rhs++);
+		} else if (ASCII_NBRSP == *cp) {
+			sz += (*p->width)(p, ' ');
+			cp++;
+		} else if (ASCII_HYPH == *cp) {
+			sz += (*p->width)(p, '-');
+			cp++;
 		} else
 			sz += (*p->width)(p, *cp++);