A few more macros in place.

[mandoc.git] / validate.c

diff --git a/validate.c b/validate.c
index d7413fa5dca16dbf9f4e8aaa08b297e9dc60aa46..275375882525a597c66ec26317b45a2db2eef0d7 100644 (file)
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.35 2009/01/16 15:58:50 kristaps Exp $ */
+/* $Id: validate.c,v 1.49 2009/02/21 15:34:46 kristaps Exp $ */

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


@@ -21,20 +21,43 @@
 
 #include "private.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.
+ */

 
 typedef        int     (*v_pre)(struct mdoc *, struct mdoc_node *);
 typedef        int     (*v_post)(struct mdoc *);
 
 
 typedef        int     (*v_pre)(struct mdoc *, struct mdoc_node *);
 typedef        int     (*v_post)(struct mdoc *);
 

+/* FIXME: some sections should only occur in specific msecs. */
+/* FIXME: ignoring Pp. */
+/* FIXME: math symbols. */
+/* FIXME: valid character-escape checks. */
+/* FIXME: make sure required sections are included (NAME, ...). */

 
 struct valids {
        v_pre   *pre;
        v_post  *post;
 };
 
 
 struct valids {
        v_pre   *pre;
        v_post  *post;
 };
 

+/* Utility checks. */
+

 static int     pre_check_parent(struct mdoc *, struct mdoc_node *, 
                        int, enum mdoc_type);
 static int     pre_check_msecs(struct mdoc *, struct mdoc_node *, 
                        int, enum mdoc_msec *);
 static int     pre_check_parent(struct mdoc *, struct mdoc_node *, 
                        int, enum mdoc_type);
 static int     pre_check_msecs(struct mdoc *, struct mdoc_node *, 
                        int, enum mdoc_msec *);

+static int     pre_check_stdarg(struct mdoc *, struct mdoc_node *);
+static int     post_check_children_count(struct mdoc *);
+static int     post_check_children_lt(struct mdoc *, const char *, int);
+static int     post_check_children_gt(struct mdoc *, const char *, int);
+static int     post_check_children_wgt(struct mdoc *, const char *, int);
+static int     post_check_children_eq(struct mdoc *, const char *, int);
+static int     post_check_children_weq(struct mdoc *, const char *, int);
+
+/* Specific pre-child-parse routines. */

 
 static int     pre_display(struct mdoc *, struct mdoc_node *);
 static int     pre_sh(struct mdoc *, struct mdoc_node *);
 
 static int     pre_display(struct mdoc *, struct mdoc_node *);
 static int     pre_sh(struct mdoc *, struct mdoc_node *);


@@ -45,28 +68,42 @@ static      int     pre_it(struct mdoc *, struct mdoc_node *);
 static int     pre_cd(struct mdoc *, struct mdoc_node *);
 static int     pre_er(struct mdoc *, struct mdoc_node *);
 static int     pre_ex(struct mdoc *, struct mdoc_node *);
 static int     pre_cd(struct mdoc *, struct mdoc_node *);
 static int     pre_er(struct mdoc *, struct mdoc_node *);
 static int     pre_ex(struct mdoc *, struct mdoc_node *);

+static int     pre_rv(struct mdoc *, struct mdoc_node *);

 static int     pre_an(struct mdoc *, struct mdoc_node *);
 static int     pre_an(struct mdoc *, struct mdoc_node *);

+static int     pre_st(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     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     head_err_ge1(struct mdoc *);
-static int     head_warn_ge1(struct mdoc *);
-static int     head_err_eq0(struct mdoc *);
-static int     elem_err_eq0(struct mdoc *);
-static int     elem_err_le1(struct mdoc *);
-static int     elem_err_eq1(struct mdoc *);
-static int     elem_err_ge1(struct mdoc *);
-static int     elem_warn_eq0(struct mdoc *);
-static int     body_warn_ge1(struct mdoc *);
-static int     body_err_eq0(struct mdoc *);
-static int     elem_warn_ge1(struct mdoc *);
-static int     elem_bool(struct mdoc *);
+/* Specific post-child-parse routines. */
+
+static int     herr_ge1(struct mdoc *);
+static int     herr_le1(struct mdoc *);
+static int     herr_eq0(struct mdoc *);
+static int     eerr_eq0(struct mdoc *);
+static int     eerr_le1(struct mdoc *);
+static int     eerr_le2(struct mdoc *);
+static int     eerr_eq1(struct mdoc *);
+static int     eerr_ge1(struct mdoc *);
+static int     ewarn_eq0(struct mdoc *);
+static int     ewarn_eq1(struct mdoc *);
+static int     bwarn_ge1(struct mdoc *);
+static int     ewarn_ge1(struct mdoc *);
+static int     ebool(struct mdoc *);

 static int     post_sh(struct mdoc *);
 static int     post_sh(struct mdoc *);

+static int     post_sh_body(struct mdoc *);
+static int     post_sh_head(struct mdoc *);

 static int     post_bl(struct mdoc *);
 static int     post_it(struct mdoc *);
 static int     post_ex(struct mdoc *);
 static int     post_an(struct mdoc *);
 static int     post_bl(struct mdoc *);
 static int     post_it(struct mdoc *);
 static int     post_ex(struct mdoc *);
 static int     post_an(struct mdoc *);

+static int     post_at(struct mdoc *);
+static int     post_xr(struct mdoc *);
+static int     post_nm(struct mdoc *);
+static int     post_bf(struct mdoc *);
+static int     post_root(struct mdoc *);
+
+/* 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_prologue[] = { pre_prologue, NULL };
 static v_pre   pres_d1[] = { pre_display, NULL };


@@ -78,44 +115,48 @@ 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_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_an[] = { pre_an, NULL };

-
-static v_post  posts_bool[] = { elem_err_eq1, elem_bool, NULL };
-static v_post  posts_bd[] = { head_err_eq0, body_warn_ge1, NULL };
-static v_post  posts_text[] = { elem_err_ge1, NULL };
-static v_post  posts_wtext[] = { elem_warn_ge1, NULL };
-static v_post  posts_notext[] = { elem_err_eq0, NULL };
-static v_post  posts_wline[] = { head_warn_ge1, body_err_eq0, NULL };
-static v_post  posts_sh[] = { head_err_ge1, 
-                       body_warn_ge1, post_sh, NULL };
-static v_post  posts_bl[] = { head_err_eq0, 
-                       body_warn_ge1, post_bl, 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[] = { head_err_ge1, NULL };
-static v_post  posts_pp[] = { elem_warn_eq0, NULL };
-static v_post  posts_d1[] = { head_err_ge1, NULL };
-static v_post  posts_ex[] = { elem_err_le1, post_ex, NULL };
+static v_post  posts_in[] = { ewarn_eq1, NULL };
+static v_post  posts_ss[] = { herr_ge1, 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_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 };

 
 

+/* Per-macro pre- and post-child-check routine collections. */

 
 const  struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL }, /* \" */
        { pres_prologue, posts_text }, /* Dd */
        { pres_prologue, NULL }, /* Dt */
        { pres_prologue, NULL }, /* Os */
 
 const  struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL }, /* \" */
        { pres_prologue, posts_text }, /* Dd */
        { pres_prologue, NULL }, /* Dt */
        { pres_prologue, NULL }, /* Os */

-       /* FIXME: preceding Pp. */ 
-       /* FIXME: NAME section internal ordering. */

        { pres_sh, posts_sh }, /* Sh */ 
        { pres_sh, posts_sh }, /* Sh */ 

-       /* FIXME: preceding Pp. */

        { pres_ss, posts_ss }, /* Ss */ 
        { pres_ss, posts_ss }, /* Ss */ 

-       /* FIXME: proceeding Pp */

        { NULL, posts_pp }, /* Pp */ 
        { NULL, posts_pp }, /* Pp */ 

-       { pres_d1, posts_d1 }, /* D1 */
-       { pres_d1, posts_d1 }, /* Dl */
-        /* FIXME: preceding Pp. */
+       { pres_d1, posts_wline }, /* D1 */
+       { pres_d1, posts_wline }, /* Dl */

        { pres_bd, posts_bd }, /* Bd */
        { NULL, NULL }, /* Ed */
        { pres_bd, posts_bd }, /* Bd */
        { NULL, NULL }, /* Ed */

-       /* FIXME: preceding Pp. */

        { pres_bl, posts_bl }, /* Bl */ 
        { NULL, NULL }, /* El */
        { pres_it, posts_it }, /* It */
        { pres_bl, posts_bl }, /* Bl */ 
        { NULL, NULL }, /* El */
        { pres_it, posts_it }, /* It */


@@ -130,24 +171,23 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { pres_ex, posts_ex }, /* Ex */ 
        { NULL, posts_text }, /* Fa */ 
        /* FIXME: only in SYNOPSIS section. */
        { pres_ex, posts_ex }, /* Ex */ 
        { NULL, posts_text }, /* Fa */ 
        /* FIXME: only in SYNOPSIS section. */

-       { NULL, NULL }, /* Fd */
+       { NULL, posts_wtext }, /* Fd */

        { NULL, NULL }, /* Fl */
        { NULL, posts_text }, /* Fn */ 
        { NULL, NULL }, /* Fl */
        { NULL, posts_text }, /* Fn */ 

-       { NULL, NULL }, /* Ft */ 
+       { NULL, posts_wtext }, /* Ft */ 

        { NULL, posts_text }, /* Ic */ 
        { NULL, posts_text }, /* Ic */ 

-       { NULL, posts_wtext }, /* In */ 
+       { NULL, posts_in }, /* In */ 

        { NULL, posts_text }, /* Li */
        { NULL, posts_wtext }, /* Nd */
        { NULL, posts_text }, /* Li */
        { NULL, posts_wtext }, /* Nd */

-       /* FIXME: check that name must be set/provided. */
-       { NULL, NULL }, /* Nm */
+       { NULL, posts_nm }, /* Nm */

        { NULL, posts_wline }, /* Op */
        { NULL, NULL }, /* Ot */
        { NULL, NULL }, /* Pa */
        { NULL, posts_wline }, /* Op */
        { NULL, NULL }, /* Ot */
        { NULL, NULL }, /* Pa */

-       { NULL, posts_notext }, /* Rv */ /* FIXME: -std required */
-       { NULL, posts_notext }, /* St */ /* FIXME: arg required */
+       { pres_rv, posts_notext }, /* Rv */
+       { pres_st, posts_notext }, /* St */ 

        { NULL, posts_text }, /* Va */
        { NULL, posts_text }, /* Vt */ 
        { NULL, posts_text }, /* Va */
        { NULL, posts_text }, /* Vt */ 

-       { NULL, NULL }, /* Xr */ /* FIXME: valid arguments */
+       { NULL, posts_xr }, /* Xr */ 

        { NULL, posts_text }, /* %A */
        { NULL, posts_text }, /* %B */
        { NULL, posts_text }, /* %D */
        { NULL, posts_text }, /* %A */
        { NULL, posts_text }, /* %B */
        { NULL, posts_text }, /* %D */


@@ -162,9 +202,9 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ao */
        { NULL, posts_wline }, /* Aq */
        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ao */
        { NULL, posts_wline }, /* Aq */

-       { NULL, NULL }, /* At */ /* FIXME: valid arguments */
+       { NULL, posts_at }, /* At */ 

        { NULL, NULL }, /* Bc */
        { NULL, NULL }, /* Bc */

-       { NULL, NULL }, /* Bf */ 
+       { NULL, posts_bf }, /* Bf */

        { NULL, NULL }, /* Bo */
        { NULL, posts_wline }, /* Bq */
        { NULL, NULL }, /* Bsx */
        { NULL, NULL }, /* Bo */
        { NULL, posts_wline }, /* Bq */
        { NULL, NULL }, /* Bsx */


@@ -178,7 +218,7 @@ const       struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, posts_text }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { NULL, NULL }, /* Fx */
        { NULL, posts_text }, /* Em */ 
        { NULL, NULL }, /* Eo */
        { NULL, NULL }, /* Fx */

-       { NULL, posts_text }, /* Ms */ /* FIXME: which symbols? */
+       { NULL, posts_text }, /* Ms */ 

        { NULL, posts_notext }, /* No */
        { NULL, posts_notext }, /* Ns */
        { NULL, NULL }, /* Nx */
        { NULL, posts_notext }, /* No */
        { NULL, posts_notext }, /* Ns */
        { NULL, NULL }, /* Nx */


@@ -186,13 +226,13 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL }, /* Pc */
        { NULL, NULL }, /* Pf */
        { NULL, NULL }, /* Po */
        { NULL, NULL }, /* Pc */
        { NULL, NULL }, /* Pf */
        { NULL, NULL }, /* Po */

-       { NULL, posts_wline }, /* Pq */ /* FIXME: ignore following Sh/Ss */
+       { NULL, posts_wline }, /* Pq */

        { NULL, NULL }, /* Qc */
        { NULL, posts_wline }, /* Ql */
        { NULL, NULL }, /* Qo */
        { NULL, posts_wline }, /* Qq */
        { NULL, NULL }, /* Re */
        { NULL, NULL }, /* Qc */
        { NULL, posts_wline }, /* Ql */
        { NULL, NULL }, /* Qo */
        { NULL, posts_wline }, /* Qq */
        { NULL, NULL }, /* Re */

-       { NULL, NULL }, /* Rs */
+       { NULL, posts_rs }, /* Rs */

        { NULL, NULL }, /* Sc */
        { NULL, NULL }, /* So */
        { NULL, posts_wline }, /* Sq */
        { NULL, NULL }, /* Sc */
        { NULL, NULL }, /* So */
        { NULL, posts_wline }, /* Sq */


@@ -203,11 +243,11 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL }, /* Ux */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
        { NULL, NULL }, /* Ux */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */

-       { NULL, NULL }, /* Fo */ 
+       { NULL, posts_fo }, /* Fo */ 

        { NULL, NULL }, /* Fc */ 
        { NULL, NULL }, /* Oo */
        { NULL, NULL }, /* Oc */
        { NULL, NULL }, /* Fc */ 
        { NULL, NULL }, /* Oo */
        { NULL, NULL }, /* Oc */

-       { NULL, NULL }, /* Bk */
+       { NULL, posts_bk }, /* Bk */

        { NULL, NULL }, /* Ek */
        { NULL, posts_notext }, /* Bt */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Ek */
        { NULL, posts_notext }, /* Bt */
        { NULL, NULL }, /* Hf */


@@ -216,6 +256,91 @@ const      struct valids mdoc_valids[MDOC_MAX] = {
 };
 
 
 };
 
 

+static int
+post_check_children_count(struct mdoc *mdoc)
+{
+       struct mdoc_node *n;
+       int               i;
+
+       for (i = 0, n = mdoc->last->child; n; n = n->next, i++)
+               /* Do nothing */ ;
+       return(i);
+}
+
+
+static int
+post_check_children_wgt(struct mdoc *mdoc, const char *p, int sz)
+{
+       int               i;
+
+       if ((i = post_check_children_count(mdoc)) > sz)
+               return(1);
+       return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests more "
+                               "than %d %s (has %d)", sz, p, i));
+}
+
+
+static int
+post_check_children_gt(struct mdoc *mdoc, const char *p, int sz)
+{
+       int               i;
+
+       if ((i = post_check_children_count(mdoc)) > sz)
+               return(1);
+       return(mdoc_err(mdoc, "macro requires more than %d "
+                               "%s (has %d)", sz, p, i));
+}
+
+
+static int
+post_check_children_weq(struct mdoc *mdoc, const char *p, int sz)
+{
+       int               i;
+
+       if ((i = post_check_children_count(mdoc)) == sz)
+               return(1);
+       return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests %d "
+                               "%s (has %d)", sz, p, i));
+}
+
+
+static int
+post_check_children_eq(struct mdoc *mdoc, const char *p, int sz)
+{
+       int               i;
+
+       if ((i = post_check_children_count(mdoc)) == sz)
+               return(1);
+       return(mdoc_err(mdoc, "macro requires %d %s "
+                               "(have %d)", sz, p, i));
+}
+
+
+static int
+post_check_children_lt(struct mdoc *mdoc, const char *p, int sz)
+{
+       int               i;
+
+       if ((i = post_check_children_count(mdoc)) < sz)
+               return(1);
+       return(mdoc_err(mdoc, "macro requires less than %d "
+                               "%s (have %d)", sz, p, i));
+}
+
+
+static int
+pre_check_stdarg(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+       if (1 == node->data.elem.argc &&
+                       MDOC_Std == node->data.elem.argv[0].arg)
+               return(1);
+       return(mdoc_nwarn(mdoc, node, WARN_COMPAT, 
+                               "macro suggests single `%s' argument",
+                               mdoc_argnames[MDOC_Std]));
+}
+
+

 static int
 pre_check_msecs(struct mdoc *mdoc, struct mdoc_node *node, 
                int sz, enum mdoc_msec *msecs)
 static int
 pre_check_msecs(struct mdoc *mdoc, struct mdoc_node *node, 
                int sz, enum mdoc_msec *msecs)


@@ -225,8 +350,8 @@ pre_check_msecs(struct mdoc *mdoc, struct mdoc_node *node,
        for (i = 0; i < sz; i++)
                if (msecs[i] == mdoc->meta.msec)
                        return(1);
        for (i = 0; i < sz; i++)
                if (msecs[i] == mdoc->meta.msec)
                        return(1);

-       return(mdoc_nwarn(mdoc, node, WARN_COMPAT,
-                               "macro is not appropriate for this manual section"));
+       return(mdoc_nwarn(mdoc, node, WARN_COMPAT, "macro not "
+                               "appropriate for manual section"));

 }
 
 
 }
 
 


@@ -248,134 +373,113 @@ pre_check_parent(struct mdoc *mdoc, struct mdoc_node *node,
 
 
 static int
 
 
 static int

-body_err_eq0(struct mdoc *mdoc)
+bwarn_ge1(struct mdoc *mdoc)

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

-       if (NULL == mdoc->last->child)
-               return(1);
-       return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no body children"));
+       return(post_check_children_wgt(mdoc, "body children", 0));

 }
 
 
 static int
 }
 
 
 static int

-body_warn_ge1(struct mdoc *mdoc)
+ewarn_eq1(struct mdoc *mdoc)

 {
 
 {
 

-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-       if (mdoc->last->child)
-               return(1);
-       return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more body children"));
+       assert(MDOC_ELEM == mdoc->last->type);
+       return(post_check_children_weq(mdoc, "parameters", 1));

 }
 
 
 static int
 }
 
 
 static int

-elem_warn_eq0(struct mdoc *mdoc)
+ewarn_eq0(struct mdoc *mdoc)

 {
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
 
        assert(MDOC_ELEM == mdoc->last->type);

-       if (NULL == mdoc->last->child)
-               return(1);
-       return(mdoc_pwarn(mdoc, mdoc->last->child->line,
-                       mdoc->last->child->pos, WARN_SYNTAX, "macro suggests no parameters"));
+       return(post_check_children_weq(mdoc, "parameters", 0));

 }
 
 
 static int
 }
 
 
 static int

-elem_warn_ge1(struct mdoc *mdoc)
+ewarn_ge1(struct mdoc *mdoc)

 {
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
 
        assert(MDOC_ELEM == mdoc->last->type);

-       if (mdoc->last->child)
-               return(1);
-       return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more parameters"));
+       return(post_check_children_wgt(mdoc, "parameters", 0));

 }
 
 
 static int
 }
 
 
 static int

-elem_err_eq1(struct mdoc *mdoc)
+eerr_eq1(struct mdoc *mdoc)

 {
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
 
        assert(MDOC_ELEM == mdoc->last->type);

-       if (NULL == mdoc->last->child)
-               return(mdoc_err(mdoc, "macro expects one parameter"));
-       if (mdoc->last->child->next)
-               return(mdoc_err(mdoc, "macro expects one parameter"));
-       return(1);
+       return(post_check_children_eq(mdoc, "parameters", 1));

 }
 
 
 static int
 }
 
 
 static int

-elem_err_le1(struct mdoc *mdoc)
+eerr_le2(struct mdoc *mdoc)

 {
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
 
        assert(MDOC_ELEM == mdoc->last->type);

-       if (NULL == mdoc->last->child)
-               return(1);
-       if (NULL == mdoc->last->child->next)
-               return(1);
-       return(mdoc_err(mdoc, "macro expects one or fewer parameters"));
+       return(post_check_children_lt(mdoc, "parameters", 3));

 }
 
 
 static int
 }
 
 
 static int

-elem_err_eq0(struct mdoc *mdoc)
+eerr_le1(struct mdoc *mdoc)

 {
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
 
        assert(MDOC_ELEM == mdoc->last->type);

-       if (NULL == mdoc->last->child)
-               return(1);
-       return(mdoc_err(mdoc, "macro expects no parameters"));
+       return(post_check_children_lt(mdoc, "parameters", 2));

 }
 
 
 static int
 }
 
 
 static int

-elem_err_ge1(struct mdoc *mdoc)
+eerr_eq0(struct mdoc *mdoc)

 {
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
 
        assert(MDOC_ELEM == mdoc->last->type);

-       if (mdoc->last->child)
-               return(1);
-       return(mdoc_err(mdoc, "macro expects one or more parameters"));
+       return(post_check_children_eq(mdoc, "parameters", 0));

 }
 
 
 static int
 }
 
 
 static int

-head_err_eq0(struct mdoc *mdoc)
+eerr_ge1(struct mdoc *mdoc)

 {
 
 {
 

-       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, "macro expects no parameters"));
+       assert(MDOC_ELEM == mdoc->last->type);
+       return(post_check_children_gt(mdoc, "parameters", 0));

 }
 
 
 static int
 }
 
 
 static int

-head_warn_ge1(struct mdoc *mdoc)
+herr_eq0(struct mdoc *mdoc)

 {
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);
 {
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);

-       if (mdoc->last->child)
+       return(post_check_children_eq(mdoc, "parameters", 0));
+}
+
+
+static int
+herr_le1(struct mdoc *mdoc)
+{
+       if (MDOC_HEAD != mdoc->last->type)

                return(1);
                return(1);

-       return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more parameters"));
+       return(post_check_children_lt(mdoc, "parameters", 2));

 }
 
 
 static int
 }
 
 
 static int

-head_err_ge1(struct mdoc *mdoc)
+herr_ge1(struct mdoc *mdoc)

 {
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);
 {
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);

-       if (mdoc->last->child)
-               return(1);
-       return(mdoc_err(mdoc, "macro expects one or more parameters"));
+       return(post_check_children_gt(mdoc, "parameters", 0));

 }
 
 
 }
 
 


@@ -388,6 +492,7 @@ pre_display(struct mdoc *mdoc, struct mdoc_node *node)
                return(1);
 
        assert(mdoc->last);
                return(1);
 
        assert(mdoc->last);

+       /* LINTED */

        for (n = mdoc->last->parent; n; n = n->parent) 
                if (MDOC_BLOCK == n->type)
                        if (MDOC_Bd == n->tok)
        for (n = mdoc->last->parent; n; n = n->parent) 
                if (MDOC_BLOCK == n->type)
                        if (MDOC_Bd == n->tok)


@@ -412,6 +517,7 @@ pre_bl(struct mdoc *mdoc, struct mdoc_node *node)
        argv = NULL;
        argc = node->data.block.argc; 
 
        argv = NULL;
        argc = node->data.block.argc; 
 

+       /* LINTED */

        for (i = type = err = 0; i < argc; i++) {
                argv = &node->data.block.argv[(int)i];
                assert(argv);
        for (i = type = err = 0; i < argc; i++) {
                argv = &node->data.block.argv[(int)i];
                assert(argv);


@@ -469,6 +575,7 @@ pre_bd(struct mdoc *mdoc, struct mdoc_node *node)
        argv = NULL;
        argc = node->data.block.argc;
 
        argv = NULL;
        argc = node->data.block.argc;
 

+       /* LINTED */

        for (err = i = type = 0; 0 == err && i < argc; i++) {
                argv = &node->data.block.argv[(int)i];
                assert(argv);
        for (err = i = type = 0; 0 == err && i < argc; i++) {
                argv = &node->data.block.argv[(int)i];
                assert(argv);


@@ -520,9 +627,22 @@ pre_sh(struct mdoc *mdoc, struct mdoc_node *node)
 }
 
 
 }
 
 

+static int
+pre_st(struct mdoc *mdoc, struct mdoc_node *node)
+{
+
+       assert(MDOC_ELEM == node->type);
+       assert(MDOC_St == node->tok);
+       if (1 == node->data.elem.argc)
+               return(1);
+       return(mdoc_nerr(mdoc, node, "macro must have one argument"));
+}
+
+

 static int
 pre_an(struct mdoc *mdoc, struct mdoc_node *node)
 {
 static int
 pre_an(struct mdoc *mdoc, struct mdoc_node *node)
 {

+

        assert(MDOC_ELEM == node->type);
        assert(MDOC_An == node->tok);
        if (1 >= node->data.elem.argc)
        assert(MDOC_ELEM == node->type);
        assert(MDOC_An == node->tok);
        if (1 >= node->data.elem.argc)


@@ -531,32 +651,36 @@ pre_an(struct mdoc *mdoc, struct mdoc_node *node)
 }
 
 
 }
 
 

+static int
+pre_rv(struct mdoc *mdoc, struct mdoc_node *node)
+{
+       enum mdoc_msec   msecs[2];
+
+       assert(MDOC_ELEM == node->type);
+       assert(MDOC_Rv == node->tok);
+
+       msecs[0] = MSEC_2;
+       msecs[1] = MSEC_3;
+       if ( ! pre_check_msecs(mdoc, node, 2, msecs))
+               return(0);
+       return(pre_check_stdarg(mdoc, node));
+}
+
+

 static int
 pre_ex(struct mdoc *mdoc, struct mdoc_node *node)
 {
        enum mdoc_msec   msecs[3];
 
        assert(MDOC_ELEM == node->type);
 static int
 pre_ex(struct mdoc *mdoc, struct mdoc_node *node)
 {
        enum mdoc_msec   msecs[3];
 
        assert(MDOC_ELEM == node->type);

+       assert(MDOC_Ex == node->tok);

 
        msecs[0] = MSEC_1;
        msecs[1] = MSEC_6;
        msecs[2] = MSEC_8;
        if ( ! pre_check_msecs(mdoc, node, 3, msecs))
                return(0);
 
        msecs[0] = MSEC_1;
        msecs[1] = MSEC_6;
        msecs[2] = MSEC_8;
        if ( ! pre_check_msecs(mdoc, node, 3, msecs))
                return(0);

-
-       if (1 != node->data.elem.argc) {
-               if ( ! mdoc_nwarn(mdoc, node, WARN_COMPAT, 
-                                       "macro suggests `%s' argument",
-                                       mdoc_argnames[MDOC_Std]))
-                       return(0);
-               return(1);
-       }
-       if (MDOC_Std != node->data.elem.argv[0].arg)
-               if ( ! mdoc_nwarn(mdoc, node, WARN_COMPAT, 
-                                       "macro suggests `%s' argument",
-                                       mdoc_argnames[MDOC_Std]))
-                       return(0);
-       return(1);
+       return(pre_check_stdarg(mdoc, node));

 }
 
 
 }
 
 


@@ -584,6 +708,9 @@ static int
 pre_it(struct mdoc *mdoc, struct mdoc_node *node)
 {
 
 pre_it(struct mdoc *mdoc, struct mdoc_node *node)
 {
 

+       /* TODO: -width attribute must be specified for -tag. */
+       /* TODO: children too big for -width? */
+

        if (MDOC_BLOCK != node->type)
                return(1);
        return(pre_check_parent(mdoc, node, MDOC_Bl, MDOC_BODY));
        if (MDOC_BLOCK != node->type)
                return(1);
        return(pre_check_parent(mdoc, node, MDOC_Bl, MDOC_BODY));


@@ -594,7 +721,7 @@ static int
 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 {
 
 pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 {
 

-       if (SEC_PROLOGUE != mdoc->sec_lastn)
+       if (SEC_PROLOGUE != mdoc->lastnamed)

                return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue"));
        assert(MDOC_ELEM == node->type);
 
                return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue"));
        assert(MDOC_ELEM == node->type);
 


@@ -602,15 +729,15 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 
        switch (node->tok) {
        case (MDOC_Os):
 
        switch (node->tok) {
        case (MDOC_Os):

-               if (mdoc->meta.title[0] && mdoc->meta.date)
+               if (mdoc->meta.title && mdoc->meta.date)

                        break;
                return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));
        case (MDOC_Dt):
                        break;
                return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));
        case (MDOC_Dt):

-               if (0 == mdoc->meta.title[0] && mdoc->meta.date)
+               if (NULL == mdoc->meta.title && mdoc->meta.date)

                        break;
                return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));
        case (MDOC_Dd):
                        break;
                return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));
        case (MDOC_Dd):

-               if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date)
+               if (NULL == mdoc->meta.title && 0 == mdoc->meta.date)

                        break;
                return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));
        default:
                        break;
                return(mdoc_nerr(mdoc, node, "prologue macro out-of-order"));
        default:


@@ -622,7 +749,7 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 
        switch (node->tok) {
        case (MDOC_Os):
 
        switch (node->tok) {
        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):


@@ -630,7 +757,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:


@@ -642,6 +769,91 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node)
 }
 
 
 }
 
 

+static int
+post_bf(struct mdoc *mdoc)
+{
+       char             *p;
+       struct mdoc_node *head;
+
+       if (MDOC_BLOCK != mdoc->last->type)
+               return(1);
+       assert(MDOC_Bf == mdoc->last->tok);
+       head = mdoc->last->data.block.head;
+       assert(head);
+
+       if (0 == mdoc->last->data.block.argc) {
+               if (head->child) {
+                       assert(MDOC_TEXT == head->child->type);
+                       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 mode"));
+               }
+               return(mdoc_err(mdoc, "macro expects an argument or parameter"));
+       }
+       if (head->child)
+               return(mdoc_err(mdoc, "macro expects an argument or parameter"));
+       if (1 == mdoc->last->data.block.argc)
+               return(1);
+       return(mdoc_err(mdoc, "macro expects an argument or parameter"));
+}
+
+
+static int
+post_nm(struct mdoc *mdoc)
+{
+
+       assert(MDOC_ELEM == mdoc->last->type);
+       assert(MDOC_Nm == mdoc->last->tok);
+       if (mdoc->last->child)
+               return(1);
+       if (mdoc->meta.name)
+               return(1);
+       return(mdoc_err(mdoc, "macro `%s' has not been invoked with a name",
+                               mdoc_macronames[MDOC_Nm]));
+}
+
+
+static int
+post_xr(struct mdoc *mdoc)
+{
+       struct mdoc_node *n;
+
+       assert(MDOC_ELEM == mdoc->last->type);
+       assert(MDOC_Xr == mdoc->last->tok);
+       assert(mdoc->last->child);
+       assert(MDOC_TEXT == mdoc->last->child->type);
+
+       if (NULL == (n = mdoc->last->child->next))
+               return(1);
+       assert(MDOC_TEXT == n->type);
+       if (MSEC_DEFAULT != mdoc_atomsec(n->data.text.string))
+               return(1);
+       return(mdoc_nerr(mdoc, n, "invalid manual section"));
+}
+
+
+static int
+post_at(struct mdoc *mdoc)
+{
+
+       assert(MDOC_ELEM == mdoc->last->type);
+       assert(MDOC_At == mdoc->last->tok);
+
+       if (NULL == mdoc->last->child)
+               return(1);
+       assert(MDOC_TEXT == mdoc->last->child->type);
+
+       if (ATT_DEFAULT != mdoc_atoatt(mdoc->last->child->data.text.string))
+               return(1);
+       return(mdoc_err(mdoc, "macro expects a valid AT&T version symbol"));
+}
+
+

 static int
 post_an(struct mdoc *mdoc)
 {
 static int
 post_an(struct mdoc *mdoc)
 {


@@ -695,6 +907,7 @@ post_it(struct mdoc *mdoc)
 #define        TYPE_NONE        (0)
 #define        TYPE_BODY        (1)
 #define        TYPE_HEAD        (2)
 #define        TYPE_NONE        (0)
 #define        TYPE_BODY        (1)
 #define        TYPE_HEAD        (2)

+#define        TYPE_OHEAD       (3)

        size_t            i, argc;
        struct mdoc_node *n;
 
        size_t            i, argc;
        struct mdoc_node *n;
 


@@ -713,9 +926,11 @@ post_it(struct mdoc *mdoc)
 
        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. */
 
        
        /* Some types require block-head, some not. */
 

+       /* LINTED */

        for (i = 0; TYPE_NONE == type && i < argc; i++)
                switch (n->data.block.argv[(int)i].arg) {
                case (MDOC_Tag):
        for (i = 0; TYPE_NONE == type && i < argc; i++)
                switch (n->data.block.argv[(int)i].arg) {
                case (MDOC_Tag):


@@ -739,20 +954,23 @@ 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;
                        sv = n->data.block.argv[(int)i].arg;
                        break;
                        type = TYPE_BODY;
                        sv = n->data.block.argv[(int)i].arg;
                        break;

+               case (MDOC_Column):
+                       type = TYPE_OHEAD;
+                       sv = n->data.block.argv[(int)i].arg;
+                       break;

                default:
                        break;
                }
 
        assert(TYPE_NONE != type);
 
                default:
                        break;
                }
 
        assert(TYPE_NONE != type);
 

+       n = mdoc->last->data.block.head;
+       assert(n);
+

        if (TYPE_HEAD == type) {
        if (TYPE_HEAD == type) {

-               n = mdoc->last->data.block.head;
-               assert(n);

                if (NULL == n->child)
                        if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters"))
                                return(0);
                if (NULL == n->child)
                        if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters"))
                                return(0);


@@ -763,45 +981,49 @@ post_it(struct mdoc *mdoc)
                        if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children"))
                                return(0);
 
                        if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children"))
                                return(0);
 

-               return(1);
+       } else if (TYPE_BODY == type) {
+               if (n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no line parameters"))
+                               return(0);
+       
+               n = mdoc->last->data.block.body;
+               assert(n);
+               if (NULL == n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children"))
+                               return(0);
+       } else {
+               if (NULL == n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters"))
+                               return(0);
+       
+               n = mdoc->last->data.block.body;
+               assert(n);
+               if (n->child)
+                       if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no body children"))
+                               return(0);

        }
 
        }
 

-       assert(TYPE_BODY == type);
-       assert(mdoc->last->data.block.head);
-
-       n = mdoc->last->data.block.head;
-       assert(n);
-       if (n->child)
-               if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no line parameters"))
-                       return(0);
-
-       n = mdoc->last->data.block.body;
-       assert(n);
-       if (NULL == n->child)
-               if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children"))
-                       return(0);
-
-       if (MDOC_Column != sv) 
+       if (MDOC_Column != sv)

                return(1);
 
        /* Make sure the number of columns is sane. */
 
                return(1);
 
        /* Make sure the number of columns is sane. */
 

-       sv = mdoc->last->parent->parent->data.block.argv->sz;
+       argc = mdoc->last->parent->parent->data.block.argv->sz;

        n = mdoc->last->data.block.head->child;
 
        for (i = 0; n; n = n->next)
                i++;
 
        n = mdoc->last->data.block.head->child;
 
        for (i = 0; n; n = n->next)
                i++;
 

-       if (i == (size_t)sv)
+       if (i == argc)

                return(1);
                return(1);

-       return(mdoc_err(mdoc, "expected %d list columns, have %d", sv, (int)i));
+       return(mdoc_err(mdoc, "expected %zu list columns, have %zu", 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
 post_bl(struct mdoc *mdoc)
 {
 static int
 post_bl(struct mdoc *mdoc)
 {


@@ -811,6 +1033,7 @@ post_bl(struct mdoc *mdoc)
                return(1);
        assert(MDOC_Bl == mdoc->last->tok);
 
                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)
        for (n = mdoc->last->child; n; n = n->next) {
                if (MDOC_BLOCK == n->type) 
                        if (MDOC_It == n->tok)


@@ -824,11 +1047,12 @@ post_bl(struct mdoc *mdoc)
 
 
 static int
 
 
 static int

-elem_bool(struct mdoc *mdoc)
+ebool(struct mdoc *mdoc)

 {
        struct mdoc_node *n;
 
        assert(MDOC_ELEM == mdoc->last->type);
 {
        struct mdoc_node *n;
 
        assert(MDOC_ELEM == mdoc->last->type);

+       /* LINTED */

        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;


@@ -840,43 +1064,86 @@ elem_bool(struct mdoc *mdoc)
        }
        if (NULL == n)
                return(1);
        }
        if (NULL == n)
                return(1);

-       return(mdoc_nerr(mdoc, n, "expected boolean value [on/off]"));
+       return(mdoc_nerr(mdoc, n, "expected boolean value"));
+}
+
+
+static int
+post_root(struct mdoc *mdoc)
+{
+
+       if (NULL == mdoc->first->child)
+               return(mdoc_err(mdoc, "document has no data"));
+       if (SEC_PROLOGUE == mdoc->lastnamed)
+               return(mdoc_err(mdoc, "document has incomplete prologue"));
+       if (MDOC_BLOCK != mdoc->first->child->type)
+               return(mdoc_err(mdoc, "document expects `%s' macro after prologue", mdoc_macronames[MDOC_Sh]));
+       if (MDOC_Sh != mdoc->first->child->tok)
+               return(mdoc_err(mdoc, "document expects `%s' macro after prologue", mdoc_macronames[MDOC_Sh]));
+       return(1);

 }
 
 
 }
 
 

-/* Warn if conventional sections are out of order. */

 static int
 post_sh(struct mdoc *mdoc)
 {
 static int
 post_sh(struct mdoc *mdoc)
 {

-       enum mdoc_sec     sec;
-       int               i;
+
+       if (MDOC_HEAD == mdoc->last->type)
+               return(post_sh_head(mdoc));
+       if (MDOC_BODY == mdoc->last->type)
+               return(post_sh_body(mdoc));
+       return(1);
+}
+
+
+static int
+post_sh_body(struct mdoc *mdoc)
+{

        struct mdoc_node *n;
        struct mdoc_node *n;

-       char             *args[MDOC_LINEARG_MAX];

 
 

-       if (MDOC_HEAD != mdoc->last->type)
+       assert(MDOC_Sh == mdoc->last->tok);
+       if (SEC_NAME != mdoc->lastnamed)

                return(1);
                return(1);

-       
+
+       if (NULL == (n = mdoc->last->child))
+               return(mdoc_err(mdoc, "section NAME must contain %s as the first body child", mdoc_macronames[MDOC_Nm]));
+       if (MDOC_ELEM != n->type || MDOC_Nm != n->tok)
+               return(mdoc_err(mdoc, "section NAME must contain %s as the first body child", mdoc_macronames[MDOC_Nm]));
+       if (NULL == (n = n->next))
+               return(mdoc_err(mdoc, "section NAME must contain %s as the second body child", mdoc_macronames[MDOC_Nd]));
+       if (MDOC_ELEM != n->type || MDOC_Nd != n->tok)
+               return(mdoc_err(mdoc, "section NAME must contain %s as the second body child", mdoc_macronames[MDOC_Nd]));
+       if (NULL == (n = n->next))
+               return(1);
+
+       return(mdoc_warn(mdoc, WARN_SYNTAX, "section NAME usually limited to %s and %s body children",
+                               mdoc_macronames[MDOC_Nm], mdoc_macronames[MDOC_Nd]));
+}
+
+
+static int
+post_sh_head(struct mdoc *mdoc)
+{
+       char              buf[64];
+       enum mdoc_sec     sec;
+

        assert(MDOC_Sh == mdoc->last->tok);
 
        assert(MDOC_Sh == mdoc->last->tok);
 

-       n = mdoc->last->child;
-       assert(n);
+       if ( ! xstrlcats(buf, mdoc->last->child, 64))
+               return(mdoc_err(mdoc, "macro parameters too long"));

 
 

-       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;
-       }
+       sec = mdoc_atosec(buf);

 
 

-       sec = mdoc_atosec((size_t)i, (const char **)args);
+       if (SEC_BODY == mdoc->lastnamed && SEC_NAME != sec)
+               return(mdoc_err(mdoc, "section NAME must be first"));

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

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

                return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated"));
                return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated"));

-       return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order"));
+       if (sec < mdoc->lastnamed)
+               return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order"));
+
+       return(1);

 }
 
 
 }
 
 


@@ -885,8 +1152,6 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node)
 {
        v_pre           *p;
 
 {
        v_pre           *p;
 

-       /* TODO: character-escape checks. */
-

        if (MDOC_TEXT == node->type)
                return(1);
        assert(MDOC_ROOT != node->type);
        if (MDOC_TEXT == node->type)
                return(1);
        assert(MDOC_ROOT != node->type);


@@ -905,12 +1170,14 @@ mdoc_valid_post(struct mdoc *mdoc)
 {
        v_post          *p;
 
 {
        v_post          *p;
 

-       if (MDOC_TEXT == mdoc->last->type)
+       if (MDOC_VALID & mdoc->last->flags)

                return(1);
                return(1);

-       if (MDOC_ROOT == mdoc->last->type) {
-               /* TODO: make sure prologue is complete. */
+       mdoc->last->flags |= MDOC_VALID;
+
+       if (MDOC_TEXT == mdoc->last->type)

                return(1);
                return(1);

-       }
+       if (MDOC_ROOT == mdoc->last->type)
+               return(post_root(mdoc));

 
        if (NULL == mdoc_valids[mdoc->last->tok].post)
                return(1);
 
        if (NULL == mdoc_valids[mdoc->last->tok].post)
                return(1);