===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -p -r1.16 -r1.18
--- mandoc/mdoc_term.c	2009/06/22 12:04:05	1.16
+++ mandoc/mdoc_term.c	2009/06/22 13:13:10	1.18
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.16 2009/06/22 12:04:05 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.18 2009/06/22 13:13:10 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -776,12 +776,14 @@ termp_it_pre(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Dash):
 		/* FALLTHROUGH */
-	case (MDOC_Enum):
-		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
 		if (width < 4)
 			width = 4;
 		break;
+	case (MDOC_Enum):
+		if (width < 5)
+			width = 5;
+		break;
 	case (MDOC_Tag):
 		if (0 == width)
 			width = 10;
@@ -791,11 +793,13 @@ termp_it_pre(DECL_ARGS)
 	}
 
 	/* 
-	 * Whitespace control.  Inset bodies need an initial space.
+	 * Whitespace control.  Inset bodies need an initial space,
+	 * while diagonal bodies need two.
 	 */
 
 	switch (type) {
 	case (MDOC_Diag):
+		term_word(p, "\\ ");
 		/* FALLTHROUGH */
 	case (MDOC_Inset):
 		if (MDOC_BODY == node->type) 
@@ -1305,7 +1309,8 @@ termp_lb_pre(DECL_ARGS)
 	const char	*lb;
 
 	assert(node->child && MDOC_TEXT == node->child->type);
-	if ((lb = mdoc_a2lib(node->child->string))) {
+	lb = mdoc_a2lib(node->child->string);
+	if (lb) {
 		term_word(p, lb);
 		return(0);
 	}