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

before paragraphs and/or within `RS' blocks.

1 files changed, 16 insertions, 12 deletions

diff --git a/man_term.c b/man_term.c
index 8184fc23..8bf9d0c6 100644
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*	$Id: man_term.c,v 1.110 2011/06/18 17:36:52 kristaps Exp $ */
+/*	$Id: man_term.c,v 1.111 2011/06/18 17:58:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -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)