]> git.cameronkatri.com Git - mandoc.git/blobdiff - validate.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Added Fd section validation.
[mandoc.git] / validate.c
diff --git a/validate.c b/validate.c
index 1242676b4fbfc03594dbe7aa5a34787ef347fa7b..d5495d4fd66e7eb8577ed4e4606dfd55c2ae784c 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.25 2009/01/12 12:52:21 kristaps Exp $ */
+/* $Id: validate.c,v 1.57 2009/02/24 13:57:17 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -17,262 +17,540 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
  * PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
+#include <ctype.h>
 #include <stdlib.h>
 
 #include "private.h"
 
 #include <stdlib.h>
 
 #include "private.h"
 
+/*
+ * 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
 
 
-typedef        int     (*v_pre)(struct mdoc *, struct mdoc_node *);
-typedef        int     (*v_post)(struct mdoc *);
+typedef        int     (*v_pre)(PRE_ARGS);
+typedef        int     (*v_post)(POST_ARGS);
 
 
+/* FIXME: some sections should only occur in specific msecs. */
+/* FIXME: ignoring Pp. */
+/* FIXME: math symbols. */
 
 struct valids {
        v_pre   *pre;
        v_post  *post;
 };
 
 
 struct valids {
        v_pre   *pre;
        v_post  *post;
 };
 
-
-static int     pre_display(struct mdoc *, struct mdoc_node *);
-static int     pre_bd(struct mdoc *, struct mdoc_node *);
-static int     pre_bl(struct mdoc *, struct mdoc_node *);
-static int     pre_it(struct mdoc *, struct mdoc_node *);
-static int     pre_prologue(struct mdoc *, struct mdoc_node *);
-static int     pre_prologue(struct mdoc *, struct mdoc_node *);
-static int     pre_prologue(struct mdoc *, struct mdoc_node *);
-
-static int     headchild_err_ge1(struct mdoc *);
-static int     headchild_err_eq0(struct mdoc *);
-static int     elemchild_err_ge1(struct mdoc *);
-static int     elemchild_warn_eq0(struct mdoc *);
-static int     bodychild_warn_ge1(struct mdoc *);
-static int     post_sh(struct mdoc *);
-static int     post_bl(struct mdoc *);
-static int     post_it(struct mdoc *);
+/* Utility checks. */
+
+static int     check_parent(PRE_ARGS, int, enum mdoc_type);
+static int     check_msec(PRE_ARGS, int, enum mdoc_msec *);
+static int     check_stdarg(PRE_ARGS);
+
+static int     check_text(struct mdoc *, 
+                       size_t, size_t, const char *);
+
+static int     err_child_lt(struct mdoc *, const char *, int);
+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);
+
+/* Utility auxiliaries. */
+
+static inline int count_child(struct mdoc *);
+static inline int warn_count(struct mdoc *, const char *, 
+                       int, const char *, int);
+static inline int err_count(struct mdoc *, const char *, 
+                       int, const char *, int);
+
+/* Specific pre-child-parse routines. */
+
+static int     pre_display(PRE_ARGS);
+static int     pre_sh(PRE_ARGS);
+static int     pre_ss(PRE_ARGS);
+static int     pre_bd(PRE_ARGS);
+static int     pre_bl(PRE_ARGS);
+static int     pre_it(PRE_ARGS);
+static int     pre_cd(PRE_ARGS);
+static int     pre_er(PRE_ARGS);
+static int     pre_ex(PRE_ARGS);
+static int     pre_rv(PRE_ARGS);
+static int     pre_an(PRE_ARGS);
+static int     pre_st(PRE_ARGS);
+static int     pre_prologue(PRE_ARGS);
+static int     pre_prologue(PRE_ARGS);
+static int     pre_prologue(PRE_ARGS);
+
+/* Specific post-child-parse routines. */
+
+static int     herr_ge1(POST_ARGS);
+static int     herr_le1(POST_ARGS);
+static int     herr_eq0(POST_ARGS);
+static int     eerr_eq0(POST_ARGS);
+static int     eerr_le1(POST_ARGS);
+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     ewarn_eq1(POST_ARGS);
+static int     bwarn_ge1(POST_ARGS);
+static int     ewarn_ge1(POST_ARGS);
+static int     ebool(POST_ARGS);
+
+static int     post_sh(POST_ARGS);
+static int     post_sh_body(POST_ARGS);
+static int     post_sh_head(POST_ARGS);
+static int     post_fd(POST_ARGS);
+static int     post_bl(POST_ARGS);
+static int     post_it(POST_ARGS);
+static int     post_ex(POST_ARGS);
+static int     post_an(POST_ARGS);
+static int     post_at(POST_ARGS);
+static int     post_xr(POST_ARGS);
+static int     post_nm(POST_ARGS);
+static int     post_bf(POST_ARGS);
+static int     post_root(POST_ARGS);
+
+/* Collections of pre-child-parse routines. */
 
 static v_pre   pres_prologue[] = { pre_prologue, NULL };
 static v_pre   pres_d1[] = { pre_display, NULL };
 static v_pre   pres_bd[] = { pre_display, pre_bd, NULL };
 static v_pre   pres_bl[] = { pre_bl, NULL };
 static v_pre   pres_it[] = { pre_it, NULL };
 
 static v_pre   pres_prologue[] = { pre_prologue, NULL };
 static v_pre   pres_d1[] = { pre_display, NULL };
 static v_pre   pres_bd[] = { pre_display, pre_bd, NULL };
 static v_pre   pres_bl[] = { pre_bl, NULL };
 static v_pre   pres_it[] = { pre_it, NULL };
-static v_post  posts_bd[] = { headchild_err_eq0, 
-                       bodychild_warn_ge1, NULL };
-
-static v_post  posts_sh[] = { headchild_err_ge1, 
-                       bodychild_warn_ge1, post_sh, NULL };
-static v_post  posts_bl[] = { headchild_err_eq0, 
-                       bodychild_warn_ge1, post_bl, NULL };
+static v_pre   pres_ss[] = { pre_ss, NULL };
+static v_pre   pres_sh[] = { pre_sh, NULL };
+static v_pre   pres_cd[] = { pre_cd, NULL };
+static v_pre   pres_er[] = { pre_er, NULL };
+static v_pre   pres_ex[] = { pre_ex, NULL };
+static v_pre   pres_rv[] = { pre_rv, NULL };
+static v_pre   pres_an[] = { pre_an, NULL };
+static v_pre   pres_st[] = { pre_st, NULL };
+
+/* Collections of post-child-parse routines. */
+
+static v_post  posts_bool[] = { eerr_eq1, ebool, NULL };
+static v_post  posts_bd[] = { herr_eq0, bwarn_ge1, NULL };
+static v_post  posts_text[] = { eerr_ge1, NULL };
+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_bl[] = { herr_eq0, 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_ss[] = { headchild_err_ge1, NULL };
-static v_post  posts_pp[] = { elemchild_warn_eq0, NULL };
-static v_post  posts_dd[] = { elemchild_err_ge1, NULL };
-static v_post  posts_d1[] = { headchild_err_ge1, NULL };
-
+static v_post  posts_in[] = { ewarn_eq1, NULL };
+static v_post  posts_ss[] = { herr_ge1, NULL };
+static v_post  posts_pf[] = { eerr_eq1, NULL };
+static v_post  posts_pp[] = { ewarn_eq0, NULL };
+static v_post  posts_ex[] = { eerr_le1, post_ex, NULL };
+static v_post  posts_an[] = { post_an, NULL };
+static v_post  posts_at[] = { post_at, NULL };
+static v_post  posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL };
+static v_post  posts_nm[] = { post_nm, NULL };
+static v_post  posts_bf[] = { herr_le1, post_bf, NULL };
+static v_post  posts_rs[] = { herr_eq0, bwarn_ge1, NULL };
+static v_post  posts_fo[] = { bwarn_ge1, NULL };
+static v_post  posts_bk[] = { herr_eq0, bwarn_ge1, NULL };
+static v_post  posts_fd[] = { ewarn_ge1, post_fd, NULL };
+
+/* Per-macro pre- and post-child-check routine collections. */
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
-       { NULL, NULL }, /* \" */
-       { pres_prologue, posts_dd }, /* Dd */
-       { pres_prologue, NULL }, /* Dt */
-       { pres_prologue, NULL }, /* Os */
-       { NULL, posts_sh }, /* Sh */ /* FIXME: preceding Pp. */
-       { NULL, posts_ss }, /* Ss */ /* FIXME: preceding Pp. */
-       { NULL, posts_pp }, /* Pp */ /* FIXME: proceeding... */
-       { pres_d1, posts_d1 }, /* D1 */
-       { pres_d1, posts_d1 }, /* Dl */
-       { pres_bd, posts_bd }, /* Bd */ /* FIXME: preceding Pp. */
-       { NULL, NULL }, /* Ed */
-       { pres_bl, posts_bl }, /* Bl */ /* FIXME: preceding Pp. */
-       { NULL, NULL }, /* El */
-       { pres_it, posts_it }, /* It */
-       { NULL, NULL }, /* Ad */ 
-       { NULL, NULL }, /* An */
-       { NULL, NULL }, /* Ar */
-       { NULL, NULL }, /* Cd */
-       { NULL, NULL }, /* Cm */
-       { NULL, NULL }, /* Dv */ 
-       { NULL, NULL }, /* Er */ 
-       { NULL, NULL }, /* Ev */ 
-       { NULL, NULL }, /* Ex */
-       { NULL, NULL }, /* Fa */ 
-       { NULL, NULL }, /* Fd */ 
-       { NULL, NULL }, /* Fl */
-       { NULL, NULL }, /* Fn */ 
-       { NULL, NULL }, /* Ft */ 
-       { NULL, NULL }, /* Ic */ 
-       { NULL, NULL }, /* In */ 
-       { NULL, NULL }, /* Li */
-       { NULL, NULL }, /* Nd */ 
-       { NULL, NULL }, /* Nm */ 
-       { NULL, NULL }, /* Op */
-       { NULL, NULL }, /* Ot */
-       { NULL, NULL }, /* Pa */
-       { NULL, NULL }, /* Rv */
-       { NULL, NULL }, /* St */
-       { NULL, NULL }, /* Va */
-       { NULL, NULL }, /* Vt */ 
-       { NULL, NULL }, /* Xr */
-       { NULL, NULL }, /* %A */
-       { NULL, NULL }, /* %B */
-       { NULL, NULL }, /* %D */
-       { NULL, NULL }, /* %I */
-       { NULL, NULL }, /* %J */
-       { NULL, NULL }, /* %N */
-       { NULL, NULL }, /* %O */
-       { NULL, NULL }, /* %P */
-       { NULL, NULL }, /* %R */
-       { NULL, NULL }, /* %T */
-       { NULL, NULL }, /* %V */
-       { NULL, NULL }, /* Ac */
-       { NULL, NULL }, /* Ao */
-       { NULL, NULL }, /* Aq */
-       { NULL, NULL }, /* At */ /* FIXME */
-       { NULL, NULL }, /* Bc */
-       { NULL, NULL }, /* Bf */ 
-       { NULL, NULL }, /* Bo */
-       { NULL, NULL }, /* Bq */
-       { NULL, NULL }, /* Bsx */
-       { NULL, NULL }, /* Bx */
-       { NULL, NULL }, /* Db */
-       { NULL, NULL }, /* Dc */
-       { NULL, NULL }, /* Do */
-       { NULL, NULL }, /* Dq */
-       { NULL, NULL }, /* Ec */
-       { NULL, NULL }, /* Ef */ /* -symbolic, etc. */
-       { NULL, NULL }, /* Em */ 
-       { NULL, NULL }, /* Eo */
-       { NULL, NULL }, /* Fx */
-       { NULL, NULL }, /* Ms */
-       { NULL, NULL }, /* No */
-       { NULL, NULL }, /* Ns */
-       { NULL, NULL }, /* Nx */
-       { NULL, NULL }, /* Ox */
-       { NULL, NULL }, /* Pc */
-       { NULL, NULL }, /* Pf */ /* 2 or more arguments */
-       { NULL, NULL }, /* Po */
-       { NULL, NULL }, /* Pq */ /* FIXME: ignore following Sh/Ss */
-       { NULL, NULL }, /* Qc */
-       { NULL, NULL }, /* Ql */
-       { NULL, NULL }, /* Qo */
-       { NULL, NULL }, /* Qq */
-       { NULL, NULL }, /* Re */
-       { NULL, NULL }, /* Rs */
-       { NULL, NULL }, /* Sc */
-       { NULL, NULL }, /* So */
-       { NULL, NULL }, /* Sq */
-       { NULL, NULL }, /* Sm */
-       { NULL, NULL }, /* Sx */
-       { NULL, NULL }, /* Sy */
-       { NULL, NULL }, /* Tn */
-       { NULL, NULL }, /* Ux */
-       { NULL, NULL }, /* Xc */
-       { NULL, NULL }, /* Xo */
-       { NULL, NULL }, /* Fo */ 
-       { NULL, NULL }, /* Fc */ 
-       { NULL, NULL }, /* Oo */
-       { NULL, NULL }, /* Oc */
-       { NULL, NULL }, /* Bk */
-       { NULL, NULL }, /* Ek */
-       { NULL, NULL }, /* Bt */
-       { NULL, NULL }, /* Hf */
-       { NULL, NULL }, /* Fr */
-       { NULL, NULL }, /* Ud */
+       { NULL, NULL },                         /* \" */
+       { pres_prologue, posts_text },          /* Dd */
+       { pres_prologue, NULL },                /* Dt */
+       { pres_prologue, NULL },                /* Os */
+       { pres_sh, posts_sh },                  /* Sh */ 
+       { pres_ss, posts_ss },                  /* Ss */ 
+       { NULL, posts_pp },                     /* Pp */ 
+       { pres_d1, posts_wline },               /* D1 */
+       { pres_d1, posts_wline },               /* Dl */
+       { pres_bd, posts_bd },                  /* Bd */
+       { NULL, NULL },                         /* Ed */
+       { pres_bl, posts_bl },                  /* Bl */ 
+       { NULL, NULL },                         /* El */
+       { pres_it, posts_it },                  /* It */
+       { NULL, posts_text },                   /* Ad */ 
+       { pres_an, posts_an },                  /* An */ 
+       { NULL, NULL },                         /* Ar */
+       { pres_cd, posts_text },                /* Cd */ 
+       { NULL, NULL },                         /* Cm */
+       { NULL, posts_text },                   /* Dv */ 
+       { pres_er, posts_text },                /* Er */ 
+       { NULL, posts_text },                   /* Ev */ 
+       { pres_ex, posts_ex },                  /* Ex */ 
+       { NULL, posts_text },                   /* Fa */ 
+       { NULL, posts_fd },                     /* Fd */
+       { NULL, NULL },                         /* Fl */
+       { NULL, posts_text },                   /* Fn */ 
+       { NULL, posts_wtext },                  /* Ft */ 
+       { NULL, posts_text },                   /* Ic */ 
+       { NULL, posts_in },                     /* In */ 
+       { NULL, posts_text },                   /* Li */
+       { NULL, posts_wtext },                  /* Nd */
+       { NULL, posts_nm },                     /* Nm */
+       { NULL, posts_wline },                  /* Op */
+       { NULL, NULL },                         /* Ot */
+       { NULL, NULL },                         /* Pa */
+       { pres_rv, posts_notext },              /* Rv */
+       { pres_st, posts_notext },              /* St */ 
+       { NULL, posts_text },                   /* Va */
+       { NULL, posts_text },                   /* Vt */ 
+       { NULL, posts_xr },                     /* Xr */ 
+       { NULL, posts_text },                   /* %A */
+       { NULL, posts_text },                   /* %B */
+       { NULL, posts_text },                   /* %D */
+       { NULL, posts_text },                   /* %I */
+       { NULL, posts_text },                   /* %J */
+       { NULL, posts_text },                   /* %N */
+       { NULL, posts_text },                   /* %O */
+       { NULL, posts_text },                   /* %P */
+       { NULL, posts_text },                   /* %R */
+       { NULL, posts_text },                   /* %T */
+       { NULL, posts_text },                   /* %V */
+       { NULL, NULL },                         /* Ac */
+       { NULL, NULL },                         /* Ao */
+       { NULL, posts_wline },                  /* Aq */
+       { NULL, posts_at },                     /* At */ 
+       { NULL, NULL },                         /* Bc */
+       { NULL, posts_bf },                     /* Bf */
+       { NULL, NULL },                         /* Bo */
+       { NULL, posts_wline },                  /* Bq */
+       { NULL, NULL },                         /* Bsx */
+       { NULL, NULL },                         /* Bx */
+       { NULL, posts_bool },                   /* Db */
+       { NULL, NULL },                         /* Dc */
+       { NULL, NULL },                         /* Do */
+       { NULL, posts_wline },                  /* Dq */
+       { NULL, NULL },                         /* Ec */
+       { NULL, NULL },                         /* Ef */ 
+       { NULL, posts_text },                   /* Em */ 
+       { NULL, NULL },                         /* Eo */
+       { NULL, NULL },                         /* Fx */
+       { NULL, posts_text },                   /* Ms */ 
+       { NULL, posts_notext },                 /* No */
+       { NULL, posts_notext },                 /* Ns */
+       { NULL, NULL },                         /* Nx */
+       { NULL, NULL },                         /* Ox */
+       { NULL, NULL },                         /* Pc */
+       { NULL, posts_pf },                     /* Pf */
+       { NULL, NULL },                         /* Po */
+       { NULL, posts_wline },                  /* Pq */
+       { NULL, NULL },                         /* Qc */
+       { NULL, posts_wline },                  /* Ql */
+       { NULL, NULL },                         /* Qo */
+       { NULL, posts_wline },                  /* Qq */
+       { NULL, NULL },                         /* Re */
+       { NULL, posts_rs },                     /* Rs */
+       { NULL, NULL },                         /* Sc */
+       { NULL, NULL },                         /* So */
+       { NULL, posts_wline },                  /* Sq */
+       { NULL, posts_bool },                   /* Sm */ 
+       { NULL, posts_text },                   /* Sx */
+       { NULL, posts_text },                   /* Sy */
+       { NULL, posts_text },                   /* Tn */
+       { NULL, NULL },                         /* Ux */
+       { NULL, NULL },                         /* Xc */
+       { NULL, NULL },                         /* Xo */
+       { NULL, posts_fo },                     /* Fo */ 
+       { NULL, NULL },                         /* Fc */ 
+       { NULL, NULL },                         /* Oo */
+       { NULL, NULL },                         /* Oc */
+       { NULL, posts_bk },                     /* Bk */
+       { NULL, NULL },                         /* Ek */
+       { NULL, posts_notext },                 /* Bt */
+       { NULL, NULL },                         /* Hf */
+       { NULL, NULL },                         /* Fr */
+       { NULL, posts_notext },                 /* Ud */
 };
 
 
 };
 
 
-static int
-bodychild_warn_ge1(struct mdoc *mdoc)
+int
+mdoc_valid_pre(struct mdoc *mdoc, 
+               const struct mdoc_node *node)
 {
 {
+       v_pre           *p;
+       struct mdoc_arg *argv;
+       size_t           argc, i, j, line, pos;
+       const char      *tp;
+
+       if (MDOC_TEXT == node->type) {
+               tp = node->data.text.string;
+               line = node->line;
+               pos = node->pos;
+               return(check_text(mdoc, line, pos, tp));
+       }
 
 
-       if (MDOC_BODY != mdoc->last->type)
+       if (MDOC_BLOCK == node->type || MDOC_ELEM == node->type) {
+               argv = MDOC_BLOCK == node->type ?
+                       node->data.block.argv :
+                       node->data.elem.argv;
+               argc = MDOC_BLOCK == node->type ?
+                       node->data.block.argc :
+                       node->data.elem.argc;
+
+               for (i = 0; i < argc; i++) {
+                       if (0 == argv[i].sz)
+                               continue;
+                       for (j = 0; j < argv[i].sz; j++) {
+                               tp = argv[i].value[j];
+                               line = argv[i].line;
+                               pos = argv[i].pos;
+                               if ( ! check_text(mdoc, line, pos, tp))
+                                       return(0);
+                       }
+               }
+       }
+
+       if (NULL == mdoc_valids[node->tok].pre)
                return(1);
                return(1);
-       if (mdoc->last->child)
+       for (p = mdoc_valids[node->tok].pre; *p; p++)
+               if ( ! (*p)(mdoc, node)) 
+                       return(0);
+       return(1);
+}
+
+
+int
+mdoc_valid_post(struct mdoc *mdoc)
+{
+       v_post          *p;
+
+       /*
+        * This check occurs after the macro's children have been filled
+        * in: postfix validation.  Since this happens when we're
+        * rewinding the scope tree, it's possible to have multiple
+        * invocations (as by design, for now), we set bit MDOC_VALID to
+        * indicate that we've validated.
+        */
+
+       if (MDOC_VALID & mdoc->last->flags)
+               return(1);
+       mdoc->last->flags |= MDOC_VALID;
+
+       if (MDOC_TEXT == mdoc->last->type)
+               return(1);
+       if (MDOC_ROOT == mdoc->last->type)
+               return(post_root(mdoc));
+
+       if (NULL == mdoc_valids[mdoc->last->tok].post)
                return(1);
                return(1);
-       return(mdoc_warn(mdoc, WARN_ARGS_GE1));
+       for (p = mdoc_valids[mdoc->last->tok].post; *p; p++)
+               if ( ! (*p)(mdoc)) 
+                       return(0);
+
+       return(1);
+}
+
+
+
+static inline int
+warn_count(struct mdoc *m, const char *k, 
+               int want, const char *v, int has)
+{
+
+       return(mdoc_warn(m, WARN_SYNTAX, 
+                               "suggests %s %d %s (has %d)", 
+                               v, want, k, has));
+}
+
+
+static inline int
+err_count(struct mdoc *m, const char *k,
+               int want, const char *v, int has)
+{
+
+       return(mdoc_err(m, "requires %s %d %s (has %d)",
+                               v, want, k, 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,
+ * but this is reasonable for now.
+ */
+
+#define CHECK_CHILD_DEFN(lvl, name, ineq)                      \
+static int                                                     \
+lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz)   \
+{                                                              \
+       int i;                                                  \
+       if ((i = count_child(mdoc)) ineq sz)                    \
+               return(1);                                      \
+       return(lvl##_count(mdoc, #ineq, sz, p, i));             \
 }
 
 }
 
+#define CHECK_BODY_DEFN(name, lvl, func, num)                  \
+static int                                                     \
+b##lvl##_##name(POST_ARGS)                                     \
+{                                                              \
+       if (MDOC_BODY != mdoc->last->type)                      \
+               return(1);                                      \
+       return(func(mdoc, "multiline parameters", (num)));      \
+}
+
+#define CHECK_ELEM_DEFN(name, lvl, func, num)                  \
+static int                                                     \
+e##lvl##_##name(POST_ARGS)                                     \
+{                                                              \
+       assert(MDOC_ELEM == mdoc->last->type);                  \
+       return(func(mdoc, "line parameters", (num)));           \
+}
+
+#define CHECK_HEAD_DEFN(name, lvl, func, num)                  \
+static int                                                     \
+h##lvl##_##name(POST_ARGS)                                     \
+{                                                              \
+       if (MDOC_HEAD != mdoc->last->type)                      \
+               return(1);                                      \
+       return(func(mdoc, "multiline parameters", (num)));      \
+}
+
+
+CHECK_CHILD_DEFN(warn, gt, >)                  /* warn_child_gt() */
+CHECK_CHILD_DEFN(err, gt, >)                   /* err_child_gt() */
+CHECK_CHILD_DEFN(warn, eq, ==)                 /* warn_child_eq() */
+CHECK_CHILD_DEFN(err, eq, ==)                  /* err_child_eq() */
+CHECK_CHILD_DEFN(err, lt, <)                   /* err_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_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(le2, err, err_child_lt, 3)     /* eerr_le2() */
+CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)     /* eerr_le1() */
+CHECK_ELEM_DEFN(eq0, err, err_child_eq, 0)     /* eerr_eq0() */
+CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0)     /* eerr_ge1() */
+CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0)     /* herr_eq0() */
+CHECK_HEAD_DEFN(le1, err, err_child_lt, 2)     /* herr_le1() */
+CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0)     /* herr_ge1() */
+
 
 static int
 
 static int
-elemchild_warn_eq0(struct mdoc *mdoc)
+check_stdarg(PRE_ARGS)
 {
 
 {
 
-       assert(MDOC_ELEM == mdoc->last->type);
-       if (NULL == mdoc->last->child)
+       if (MDOC_Std == n->data.elem.argv[0].arg && 
+                       1 == n->data.elem.argc)
                return(1);
                return(1);
-       return(mdoc_pwarn(mdoc, mdoc->last->child->line,
-                       mdoc->last->child->pos, WARN_ARGS_EQ0));
+
+       return(mdoc_nwarn(mdoc, n, WARN_COMPAT, 
+                               "one argument suggested"));
 }
 
 
 static int
 }
 
 
 static int
-elemchild_err_ge1(struct mdoc *mdoc)
+check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs)
 {
 {
+       int              i;
 
 
-       assert(MDOC_ELEM == mdoc->last->type);
-       if (mdoc->last->child)
-               return(1);
-       return(mdoc_err(mdoc, ERR_ARGS_GE1));
+       for (i = 0; i < sz; i++)
+               if (msecs[i] == mdoc->meta.msec)
+                       return(1);
+       return(mdoc_nwarn(mdoc, n, WARN_COMPAT, 
+                               "invalid manual section"));
 }
 
 
 static int
 }
 
 
 static int
-headchild_err_eq0(struct mdoc *mdoc)
+check_text(struct mdoc *mdoc, size_t line, size_t pos, const char *p)
 {
 {
+       size_t           c;
+
+       for ( ; *p; p++) {
+               if ( ! isprint(*p) && '\t' != *p)
+                       return(mdoc_perr(mdoc, line, pos,
+                                       "invalid characters"));
+               if ('\\' != *p)
+                       continue;
+               if ((c = mdoc_isescape(p))) {
+                       p += (c - 1);
+                       continue;
+               }
+               return(mdoc_perr(mdoc, line, pos,
+                                       "invalid escape sequence"));
+       }
 
 
-       if (MDOC_HEAD != mdoc->last->type)
-               return(1);
-       if (NULL == mdoc->last->child)
-               return(1);
-       return(mdoc_perr(mdoc, mdoc->last->child->line,
-                       mdoc->last->child->pos, ERR_ARGS_EQ0));
+       return(1);
 }
 
 
 }
 
 
+
+
 static int
 static int
-headchild_err_ge1(struct mdoc *mdoc)
+check_parent(PRE_ARGS, int tok, enum mdoc_type t)
 {
 
 {
 
-       if (MDOC_HEAD != mdoc->last->type)
-               return(1);
-       if (mdoc->last->child)
+       assert(n->parent);
+       if ((MDOC_ROOT == t || tok == n->parent->tok) &&
+                       (t == n->parent->type))
                return(1);
                return(1);
-       return(mdoc_err(mdoc, ERR_ARGS_GE1));
+
+       return(mdoc_nerr(mdoc, n, "require parent %s",
+               MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]));
 }
 
 
 }
 
 
+
 static int
 static int
-pre_display(struct mdoc *mdoc, struct mdoc_node *node)
+pre_display(PRE_ARGS)
 {
 {
-       struct mdoc_node *n;
+       struct mdoc_node *node;
+
+       /* Display elements (`Bd', `D1'...) cannot be nested. */
 
 
-       if (MDOC_BLOCK != node->type)
+       if (MDOC_BLOCK != n->type)
                return(1);
 
                return(1);
 
-       for (n = mdoc->last; n; n = n->parent) 
-               if (MDOC_BLOCK == n->type)
-                       if (MDOC_Bd == n->tok)
+       /* LINTED */
+       for (node = mdoc->last->parent; node; node = node->parent) 
+               if (MDOC_BLOCK == node->type)
+                       if (MDOC_Bd == node->tok)
                                break;
                                break;
-       if (NULL == n)
+       if (NULL == node)
                return(1);
                return(1);
-       return(mdoc_verr(mdoc, node, ERR_SCOPE_NONEST));
+
+       return(mdoc_nerr(mdoc, n, "displays may not be nested"));
 }
 
 
 static int
 }
 
 
 static int
-pre_bl(struct mdoc *mdoc, struct mdoc_node *node)
+pre_bl(PRE_ARGS)
 {
 {
-       int              type, err;
+       int              type, err, i;
        struct mdoc_arg *argv;
        struct mdoc_arg *argv;
-       size_t           i, argc;
+       size_t           argc;
 
 
-       if (MDOC_BLOCK != node->type)
+       if (MDOC_BLOCK != n->type)
                return(1);
                return(1);
-       assert(MDOC_Bl == node->tok);
 
 
-       argv = NULL;
-       argc = node->data.block.argc; 
+       argc = n->data.block.argc; 
+
+       /* Make sure that only one type of list is specified.  */
+
+       /* LINTED */
+       for (i = 0, type = err = 0; i < (int)argc; i++) {
+               argv = &n->data.block.argv[i];
 
 
-       for (i = type = err = 0; i < argc; i++) {
-               argv = &node->data.block.argv[(int)i];
-               assert(argv);
                switch (argv->arg) {
                case (MDOC_Bullet):
                        /* FALLTHROUGH */
                switch (argv->arg) {
                case (MDOC_Bullet):
                        /* FALLTHROUGH */
@@ -293,107 +571,181 @@ pre_bl(struct mdoc *mdoc, struct mdoc_node *node)
                case (MDOC_Ohang):
                        /* FALLTHROUGH */
                case (MDOC_Inset):
                case (MDOC_Ohang):
                        /* FALLTHROUGH */
                case (MDOC_Inset):
-                       if (type)
-                               err++;
-                       type++;
-                       break;
+                       /* FALLTHROUGH */
+               case (MDOC_Column):
+                       if (0 == type++)
+                               break;
+                       return(mdoc_perr(mdoc, argv->line, argv->pos, 
+                                       "multiple types specified"));
                default:
                        break;
                }
        }
                default:
                        break;
                }
        }
-       if (0 == type)
-               return(mdoc_err(mdoc, ERR_SYNTAX_ARGMISS));
-       if (0 == err)
+
+       if (type)
                return(1);
                return(1);
-       assert(argv);
-       return(mdoc_perr(mdoc, argv->line, 
-                       argv->pos, ERR_SYNTAX_ARGBAD));
+       return(mdoc_err(mdoc, "no type specified"));
 }
 
 
 static int
 }
 
 
 static int
-pre_bd(struct mdoc *mdoc, struct mdoc_node *node)
+pre_bd(PRE_ARGS)
 {
 {
-       int              type, err;
+       int              type, err, i;
        struct mdoc_arg *argv;
        struct mdoc_arg *argv;
-       size_t           i, argc;
+       size_t           argc;
 
 
-       if (MDOC_BLOCK != node->type)
+       if (MDOC_BLOCK != n->type)
                return(1);
                return(1);
-       assert(MDOC_Bd == node->tok);
 
 
-       argv = NULL;
-       argc = node->data.block.argc;
+       argc = n->data.block.argc;
+
+       /* Make sure that only one type of display is specified.  */
+
+       /* LINTED */
+       for (i = 0, err = type = 0; ! err && i < (int)argc; i++) {
+               argv = &n->data.block.argv[i];
 
 
-       for (err = i = type = 0; 0 == err && i < argc; i++) {
-               argv = &node->data.block.argv[(int)i];
-               assert(argv);
                switch (argv->arg) {
                case (MDOC_Ragged):
                        /* FALLTHROUGH */
                case (MDOC_Unfilled):
                        /* FALLTHROUGH */
                switch (argv->arg) {
                case (MDOC_Ragged):
                        /* FALLTHROUGH */
                case (MDOC_Unfilled):
                        /* FALLTHROUGH */
+               case (MDOC_Filled):
+                       /* FALLTHROUGH */
                case (MDOC_Literal):
                        /* FALLTHROUGH */
                case (MDOC_File):
                case (MDOC_Literal):
                        /* FALLTHROUGH */
                case (MDOC_File):
-                       if (type)
-                               err++;
-                       type++;
-                       break;
+                       if (0 == type++) 
+                               break;
+                       return(mdoc_perr(mdoc, argv->line, argv->pos, 
+                                       "multiple types specified"));
                default:
                        break;
                }
        }
                default:
                        break;
                }
        }
-       if (0 == type)
-               return(mdoc_err(mdoc, ERR_SYNTAX_ARGMISS));
-       if (0 == err)
+
+       if (type)
                return(1);
                return(1);
-       assert(argv);
-       return(mdoc_perr(mdoc, argv->line, 
-                       argv->pos, ERR_SYNTAX_ARGBAD));
+       return(mdoc_err(mdoc, "no type specified"));
 }
 
 
 static int
 }
 
 
 static int
-pre_it(struct mdoc *mdoc, struct mdoc_node *node)
+pre_ss(PRE_ARGS)
 {
 
 {
 
-       if (MDOC_BLOCK != mdoc->last->type)
+       if (MDOC_BLOCK != n->type)
                return(1);
                return(1);
-       assert(MDOC_It == mdoc->last->tok);
+       return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
+}
 
 
-       if (MDOC_BODY != mdoc->last->parent->type) 
-               return(mdoc_verr(mdoc, node, ERR_SYNTAX_PARENTBAD));
-       if (MDOC_Bl != mdoc->last->parent->tok)
-               return(mdoc_verr(mdoc, node, ERR_SYNTAX_PARENTBAD));
 
 
-       return(1);
+static int
+pre_sh(PRE_ARGS)
+{
+
+       if (MDOC_BLOCK != n->type)
+               return(1);
+       return(check_parent(mdoc, n, -1, MDOC_ROOT));
 }
 
 
 static int
 }
 
 
 static int
-pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
+pre_it(PRE_ARGS)
 {
 
 {
 
-       if (SEC_PROLOGUE != mdoc->sec_lastn)
-               return(mdoc_verr(mdoc, node, ERR_SEC_NPROLOGUE));
-       assert(MDOC_ELEM == node->type);
+       /* TODO: -width attribute must be specified for -tag. */
+       /* TODO: children too big for -width? */
+
+       if (MDOC_BLOCK != n->type)
+               return(1);
+       return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
+}
+
+
+static int
+pre_st(PRE_ARGS)
+{
+
+       if (1 == n->data.elem.argc)
+               return(1);
+       return(mdoc_nerr(mdoc, n, "one argument required"));
+}
+
+
+static int
+pre_an(PRE_ARGS)
+{
+
+       if (1 >= n->data.elem.argc)
+               return(1);
+       return(mdoc_nerr(mdoc, n, "one argument allowed"));
+}
+
+
+static int
+pre_rv(PRE_ARGS)
+{
+       enum mdoc_msec msecs[] = { MSEC_2, MSEC_3 };
+
+       if ( ! check_msec(mdoc, n, 2, msecs))
+               return(0);
+       return(check_stdarg(mdoc, n));
+}
+
+
+static int
+pre_ex(PRE_ARGS)
+{
+       enum mdoc_msec msecs[] = { MSEC_1, MSEC_6, MSEC_8 };
+
+       if ( ! check_msec(mdoc, n, 3, msecs))
+               return(0);
+       return(check_stdarg(mdoc, n));
+}
+
+
+static int
+pre_er(PRE_ARGS)
+{
+       enum mdoc_msec msecs[] = { MSEC_2 };
+
+       return(check_msec(mdoc, n, 1, msecs));
+}
+
+
+static int
+pre_cd(PRE_ARGS)
+{
+       enum mdoc_msec msecs[] = { MSEC_4 };
+
+       return(check_msec(mdoc, n, 1, msecs));
+}
+
+
+static int
+pre_prologue(PRE_ARGS)
+{
+
+       if (SEC_PROLOGUE != mdoc->lastnamed)
+               return(mdoc_nerr(mdoc, n, "prologue only"));
 
        /* Check for ordering. */
 
 
        /* Check for ordering. */
 
-       switch (node->tok) {
+       switch (n->tok) {
        case (MDOC_Os):
        case (MDOC_Os):
-               if (mdoc->meta.title[0] && mdoc->meta.date)
+               if (mdoc->meta.title && mdoc->meta.date)
                        break;
                        break;
-               return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+               return(mdoc_nerr(mdoc, n, "prologue out-of-order"));
        case (MDOC_Dt):
        case (MDOC_Dt):
-               if (0 == mdoc->meta.title[0] && mdoc->meta.date)
+               if (NULL == mdoc->meta.title && mdoc->meta.date)
                        break;
                        break;
-               return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+               return(mdoc_nerr(mdoc, n, "prologue out-of-order"));
        case (MDOC_Dd):
        case (MDOC_Dd):
-               if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date)
+               if (NULL == mdoc->meta.title && 0 == mdoc->meta.date)
                        break;
                        break;
-               return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_OO));
+               return(mdoc_nerr(mdoc, n, "prologue out-of-order"));
        default:
                abort();
                /* NOTREACHED */
        default:
                abort();
                /* NOTREACHED */
@@ -401,9 +753,9 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 
        /* Check for repetition. */
 
 
        /* Check for repetition. */
 
-       switch (node->tok) {
+       switch (n->tok) {
        case (MDOC_Os):
        case (MDOC_Os):
-               if (0 == mdoc->meta.os[0])
+               if (NULL == mdoc->meta.os)
                        return(1);
                break;
        case (MDOC_Dd):
                        return(1);
                break;
        case (MDOC_Dd):
@@ -411,7 +763,7 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
                        return(1);
                break;
        case (MDOC_Dt):
                        return(1);
                break;
        case (MDOC_Dt):
-               if (0 == mdoc->meta.title[0])
+               if (NULL == mdoc->meta.title)
                        return(1);
                break;
        default:
                        return(1);
                break;
        default:
@@ -419,39 +771,142 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
                /* NOTREACHED */
        }
 
                /* NOTREACHED */
        }
 
-       return(mdoc_verr(mdoc, node, ERR_SEC_PROLOGUE_REP));
+       return(mdoc_nerr(mdoc, n, "prologue repetition"));
+}
+
+
+static int
+post_bf(POST_ARGS)
+{
+       char             *p;
+       struct mdoc_node *head;
+
+       if (MDOC_BLOCK != mdoc->last->type)
+               return(1);
+
+       head = mdoc->last->data.block.head;
+
+       if (0 == mdoc->last->data.block.argc) {
+               if (NULL == head->child)
+                       return(mdoc_err(mdoc, "argument expected"));
+
+               p = head->child->data.text.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 (head->child)
+               return(mdoc_err(mdoc, "argument expected"));
+
+       if (1 == mdoc->last->data.block.argc)
+               return(1);
+       return(mdoc_err(mdoc, "argument expected"));
+}
+
+
+static int
+post_nm(POST_ARGS)
+{
+
+       if (mdoc->last->child)
+               return(1);
+       if (mdoc->meta.name)
+               return(1);
+       return(mdoc_err(mdoc, "not yet invoked with name"));
+}
+
+
+static int
+post_xr(POST_ARGS)
+{
+       struct mdoc_node *n;
+
+       if (NULL == (n = mdoc->last->child->next))
+               return(1);
+       if (MSEC_DEFAULT != mdoc_atomsec(n->data.text.string))
+               return(1);
+       return(mdoc_nerr(mdoc, n, "invalid manual section"));
+}
+
+
+static int
+post_at(POST_ARGS)
+{
+
+       if (NULL == mdoc->last->child)
+               return(1);
+       if (ATT_DEFAULT != mdoc_atoatt(mdoc->last->child->data.text.string))
+               return(1);
+       return(mdoc_err(mdoc, "require valid symbol"));
+}
+
+
+static int
+post_an(POST_ARGS)
+{
+
+       if (0 != mdoc->last->data.elem.argc) {
+               if (NULL == mdoc->last->child)
+                       return(1);
+               return(mdoc_err(mdoc, "argument(s) expected"));
+       }
+
+       if (mdoc->last->child)
+               return(1);
+       return(mdoc_err(mdoc, "argument(s) expected"));
+}
+
+
+static int
+post_ex(POST_ARGS)
+{
+
+       if (0 == mdoc->last->data.elem.argc) {
+               if (mdoc->last->child)
+                       return(1);
+               return(mdoc_err(mdoc, "argument(s) expected"));
+       }
+       if (mdoc->last->child)
+               return(mdoc_err(mdoc, "argument(s) expected"));
+       if (1 != mdoc->last->data.elem.argc)
+               return(mdoc_err(mdoc, "argument(s) expected"));
+       if (MDOC_Std != mdoc->last->data.elem.argv[0].arg)
+               return(mdoc_err(mdoc, "argument(s) expected"));
+
+       return(1);
 }
 
 
 }
 
 
-/* Warn if `Bl' type-specific syntax isn't reflected in items. */
 static int
 static int
-post_it(struct mdoc *mdoc)
+post_it(POST_ARGS)
 {
 {
-       int               type, sv;
+       int               type, sv, i;
 #define        TYPE_NONE        (0)
 #define        TYPE_BODY        (1)
 #define        TYPE_HEAD        (2)
 #define        TYPE_NONE        (0)
 #define        TYPE_BODY        (1)
 #define        TYPE_HEAD        (2)
-       size_t            i, argc;
+#define        TYPE_OHEAD       (3)
+       size_t            argc;
        struct mdoc_node *n;
 
        if (MDOC_BLOCK != mdoc->last->type)
                return(1);
 
        struct mdoc_node *n;
 
        if (MDOC_BLOCK != mdoc->last->type)
                return(1);
 
-       assert(MDOC_It == mdoc->last->tok);
-
-       n = mdoc->last->parent;
-       assert(n);
-       assert(MDOC_Bl == n->tok);
-
-       n = n->parent;
-       assert(MDOC_BLOCK == n->type);
-       assert(MDOC_Bl == n->tok);
+       n = mdoc->last->parent->parent;
 
        argc = n->data.block.argc;
        type = TYPE_NONE;
 
        argc = n->data.block.argc;
        type = TYPE_NONE;
+       sv = -1;
+       
+       /* Some types require block-head, some not. */
 
 
-       for (i = 0; TYPE_NONE == type && i < argc; i++)
-               switch (n->data.block.argv[(int)i].arg) {
+       /* LINTED */
+       for (i = 0; TYPE_NONE == type && i < (int)argc; i++)
+               switch (n->data.block.argv[i].arg) {
                case (MDOC_Tag):
                        /* FALLTHROUGH */
                case (MDOC_Diag):
                case (MDOC_Tag):
                        /* FALLTHROUGH */
                case (MDOC_Diag):
@@ -462,7 +917,7 @@ post_it(struct mdoc *mdoc)
                        /* FALLTHROUGH */
                case (MDOC_Inset):
                        type = TYPE_HEAD;
                        /* FALLTHROUGH */
                case (MDOC_Inset):
                        type = TYPE_HEAD;
-                       sv = n->data.block.argv[(int)i].arg;
+                       sv = n->data.block.argv[i].arg;
                        break;
                case (MDOC_Bullet):
                        /* FALLTHROUGH */
                        break;
                case (MDOC_Bullet):
                        /* FALLTHROUGH */
@@ -473,10 +928,12 @@ post_it(struct mdoc *mdoc)
                case (MDOC_Hyphen):
                        /* FALLTHROUGH */
                case (MDOC_Item):
                case (MDOC_Hyphen):
                        /* FALLTHROUGH */
                case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
                        type = TYPE_BODY;
                        type = TYPE_BODY;
-                       sv = n->data.block.argv[(int)i].arg;
+                       sv = n->data.block.argv[i].arg;
+                       break;
+               case (MDOC_Column):
+                       type = TYPE_OHEAD;
+                       sv = n->data.block.argv[i].arg;
                        break;
                default:
                        break;
                        break;
                default:
                        break;
@@ -484,140 +941,217 @@ post_it(struct mdoc *mdoc)
 
        assert(TYPE_NONE != type);
 
 
        assert(TYPE_NONE != type);
 
+       n = mdoc->last->data.block.head;
+
        if (TYPE_HEAD == type) {
        if (TYPE_HEAD == type) {
-               if (NULL == (n = mdoc->last->data.block.head)) {
-                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
+               if (NULL == n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "argument(s) suggested"))
                                return(0);
                                return(0);
-               } else if (NULL == n->child)
-                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
+
+               n = mdoc->last->data.block.body;
+               if (NULL == n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "multiline body suggested"))
                                return(0);
 
                                return(0);
 
-               if (NULL == (n = mdoc->last->data.block.body)) {
-                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYBODY))
+       } else if (TYPE_BODY == type) {
+               if (n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "no argument suggested"))
                                return(0);
                                return(0);
-               } else if (NULL == n->child)
-                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYBODY))
+       
+               n = mdoc->last->data.block.body;
+               if (NULL == n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "multiline body suggested"))
+                               return(0);
+       } else {
+               if (NULL == n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "argument(s) suggested"))
+                               return(0);
+       
+               n = mdoc->last->data.block.body;
+               if (n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "no multiline body suggested"))
                                return(0);
                                return(0);
-
-               return(1);
        }
 
        }
 
-       if (NULL == (n = mdoc->last->data.block.head)) {
-               if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
-                       return(0);
-       } else if (NULL == n->child)
-               if ( ! mdoc_warn(mdoc, WARN_SYNTAX_EMPTYHEAD))
-                       return(0);
+       if (MDOC_Column != sv)
+               return(1);
 
 
-       if ((n = mdoc->last->data.block.body) && n->child)
-               if ( ! mdoc_warn(mdoc, WARN_SYNTAX_NOBODY))
-                       return(0);
+       argc = mdoc->last->parent->parent->data.block.argv->sz;
+       n = mdoc->last->data.block.head->child;
 
 
-       /* TODO: make sure columns are aligned. */
-       assert(MDOC_Column != sv);
+       for (i = 0; n; n = n->next)
+               i++;
 
 
-       return(1);
+       if (i == (int)argc)
+               return(1);
 
 
+       return(mdoc_err(mdoc, "need %zu columns (have %d)", argc, i));
 #undef TYPE_NONE
 #undef TYPE_BODY
 #undef TYPE_HEAD
 #undef TYPE_NONE
 #undef TYPE_BODY
 #undef TYPE_HEAD
+#undef TYPE_OHEAD
 }
 
 
 }
 
 
-/* Make sure that only `It' macros are our body-children. */
 static int
 static int
-post_bl(struct mdoc *mdoc)
+post_bl(POST_ARGS)
 {
 {
-       struct mdoc_node *n;
+       struct mdoc_node        *n;
 
        if (MDOC_BODY != mdoc->last->type)
                return(1);
 
        if (MDOC_BODY != mdoc->last->type)
                return(1);
-       assert(MDOC_Bl == mdoc->last->tok);
 
 
+       /* LINTED */
        for (n = mdoc->last->child; n; n = n->next) {
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;
                break;
        }
        for (n = mdoc->last->child; n; n = n->next) {
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)
                                continue;
                break;
        }
+
        if (NULL == n)
                return(1);
        if (NULL == n)
                return(1);
-       return(mdoc_verr(mdoc, n, ERR_SYNTAX_CHILDBAD));
+
+       return(mdoc_nerr(mdoc, n, "bad child of parent list"));
 }
 
 
 }
 
 
-/* Warn if conventional sections are out of order. */
 static int
 static int
-post_sh(struct mdoc *mdoc)
+ebool(struct mdoc *mdoc)
 {
 {
-       enum mdoc_sec     sec;
-       int               i;
        struct mdoc_node *n;
        struct mdoc_node *n;
-       char             *args[MDOC_LINEARG_MAX];
 
 
-       if (MDOC_HEAD != mdoc->last->type)
+       /* LINTED */
+       for (n = mdoc->last->child; n; n = n->next) {
+               if (MDOC_TEXT != n->type)
+                       break;
+               if (xstrcmp(n->data.text.string, "on"))
+                       continue;
+               if (xstrcmp(n->data.text.string, "off"))
+                       continue;
+               break;
+       }
+
+       if (NULL == n)
                return(1);
                return(1);
-       
-       assert(MDOC_Sh == mdoc->last->tok);
+       return(mdoc_nerr(mdoc, n, "expected boolean"));
+}
 
 
-       n = mdoc->last->child;
-       assert(n);
 
 
-       for (i = 0; n && i < MDOC_LINEARG_MAX; n = n->next, i++) {
-               assert(MDOC_TEXT == n->type);
-               assert(NULL == n->child);
-               assert(n->data.text.string);
-               args[i] = n->data.text.string;
-       }
+static int
+post_root(POST_ARGS)
+{
 
 
-       sec = mdoc_atosec((size_t)i, (const char **)args);
-       if (SEC_CUSTOM == sec)
-               return(1);
-       if (sec > mdoc->sec_lastn)
-               return(1);
+       if (NULL == mdoc->first->child)
+               return(mdoc_err(mdoc, "document lacks data"));
+       if (SEC_PROLOGUE == mdoc->lastnamed)
+               return(mdoc_err(mdoc, "document lacks prologue"));
+
+       if (MDOC_BLOCK != mdoc->first->child->type)
+               return(mdoc_err(mdoc, "lacking post-prologue %s", 
+                                       mdoc_macronames[MDOC_Sh]));
+       if (MDOC_Sh != mdoc->first->child->tok)
+               return(mdoc_err(mdoc, "lacking post-prologue %s", 
+                                       mdoc_macronames[MDOC_Sh]));
 
 
-       if (sec == mdoc->sec_lastn)
-               return(mdoc_warn(mdoc, WARN_SEC_REP));
-       return(mdoc_warn(mdoc, WARN_SEC_OO));
+       return(1);
 }
 
 
 }
 
 
-int
-mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node)
+static int
+post_sh(POST_ARGS)
 {
 {
-       v_pre           *p;
 
 
-       /* TODO: character-escape checks. */
+       if (MDOC_HEAD == mdoc->last->type)
+               return(post_sh_head(mdoc));
+       if (MDOC_BODY == mdoc->last->type)
+               return(post_sh_body(mdoc));
 
 
-       if (MDOC_TEXT == node->type)
-               return(1);
-       assert(MDOC_ROOT != node->type);
-
-       if (NULL == mdoc_valids[node->tok].pre)
-               return(1);
-       for (p = mdoc_valids[node->tok].pre; *p; p++)
-               if ( ! (*p)(mdoc, node)) 
-                       return(0);
        return(1);
 }
 
 
        return(1);
 }
 
 
-int
-mdoc_valid_post(struct mdoc *mdoc)
+static int
+post_sh_body(POST_ARGS)
 {
 {
-       v_post          *p;
+       struct mdoc_node *n;
 
 
-       if (MDOC_TEXT == mdoc->last->type)
+       if (SEC_NAME != mdoc->lastnamed)
                return(1);
                return(1);
-       if (MDOC_ROOT == mdoc->last->type)
+
+       /*
+        * Warn if the NAME section doesn't contain the `Nm' and `Nd'
+        * macros (can have multiple `Nm' and one `Nd').  Note that the
+        * children of the BODY declaration can also be "text".
+        */
+
+       if (NULL == (n = mdoc->last->child))
+               return(mdoc_warn(mdoc, WARN_SYNTAX, 
+                                       "section should have %s and %s",
+                                       mdoc_macronames[MDOC_Nm],
+                                       mdoc_macronames[MDOC_Nd]));
+
+       for ( ; n && n->next; n = n->next) {
+               if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
+                       continue;
+               if (MDOC_TEXT == n->type)
+                       continue;
+               if ( ! (mdoc_nwarn(mdoc, n, WARN_SYNTAX, 
+                                       "section should have %s first",
+                                       mdoc_macronames[MDOC_Nm])))
+                       return(0);
+       }
+
+       if (MDOC_ELEM == n->type && MDOC_Nd == n->tok)
                return(1);
 
                return(1);
 
-       if (NULL == mdoc_valids[mdoc->last->tok].post)
+       return(mdoc_warn(mdoc, WARN_SYNTAX, 
+                               "section should have %s last",
+                               mdoc_macronames[MDOC_Nd]));
+}
+
+
+static int
+post_sh_head(POST_ARGS)
+{
+       char              buf[64];
+       enum mdoc_sec     sec;
+
+       assert(MDOC_Sh == mdoc->last->tok);
+
+       if ( ! xstrlcats(buf, mdoc->last->child, sizeof(buf)))
+               return(mdoc_err(mdoc, "argument too long"));
+
+       sec = mdoc_atosec(buf);
+
+       if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec)
+               return(mdoc_warn(mdoc, WARN_SYNTAX, 
+                               "section NAME should be first"));
+       if (SEC_CUSTOM == sec)
                return(1);
                return(1);
-       for (p = mdoc_valids[mdoc->last->tok].post; *p; p++)
-               if ( ! (*p)(mdoc)) 
-                       return(0);
+       if (sec == mdoc->lastnamed)
+               return(mdoc_warn(mdoc, WARN_SYNTAX, 
+                               "section repeated"));
+       if (sec < mdoc->lastnamed)
+               return(mdoc_warn(mdoc, WARN_SYNTAX, 
+                               "section out of order"));
 
        return(1);
 }
 
 
        return(1);
 }
 
+
+static int
+post_fd(POST_ARGS)
+{
+
+       if (SEC_SYNOPSIS == mdoc->last->sec)
+               return(1);
+       return(mdoc_warn(mdoc, WARN_COMPAT, 
+                       "suggested only in section SYNOPSIS"));
+}
A git conversion mirror of mandoc.bsd.lv