===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.140
retrieving revision 1.144
diff -u -p -r1.140 -r1.144
--- mandoc/man_html.c	2017/05/05 13:17:54	1.140
+++ mandoc/man_html.c	2017/06/24 14:38:32	1.144
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.140 2017/05/05 13:17:54 schwarze Exp $ */
+/*	$Id: man_html.c,v 1.144 2017/06/24 14:38:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -26,6 +26,7 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
+#include "mandoc.h"
 #include "roff.h"
 #include "man.h"
 #include "out.h"
@@ -69,7 +70,6 @@ static	int		  man_ign_pre(MAN_ARGS);
 static	int		  man_in_pre(MAN_ARGS);
 static	void		  man_root_post(MAN_ARGS);
 static	void		  man_root_pre(MAN_ARGS);
-static	int		  man_sp_pre(MAN_ARGS);
 
 static	const struct htmlman __mans[MAN_MAX - MAN_TH] = {
 	{ NULL, NULL }, /* TH */
@@ -92,7 +92,6 @@ static	const struct htmlman __mans[MAN_MAX - MAN_TH] =
 	{ man_I_pre, NULL }, /* I */
 	{ man_alt_pre, NULL }, /* IR */
 	{ man_alt_pre, NULL }, /* RI */
-	{ man_sp_pre, NULL }, /* sp */
 	{ NULL, NULL }, /* nf */
 	{ NULL, NULL }, /* fi */
 	{ NULL, NULL }, /* RE */
@@ -253,7 +252,8 @@ print_man_node(MAN_ARGS)
 	case ROFFT_TEXT:
 		if (fillmode(h, want_fillmode) == MAN_fi &&
 		    want_fillmode == MAN_fi &&
-		    n->flags & NODE_LINE && *n->string == ' ')
+		    n->flags & NODE_LINE && *n->string == ' ' &&
+		    (h->flags & HTML_NONEWLINE) == 0)
 			print_otag(h, TAG_BR, "");
 		if (*n->string != '\0')
 			break;
@@ -304,6 +304,7 @@ print_man_node(MAN_ARGS)
 		t = h->tag;
 		if (n->tok < ROFF_MAX) {
 			roff_html_pre(h, n);
+			child = 0;
 			break;
 		}
 
@@ -358,13 +359,9 @@ fillmode(struct html *h, int want)
 static int
 a2width(const struct roff_node *n, struct roffsu *su)
 {
-
 	if (n->type != ROFFT_TEXT)
 		return 0;
-	if (a2roffsu(n->string, su, SCALE_EN))
-		return 1;
-
-	return 0;
+	return a2roffsu(n->string, su, SCALE_EN) != NULL;
 }
 
 static void
@@ -411,25 +408,6 @@ man_root_post(MAN_ARGS)
 	if (man->os)
 		print_text(h, man->os);
 	print_tagq(h, t);
-}
-
-
-static int
-man_sp_pre(MAN_ARGS)
-{
-	struct roffsu	 su;
-
-	SCALE_VS_INIT(&su, 1);
-	if (NULL != (n = n->child))
-		if ( ! a2roffsu(n->string, &su, SCALE_VS))
-			su.scale = 1.0;
-
-	print_otag(h, TAG_DIV, "suh", &su);
-
-	/* So the div isn't empty: */
-	print_text(h, "\\~");
-
-	return 0;
 }
 
 static int