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 ca2230a927678a33a38ed98f37cc81e46c3ae5b3..1c5d8c9fe7a9f31040c59ba938de5568ccadb1cd 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,20 +1,18 @@
-/* $Id: mdoc_validate.c,v 1.1 2009/03/25 15:17:49 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.30 2009/07/12 20:30:35 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 #include <sys/types.h>
 
  */
 #include <sys/types.h>
 


@@ -22,57 +20,17 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>

+#include <string.h>

 
 #include "libmdoc.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). */
 

-/*
- * Pre- and post-validate macros as they're parsed.  Pre-validation
- * occurs when the macro has been detected and its arguments parsed.
- * Post-validation occurs when all child macros have also been parsed.
- * In the ELEMENT case, this is simply the parameters of the macro; in
- * the BLOCK case, this is the HEAD, BODY, TAIL and so on.
- */
-

 #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 {
-       EESCAPE,
-       EPRINT,
-       ENODATA,
-       ENOPROLOGUE,
-       ELINE,
-       EATT,
-       ENAME,
-       ELISTTYPE,
-       EDISPTYPE,
-       EMULTIDISP,
-       EMULTILIST,
-       EARGREP,
-       EBOOL,
-       ENESTDISP
-};
-
-enum   mwarn {
-       WESCAPE,
-       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);


@@ -82,10 +40,6 @@ struct       valids {
        v_post  *post;
 };
 
        v_post  *post;
 };
 

-/* Utility checks. */
-
-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, ...);


@@ -102,10 +56,10 @@ 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 inline int count_child(struct mdoc *);
-static inline int warn_count(struct mdoc *, const char *, 
+static int     warn_print(struct mdoc *, int, int);
+static int     warn_count(struct mdoc *, const char *, 

                        int, const char *, int);
                        int, const char *, int);

-static inline int err_count(struct mdoc *, const char *, 
+static int     err_count(struct mdoc *, const char *, 

                        int, const char *, int);
 static int     pre_an(PRE_ARGS);
 static int     pre_bd(PRE_ARGS);
                        int, const char *, int);
 static int     pre_an(PRE_ARGS);
 static int     pre_bd(PRE_ARGS);


@@ -120,7 +74,6 @@ static       int     pre_fd(PRE_ARGS);
 static int     pre_it(PRE_ARGS);
 static int     pre_lb(PRE_ARGS);
 static int     pre_os(PRE_ARGS);
 static int     pre_it(PRE_ARGS);
 static int     pre_lb(PRE_ARGS);
 static int     pre_os(PRE_ARGS);

-static int     pre_prologue(PRE_ARGS);

 static int     pre_rv(PRE_ARGS);
 static int     pre_sh(PRE_ARGS);
 static int     pre_ss(PRE_ARGS);
 static int     pre_rv(PRE_ARGS);
 static int     pre_sh(PRE_ARGS);
 static int     pre_ss(PRE_ARGS);


@@ -132,17 +85,17 @@ 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);

-

 static int     post_an(POST_ARGS);
 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_an(POST_ARGS);
 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_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);


@@ -151,24 +104,19 @@ 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        mwarn(m, t) nwarn((m), (m)->last, (t))
-#define        merr(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_cd[] = { pre_cd, 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 };
 static v_pre   pres_cd[] = { pre_cd, NULL };

-static v_pre   pres_dd[] = { pre_prologue, pre_dd, NULL };
+static v_pre   pres_dd[] = { pre_dd, NULL };

 static v_pre   pres_d1[] = { pre_display, NULL };
 static v_pre   pres_d1[] = { pre_display, NULL };

-static v_pre   pres_dt[] = { pre_prologue, pre_dt, NULL };
+static v_pre   pres_dt[] = { pre_dt, NULL };

 static v_pre   pres_er[] = { pre_er, NULL };
 static v_pre   pres_ex[] = { pre_ex, NULL };
 static v_pre   pres_fd[] = { pre_fd, NULL };
 static v_pre   pres_it[] = { pre_it, NULL };
 static v_pre   pres_lb[] = { pre_lb, NULL };
 static v_pre   pres_er[] = { pre_er, NULL };
 static v_pre   pres_ex[] = { pre_ex, NULL };
 static v_pre   pres_fd[] = { pre_fd, NULL };
 static v_pre   pres_it[] = { pre_it, NULL };
 static v_pre   pres_lb[] = { pre_lb, NULL };

-static v_pre   pres_os[] = { pre_prologue, pre_os, NULL };
+static v_pre   pres_os[] = { pre_os, NULL };

 static v_pre   pres_rv[] = { pre_rv, NULL };
 static v_pre   pres_sh[] = { pre_sh, NULL };
 static v_pre   pres_ss[] = { pre_ss, NULL };
 static v_pre   pres_rv[] = { pre_rv, NULL };
 static v_pre   pres_sh[] = { pre_sh, NULL };
 static v_pre   pres_ss[] = { pre_ss, NULL };


@@ -179,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 };


@@ -197,7 +146,7 @@ static      v_post  posts_bf[] = { hwarn_le1, post_bf, NULL };
 static v_post  posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
 static v_post  posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 
 const  struct valids mdoc_valids[MDOC_MAX] = {

-       { NULL, NULL },                         /* \" */
+       { NULL, NULL },                         /* Ap */

        { pres_dd, posts_text },                /* Dd */
        { pres_dt, NULL },                      /* Dt */
        { pres_os, NULL },                      /* Os */
        { pres_dd, posts_text },                /* Dd */
        { pres_dt, NULL },                      /* Dt */
        { pres_os, NULL },                      /* Os */


@@ -228,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 */


@@ -304,9 +253,8 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Fr */
        { NULL, posts_notext },                 /* Ud */
        { pres_lb, posts_lb },                  /* Lb */
        { NULL, NULL },                         /* Fr */
        { NULL, posts_notext },                 /* Ud */
        { pres_lb, posts_lb },                  /* Lb */

-       { NULL, NULL },                         /* Ap */

        { NULL, posts_pp },                     /* Lp */ 
        { NULL, posts_pp },                     /* Lp */ 

-       { NULL, posts_text },                   /* Lk */ 
+       { NULL, NULL },                         /* Lk */ 

        { NULL, posts_text },                   /* Mt */ 
        { NULL, posts_wline },                  /* Brq */ 
        { NULL, NULL },                         /* Bro */ 
        { NULL, posts_text },                   /* Mt */ 
        { NULL, posts_wline },                  /* Brq */ 
        { NULL, NULL },                         /* Bro */ 


@@ -319,6 +267,11 @@ const      struct valids mdoc_valids[MDOC_MAX] = {
 };
 
 
 };
 
 

+#ifdef __linux__
+extern size_t  strlcat(char *, const char *, size_t);
+#endif
+
+

 int
 mdoc_valid_pre(struct mdoc *mdoc, 
                const struct mdoc_node *n)
 int
 mdoc_valid_pre(struct mdoc *mdoc, 
                const struct mdoc_node *n)


@@ -378,133 +331,21 @@ mdoc_valid_post(struct mdoc *mdoc)
 
 
 static int
 
 
 static int

-perr(struct mdoc *m, int line, int pos, enum merr type)
+warn_print(struct mdoc *m, int ln, int pos)

 {
 {

-       char             *p;
-       
-       p = NULL;
-       switch (type) {
-       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 (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 (WESCAPE):
-               p = "invalid escape sequence";
-               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));
+       if (MDOC_IGN_CHARS & m->pflags)
+               return(mdoc_pwarn(m, ln, pos, EPRINT));
+       return(mdoc_perr(m, ln, pos, EPRINT));

 }
 
 
 }
 
 

-

 static inline int
 warn_count(struct mdoc *m, const char *k, 
                int want, const char *v, int has)
 {
 
 static inline int
 warn_count(struct mdoc *m, const char *k, 
                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));
 }
 


@@ -514,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,


@@ -542,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)                  \


@@ -582,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() */


@@ -602,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));

 }
 
 
 }
 
 


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

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

 }
 
 
 }
 
 


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

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

 }
 
 
 }
 
 


@@ -683,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);


@@ -693,28 +520,29 @@ 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;
-
-       /* FIXME: indicate deprecated escapes \*(xx and \*x. */
+       int              c;

 
 

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

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

-                               return(perr(mdoc, line, pos, EPRINT));
+                               if ( ! warn_print(mdoc, line, pos))
+                                       return(0);

                } else if ( ! isprint((u_char)*p))
                } else if ( ! isprint((u_char)*p))

-                       return(perr(mdoc, line, pos, EPRINT));
+                       if ( ! warn_print(mdoc, line, pos))
+                               return(0);

 
                if ('\\' != *p)
                        continue;
 
 
                if ('\\' != *p)
                        continue;
 

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

                if (c) {
                if (c) {

-                       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);
        }
 


@@ -733,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]));
 }
 


@@ -757,27 +585,27 @@ 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              i, 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.  */
 
        type = offset = width = -1;
 
        /* LINTED */
 
        /* Make sure that only one type of list is specified.  */
 
        type = offset = width = -1;
 
        /* LINTED */

-       for (i = 0; i < (int)n->args->argc; i++)
-               switch (n->args->argv[i].arg) {
+       for (pos = 0; pos < (int)n->args->argc; pos++)
+               switch (n->args->argv[pos].arg) {

                case (MDOC_Bullet):
                        /* FALLTHROUGH */
                case (MDOC_Dash):
                case (MDOC_Bullet):
                        /* FALLTHROUGH */
                case (MDOC_Dash):


@@ -799,31 +627,38 @@ pre_bl(PRE_ARGS)
                case (MDOC_Inset):
                        /* FALLTHROUGH */
                case (MDOC_Column):
                case (MDOC_Inset):
                        /* FALLTHROUGH */
                case (MDOC_Column):

-                       if (-1 == type) {
-                               type = n->args->argv[i].arg;
-                               break;
-                       }
-                       return(nerr(mdoc, n, EMULTILIST));
+                       if (-1 != type) 
+                               return(mdoc_nerr(mdoc, n, EMULTILIST));
+                       type = n->args->argv[pos].arg;
+                       break;

                case (MDOC_Width):
                case (MDOC_Width):

-                       if (-1 == width) {
-                               width = n->args->argv[i].arg;
-                               break;
-                       }
-                       return(nerr(mdoc, n, EARGREP));
+                       if (-1 != width)
+                               return(mdoc_nerr(mdoc, n, EARGREP));
+                       width = n->args->argv[pos].arg;
+                       break;

                case (MDOC_Offset):
                case (MDOC_Offset):

-                       if (-1 == offset) {
-                               offset = n->args->argv[i].arg;
-                               break;
-                       }
-                       return(nerr(mdoc, n, EARGREP));
+                       if (-1 != offset)
+                               return(mdoc_nerr(mdoc, n, EARGREP));
+                       offset = n->args->argv[pos].arg;
+                       break;

                default:
                        break;
                }
 
        if (-1 == type)
                default:
                        break;
                }
 
        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
+        * types and should be warned about them.  Others should have it
+        * and must also be warned.
+        */

 
        switch (type) {
 
        switch (type) {

+       case (MDOC_Tag):
+               if (-1 == width && ! mdoc_nwarn(mdoc, n, EMISSWIDTH))
+                       return(0);
+               break;

        case (MDOC_Column):
                /* FALLTHROUGH */
        case (MDOC_Diag):
        case (MDOC_Column):
                /* FALLTHROUGH */
        case (MDOC_Diag):


@@ -831,17 +666,9 @@ pre_bl(PRE_ARGS)
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Item):
        case (MDOC_Inset):
                /* FALLTHROUGH */
        case (MDOC_Item):

-               if (-1 == width)
-                       break;
-               return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
-                               "superfluous %s argument",
-                               mdoc_argnames[MDOC_Width]));
-       case (MDOC_Tag):
-               if (-1 != width)
-                       break;
-               return(mdoc_nwarn(mdoc, n, WARN_SYNTAX, 
-                               "suggest %s argument", 
-                               mdoc_argnames[MDOC_Width]));
+               if (-1 != width && ! mdoc_nwarn(mdoc, n, ENOWIDTH))
+                       return(0);
+               break;

        default:
                break;
        }
        default:
                break;
        }


@@ -858,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.  */
 


@@ -877,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));

 }
 
 
 }
 
 


@@ -924,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"));

 }
 
 
 }
 
 


@@ -960,7 +788,7 @@ static int
 pre_er(PRE_ARGS)
 {
 
 pre_er(PRE_ARGS)
 {
 

-       return(check_msec(mdoc, n, 2, 0));
+       return(check_msec(mdoc, n, 2, 3, 9, 0));

 }
 
 
 }
 
 


@@ -972,23 +800,15 @@ pre_cd(PRE_ARGS)
 }
 
 
 }
 
 

-static int
-pre_prologue(PRE_ARGS)
-{
-
-       return(check_sec(mdoc, n, SEC_PROLOGUE, SEC_CUSTOM));
-}
-
-

 static int
 pre_dt(PRE_ARGS)
 {
 
        if (0 == mdoc->meta.date || mdoc->meta.os)
 static int
 pre_dt(PRE_ARGS)
 {
 
        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);
 }


@@ -999,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);
 }


@@ -1013,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);
 }


@@ -1033,25 +853,24 @@ post_bf(POST_ARGS)
 
        head = mdoc->last->head;
 
 
        head = mdoc->last->head;
 

-       if (NULL == mdoc->last->args) {
-               if (NULL == head->child || 
-                               MDOC_TEXT != head->child->type)
-                       return(mdoc_err(mdoc, "text argument expected"));
+       if (mdoc->last->args && head->child)
+               return(mdoc_nerr(mdoc, mdoc->last, ELINE));
+       else if (mdoc->last->args)
+               return(1);

 
 

-               p = head->child->string;
-               if (xstrcmp(p, "Em"))
-                       return(1);
-               else if (xstrcmp(p, "Li"))
-                       return(1);
-               else if (xstrcmp(p, "Sm"))
-                       return(1);
-               return(mdoc_nerr(mdoc, head->child, "invalid font"));
-       }
+       if (NULL == head->child || MDOC_TEXT != head->child->type)
+               return(mdoc_nerr(mdoc, mdoc->last, ELINE));

 
 

-       if (head->child)
-               return(mdoc_err(mdoc, "one argument expected"));
+       p = head->child->string;

 
 

-       return(1);
+       if (0 == strcmp(p, "Em"))
+               return(1);
+       else if (0 == strcmp(p, "Li"))
+               return(1);
+       else if (0 == strcmp(p, "Sm"))
+               return(1);
+
+       return(mdoc_nerr(mdoc, head, EFONT));

 }
 
 
 }
 
 


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

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

 }
 
 
 }
 
 


@@ -1074,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(merr(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(merr(mdoc, EATT));
+       return(mdoc_nerr(mdoc, mdoc->last, EATT));

 }
 
 
 }
 
 


@@ -1088,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(merr(mdoc, ELINE));
+               return(mdoc_nerr(mdoc, mdoc->last, ELINE));

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

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

 }
 
 
 }
 
 


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

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

 }
 
 
 }
 
 


@@ -1118,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(merr(mdoc, ELISTTYPE));
+               return(mdoc_nerr(mdoc, mdoc->last, ELISTTYPE));

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


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

-               return(merr(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 ( ! mwarn(mdoc, WLINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))

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


@@ -1172,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 ( ! mwarn(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 ( ! mwarn(mdoc, WMULTILINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, EMULTILINE))

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


@@ -1188,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 ( ! mwarn(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 ( ! mwarn(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 ( ! mwarn(mdoc, WLINE))
+                       if ( ! mdoc_nwarn(mdoc, mdoc->last, ELINE))

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

-                       if ( ! mwarn(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;
        }


@@ -1216,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)


@@ -1231,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]));
        }
 


@@ -1248,16 +1094,16 @@ ebool(struct mdoc *mdoc)
        for (n = mdoc->last->child; n; n = n->next) {
                if (MDOC_TEXT != n->type)
                        break;
        for (n = mdoc->last->child; n; n = n->next) {
                if (MDOC_TEXT != n->type)
                        break;

-               if (xstrcmp(n->string, "on"))
+               if (0 == strcmp(n->string, "on"))

                        continue;
                        continue;

-               if (xstrcmp(n->string, "off"))
+               if (0 == strcmp(n->string, "off"))

                        continue;
                break;
        }
 
        if (NULL == n)
                return(1);
                        continue;
                break;
        }
 
        if (NULL == n)
                return(1);

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

 }
 
 
 }
 
 


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

-               return(merr(mdoc, ENODATA));
-       if (SEC_PROLOGUE == mdoc->lastnamed)
-               return(merr(mdoc, ENOPROLOGUE));
+               return(mdoc_nerr(mdoc, mdoc->first, ENODAT));
+       if ( ! (MDOC_PBODY & mdoc->flags))
+               return(mdoc_nerr(mdoc, mdoc->first, ENOPROLOGUE));

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

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

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

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

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


@@ -1285,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(mwarn(mdoc, WBADSTAND));
+       return(mdoc_nerr(mdoc, mdoc->last, EBADSTAND));

 }
 
 
 }
 
 


@@ -1307,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);
 
        /*


@@ -1317,28 +1163,29 @@ post_sh_body(POST_ARGS)
         */
 
        if (NULL == (n = mdoc->last->child))
         */
 
        if (NULL == (n = mdoc->last->child))

-               return(mwarn(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 ( ! mwarn(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(mwarn(mdoc, WNAMESECINC));
+       return(mdoc_nwarn(mdoc, mdoc->last, ENAMESECINC));

 }
 
 
 static int
 post_sh_head(POST_ARGS)
 {
 }
 
 
 static int
 post_sh_head(POST_ARGS)
 {

-       char              buf[64];
-       enum mdoc_sec     sec;
+       char                    buf[64];
+       enum mdoc_sec           sec;
+       const struct mdoc_node *n;

 
        /*
         * Process a new section.  Sections are either "named" or
 
        /*
         * Process a new section.  Sections are either "named" or


@@ -1347,27 +1194,42 @@ post_sh_head(POST_ARGS)
         * certain manual sections.
         */
 
         * certain manual sections.
         */
 

-       assert(MDOC_Sh == mdoc->last->tok);
+       buf[0] = 0;

 
 

-       (void)xstrlcpys(buf, mdoc->last->child, sizeof(buf));
+       for (n = mdoc->last->child; n; n = n->next) {
+               /* XXX - copied from compact(). */
+               assert(MDOC_TEXT == n->type);
+
+               if (strlcat(buf, n->string, 64) >= 64)
+                       return(mdoc_nerr(mdoc, n, ETOOLONG));
+               if (NULL == n->next)
+                       continue;
+               if (strlcat(buf, " ", 64) >= 64)
+                       return(mdoc_nerr(mdoc, n, ETOOLONG));
+       }

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

-       /* The NAME section should always be first. */
+       /* 
+        * Check: NAME should always be first, CUSTOM has no roles,
+        * non-CUSTOM has a conventional order to be followed.
+        */

 
 

-       if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec)
-               return(mwarn(mdoc, WSECOOO));
+       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
+               return(mdoc_nerr(mdoc, mdoc->last, ESECNAME));

        if (SEC_CUSTOM == sec)
                return(1);
        if (SEC_CUSTOM == sec)
                return(1);

-
-       /* Check for repeated or out-of-order sections. */
-

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

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

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

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

 
 

-       /* Check particular section/manual section conventions. */
+       /* 
+        * Check particular section/manual conventions.  LIBRARY can
+        * only occur in msec 2, 3 (TODO: are there more of these?).
+        */

 
        switch (sec) {
        case (SEC_LIBRARY):
 
        switch (sec) {
        case (SEC_LIBRARY):


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

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

                }
                break;
        default:
                }
                break;
        default: