===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.63
retrieving revision 1.65
diff -u -p -r1.63 -r1.65
--- mandoc/mdoc_html.c	2010/05/15 16:24:38	1.63
+++ mandoc/mdoc_html.c	2010/05/17 22:11:42	1.65
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.63 2010/05/15 16:24:38 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.65 2010/05/17 22:11:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,6 +27,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
 #include "out.h"
 #include "html.h"
 #include "mdoc.h"
@@ -729,6 +730,9 @@ mdoc_nm_pre(MDOC_ARGS)
 {
 	struct htmlpair	tag;
 
+	if (NULL == n->child && NULL == m->name)
+		return(1);
+
 	if (SEC_SYNOPSIS == n->sec && 
 			n->prev && MDOC_LINE & n->flags) {
 		bufcat_style(h, "clear", "both");
@@ -1181,7 +1185,7 @@ mdoc_ex_pre(MDOC_ARGS)
 			h->flags &= ~HTML_NOSPACE;
 	}
 
-	if (n->child->next)
+	if (n->child && n->child->next)
 		print_text(h, "utilities exit");
 	else
 		print_text(h, "utility exits");
@@ -1289,7 +1293,7 @@ mdoc_d1_pre(MDOC_ARGS)
 
 	/* FIXME: D1 shouldn't be literal. */
 
-	SCALE_VS_INIT(&su, INDENT - 2);
+	SCALE_VS_INIT(&su, INDENT - 1);
 	bufcat_su(h, "margin-left", &su);
 	PAIR_CLASS_INIT(&tag[0], "lit");
 	PAIR_STYLE_INIT(&tag[1], h);
@@ -1402,7 +1406,8 @@ mdoc_bd_pre(MDOC_ARGS)
 				break;
 		}
 		if (comp) {
-			print_otag(h, TAG_DIV, 0, tag);
+			PAIR_STYLE_INIT(&tag[0], h);
+			print_otag(h, TAG_DIV, 1, tag);
 			return(1);
 		}
 		SCALE_VS_INIT(&su, 1);
@@ -1950,7 +1955,7 @@ mdoc_rv_pre(MDOC_ARGS)
 			print_text(h, "()");
 	}
 
-	if (n->child->next)
+	if (n->child && n->child->next)
 		print_text(h, "functions return");
 	else
 		print_text(h, "function returns");