Bring schwarze@'s mandoc.h and main.c errors and warnings entirely in sync,

except for the tbl one which will be the focus of later study.

1 files changed, 53 insertions, 44 deletions

diff --git a/main.c b/main.c
index 1a9a2554..5468bbc7 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.120 2010/12/06 15:31:19 kristaps Exp $ */
+/*	$Id: main.c,v 1.121 2010/12/06 16:55:35 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -122,73 +122,82 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 
 	"generic warning",
 
+	/* related to the prologue */
+	"no title in document",
+	"document title should be all caps",
+	"unknown manual section",
+	"cannot parse date argument",
+	"prologue macros out of order",
+	"duplicate prologue macro",
+	"macro not allowed in prologue",
+	"macro not allowed in body",
+
+	/* related to document structure */
 	".so is fragile, better use ln(1)",
-	"text should be uppercase",
+	"NAME section must come first",
+	"bad NAME section contents",
+	"manual name not yet set",
 	"sections out of conventional order",
-	"section name repeats",
-	"out of order prologue",
-	"repeated prologue entry",
-	"list type must come first",
-	"tab in non-literal context",
-	"bad escape sequence",
-	"unterminated quoted string",
-	"argument requires the width argument",
-	"bad date argument",
-	"bad width argument",
-	"unknown manual section",
+	"duplicate section name",
 	"section not in conventional manual section",
-	"end of line whitespace",
+
+	/* related to macros and nesting */
+	"skipping obsolete macro",
+	"skipping paragraph macro",
 	"blocks badly nested",
+	"child violates parent syntax",
+	"nested displays are not portable",
+	"already in literal mode",
 
-	"generic error",
+	/* related to missing macro arguments */
+	"skipping empty macro",
+	"missing display type",
+	"list type must come first",
+	"tag lists require a width argument",
+	"missing font type",
 
-	"NAME section must come first",
+	/* related to bad macro arguments */
+	"skipping argument",
+	"duplicate argument",
+	"duplicate display type",
+	"duplicate list type",
+	"unknown AT&T UNIX version",
 	"bad Boolean value",
 	"unknown font",
-	"child violates parent syntax",
-	"displays may not be nested",
-	"bad AT&T symbol",
-	"bad standard",
-	"list type repeated",
-	"display type repeated",
-	"argument repeated",
-	"ignoring argument",
-	"manual name not yet set",
-	"obsolete macro ignored",
-	"empty macro ignored",
-	"macro not allowed in body",
-	"macro not allowed in prologue",
-	"bad character",
-	"bad NAME section contents",
-	"no blank lines",
-	"no text in this context",
+	"unknown standard specifier",
+	"bad width argument",
+
+	/* related to plain text */
+	"blank line in non-literal context",
+	"tab in non-literal context",
+	"end of line whitespace",
 	"bad comment style",
-	"unknown macro will be lost",
+	"unknown escape sequence",
+	"unterminated quoted string",
+
+	"generic error",
+
+	"skipping bad character",
+	"skipping text before the first section header",
+	"skipping unknown macro",
 	"NOT IMPLEMENTED: skipping request",
 	"line scope broken",
 	"argument count wrong",
-	"request scope close w/none open",
-	"scope already open",
+	"skipping end of block that is not open",
+	"missing end of block",
 	"scope open on exit",
 	"uname(3) system call failed",
 	"macro requires line argument(s)",
 	"macro requires body argument(s)",
 	"macro requires argument(s)",
-	"no title in document",
 	"missing list type",
-	"missing display type",
-	"missing font type",
 	"line argument(s) will be lost",
 	"body argument(s) will be lost",
-	"paragraph macro ignored",
 
 	"generic fatal error",
 
 	"column syntax is inconsistent",
-	"unsupported display type",
-	"blocks badly nested",
-	"no such block is open",
-	"missing end of block",
+	"NOT IMPLEMENTED: .Bd -file",
 	"line scope broken, syntax violated",
 	"argument count wrong, violates syntax",
 	"child violates parent syntax",