===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.211
retrieving revision 1.215
diff -u -p -r1.211 -r1.215
--- mandoc/mdoc_term.c	2011/01/25 15:17:18	1.211
+++ mandoc/mdoc_term.c	2011/02/02 21:40:45	1.215
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.211 2011/01/25 15:17:18 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.215 2011/02/02 21:40:45 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -1151,7 +1151,8 @@ static int
 termp_ns_pre(DECL_ARGS)
 {
 
-	p->flags |= TERMP_NOSPACE;
+	if ( ! (MDOC_LINE & n->flags))
+		p->flags |= TERMP_NOSPACE;
 	return(1);
 }
 
@@ -1728,9 +1729,13 @@ termp_xx_pre(DECL_ARGS)
 		break;
 	}
 
-	assert(pp);
 	term_word(p, pp);
-	return(1);
+	if (n->child) {
+		p->flags |= TERMP_KEEP;
+		term_word(p, n->child->string);
+		p->flags &= ~TERMP_KEEP;
+	}
+	return(0);
 }