===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.111
retrieving revision 1.114
diff -u -p -r1.111 -r1.114
--- mandoc/mdoc_term.c	2010/03/23 12:42:22	1.111
+++ mandoc/mdoc_term.c	2010/04/06 07:27:42	1.114
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.111 2010/03/23 12:42:22 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.114 2010/04/06 07:27:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -203,7 +203,7 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Dc */
 	{ termp_dq_pre, termp_dq_post }, /* Do */
 	{ termp_dq_pre, termp_dq_post }, /* Dq */
-	{ NULL, NULL }, /* Ec */
+	{ NULL, NULL }, /* Ec */ /* FIXME: no space */
 	{ NULL, NULL }, /* Ef */
 	{ termp_under_pre, NULL }, /* Em */ 
 	{ NULL, NULL }, /* Eo */
@@ -1070,10 +1070,10 @@ termp_fl_pre(DECL_ARGS)
 	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, "\\-");
 
-	/* A blank `Fl' should incur a subsequent space. */
-
 	if (n->child)
 		p->flags |= TERMP_NOSPACE;
+	else if (n->next && n->next->line == n->line)
+		p->flags |= TERMP_NOSPACE;
 
 	return(1);
 }
@@ -1277,7 +1277,10 @@ termp_xr_pre(DECL_ARGS)
 {
 	const struct mdoc_node *nn;
 
-	assert(n->child && MDOC_TEXT == n->child->type);
+	if (NULL == n->child)
+		return(0);
+
+	assert(MDOC_TEXT == n->child->type);
 	nn = n->child;
 
 	term_word(p, nn->string);