===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.74
retrieving revision 1.80
diff -u -p -r1.74 -r1.80
--- mandoc/read.c	2014/07/30 23:38:52	1.74
+++ mandoc/read.c	2014/08/10 23:54:41	1.80
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.74 2014/07/30 23:38:52 schwarze Exp $ */
+/*	$Id: read.c,v 1.80 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,13 +16,12 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
 #ifdef HAVE_MMAP
-# include <sys/stat.h>
-# include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
 #endif
 
 #include <assert.h>
@@ -93,16 +92,19 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"generic warning",
 
 	/* related to the prologue */
-	"missing .TH macro, using \"unknown 1\"",
+	"missing manual title, using UNTITLED",
+	"missing manual title, using \"\"",
 	"lower case character in document title",
+	"missing manual section, using \"\"",
 	"unknown manual section",
 	"unknown manual volume or arch",
 	"missing date, using today's date",
 	"cannot parse date, using it verbatim",
-	"prologue macros out of order",
+	"missing Os macro, using \"\"",
 	"duplicate prologue macro",
-	"incomplete prologue, terminated by",
-	"skipping prologue macro in body",
+	"late prologue macro",
+	"skipping late title macro",
+	"prologue macros out of order",
 
 	/* related to document structure */
 	".so is fragile, better use ln(1)",
@@ -123,8 +125,8 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"nested displays are not portable",
 	"moving content out of list",
 	".Vt block has child macro",
-	"fill mode already enabled, skipping .fi",
-	"fill mode already disabled, skipping .nf",
+	"fill mode already enabled, skipping",
+	"fill mode already disabled, skipping",
 	"line scope broken",
 
 	/* related to missing macro arguments */
@@ -136,7 +138,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 \"\"",
+	"missing utility name, using \"\"",
 	"empty head in list item",
 	"empty list item",
 	"missing font type, using \\fR",
@@ -144,11 +146,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",
@@ -205,11 +208,9 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"generic fatal error",
 
 	"input too large",
-	"column syntax is inconsistent",
-	"NOT IMPLEMENTED: .Bd -file",
+	"NOT IMPLEMENTED: Bd -file",
 	"NOT IMPLEMENTED: .so with absolute path or \"..\"",
 	".so request failed",
-	"static buffer exhausted",
 
 	/* system errors */
 	NULL,
@@ -354,8 +355,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int 
 
 			if ( ! (isascii(c) &&
 			    (isgraph(c) || isblank(c)))) {
-				mandoc_msg(MANDOCERR_BADCHAR, curp,
-				    curp->line, pos, NULL);
+				mandoc_vmsg(MANDOCERR_BADCHAR, curp,
+				    curp->line, pos, "0x%x", c);
 				i++;
 				ln.buf[pos++] = '?';
 				continue;
@@ -411,8 +412,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int 
 
 			if ( ! (isascii(c) &&
 			    (isgraph(c) || isblank(c)))) {
-				mandoc_msg(MANDOCERR_BADCHAR, curp,
-				    curp->line, pos, NULL);
+				mandoc_vmsg(MANDOCERR_BADCHAR, curp,
+				    curp->line, pos, "0x%x", c);
 				i += 2;
 				ln.buf[pos++] = '?';
 				continue;