===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.68
retrieving revision 1.77
diff -u -p -r1.68 -r1.77
--- mandoc/read.c	2014/07/07 21:36:20	1.68
+++ mandoc/read.c	2014/08/01 15:08:46	1.77
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.68 2014/07/07 21:36:20 schwarze Exp $ */
+/*	$Id: read.c,v 1.77 2014/08/01 15:08:46 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -65,7 +65,7 @@ struct	mparse {
 	mandocmsg	  mmsg; /* warning/error message handler */
 	const char	 *file;
 	struct buf	 *secondary;
-	char		 *defos; /* default operating system */
+	const char	 *defos; /* default operating system */
 };
 
 static	void	  resize_buf(struct buf *, size_t);
@@ -136,6 +136,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"missing display type, using -ragged",
 	"list type is not the first argument",
 	"missing -width in -tag list, using 8n",
+	"missing name for .Ex, using \"\"",
 	"empty head in list item",
 	"empty list item",
 	"missing font type, using \\fR",
@@ -143,11 +144,12 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"missing -std argument, adding it",
 
 	/* related to bad macro arguments */
-	"skipping argument",
 	"unterminated quoted argument",
 	"duplicate argument",
+	"skipping duplicate argument",
 	"skipping duplicate display type",
 	"skipping duplicate list type",
+	"skipping -width argument",
 	"unknown AT&T UNIX version",
 	"invalid content in Rs block",
 	"invalid Boolean argument",
@@ -184,6 +186,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"input stack limit exceeded, infinite loop?",
 	"skipping bad character",
 	"skipping unknown macro",
+	"skipping item outside list",
 	"skipping column outside column list",
 	"skipping end of block that is not open",
 	"inserting missing end of block",
@@ -191,27 +194,21 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 
 	/* related to request and macro arguments */
 	"escaped character not allowed in a name",
-	"manual name not yet set",
 	"argument count wrong",
-	"unknown standard specifier",
-	"uname(3) system call failed",
-	"request requires a numeric argument",
 	"missing list type, using -item",
+	"missing manual name, using \"\"",
+	"uname(3) system call failed, using UNKNOWN",
+	"unknown standard specifier",
+	"skipping request without numeric argument",
 	"skipping all arguments",
 	"skipping excess arguments",
 
 	"generic fatal error",
 
 	"input too large",
-	"not a manual",
-	"column syntax is inconsistent",
 	"NOT IMPLEMENTED: .Bd -file",
-	"child violates parent syntax",
-	"argument count wrong, violates syntax",
 	"NOT IMPLEMENTED: .so with absolute path or \"..\"",
 	".so request failed",
-	"no document prologue",
-	"static buffer exhausted",
 
 	/* system errors */
 	NULL,
@@ -263,18 +260,9 @@ pset(const char *buf, int pos, struct mparse *curp)
 	}
 
 	if (MPARSE_MDOC & curp->options) {
-		if (NULL == curp->pmdoc)
-			curp->pmdoc = mdoc_alloc(
-			    curp->roff, curp, curp->defos,
-			    MPARSE_QUICK & curp->options ? 1 : 0);
-		assert(curp->pmdoc);
 		curp->mdoc = curp->pmdoc;
 		return;
 	} else if (MPARSE_MAN & curp->options) {
-		if (NULL == curp->pman)
-			curp->pman = man_alloc(curp->roff, curp,
-			    MPARSE_QUICK & curp->options ? 1 : 0);
-		assert(curp->pman);
 		curp->man = curp->pman;
 		return;
 	}
@@ -682,6 +670,19 @@ mparse_end(struct mparse *curp)
 	if (MANDOCLEVEL_FATAL <= curp->file_status)
 		return;
 
+	if (curp->mdoc == NULL &&
+	    curp->man == NULL &&
+	    curp->sodest == NULL) {
+		if (curp->options & MPARSE_MDOC)
+			curp->mdoc = curp->pmdoc;
+		else {
+			if (curp->pman == NULL)
+				curp->pman = man_alloc(curp->roff, curp,
+				    curp->options & MPARSE_QUICK ? 1 : 0);
+			curp->man = curp->pman;
+		}
+	}
+
 	if (curp->mdoc && ! mdoc_endparse(curp->mdoc)) {
 		assert(MANDOCLEVEL_FATAL <= curp->file_status);
 		return;
@@ -692,12 +693,6 @@ mparse_end(struct mparse *curp)
 		return;
 	}
 
-	if ( ! (curp->mdoc || curp->man || curp->sodest)) {
-		mandoc_msg(MANDOCERR_NOTMANUAL, curp, 0, 0, NULL);
-		curp->file_status = MANDOCLEVEL_FATAL;
-		return;
-	}
-
 	roff_endparse(curp->roff);
 }
 
@@ -781,7 +776,7 @@ out:
 
 struct mparse *
 mparse_alloc(int options, enum mandoclevel wlevel,
-		mandocmsg mmsg, char *defos)
+		mandocmsg mmsg, const char *defos)
 {
 	struct mparse	*curp;
 
@@ -795,6 +790,14 @@ mparse_alloc(int options, enum mandoclevel wlevel,
 	curp->defos = defos;
 
 	curp->roff = roff_alloc(curp, options);
+	if (curp->options & MPARSE_MDOC)
+		curp->pmdoc = mdoc_alloc(
+		    curp->roff, curp, curp->defos,
+		    curp->options & MPARSE_QUICK ? 1 : 0);
+	if (curp->options & MPARSE_MAN)
+		curp->pman = man_alloc(curp->roff, curp,
+		    curp->options & MPARSE_QUICK ? 1 : 0);
+
 	return(curp);
 }