Disentangle the MANDOCERR_CHILD message, which reported three

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 097a62e8abad0bb41b6bf8d79918fc268897e84f..a60f42f970776e1abe2593ed9553ce1ab7f02341 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.54 2014/07/01 22:37:15 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>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -115,14 +115,16 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "unexpected section",
 
        /* related to macros and nesting */
        "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",
        "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",
        "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 */
        "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",
        "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",
 
        /* related to bad macro arguments */
        "skipping argument",


@@ -180,6 +181,7 @@ static      const char * const      mandocerrs[MANDOCERR_MAX] = {
        "skipping unknown macro",
        "NOT IMPLEMENTED, please use groff: skipping request",
        "argument count wrong",
        "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",
        "skipping column outside column list",
        "skipping end of block that is not open",
        "missing end of block",