From b3abf1d9e473d326d2a09cdee5eda0bb4f0234ce Mon Sep 17 00:00:00 2001
From: Kristaps Dzonsons <kristaps@bsd.lv>
Date: Sun, 22 Mar 2009 21:19:34 +0000
Subject: Fixed Bd -compact. Fixed vspace before Bd and Bl.

---
 Makefile  |  2 +-
 manuals.7 |  5 +++--
 term.c    | 57 +++++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index ebbeb521..5837b991 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ INSTALL_DATA	= install -m 0444
 INSTALL_LIB	= install -m 0644
 INSTALL_MAN	= $(INSTALL_DATA)
 
-VERSION	   = 1.6.9
+VERSION	   = 1.6.10
 VDATE	   = 22 March 2009
 
 VFLAGS     = -DVERSION=\"$(VERSION)\"
diff --git a/manuals.7 b/manuals.7
index 89bc1d34..d394e538 100644
--- a/manuals.7
+++ b/manuals.7
@@ -72,7 +72,8 @@ to see the specific section manual (section 1, in this example):
 .\" DISPLAY
 .Bd -literal -offset indent
 % apropos myname
-myname (1) - some description here
+myname (1) - utility description
+myname (3) - library description
 % man \-s 1 myname
 .Ed
 .\" SUBSECTION
@@ -229,7 +230,7 @@ publications, please use the
 block macros.
 .\" SUBSECTION
 .Ss Formatting
-.Em Don't style your manual.  
+.Em Don't style your manual.
 Give it meaningful content.  The front-end will worry about formatting
 and style.
 .\" SECTION
diff --git a/term.c b/term.c
index 3d1db05a..f549668f 100644
--- a/term.c
+++ b/term.c
@@ -98,6 +98,9 @@ static	int		  arg_getattr(int, const struct mdoc_node *);
 static	size_t		  arg_offset(const struct mdoc_argv *);
 static	size_t		  arg_width(const struct mdoc_argv *, int);
 static	int		  arg_listtype(const struct mdoc_node *);
+static	int		  fmt_block_vspace(struct termp *,
+				const struct mdoc_node *,
+				const struct mdoc_node *);
 
 /*
  * What follows describes prefix and postfix operations for the abstract
@@ -428,6 +431,36 @@ arg_getattrs(const int *keys, int *vals,
 }
 
 
+/* ARGSUSED */
+static int
+fmt_block_vspace(struct termp *p, 
+		const struct mdoc_node *bl, 
+		const struct mdoc_node *node)
+{
+	const struct mdoc_node *n;
+
+	term_newln(p);
+
+	if (arg_hasattr(MDOC_Compact, bl))
+		return(1);
+
+	for (n = node; n; n = n->parent) {
+		if (MDOC_BLOCK != n->type)
+			continue;
+		if (MDOC_Ss == n->tok)
+			break;
+		if (MDOC_Sh == n->tok)
+			break;
+		if (NULL == n->prev)
+			continue;
+		term_vspace(p);
+		break;
+	}
+
+	return(1);
+}
+
+
 /* ARGSUSED */
 static int
 termp_dq_pre(DECL_ARGS)
@@ -455,19 +488,6 @@ termp_dq_post(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp_it_pre_block(DECL_ARGS)
-{
-
-	term_newln(p);
-	if ( ! arg_hasattr(MDOC_Compact, node->parent->parent))
-		term_vspace(p);
-
-	return(1);
-}
-
-
 /* ARGSUSED */
 static int
 termp_it_pre(DECL_ARGS)
@@ -478,7 +498,7 @@ termp_it_pre(DECL_ARGS)
 	size_t		        width, offset;
 
 	if (MDOC_BLOCK == node->type)
-		return(termp_it_pre_block(p, pair, meta, node));
+		return(fmt_block_vspace(p, node->parent->parent, node));
 
 	bl = node->parent->parent->parent;
 
@@ -1265,12 +1285,9 @@ termp_bd_pre(DECL_ARGS)
 	 * line.  Blank lines are allowed.
 	 */
 
-	if (MDOC_BLOCK == node->type) {
-		/* FIXME: parent prev? */
-		if (node->prev)
-			term_vspace(p);
-		return(1);
-	} else if (MDOC_BODY != node->type)
+	if (MDOC_BLOCK == node->type)
+		return(fmt_block_vspace(p, node, node));
+	else if (MDOC_BODY != node->type)
 		return(1);
 
 	if (NULL == node->parent->args)
-- 
cgit