===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.95
retrieving revision 1.98
diff -u -p -r1.95 -r1.98
--- mandoc/mdoc_html.c	2010/07/07 15:04:54	1.95
+++ mandoc/mdoc_html.c	2010/07/19 11:11:54	1.98
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_html.c,v 1.95 2010/07/07 15:04:54 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.98 2010/07/19 11:11:54 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -209,7 +209,7 @@ static	const struct htmlmdoc mdocs[MDOC_MAX] = {
 	{mdoc_em_pre, NULL}, /* Em */ 
 	{NULL, NULL}, /* Eo */
 	{mdoc_xx_pre, NULL}, /* Fx */
-	{mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
+	{mdoc_ms_pre, NULL}, /* Ms */
 	{NULL, NULL}, /* No */
 	{mdoc_ns_pre, NULL}, /* Ns */
 	{mdoc_xx_pre, NULL}, /* Nx */
@@ -1737,6 +1737,11 @@ mdoc_sp_pre(MDOC_ARGS)
 		len = 0;
 		break;
 	default:
+		assert(n->parent);
+		if ((NULL == n->next || NULL == n->prev) &&
+				(MDOC_Ss == n->parent->tok ||
+				 MDOC_Sh == n->parent->tok))
+			return(0);
 		len = 1;
 		break;
 	}