===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.120
retrieving revision 1.122
diff -u -p -r1.120 -r1.122
--- mandoc/man.c	2013/10/17 20:54:58	1.120
+++ mandoc/man.c	2013/12/31 23:23:10	1.122
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.120 2013/10/17 20:54:58 schwarze Exp $ */
+/*	$Id: man.c,v 1.122 2013/12/31 23:23:10 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 of
 		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);
 	}
 
@@ -473,7 +479,7 @@ man_ptext(struct man *man, int line, char *buf, int of
 	 */
 
 	assert(i);
-	if (mandoc_eos(buf, (size_t)i, 0))
+	if (mandoc_eos(buf, (size_t)i))
 		man->last->flags |= MAN_EOS;
 
 	return(man_descope(man, line, offs));