===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.63
retrieving revision 1.74
diff -u -p -r1.63 -r1.74
--- mandoc/read.c	2014/07/05 12:34:17	1.63
+++ mandoc/read.c	2014/07/30 23:38:52	1.74
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.63 2014/07/05 12:34:17 schwarze Exp $ */
+/*	$Id: read.c,v 1.74 2014/07/30 23:38:52 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",
@@ -144,20 +145,22 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 
 	/* related to bad macro arguments */
 	"skipping argument",
+	"unterminated quoted argument",
 	"duplicate argument",
 	"skipping duplicate display type",
 	"skipping duplicate list type",
 	"unknown AT&T UNIX version",
+	"invalid content in Rs block",
 	"invalid Boolean argument",
 	"unknown font, skipping request",
 
 	/* related to plain text */
-	"blank line in non-literal context",
-	"tab in non-literal context",
-	"end of line whitespace",
+	"blank line in fill mode, using .sp",
+	"tab in filled text",
+	"whitespace at end of input line",
 	"bad comment style",
-	"bad escape sequence",
-	"unterminated quoted string",
+	"invalid escape sequence",
+	"undefined string, using \"\"",
 
 	"generic error",
 
@@ -178,37 +181,34 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"data block still open",
 	"ignoring extra data cells",
 
+	/* related to document structure and macros */
 	"input stack limit exceeded, infinite loop?",
 	"skipping bad character",
-	"escaped character not allowed in a name",
-	"manual name not yet set",
-	"skipping text before first section header",
 	"skipping unknown macro",
-	"NOT IMPLEMENTED, please use groff: skipping request",
-	"argument count wrong",
-	"skipping invalid content in .Rs block",
-	"unknown standard specifier",
+	"skipping item outside list",
 	"skipping column outside column list",
 	"skipping end of block that is not open",
-	"missing end of block",
-	"scope open on exit",
-	"uname(3) system call failed",
-	"request requires a numeric argument",
+	"inserting missing end of block",
+	"appending missing end of block",
+
+	/* related to request and macro arguments */
+	"escaped character not allowed in a name",
+	"argument count wrong",
 	"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 */
@@ -261,18 +261,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;
 	}
@@ -680,6 +671,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;
@@ -690,12 +694,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);
 }
 
@@ -779,7 +777,7 @@ out:
 
 struct mparse *
 mparse_alloc(int options, enum mandoclevel wlevel,
-		mandocmsg mmsg, char *defos)
+		mandocmsg mmsg, const char *defos)
 {
 	struct mparse	*curp;
 
@@ -793,6 +791,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);
 }