===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.70
retrieving revision 1.76
diff -u -p -r1.70 -r1.76
--- mandoc/man_html.c	2011/03/07 01:35:51	1.70
+++ mandoc/man_html.c	2011/07/03 22:57:32	1.76
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.70 2011/03/07 01:35:51 schwarze Exp $ */
+/*	$Id: man_html.c,v 1.76 2011/07/03 22:57:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -53,6 +53,8 @@ struct	htmlman {
 	int		(*post)(MAN_ARGS);
 };
 
+static	void		  print_bvspace(struct html *, 
+				const struct man_node *);
 static	void		  print_man(MAN_ARGS);
 static	void		  print_man_head(MAN_ARGS);
 static	void		  print_man_nodelist(MAN_ARGS);
@@ -114,7 +116,29 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_ign_pre, NULL }, /* ft */
 };
 
+/*
+ * Printing leading vertical space before a block.
+ * This is used for the paragraph macros.
+ * The rules are pretty simple, since there's very little nesting going
+ * on here.  Basically, if we're the first within another block (SS/SH),
+ * then don't emit vertical space.  If we are (RS), then do.  If not the
+ * first, print it.
+ */
+static void
+print_bvspace(struct html *h, const struct man_node *n)
+{
 
+	if (n->body && n->body->child)
+		if (MAN_TBL == n->body->child->type)
+			return;
+
+	if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
+		if (NULL == n->prev)
+			return;
+
+	print_otag(h, TAG_P, 0, NULL);
+}
+
 void
 html_man(void *arg, const struct man *m)
 {
@@ -135,7 +159,6 @@ html_man(void *arg, const struct man *m)
 	printf("\n");
 }
 
-
 static void
 print_man(MAN_ARGS) 
 {
@@ -157,9 +180,7 @@ print_man_head(MAN_ARGS)
 {
 
 	print_gen_head(h);
-	bufinit(h);
-	buffmt(h, "%s(%s)", m->title, m->msec);
-
+	bufcat_fmt(h, "%s(%s)", m->title, m->msec);
 	print_otag(h, TAG_TITLE, 0, NULL);
 	print_text(h, h->buf);
 }
@@ -184,7 +205,6 @@ print_man_node(MAN_ARGS)
 
 	child = 1;
 	t = h->tags.head;
-	bufinit(h);
 
 	switch (n->type) {
 	case (MAN_ROOT):
@@ -259,8 +279,6 @@ print_man_node(MAN_ARGS)
 	/* This will automatically close out any font scope. */
 	print_stagq(h, t);
 
-	bufinit(h);
-
 	switch (n->type) {
 	case (MAN_ROOT):
 		man_root_post(m, n, mh, h);
@@ -396,11 +414,13 @@ man_br_pre(MAN_ARGS)
 	SCALE_VS_INIT(&su, 1);
 
 	if (MAN_sp == n->tok) {
-		if (n->child)
-			a2roffsu(n->child->string, &su, SCALE_VS);
+		if (NULL != (n = n->child))
+			if ( ! a2roffsu(n->string, &su, SCALE_VS))
+				SCALE_VS_INIT(&su, atoi(n->string));
 	} else
 		su.scale = 0;
 
+	bufinit(h);
 	bufcat_su(h, "height", &su);
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, 1, &tag);
@@ -419,6 +439,7 @@ man_SH_pre(MAN_ARGS)
 	struct htmlpair	 tag;
 
 	if (MAN_BLOCK == n->type) {
+		mh->fl &= ~MANH_LITERAL;
 		PAIR_CLASS_INIT(&tag, "section");
 		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
@@ -500,6 +521,7 @@ man_SS_pre(MAN_ARGS)
 	struct htmlpair	 tag;
 
 	if (MAN_BLOCK == n->type) {
+		mh->fl &= ~MANH_LITERAL;
 		PAIR_CLASS_INIT(&tag, "subsection");
 		print_otag(h, TAG_DIV, 1, &tag);
 		return(1);
@@ -518,8 +540,8 @@ man_PP_pre(MAN_ARGS)
 
 	if (MAN_HEAD == n->type)
 		return(0);
-	else if (MAN_BODY == n->type && n->prev)
-		print_otag(h, TAG_P, 0, NULL);
+	else if (MAN_BLOCK == n->type)
+		print_bvspace(h, n);
 
 	return(1);
 }
@@ -567,8 +589,9 @@ man_IP_pre(MAN_ARGS)
 	}
 
 	if (MAN_BLOCK == n->type) {
-		print_otag(h, TAG_P, 0, NULL);
+		print_bvspace(h, n);
 		print_otag(h, TAG_TABLE, 0, NULL);
+		bufinit(h);
 		bufcat_su(h, "width", &su);
 		PAIR_STYLE_INIT(&tag, h);
 		print_otag(h, TAG_COL, 1, &tag);
@@ -604,6 +627,8 @@ man_HP_pre(MAN_ARGS)
 	struct roffsu	 su;
 	const struct man_node *np;
 
+	bufinit(h);
+
 	np = MAN_BLOCK == n->type ? 
 		n->head->child : 
 		n->parent->head->child;
@@ -615,7 +640,7 @@ man_HP_pre(MAN_ARGS)
 		print_otag(h, TAG_TD, 0, NULL);
 		return(0);
 	} else if (MAN_BLOCK == n->type) {
-		print_otag(h, TAG_P, 0, NULL);
+		print_bvspace(h, n);
 		print_otag(h, TAG_TABLE, 0, NULL);
 		bufcat_su(h, "width", &su);
 		PAIR_STYLE_INIT(&tag, h);
@@ -704,6 +729,7 @@ man_RS_pre(MAN_ARGS)
 	if (n->head->child)
 		a2width(n->head->child, &su);
 
+	bufinit(h);
 	bufcat_su(h, "margin-left", &su);
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, 1, &tag);