===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- src/usr.bin/mandoc/man.c	2017/05/08 20:33:40	1.121
+++ src/usr.bin/mandoc/man.c	2017/06/03 15:54:09	1.122
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man.c,v 1.121 2017/05/08 20:33:40 schwarze Exp $ */
+/*	$OpenBSD: man.c,v 1.122 2017/06/03 15:54:09 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -87,14 +87,15 @@
 		/* Skip leading whitespace. */ ;
 
 	/*
-	 * Blank lines are ignored right after headings
-	 * but add a single vertical space elsewhere.
+	 * Blank lines are ignored in next line scope and right
+	 * after headings but add a single vertical space elsewhere.
 	 */
 
 	if (buf[i] == '\0') {
-		man_breakscope(man, ROFF_sp);
-		/* Allocate a blank entry. */
-		if (man->last->tok != MAN_SH &&
+		if (man->flags & (MAN_ELINE | MAN_BLINE))
+			mandoc_msg(MANDOCERR_BLK_BLANK, man->parse,
+			    line, 0, NULL);
+		else if (man->last->tok != MAN_SH &&
 		    man->last->tok != MAN_SS) {
 			roff_elem_alloc(man, line, offs, ROFF_sp);
 			man->next = ROFF_NEXT_SIBLING;