===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.61
retrieving revision 1.64
diff -u -p -r1.61 -r1.64
--- mandoc/mdoc_term.c	2009/07/24 12:47:35	1.61
+++ mandoc/mdoc_term.c	2009/07/29 08:46:06	1.64
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.61 2009/07/24 12:47:35 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.64 2009/07/29 08:46:06 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -674,6 +674,7 @@ fmt_block_vspace(struct termp *p, 
 
 	if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Compact, bl))
 		return;
+	assert(node);
 
 	/*
 	 * Search through our prior nodes.  If we follow a `Ss' or `Sh',
@@ -858,7 +859,8 @@ termp_it_pre(DECL_ARGS)
 
 	switch (type) {
 	case (MDOC_Diag):
-		term_word(p, "\\ \\ ");
+		if (MDOC_BODY == node->type)
+			term_word(p, "\\ \\ ");
 		break;
 	case (MDOC_Inset):
 		if (MDOC_BODY == node->type) 
@@ -1396,7 +1398,10 @@ termp_fd_post(DECL_ARGS)
 static int
 termp_sh_pre(DECL_ARGS)
 {
-
+	/* 
+	 * FIXME: using two `Sh' macros in sequence has no vspace
+	 * between calls, only a newline.
+	 */
 	switch (node->type) {
 	case (MDOC_HEAD):
 		term_vspace(p);