Moved mdoc_a2st() out of mdoc.h -> libmdoc.h (replacement in mdoc_action.c).

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 81211db4c9855e732b40db55751c276bec8be37e..1c5d8c9fe7a9f31040c59ba938de5568ccadb1cd 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.13 2009/06/17 11:02:06 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.30 2009/07/12 20:30:35 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include "libmdoc.h"
 #include <string.h>
 
 #include "libmdoc.h"

+#include "libmandoc.h"

 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 /* TODO: ignoring Pp (it's superfluous in some invocations). */
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 /* TODO: ignoring Pp (it's superfluous in some invocations). */


@@ -30,47 +31,6 @@
 #define        PRE_ARGS        struct mdoc *mdoc, const struct mdoc_node *n
 #define        POST_ARGS       struct mdoc *mdoc
 
 #define        PRE_ARGS        struct mdoc *mdoc, const struct mdoc_node *n
 #define        POST_ARGS       struct mdoc *mdoc
 

-enum   merr {
-       ETOOLONG,
-       EESCAPE,
-       EPRINT,
-       ENODATA,
-       ENOPROLOGUE,
-       ELINE,
-       EATT,
-       ENAME,
-       ELISTTYPE,
-       EDISPTYPE,
-       EMULTIDISP,
-       ESECNAME,
-       EMULTILIST,
-       EARGREP,
-       EBOOL,
-       ENESTDISP
-};
-
-enum   mwarn {
-       WPRINT,
-       WNOWIDTH,
-       WMISSWIDTH,
-       WESCAPE,
-       WDEPESC,
-       WDEPCOL,
-       WWRONGMSEC,
-       WSECOOO,
-       WSECREP,
-       WBADSTAND,
-       WNAMESECINC,
-       WNOMULTILINE,
-       WMULTILINE,
-       WLINE,
-       WNOLINE,
-       WPROLOOO,
-       WPROLREP,
-       WARGVAL,
-       WBADSEC,
-       WBADMSEC
-};

 
 typedef        int     (*v_pre)(PRE_ARGS);
 typedef        int     (*v_post)(POST_ARGS);
 
 typedef        int     (*v_pre)(PRE_ARGS);
 typedef        int     (*v_post)(POST_ARGS);


@@ -80,8 +40,6 @@ struct        valids {
        v_post  *post;
 };
 
        v_post  *post;
 };
 

-static int     pwarn(struct mdoc *, int, int, enum mwarn);
-static int     perr(struct mdoc *, int, int, enum merr);

 static int     check_parent(PRE_ARGS, int, enum mdoc_type);
 static int     check_msec(PRE_ARGS, ...);
 static int     check_sec(PRE_ARGS, ...);
 static int     check_parent(PRE_ARGS, int, enum mdoc_type);
 static int     check_msec(PRE_ARGS, ...);
 static int     check_sec(PRE_ARGS, ...);


@@ -98,7 +56,6 @@ static        int     err_child_gt(struct mdoc *, const char *, int);
 static int     warn_child_gt(struct mdoc *, const char *, int);
 static int     err_child_eq(struct mdoc *, const char *, int);
 static int     warn_child_eq(struct mdoc *, const char *, int);
 static int     warn_child_gt(struct mdoc *, const char *, int);
 static int     err_child_eq(struct mdoc *, const char *, int);
 static int     warn_child_eq(struct mdoc *, const char *, int);

-static int     count_child(struct mdoc *);

 static int     warn_print(struct mdoc *, int, int);
 static int     warn_count(struct mdoc *, const char *, 
                        int, const char *, int);
 static int     warn_print(struct mdoc *, int, int);
 static int     warn_count(struct mdoc *, const char *, 
                        int, const char *, int);


@@ -128,8 +85,8 @@ static       int     eerr_le2(POST_ARGS);
 static int     eerr_eq1(POST_ARGS);
 static int     eerr_ge1(POST_ARGS);
 static int     ewarn_eq0(POST_ARGS);
 static int     eerr_eq1(POST_ARGS);
 static int     eerr_ge1(POST_ARGS);
 static int     ewarn_eq0(POST_ARGS);

-static int     ewarn_eq1(POST_ARGS);

 static int     bwarn_ge1(POST_ARGS);
 static int     bwarn_ge1(POST_ARGS);

+static int     berr_ge1(POST_ARGS);

 static int     hwarn_eq1(POST_ARGS);
 static int     ewarn_ge1(POST_ARGS);
 static int     ebool(POST_ARGS);
 static int     hwarn_eq1(POST_ARGS);
 static int     ewarn_ge1(POST_ARGS);
 static int     ebool(POST_ARGS);


@@ -138,6 +95,7 @@ static       int     post_args(POST_ARGS);
 static int     post_at(POST_ARGS);
 static int     post_bf(POST_ARGS);
 static int     post_bl(POST_ARGS);
 static int     post_at(POST_ARGS);
 static int     post_bf(POST_ARGS);
 static int     post_bl(POST_ARGS);

+static int     post_bl_head(POST_ARGS);

 static int     post_it(POST_ARGS);
 static int     post_nm(POST_ARGS);
 static int     post_root(POST_ARGS);
 static int     post_it(POST_ARGS);
 static int     post_nm(POST_ARGS);
 static int     post_root(POST_ARGS);


@@ -146,11 +104,6 @@ static     int     post_sh_body(POST_ARGS);
 static int     post_sh_head(POST_ARGS);
 static int     post_st(POST_ARGS);
 
 static int     post_sh_head(POST_ARGS);
 static int     post_st(POST_ARGS);
 

-#define        vwarn(m, t) nwarn((m), (m)->last, (t))
-#define        verr(m, t) nerr((m), (m)->last, (t))
-#define        nwarn(m, n, t) pwarn((m), (n)->line, (n)->pos, (t))
-#define        nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
-

 static v_pre   pres_an[] = { pre_an, NULL };
 static v_pre   pres_bd[] = { pre_display, pre_bd, NULL };
 static v_pre   pres_bl[] = { pre_bl, NULL };
 static v_pre   pres_an[] = { pre_an, NULL };
 static v_pre   pres_bd[] = { pre_display, pre_bd, NULL };
 static v_pre   pres_bl[] = { pre_bl, NULL };


@@ -174,10 +127,11 @@ static    v_post  posts_wtext[] = { ewarn_ge1, NULL };
 static v_post  posts_notext[] = { eerr_eq0, NULL };
 static v_post  posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static v_post  posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
 static v_post  posts_notext[] = { eerr_eq0, NULL };
 static v_post  posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static v_post  posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };

-static v_post  posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };
+static v_post  posts_bl[] = { bwarn_ge1, post_bl, NULL };

 static v_post  posts_it[] = { post_it, NULL };
 static v_post  posts_it[] = { post_it, NULL };

-static v_post  posts_in[] = { ewarn_eq1, NULL };
+static v_post  posts_in[] = { eerr_eq1, NULL };

 static v_post  posts_ss[] = { herr_ge1, NULL };
 static v_post  posts_ss[] = { herr_ge1, NULL };

+static v_post  posts_nd[] = { berr_ge1, NULL };

 static v_post  posts_pf[] = { eerr_eq1, NULL };
 static v_post  posts_lb[] = { eerr_eq1, NULL };
 static v_post  posts_st[] = { eerr_eq1, post_st, NULL };
 static v_post  posts_pf[] = { eerr_eq1, NULL };
 static v_post  posts_lb[] = { eerr_eq1, NULL };
 static v_post  posts_st[] = { eerr_eq1, post_st, NULL };


@@ -223,7 +177,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, posts_text },                   /* Ic */ 
        { NULL, posts_in },                     /* In */ 
        { NULL, NULL },                         /* Li */
        { NULL, posts_text },                   /* Ic */ 
        { NULL, posts_in },                     /* In */ 
        { NULL, NULL },                         /* Li */

-       { NULL, posts_wtext },                  /* Nd */
+       { NULL, posts_nd },                     /* Nd */

        { NULL, posts_nm },                     /* Nm */
        { NULL, posts_wline },                  /* Op */
        { NULL, NULL },                         /* Ot */
        { NULL, posts_nm },                     /* Nm */
        { NULL, posts_wline },                  /* Op */
        { NULL, NULL },                         /* Ot */


@@ -376,155 +330,13 @@ mdoc_valid_post(struct mdoc *mdoc)
 }
 
 
 }
 
 

-static int
-perr(struct mdoc *m, int line, int pos, enum merr type)
-{
-       char             *p;
-       
-       p = NULL;
-       switch (type) {
-       case (ETOOLONG):
-               p = "text argument too long";
-               break;
-       case (EESCAPE):
-               p = "invalid escape sequence";
-               break;
-       case (EPRINT):
-               p = "invalid character";
-               break;
-       case (ENESTDISP):
-               p = "displays may not be nested";
-               break;
-       case (EBOOL):
-               p = "expected boolean value";
-               break;
-       case (EARGREP):
-               p = "argument repeated";
-               break;
-       case (EMULTIDISP):
-               p = "multiple display types specified";
-               break;
-       case (EMULTILIST):
-               p = "multiple list types specified";
-               break;
-       case (ELISTTYPE):
-               p = "missing list type";
-               break;
-       case (EDISPTYPE):
-               p = "missing display type";
-               break;
-       case (ESECNAME):
-               p = "the NAME section must come first";
-               break;
-       case (ELINE):
-               p = "expected line arguments";
-               break;
-       case (ENOPROLOGUE):
-               p = "document has no prologue";
-               break;
-       case (ENODATA):
-               p = "document has no data";
-               break;
-       case (EATT):
-               p = "expected valid AT&T symbol";
-               break;
-       case (ENAME):
-               p = "default name not yet set";
-               break;
-       }
-       assert(p);
-       return(mdoc_perr(m, line, pos, p));
-}
-
-
-static int
-pwarn(struct mdoc *m, int line, int pos, enum mwarn type)
-{
-       char             *p;
-       enum mdoc_warn    c;
-
-       c = WARN_SYNTAX;
-       p = NULL;
-       switch (type) {
-       case (WBADMSEC):
-               p = "inappropriate manual section";
-               c = WARN_COMPAT;
-               break;
-       case (WBADSEC):
-               p = "inappropriate document section";
-               c = WARN_COMPAT;
-               break;
-       case (WARGVAL):
-               p = "argument value suggested";
-               c = WARN_COMPAT;
-               break;
-       case (WPROLREP):
-               p = "prologue macros repeated";
-               c = WARN_COMPAT;
-               break;
-       case (WPROLOOO):
-               p = "prologue macros out-of-order";
-               c = WARN_COMPAT;
-               break;
-       case (WDEPCOL):
-               p = "deprecated column argument syntax";
-               c = WARN_COMPAT;
-               break;
-       case (WNOWIDTH):
-               p = "superfluous width argument";
-               break;
-       case (WMISSWIDTH):
-               p = "missing width argument";
-               break;
-       case (WPRINT):
-               p = "invalid character";
-               break;
-       case (WESCAPE):
-               p = "invalid escape sequence";
-               break;
-       case (WDEPESC):
-               p = "deprecated special-character escape";
-               break;
-       case (WNOLINE):
-               p = "suggested no line arguments";
-               break;
-       case (WLINE):
-               p = "suggested line arguments";
-               break;
-       case (WMULTILINE):
-               p = "suggested multi-line arguments";
-               break;
-       case (WNOMULTILINE):
-               p = "suggested no multi-line arguments";
-               break;
-       case (WWRONGMSEC):
-               p = "document section in wrong manual section";
-               c = WARN_COMPAT;
-               break;
-       case (WSECOOO):
-               p = "document section out of conventional order";
-               break;
-       case (WSECREP):
-               p = "document section repeated";
-               break;
-       case (WBADSTAND):
-               p = "unknown standard";
-               break;
-       case (WNAMESECINC):
-               p = "NAME section contents incomplete/badly-ordered";
-               break;
-       }
-       assert(p);
-       return(mdoc_pwarn(m, line, pos, c, p));
-}
-
-

 static int
 warn_print(struct mdoc *m, int ln, int pos)
 {
 static int
 warn_print(struct mdoc *m, int ln, int pos)
 {

+

        if (MDOC_IGN_CHARS & m->pflags)
        if (MDOC_IGN_CHARS & m->pflags)

-               return(pwarn(m, ln, pos, WPRINT));
-       return(perr(m, ln, pos, EPRINT));
+               return(mdoc_pwarn(m, ln, pos, EPRINT));
+       return(mdoc_perr(m, ln, pos, EPRINT));

 }
 
 
 }
 
 


@@ -533,7 +345,7 @@ warn_count(struct mdoc *m, const char *k,
                int want, const char *v, int has)
 {
 
                int want, const char *v, int has)
 {
 

-       return(mdoc_warn(m, WARN_SYNTAX, 
+       return(mdoc_vwarn(m, m->last->line, m->last->pos, 

                "suggests %s %s %d (has %d)", v, k, want, has));
 }
 
                "suggests %s %s %d (has %d)", v, k, want, has));
 }
 


@@ -543,24 +355,11 @@ err_count(struct mdoc *m, const char *k,
                int want, const char *v, int has)
 {
 
                int want, const char *v, int has)
 {
 

-       return(mdoc_err(m, 
+       return(mdoc_verr(m, m->last->line, m->last->pos,

                "requires %s %s %d (has %d)", v, k, want, has));
 }
 
 
                "requires %s %s %d (has %d)", v, k, want, has));
 }
 
 

-static inline int
-count_child(struct mdoc *mdoc)
-{
-       int               i;
-       struct mdoc_node *n;
-
-       for (i = 0, n = mdoc->last->child; n; n = n->next, i++)
-               /* Do nothing */ ;
-
-       return(i);
-}
-
-

 /*
  * Build these up with macros because they're basically the same check
  * for different inequalities.  Yes, this could be done with functions,
 /*
  * Build these up with macros because they're basically the same check
  * for different inequalities.  Yes, this could be done with functions,


@@ -571,10 +370,9 @@ count_child(struct mdoc *mdoc)
 static int                                                     \
 lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz)   \
 {                                                              \
 static int                                                     \
 lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz)   \
 {                                                              \

-       int i;                                                  \
-       if ((i = count_child(mdoc)) ineq sz)                    \
+       if (mdoc->last->nchild ineq sz)                         \

                return(1);                                      \
                return(1);                                      \

-       return(lvl##_count(mdoc, #ineq, sz, p, i));             \
+       return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \

 }
 
 #define CHECK_BODY_DEFN(name, lvl, func, num)                  \
 }
 
 #define CHECK_BODY_DEFN(name, lvl, func, num)                  \


@@ -611,7 +409,7 @@ CHECK_CHILD_DEFN(err, eq, ==)                       /* err_child_eq() */
 CHECK_CHILD_DEFN(err, lt, <)                   /* err_child_lt() */
 CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
 CHECK_CHILD_DEFN(err, lt, <)                   /* err_child_lt() */
 CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
 CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */

-CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1)   /* ewarn_eq1() */
+CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)     /* berr_ge1() */

 CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)   /* ewarn_eq0() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
 CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)   /* ewarn_eq0() */
 CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_gt1() */
 CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */


@@ -631,7 +429,7 @@ check_stdarg(PRE_ARGS)
        if (n->args && 1 == n->args->argc)
                if (MDOC_Std == n->args->argv[0].arg)
                        return(1);
        if (n->args && 1 == n->args->argc)
                if (MDOC_Std == n->args->argv[0].arg)
                        return(1);

-       return(nwarn(mdoc, n, WARGVAL));
+       return(mdoc_nwarn(mdoc, n, EARGVAL));

 }
 
 
 }
 
 


@@ -655,7 +453,7 @@ check_sec(PRE_ARGS, ...)
        }
 
        va_end(ap);
        }
 
        va_end(ap);

-       return(nwarn(mdoc, n, WBADSEC));
+       return(mdoc_nwarn(mdoc, n, EBADSEC));

 }
 
 
 }
 
 


@@ -677,7 +475,7 @@ check_msec(PRE_ARGS, ...)
        }
 
        va_end(ap);
        }
 
        va_end(ap);

-       return(nwarn(mdoc, n, WBADMSEC));
+       return(mdoc_nwarn(mdoc, n, EBADMSEC));

 }
 
 
 }
 
 


@@ -712,7 +510,7 @@ check_argv(struct mdoc *m, const struct mdoc_node *n,
                /* `Nm' name must be set. */
                if (v->sz || m->meta.name)
                        return(1);
                /* `Nm' name must be set. */
                if (v->sz || m->meta.name)
                        return(1);

-               return(nerr(m, n, ENAME));
+               return(mdoc_nerr(m, n, ENAME));

        }
 
        return(1);
        }
 
        return(1);


@@ -722,9 +520,9 @@ check_argv(struct mdoc *m, const struct mdoc_node *n,
 static int
 check_text(struct mdoc *mdoc, int line, int pos, const char *p)
 {
 static int
 check_text(struct mdoc *mdoc, int line, int pos, const char *p)
 {

-       size_t           c;
+       int              c;

 
 

-       for ( ; *p; p++) {
+       for ( ; *p; p++, pos++) {

                if ('\t' == *p) {
                        if ( ! (MDOC_LITERAL & mdoc->flags))
                                if ( ! warn_print(mdoc, line, pos))
                if ('\t' == *p) {
                        if ( ! (MDOC_LITERAL & mdoc->flags))
                                if ( ! warn_print(mdoc, line, pos))


@@ -736,18 +534,15 @@ check_text(struct mdoc *mdoc, int line, int pos, const char *p)
                if ('\\' != *p)
                        continue;
 
                if ('\\' != *p)
                        continue;
 

-               c = mdoc_isescape(p);
+               c = mandoc_special(p);

                if (c) {
                if (c) {

-                       /* See if form is deprecated. */
-                       if ('*' == p[1]) 
-                               if ( ! pwarn(mdoc, line, pos, WDEPESC))
-                                       return(0);
-                       p += (int)c - 1;
+                       p += c - 1;
+                       pos += c - 1;

                        continue;
                }
                if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags))
                        continue;
                }
                if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags))

-                       return(perr(mdoc, line, pos, EESCAPE));
-               if ( ! pwarn(mdoc, line, pos, WESCAPE))
+                       return(mdoc_perr(mdoc, line, pos, EESCAPE));
+               if ( ! mdoc_perr(mdoc, line, pos, EESCAPE))

                        return(0);
        }
 
                        return(0);
        }
 


@@ -766,7 +561,7 @@ check_parent(PRE_ARGS, int tok, enum mdoc_type t)
                        (t == n->parent->type))
                return(1);
 
                        (t == n->parent->type))
                return(1);
 

-       return(mdoc_nerr(mdoc, n, "require parent %s",
+       return(mdoc_verr(mdoc, n->line, n->pos, "require parent %s",

                MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]));
 }
 
                MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]));
 }
 


@@ -790,23 +585,23 @@ pre_display(PRE_ARGS)
        if (NULL == node)
                return(1);
 
        if (NULL == node)
                return(1);
 

-       return(nerr(mdoc, n, ENESTDISP));
+       return(mdoc_nerr(mdoc, n, ENESTDISP));

 }
 
 
 static int
 pre_bl(PRE_ARGS)
 {
 }
 
 
 static int
 pre_bl(PRE_ARGS)
 {

-       int              pos, col, type, width, offset;
+       int              pos, type, width, offset;

 
        if (MDOC_BLOCK != n->type)
                return(1);
        if (NULL == n->args)
 
        if (MDOC_BLOCK != n->type)
                return(1);
        if (NULL == n->args)

-               return(nerr(mdoc, n, ELISTTYPE));
+               return(mdoc_nerr(mdoc, n, ELISTTYPE));

 
        /* Make sure that only one type of list is specified.  */
 
 
        /* Make sure that only one type of list is specified.  */
 

-       type = offset = width = col = -1;
+       type = offset = width = -1;

 
        /* LINTED */
        for (pos = 0; pos < (int)n->args->argc; pos++)
 
        /* LINTED */
        for (pos = 0; pos < (int)n->args->argc; pos++)


@@ -833,18 +628,17 @@ pre_bl(PRE_ARGS)
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        if (-1 != type) 
                        /* FALLTHROUGH */
                case (MDOC_Column):
                        if (-1 != type) 

-                               return(nerr(mdoc, n, EMULTILIST));
+                               return(mdoc_nerr(mdoc, n, EMULTILIST));

                        type = n->args->argv[pos].arg;
                        type = n->args->argv[pos].arg;

-                       col = pos;

                        break;
                case (MDOC_Width):
                        if (-1 != width)
                        break;
                case (MDOC_Width):
                        if (-1 != width)

-                               return(nerr(mdoc, n, EARGREP));
+                               return(mdoc_nerr(mdoc, n, EARGREP));

                        width = n->args->argv[pos].arg;
                        break;
                case (MDOC_Offset):
                        if (-1 != offset)
                        width = n->args->argv[pos].arg;
                        break;
                case (MDOC_Offset):
                        if (-1 != offset)

-                               return(nerr(mdoc, n, EARGREP));
+                               return(mdoc_nerr(mdoc, n, EARGREP));

                        offset = n->args->argv[pos].arg;
                        break;
                default:
                        offset = n->args->argv[pos].arg;
                        break;
                default:


@@ -852,7 +646,7 @@ pre_bl(PRE_ARGS)
                }
 
        if (-1 == type)
                }
 
        if (-1 == type)

-               return(nerr(mdoc, n, ELISTTYPE));
+               return(mdoc_nerr(mdoc, n, ELISTTYPE));

 
        /* 
         * Validate the width field.  Some list types don't need width
 
        /* 
         * Validate the width field.  Some list types don't need width


@@ -862,7 +656,7 @@ pre_bl(PRE_ARGS)
 
        switch (type) {
        case (MDOC_Tag):
 
        switch (type) {
        case (MDOC_Tag):

-               if (-1 == width && ! nwarn(mdoc, n, WMISSWIDTH))
+               if (-1 == width && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))

                        return(0);
                break;
        case (MDOC_Column):
                        return(0);
                break;
        case (MDOC_Column):


@@ -872,23 +666,7 @@ pre_bl(PRE_ARGS)
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Item):
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Item):

-               if (-1 != width && ! nwarn(mdoc, n, WNOWIDTH))
-                       return(0);
-               break;
-       default:
-               break;
-       }
-
-       /*
-        * General validation of fields.
-        */
-
-       switch (type) {
-       case (MDOC_Column):
-               assert(col >= 0);
-               if (0 == n->args->argv[col].sz)
-                       break;
-               if ( ! nwarn(mdoc, n, WDEPCOL))
+               if (-1 != width && ! mdoc_nwarn(mdoc, n, ENOWIDTH))

                        return(0);
                break;
        default:
                        return(0);
                break;
        default:


@@ -907,7 +685,7 @@ pre_bd(PRE_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
        if (NULL == n->args) 
        if (MDOC_BLOCK != n->type)
                return(1);
        if (NULL == n->args) 

-               return(nerr(mdoc, n, EDISPTYPE));
+               return(mdoc_nerr(mdoc, n, EDISPTYPE));

 
        /* Make sure that only one type of display is specified.  */
 
 
        /* Make sure that only one type of display is specified.  */
 


@@ -926,14 +704,14 @@ pre_bd(PRE_ARGS)
                case (MDOC_File):
                        if (0 == type++) 
                                break;
                case (MDOC_File):
                        if (0 == type++) 
                                break;

-                       return(nerr(mdoc, n, EMULTIDISP));
+                       return(mdoc_nerr(mdoc, n, EMULTIDISP));

                default:
                        break;
                }
 
        if (type)
                return(1);
                default:
                        break;
                }
 
        if (type)
                return(1);

-       return(nerr(mdoc, n, EDISPTYPE));
+       return(mdoc_nerr(mdoc, n, EDISPTYPE));

 }
 
 
 }
 
 


@@ -973,7 +751,8 @@ pre_an(PRE_ARGS)
 
        if (NULL == n->args || 1 == n->args->argc)
                return(1);
 
        if (NULL == n->args || 1 == n->args->argc)
                return(1);

-       return(mdoc_nerr(mdoc, n, "only one argument allowed"));
+       return(mdoc_verr(mdoc, n->line, n->pos, 
+                               "only one argument allowed"));

 }
 
 
 }
 
 


@@ -1026,10 +805,10 @@ pre_dt(PRE_ARGS)
 {
 
        if (0 == mdoc->meta.date || mdoc->meta.os)
 {
 
        if (0 == mdoc->meta.date || mdoc->meta.os)

-               if ( ! nwarn(mdoc, n, WPROLOOO))
+               if ( ! mdoc_nwarn(mdoc, n, EPROLOOO))

                        return(0);
        if (mdoc->meta.title)
                        return(0);
        if (mdoc->meta.title)

-               if ( ! nwarn(mdoc, n, WPROLREP))
+               if ( ! mdoc_nwarn(mdoc, n, EPROLREP))

                        return(0);
        return(1);
 }
                        return(0);
        return(1);
 }


@@ -1040,10 +819,10 @@ pre_os(PRE_ARGS)
 {
 
        if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
 {
 
        if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)

-               if ( ! nwarn(mdoc, n, WPROLOOO))
+               if ( ! mdoc_nwarn(mdoc, n, EPROLOOO))

                        return(0);
        if (mdoc->meta.os)
                        return(0);
        if (mdoc->meta.os)

-               if ( ! nwarn(mdoc, n, WPROLREP))
+               if ( ! mdoc_nwarn(mdoc, n, EPROLREP))

                        return(0);
        return(1);
 }
                        return(0);
        return(1);
 }


@@ -1054,10 +833,10 @@ pre_dd(PRE_ARGS)
 {
 
        if (mdoc->meta.title || mdoc->meta.os)
 {
 
        if (mdoc->meta.title || mdoc->meta.os)

-               if ( ! nwarn(mdoc, n, WPROLOOO))
+               if ( ! mdoc_nwarn(mdoc, n, EPROLOOO))

                        return(0);
        if (mdoc->meta.date)
                        return(0);
        if (mdoc->meta.date)

-               if ( ! nwarn(mdoc, n, WPROLREP))
+               if ( ! mdoc_nwarn(mdoc, n, EPROLREP))

                        return(0);
        return(1);
 }
                        return(0);
        return(1);
 }


@@ -1075,12 +854,12 @@ post_bf(POST_ARGS)
        head = mdoc->last->head;
 
        if (mdoc->last->args && head->child)
        head = mdoc->last->head;
 
        if (mdoc->last->args && head->child)

-               return(mdoc_err(mdoc, "one argument expected"));
+               return(mdoc_nerr(mdoc, mdoc->last, ELINE));

        else if (mdoc->last->args)
                return(1);
 
        if (NULL == head->child || MDOC_TEXT != head->child->type)
        else if (mdoc->last->args)
                return(1);
 
        if (NULL == head->child || MDOC_TEXT != head->child->type)

-               return(mdoc_err(mdoc, "text argument expected"));
+               return(mdoc_nerr(mdoc, mdoc->last, ELINE));

 
        p = head->child->string;
 
 
        p = head->child->string;
 


@@ -1091,7 +870,7 @@ post_bf(POST_ARGS)
        else if (0 == strcmp(p, "Sm"))
                return(1);
 
        else if (0 == strcmp(p, "Sm"))
                return(1);
 

-       return(mdoc_nerr(mdoc, head->child, "invalid font mode"));
+       return(mdoc_nerr(mdoc, head, EFONT));

 }
 
 
 }
 
 


@@ -1103,7 +882,7 @@ post_nm(POST_ARGS)
                return(1);
        if (mdoc->meta.name)
                return(1);
                return(1);
        if (mdoc->meta.name)
                return(1);

-       return(verr(mdoc, ENAME));
+       return(mdoc_nerr(mdoc, mdoc->last, ENAME));

 }
 
 
 }
 
 


@@ -1114,10 +893,10 @@ post_at(POST_ARGS)
        if (NULL == mdoc->last->child)
                return(1);
        if (MDOC_TEXT != mdoc->last->child->type)
        if (NULL == mdoc->last->child)
                return(1);
        if (MDOC_TEXT != mdoc->last->child->type)

-               return(verr(mdoc, EATT));
+               return(mdoc_nerr(mdoc, mdoc->last, EATT));

        if (mdoc_a2att(mdoc->last->child->string))
                return(1);
        if (mdoc_a2att(mdoc->last->child->string))
                return(1);

-       return(verr(mdoc, EATT));
+       return(mdoc_nerr(mdoc, mdoc->last, EATT));

 }
 
 
 }
 
 


@@ -1128,12 +907,12 @@ post_an(POST_ARGS)
        if (mdoc->last->args) {
                if (NULL == mdoc->last->child)
                        return(1);
        if (mdoc->last->args) {
                if (NULL == mdoc->last->child)
                        return(1);

-               return(verr(mdoc, ELINE));
+               return(mdoc_nerr(mdoc, mdoc->last, ELINE));

        }
 
        if (mdoc->last->child)
                return(1);
        }
 
        if (mdoc->last->child)
                return(1);

-       return(verr(mdoc, ELINE));
+       return(mdoc_nerr(mdoc, mdoc->last, ELINE));

 }
 
 
 }
 
 


@@ -1143,7 +922,7 @@ post_args(POST_ARGS)
 
        if (mdoc->last->args)
                return(1);
 
        if (mdoc->last->args)
                return(1);

-       return(verr(mdoc, ELINE));
+       return(mdoc_nerr(mdoc, mdoc->last, ELINE));

 }
 
 
 }
 
 


@@ -1158,7 +937,7 @@ post_it(POST_ARGS)
 
        n = mdoc->last->parent->parent;
        if (NULL == n->args)
 
        n = mdoc->last->parent->parent;
        if (NULL == n->args)

-               return(verr(mdoc, ELISTTYPE));
+               return(mdoc_nerr(mdoc, mdoc->last, ELISTTYPE));

 
        /* Some types require block-head, some not. */
 
 
        /* Some types require block-head, some not. */
 


@@ -1196,12 +975,12 @@ post_it(POST_ARGS)
                }
 
        if (-1 == type)
                }
 
        if (-1 == type)

-               return(verr(mdoc, ELISTTYPE));
+               return(mdoc_nerr(mdoc, mdoc->last, ELISTTYPE));

 
        switch (type) {
        case (MDOC_Tag):
                if (NULL == mdoc->last->head->child)
 
        switch (type) {
        case (MDOC_Tag):
                if (NULL == mdoc->last->head->child)

-                       if ( ! vwarn(mdoc, WLINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))

                                return(0);
                break;
        case (MDOC_Hang):
                                return(0);
                break;
        case (MDOC_Hang):


@@ -1212,10 +991,10 @@ post_it(POST_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Diag):
                if (NULL == mdoc->last->head->child)
                /* FALLTHROUGH */
        case (MDOC_Diag):
                if (NULL == mdoc->last->head->child)

-                       if ( ! vwarn(mdoc, WLINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))

                                return(0);
                if (NULL == mdoc->last->body->child)
                                return(0);
                if (NULL == mdoc->last->body->child)

-                       if ( ! vwarn(mdoc, WMULTILINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, EMULTILINE))

                                return(0);
                break;
        case (MDOC_Bullet):
                                return(0);
                break;
        case (MDOC_Bullet):


@@ -1228,26 +1007,27 @@ post_it(POST_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Item):
                if (mdoc->last->head->child)
                /* FALLTHROUGH */
        case (MDOC_Item):
                if (mdoc->last->head->child)

-                       if ( ! vwarn(mdoc, WNOLINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ENOLINE))

                                return(0);
                if (NULL == mdoc->last->body->child)
                                return(0);
                if (NULL == mdoc->last->body->child)

-                       if ( ! vwarn(mdoc, WMULTILINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, EMULTILINE))

                                return(0);
                break;
        case (MDOC_Column):
                if (NULL == mdoc->last->head->child)
                                return(0);
                break;
        case (MDOC_Column):
                if (NULL == mdoc->last->head->child)

-                       if ( ! vwarn(mdoc, WLINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))

                                return(0);
                if (mdoc->last->body->child)
                                return(0);
                if (mdoc->last->body->child)

-                       if ( ! vwarn(mdoc, WNOMULTILINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ENOMULTILINE))

                                return(0);
                c = mdoc->last->child;
                for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
                        i++;
                if (i == cols)
                        break;
                                return(0);
                c = mdoc->last->child;
                for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
                        i++;
                if (i == cols)
                        break;

-               return(mdoc_err(mdoc, "column mismatch (have "
-                                       "%d, want %d)", i, cols));
+               return(mdoc_verr(mdoc, mdoc->last->line, mdoc->last->pos,
+                               "column mismatch (have %d, want %d)", 
+                               i, cols));

        default:
                break;
        }
        default:
                break;
        }


@@ -1256,11 +1036,36 @@ post_it(POST_ARGS)
 }
 
 
 }
 
 

+static int
+post_bl_head(POST_ARGS) 
+{
+       int                     i;
+       const struct mdoc_node *n;
+
+       n = mdoc->last->parent;
+       assert(n->args);
+
+       for (i = 0; i < (int)n->args->argc; i++)
+               if (n->args->argv[i].arg == MDOC_Column)
+                       break;
+
+       if (i == (int)n->args->argc)
+               return(1);
+
+       if (n->args->argv[i].sz && mdoc->last->child)
+               return(mdoc_nerr(mdoc, n, ECOLMIS));
+
+       return(1);
+}
+
+

 static int
 post_bl(POST_ARGS)
 {
        struct mdoc_node        *n;
 
 static int
 post_bl(POST_ARGS)
 {
        struct mdoc_node        *n;
 

+       if (MDOC_HEAD == mdoc->last->type) 
+               return(post_bl_head(mdoc));

        if (MDOC_BODY != mdoc->last->type)
                return(1);
        if (NULL == mdoc->last->child)
        if (MDOC_BODY != mdoc->last->type)
                return(1);
        if (NULL == mdoc->last->child)


@@ -1271,7 +1076,8 @@ post_bl(POST_ARGS)
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;

-               return(mdoc_nerr(mdoc, n, "bad child of parent %s",
+               return(mdoc_verr(mdoc, n->line, n->pos, 
+                               "bad child of parent %s",

                                mdoc_macronames[mdoc->last->tok]));
        }
 
                                mdoc_macronames[mdoc->last->tok]));
        }
 


@@ -1297,7 +1103,7 @@ ebool(struct mdoc *mdoc)
 
        if (NULL == n)
                return(1);
 
        if (NULL == n)
                return(1);

-       return(nerr(mdoc, n, EBOOL));
+       return(mdoc_nerr(mdoc, n, EBOOL));

 }
 
 
 }
 
 


@@ -1306,14 +1112,14 @@ post_root(POST_ARGS)
 {
 
        if (NULL == mdoc->first->child)
 {
 
        if (NULL == mdoc->first->child)

-               return(verr(mdoc, ENODATA));
+               return(mdoc_nerr(mdoc, mdoc->first, ENODAT));

        if ( ! (MDOC_PBODY & mdoc->flags))
        if ( ! (MDOC_PBODY & mdoc->flags))

-               return(verr(mdoc, ENOPROLOGUE));
+               return(mdoc_nerr(mdoc, mdoc->first, ENOPROLOGUE));

 
        if (MDOC_BLOCK != mdoc->first->child->type)
 
        if (MDOC_BLOCK != mdoc->first->child->type)

-               return(verr(mdoc, ENODATA));
+               return(mdoc_nerr(mdoc, mdoc->first, ENODAT));

        if (MDOC_Sh != mdoc->first->child->tok)
        if (MDOC_Sh != mdoc->first->child->tok)

-               return(verr(mdoc, ENODATA));
+               return(mdoc_nerr(mdoc, mdoc->first, ENODAT));

 
        return(1);
 }
 
        return(1);
 }


@@ -1325,7 +1131,7 @@ post_st(POST_ARGS)
 
        if (mdoc_a2st(mdoc->last->child->string))
                return(1);
 
        if (mdoc_a2st(mdoc->last->child->string))
                return(1);

-       return(vwarn(mdoc, WBADSTAND));
+       return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));

 }
 
 
 }
 
 


@@ -1347,7 +1153,7 @@ post_sh_body(POST_ARGS)
 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 

-       if (SEC_NAME != mdoc->lastnamed)
+       if (SEC_NAME != mdoc->lastsec)

                return(1);
 
        /*
                return(1);
 
        /*


@@ -1357,20 +1163,20 @@ post_sh_body(POST_ARGS)
         */
 
        if (NULL == (n = mdoc->last->child))
         */
 
        if (NULL == (n = mdoc->last->child))

-               return(vwarn(mdoc, WNAMESECINC));
+               return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC));

 
        for ( ; n && n->next; n = n->next) {
                if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
                        continue;
                if (MDOC_TEXT == n->type)
                        continue;
 
        for ( ; n && n->next; n = n->next) {
                if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
                        continue;
                if (MDOC_TEXT == n->type)
                        continue;

-               if ( ! vwarn(mdoc, WNAMESECINC))
+               if ( ! mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC))

                        return(0);
        }
 
                        return(0);
        }
 

-       if (MDOC_ELEM == n->type && MDOC_Nd == n->tok)
+       if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)

                return(1);
                return(1);

-       return(vwarn(mdoc, WNAMESECINC));
+       return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC));

 }
 
 
 }
 
 


@@ -1395,11 +1201,11 @@ post_sh_head(POST_ARGS)
                assert(MDOC_TEXT == n->type);
 
                if (strlcat(buf, n->string, 64) >= 64)
                assert(MDOC_TEXT == n->type);
 
                if (strlcat(buf, n->string, 64) >= 64)

-                       return(nerr(mdoc, n, ETOOLONG));
+                       return(mdoc_nerr(mdoc, n, ETOOLONG));

                if (NULL == n->next)
                        continue;
                if (strlcat(buf, " ", 64) >= 64)
                if (NULL == n->next)
                        continue;
                if (strlcat(buf, " ", 64) >= 64)

-                       return(nerr(mdoc, n, ETOOLONG));
+                       return(mdoc_nerr(mdoc, n, ETOOLONG));

        }
 
        sec = mdoc_atosec(buf);
        }
 
        sec = mdoc_atosec(buf);


@@ -1410,13 +1216,15 @@ post_sh_head(POST_ARGS)
         */
 
        if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
         */
 
        if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)

-               return(verr(mdoc, ESECNAME));
+               return(mdoc_nerr(mdoc, mdoc->last, ESECNAME));

        if (SEC_CUSTOM == sec)
                return(1);
        if (sec == mdoc->lastnamed)
        if (SEC_CUSTOM == sec)
                return(1);
        if (sec == mdoc->lastnamed)

-               return(vwarn(mdoc, WSECREP));
+               if ( ! mdoc_nwarn(mdoc, mdoc->last, ESECREP))
+                       return(0);

        if (sec < mdoc->lastnamed)
        if (sec < mdoc->lastnamed)

-               return(vwarn(mdoc, WSECOOO));
+               if ( ! mdoc_nwarn(mdoc, mdoc->last, ESECOOO))
+                       return(0);

 
        /* 
         * Check particular section/manual conventions.  LIBRARY can
 
        /* 
         * Check particular section/manual conventions.  LIBRARY can


@@ -1431,7 +1239,7 @@ post_sh_head(POST_ARGS)
                case (3):
                        break;
                default:
                case (3):
                        break;
                default:

-                       return(vwarn(mdoc, WWRONGMSEC));
+                       return(mdoc_nwarn(mdoc, mdoc->last, EWRONGMSEC));

                }
                break;
        default:
                }
                break;
        default: