Fix two TODOs with one check-in. Both of these relate to vertical space

before paragraphs and/or within `RS' blocks.

3 files changed, 15 insertions, 33 deletions

diff --git a/TODO b/TODO
index 74687c53..bbbbc2bb 100644
--- a/TODO
+++ b/TODO
@@ -278,13 +278,6 @@
   see for example named-checkconf(8).
 
 - In man(7), the sequence
-    regular text
-    .RS
-    .IP
-  should have a blank line between the text and the beginning of the
-  indented paragraph, see for example sudo(1).
-
-- In man(7), the sequence
     .SH HEADER
     <blank line>
     .PP
@@ -295,20 +288,6 @@
 
 - In man(7), the sequence
     regular text
-    .PP
-    .RS
-    indented text
-  should produce one blank line between the regular and indented texts,
-  see for example rsync(1), and
-    .RE
-    <blank line>
-    .PP
-    .RS
-  should produce two,not one blank lines.
-  Reported by naddy@  Mon, 28 Mar 2011 20:45:42 +0200
-
-- In man(7), the sequence
-    regular text
     .IP
     .IP "tag"
     indented text
diff --git a/man_html.c b/man_html.c
index 2a1ef716..1bf9c571 100644
--- a/man_html.c
+++ b/man_html.c
@@ -135,7 +135,6 @@ html_man(void *arg, const struct man *m)
 	printf("\n");
 }
 
-
 static void
 print_man(MAN_ARGS) 
 {
diff --git a/man_term.c b/man_term.c
index 090f2eb0..94160cde 100644
--- a/man_term.c
+++ b/man_term.c
@@ -198,27 +198,31 @@ a2width(const struct termp *p, const char *cp)
 	return((int)term_hspan(p, &su));
 }
 
-
+/*
+ * 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 termp *p, const struct man_node *n)
 {
-	term_newln(p);
 
-	if (n->body && n->body->child && MAN_TBL == n->body->child->type)
-		return;
+	term_newln(p);
 
-	if (NULL == n->prev)
-		return;
+	if (n->body && n->body->child)
+		if (MAN_TBL == n->body->child->type)
+			return;
 
-	if (MAN_SS == n->prev->tok)
-		return;
-	if (MAN_SH == n->prev->tok)
-		return;
+	if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok)
+		if (NULL == n->prev)
+			return;
 
 	term_vspace(p);
 }
 
-
 /* ARGSUSED */
 static int
 pre_ign(DECL_ARGS)