===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.260
retrieving revision 1.262
diff -u -p -r1.260 -r1.262
--- mandoc/mdoc_term.c	2014/03/30 19:47:48	1.260
+++ mandoc/mdoc_term.c	2014/04/08 04:40:47	1.262
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.260 2014/03/30 19:47:48 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.262 2014/04/08 04:40:47 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -622,7 +622,7 @@ static int
 termp_ll_pre(DECL_ARGS)
 {
 
-	(*p->setwidth)(p, n->nchild ? a2width(p, n->child->string) : 0);
+	term_setwidth(p, n->nchild ? n->child->string : NULL);
 	return(0);
 }
 
@@ -1029,6 +1029,8 @@ termp_nm_pre(DECL_ARGS)
 		     MDOC_TEXT == n->prev->child->type ?
 		     term_strlen(p, n->prev->child->string) :
 		     term_len(p, 5));
+		if (p->rmargin < p->offset)
+			p->rmargin = p->offset;
 		return(1);
 	}