===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.61
retrieving revision 1.63
diff -u -p -r1.61 -r1.63
--- mandoc/man_html.c	2011/01/04 10:31:15	1.61
+++ mandoc/man_html.c	2011/01/12 10:43:22	1.63
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.61 2011/01/04 10:31:15 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.63 2011/01/12 10:43:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -197,7 +197,16 @@ print_man_node(MAN_ARGS)
 		child = man_root_pre(m, n, mh, h);
 		break;
 	case (MAN_TEXT):
+		if ('\0' == *n->string) {
+			print_otag(h, TAG_P, 0, NULL);
+			return;
+		}
+
+		if (' ' == *n->string && MAN_LINE & n->flags)
+			print_otag(h, TAG_BR, 0, NULL);
+
 		print_text(h, n->string);
+
 		if (MANH_LITERAL & mh->fl)
 			print_otag(h, TAG_BR, 0, NULL);
 		return;
@@ -505,7 +514,6 @@ man_IP_pre(MAN_ARGS)
 	struct roffsu		 su;
 	struct htmlpair	 	 tag;
 	const struct man_node	*nn;
-	int			 width;
 
 	/*
 	 * This scattering of 1-BU margins and pads is to make sure that
@@ -523,13 +531,12 @@ man_IP_pre(MAN_ARGS)
 		n->head->child : n->parent->head->child;
 
 	SCALE_HS_INIT(&su, INDENT);
-	width = 0;
 
 	/* Width is the second token. */
 
 	if (MAN_IP == n->tok && NULL != nn)
 		if (NULL != (nn = nn->next))
-			width = a2width(nn, &su);
+			a2width(nn, &su);
 
 	/* Width is the first token. */
 
@@ -538,7 +545,7 @@ man_IP_pre(MAN_ARGS)
 		while (nn && MAN_TEXT != nn->type)
 			nn = nn->next;
 		if (nn)
-			width = a2width(nn, &su);
+			a2width(nn, &su);
 	}
 
 	if (MAN_BLOCK == n->type) {