From 1d9f222c71514edbb38c172df3c47de91a0113fd Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Fri, 13 Jul 2012 14:19:49 +0000
Subject: In -man -Tascii, support .sp with negative argument. In -mdoc -Tman,
 improve the framework to control vertical spacing. Use both to support .Bl
 -compact (surprisingly hard to get right). OpenBSD rev. 1.85 and 1.34,
 respectively.

---
 man_term.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

(limited to 'man_term.c')

diff --git a/man_term.c b/man_term.c
index 5a6b2648..a00d26f2 100644
--- a/man_term.c
+++ b/man_term.c
@@ -440,7 +440,9 @@ pre_in(DECL_ARGS)
 static int
 pre_sp(DECL_ARGS)
 {
+	char		*s;
 	size_t		 i, len;
+	int		 neg;
 
 	if ((NULL == n->prev && n->parent)) {
 		if (MAN_SS == n->parent->tok)
@@ -449,19 +451,32 @@ pre_sp(DECL_ARGS)
 			return(0);
 	}
 
+	neg = 0;
 	switch (n->tok) {
 	case (MAN_br):
 		len = 0;
 		break;
 	default:
-		len = n->child ? a2height(p, n->child->string) : 1;
+		if (NULL == n->child) {
+			len = 1;
+			break;
+		}
+		s = n->child->string;
+		if ('-' == *s) {
+			neg = 1;
+			s++;
+		}
+		len = a2height(p, s);
 		break;
 	}
 
 	if (0 == len)
 		term_newln(p);
-	for (i = 0; i < len; i++)
-		term_vspace(p);
+	else if (neg)
+		p->skipvsp += len;
+	else
+		for (i = 0; i < len; i++)
+			term_vspace(p);
 
 	return(0);
 }
-- 
cgit