Disentangle the MANDOCERR_CHILD message, which reported three

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index c4edcc3252930949f01813bd177e83a0b6b1ded0..a60f42f970776e1abe2593ed9553ce1ab7f02341 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.52 2014/06/25 00:20:19 schwarze Exp $ */
+/*     $Id: read.c,v 1.57 2014/07/02 13:10:45 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -93,36 +93,38 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "generic warning",
 
        /* related to the prologue */
-       "no TH macro in document",
-       "document title should be all caps",
+       "missing .TH macro, using \"unknown 1\"",
+       "lower case character in document title",
        "unknown manual section",
        "unknown manual volume or arch",
-       "date missing, using today's date",
+       "missing date, using today's date",
        "cannot parse date, using it verbatim",
        "prologue macros out of order",
        "duplicate prologue macro",
-       "macro not allowed in prologue",
-       "macro not allowed in body",
+       "incomplete prologue, terminated by",
+       "skipping prologue macro in body",
 
        /* related to document structure */
        ".so is fragile, better use ln(1)",
        "no document body",
-       "content before the first section header",
-       "NAME section must come first",
+       "content before first section header",
+       "first section is not \"NAME\"",
        "bad NAME section contents",
        "sections out of conventional order",
-       "duplicate section name",
-       "section header suited to sections 2, 3, and 9 only",
+       "duplicate section title",
+       "unexpected section",
 
        /* related to macros and nesting */
-       "skipping obsolete macro",
+       "obsolete macro",
        "skipping paragraph macro",
        "moving paragraph macro out of list",
        "skipping no-space macro",
        "blocks badly nested",
-       "child violates parent syntax",
        "nested displays are not portable",
-       "already in literal mode",
+       "moving content out of list",
+       ".Vt block has child macro",
+       "fill mode already enabled, skipping .fi",
+       "fill mode already disabled, skipping .nf",
        "line scope broken",
 
        /* related to missing macro arguments */
@@ -132,7 +134,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "list type must come first",
        "tag lists require a width argument",
        "missing font type",
-       "skipping end of block that is not open",
 
        /* related to bad macro arguments */
        "skipping argument",
@@ -153,9 +154,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "bad escape sequence",
        "unterminated quoted string",
 
-       /* related to equations */
-       "unexpected literal in equation",
-
        "generic error",
 
        /* related to equations */
@@ -179,10 +177,11 @@ 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 the first section header",
+       "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",
        "skipping column outside column list",
        "skipping end of block that is not open",
        "missing end of block",
@@ -194,7 +193,6 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "request requires a numeric argument",
        "missing list type",
        "line argument(s) will be lost",
-       "body argument(s) will be lost",
 
        "generic fatal error",