Switch to autogenerated dependency rules; they are less error-prone.

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index 201100cdc307a70e9f0d95f10ddec73c43b73f6d..95c0fe40890e4eb71823d567e6cc4eb8d3869420 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.74 2014/07/30 23:38:52 schwarze Exp $ */
+/*     $Id: read.c,v 1.78 2014/08/01 17:27:44 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -123,8 +123,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 +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 \"\"",
+       "missing utility name, using \"\"",
        "empty head in list item",
        "empty list item",
        "missing font type, using \\fR",
@@ -144,11 +144,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 +206,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 +353,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
 
                        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 +410,8 @@ mparse_buf_r(struct mparse *curp, struct buf blk, int start)
 
                        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;