From 7e66e0356807e7c8c64b707c229784ae9fdc0512 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Sun, 10 Nov 2013 22:54:40 +0000
Subject: Ignore blank lines right after .SH and .SS. Improves the rendering of
 gpg(1); issue reported by jca on ports.

---
 man.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'man.c')

diff --git a/man.c b/man.c
index 10cf610c..e6e1c289 100644
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.120 2013/10/17 20:54:58 schwarze Exp $ */
+/*	$Id: man.c,v 1.121 2013/11/10 22:54:40 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -429,16 +429,22 @@ man_ptext(struct man *man, int line, char *buf, int offs)
 		return(man_descope(man, line, offs));
 	}
 
-	/* Pump blank lines directly into the backend. */
-
 	for (i = offs; ' ' == buf[i]; i++)
 		/* Skip leading whitespace. */ ;
 
+	/*
+	 * Blank lines are ignored right after headings
+	 * but add a single vertical space elsewhere.
+	 */
+
 	if ('\0' == buf[i]) {
 		/* Allocate a blank entry. */
-		if ( ! man_elem_alloc(man, line, offs, MAN_sp))
-			return(0);
-		man->next = MAN_NEXT_SIBLING;
+		if (MAN_SH != man->last->tok &&
+		    MAN_SS != man->last->tok) {
+			if ( ! man_elem_alloc(man, line, offs, MAN_sp))
+				return(0);
+			man->next = MAN_NEXT_SIBLING;
+		}
 		return(1);
 	}
 
-- 
cgit v1.2.3-56-ge451