no need to skip content before first section header

8 files changed, 28 insertions, 33 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Sh/Makefile b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
index f05a74e42de..df98590a6f5 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Sh/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2014/07/02 08:03:57 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2014/07/07 15:03:24 schwarze Exp $
 
 REGRESS_TARGETS	= before first emptyNAME badNAME order
 LINT_TARGETS	= before first emptyNAME badNAME order
 
-SKIP_GROFF	= before first
-SKIP_ASCII	= before first
+SKIP_GROFF	= first
+SKIP_ASCII	= first
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/before.in b/regress/usr.bin/mandoc/mdoc/Sh/before.in
index 45b09905b5d..95b750cc585 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/before.in
+++ b/regress/usr.bin/mandoc/mdoc/Sh/before.in
@@ -1,7 +1,11 @@
-.Dd June 20, 2014
+.Dd July 7, 2014
 .Dt SH-BEFORE 1
 .Os OpenBSD
+Can
+.Xr mandoc 1
+on
 .Ox
+handle this?
 .Sh NAME
 .Nm Sh-before
 .Nd content before the first section header
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii b/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii
new file mode 100644
index 00000000000..71f35f20095
--- /dev/null
+++ b/regress/usr.bin/mandoc/mdoc/Sh/before.out_ascii
@@ -0,0 +1,11 @@
+SH-BEFORE(1)               OpenBSD Reference Manual               SH-BEFORE(1)
+
+Can mandoc(1) on OpenBSD handle this?
+
+NNAAMMEE
+     SShh--bbeeffoorree - content before the first section header
+
+DDEESSCCRRIIPPTTIIOONN
+     some text
+
+OpenBSD                          July 7, 2014                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Sh/before.out_lint b/regress/usr.bin/mandoc/mdoc/Sh/before.out_lint
index d79895148a0..314acb29068 100644
--- a/regress/usr.bin/mandoc/mdoc/Sh/before.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Sh/before.out_lint
@@ -1 +1 @@
-mandoc: before.in:4:2: WARNING: content before first section header: Ox
+mandoc: before.in:4:1: WARNING: content before first section header: text
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h
index 6b33a003812..dcc9b56ff12 100644
--- a/usr.bin/mandoc/mandoc.h
+++ b/usr.bin/mandoc/mandoc.h
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.82 2014/07/07 11:34:41 schwarze Exp $ */
+/*	$Id: mandoc.h,v 1.83 2014/07/07 15:03:24 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -139,7 +139,6 @@ enum	mandocerr {
 	MANDOCERR_BADCHAR, /* skipping bad character */
 	MANDOCERR_NAMESC, /* escaped character not allowed in a name */
 	MANDOCERR_NONAME, /* manual name not yet set */
-	MANDOCERR_NOTEXT, /* skipping text before first section header */
 	MANDOCERR_MACRO, /* skipping unknown macro */
 	MANDOCERR_ARGCOUNT, /* argument count wrong */
 	MANDOCERR_RS_SKIP, /* skipping invalid content in .Rs block: macro */
diff --git a/usr.bin/mandoc/mdoc.c b/usr.bin/mandoc/mdoc.c
index d888f377236..adbc5238fcb 100644
--- a/usr.bin/mandoc/mdoc.c
+++ b/usr.bin/mandoc/mdoc.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.108 2014/07/06 19:08:56 schwarze Exp $ */
+/*	$Id: mdoc.c,v 1.109 2014/07/07 15:03:24 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -223,13 +223,6 @@ mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)
 
 	assert( ! (MDOC_HALT & mdoc->flags));
 
-	/* No text before an initial macro. */
-
-	if (SEC_NONE == mdoc->lastnamed) {
-		mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT);
-		return(1);
-	}
-
 	n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);
 	n->eqn = ep;
 
@@ -247,13 +240,6 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
 
 	assert( ! (MDOC_HALT & mdoc->flags));
 
-	/* No text before an initial macro. */
-
-	if (SEC_NONE == mdoc->lastnamed) {
-		mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT);
-		return(1);
-	}
-
 	n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);
 	n->span = sp;
 
@@ -718,13 +704,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
 	char		 *c, *ws, *end;
 	struct mdoc_node *n;
 
-	/* No text before an initial macro. */
-
-	if (SEC_NONE == mdoc->lastnamed) {
-		mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT);
-		return(1);
-	}
-
 	assert(mdoc->last);
 	n = mdoc->last;
 
diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c
index ec0d3ec08fc..db74c881e83 100644
--- a/usr.bin/mandoc/mdoc_term.c
+++ b/usr.bin/mandoc/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.172 2014/07/03 23:23:45 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.173 2014/07/07 15:03:24 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -271,8 +271,11 @@ terminal_mdoc(void *arg, const struct mdoc *mdoc)
 
 	term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
 
-	if (n->child)
+	if (n->child) {
+		if (MDOC_Sh != n->child->tok)
+			term_vspace(p);
 		print_mdoc_nodelist(p, NULL, meta, n->child);
+	}
 
 	term_end(p);
 }
diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c
index 78a7e52ee88..66624759f75 100644
--- a/usr.bin/mandoc/read.c
+++ b/usr.bin/mandoc/read.c
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.43 2014/07/07 11:34:41 schwarze Exp $ */
+/*	$Id: read.c,v 1.44 2014/07/07 15:03:24 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -175,7 +175,6 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"skipping bad character",
 	"escaped character not allowed in a name",
 	"manual name not yet set",
-	"skipping text before first section header",
 	"skipping unknown macro",
 	"argument count wrong",
 	"skipping invalid content in .Rs block",