fix a typo that prevented names from .Dt from getting priority

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 002c6e6b59dec281256fb4837757b603090656b4..e369349c8a35722d8f851c3eff53299985f6d0a2 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,1437 +1,2294 @@
-/*     $Id: mdoc_validate.c,v 1.19 2009/07/04 10:41:29 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.301 2016/01/08 17:48:09 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2016 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#include "config.h"
+

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

+#ifndef OSNAME
+#include <sys/utsname.h>
+#endif

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <stdarg.h>
+#include <limits.h>
+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>

 
 

-#include "libmdoc.h"
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"

 #include "libmandoc.h"
 #include "libmandoc.h"

+#include "roff_int.h"
+#include "libmdoc.h"

 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */

-/* TODO: ignoring Pp (it's superfluous in some invocations). */
-
-#define        PRE_ARGS        struct mdoc *mdoc, const struct mdoc_node *n
-#define        POST_ARGS       struct mdoc *mdoc
-
-enum   merr {
-       ETOOLONG,
-       EESCAPE,
-       EPRINT,
-       ENODATA,
-       ENOPROLOGUE,
-       ELINE,
-       EATT,
-       ENAME,
-       ELISTTYPE,
-       EDISPTYPE,
-       EMULTIDISP,
-       ESECNAME,
-       EMULTILIST,
-       EARGREP,
-       EBOOL,
-       ECOLMIS,
-       ENESTDISP
-};

 
 

-enum   mwarn {
-       WPRINT,
-       WNOWIDTH,
-       WMISSWIDTH,
-       WESCAPE,
-       WWRONGMSEC,
-       WSECOOO,
-       WSECREP,
-       WBADSTAND,
-       WNAMESECINC,
-       WNOMULTILINE,
-       WMULTILINE,
-       WLINE,
-       WNOLINE,
-       WPROLOOO,
-       WPROLREP,
-       WARGVAL,
-       WBADSEC,
-       WBADMSEC
+#define        POST_ARGS struct roff_man *mdoc
+
+enum   check_ineq {
+       CHECK_LT,
+       CHECK_GT,
+       CHECK_EQ

 };
 
 };
 

-typedef        int     (*v_pre)(PRE_ARGS);
-typedef        int     (*v_post)(POST_ARGS);
+typedef        void    (*v_post)(POST_ARGS);
+
+static void     check_text(struct roff_man *, int, int, char *);
+static void     check_argv(struct roff_man *,
+                       struct roff_node *, struct mdoc_argv *);
+static void     check_args(struct roff_man *, struct roff_node *);
+static int      child_an(const struct roff_node *);
+static size_t          macro2len(int);
+static void     rewrite_macro2len(char **);
+
+static void     post_an(POST_ARGS);
+static void     post_an_norm(POST_ARGS);
+static void     post_at(POST_ARGS);
+static void     post_bd(POST_ARGS);
+static void     post_bf(POST_ARGS);
+static void     post_bk(POST_ARGS);
+static void     post_bl(POST_ARGS);
+static void     post_bl_block(POST_ARGS);
+static void     post_bl_block_tag(POST_ARGS);
+static void     post_bl_head(POST_ARGS);
+static void     post_bl_norm(POST_ARGS);
+static void     post_bx(POST_ARGS);
+static void     post_defaults(POST_ARGS);
+static void     post_display(POST_ARGS);
+static void     post_dd(POST_ARGS);
+static void     post_dt(POST_ARGS);
+static void     post_en(POST_ARGS);
+static void     post_es(POST_ARGS);
+static void     post_eoln(POST_ARGS);
+static void     post_ex(POST_ARGS);
+static void     post_fa(POST_ARGS);
+static void     post_fn(POST_ARGS);
+static void     post_fname(POST_ARGS);
+static void     post_fo(POST_ARGS);
+static void     post_hyph(POST_ARGS);
+static void     post_ignpar(POST_ARGS);
+static void     post_it(POST_ARGS);
+static void     post_lb(POST_ARGS);
+static void     post_nd(POST_ARGS);
+static void     post_nm(POST_ARGS);
+static void     post_ns(POST_ARGS);
+static void     post_obsolete(POST_ARGS);
+static void     post_os(POST_ARGS);
+static void     post_par(POST_ARGS);
+static void     post_prevpar(POST_ARGS);
+static void     post_root(POST_ARGS);
+static void     post_rs(POST_ARGS);
+static void     post_sh(POST_ARGS);
+static void     post_sh_head(POST_ARGS);
+static void     post_sh_name(POST_ARGS);
+static void     post_sh_see_also(POST_ARGS);
+static void     post_sh_authors(POST_ARGS);
+static void     post_sm(POST_ARGS);
+static void     post_st(POST_ARGS);
+static void     post_std(POST_ARGS);
+
+static v_post mdoc_valids[MDOC_MAX] = {
+       NULL,           /* Ap */
+       post_dd,        /* Dd */
+       post_dt,        /* Dt */
+       post_os,        /* Os */
+       post_sh,        /* Sh */
+       post_ignpar,    /* Ss */
+       post_par,       /* Pp */
+       post_display,   /* D1 */
+       post_display,   /* Dl */
+       post_display,   /* Bd */
+       NULL,           /* Ed */
+       post_bl,        /* Bl */
+       NULL,           /* El */
+       post_it,        /* It */
+       NULL,           /* Ad */
+       post_an,        /* An */
+       post_defaults,  /* Ar */
+       NULL,           /* Cd */
+       NULL,           /* Cm */
+       NULL,           /* Dv */
+       NULL,           /* Er */
+       NULL,           /* Ev */
+       post_ex,        /* Ex */
+       post_fa,        /* Fa */
+       NULL,           /* Fd */
+       NULL,           /* Fl */
+       post_fn,        /* Fn */
+       NULL,           /* Ft */
+       NULL,           /* Ic */
+       NULL,           /* In */
+       post_defaults,  /* Li */
+       post_nd,        /* Nd */
+       post_nm,        /* Nm */
+       NULL,           /* Op */
+       post_obsolete,  /* Ot */
+       post_defaults,  /* Pa */
+       post_std,       /* Rv */
+       post_st,        /* St */
+       NULL,           /* Va */
+       NULL,           /* Vt */
+       NULL,           /* Xr */
+       NULL,           /* %A */
+       post_hyph,      /* %B */ /* FIXME: can be used outside Rs/Re. */
+       NULL,           /* %D */
+       NULL,           /* %I */
+       NULL,           /* %J */
+       post_hyph,      /* %N */
+       post_hyph,      /* %O */
+       NULL,           /* %P */
+       post_hyph,      /* %R */
+       post_hyph,      /* %T */ /* FIXME: can be used outside Rs/Re. */
+       NULL,           /* %V */
+       NULL,           /* Ac */
+       NULL,           /* Ao */
+       NULL,           /* Aq */
+       post_at,        /* At */
+       NULL,           /* Bc */
+       post_bf,        /* Bf */
+       NULL,           /* Bo */
+       NULL,           /* Bq */
+       NULL,           /* Bsx */
+       post_bx,        /* Bx */
+       post_obsolete,  /* Db */
+       NULL,           /* Dc */
+       NULL,           /* Do */
+       NULL,           /* Dq */
+       NULL,           /* Ec */
+       NULL,           /* Ef */
+       NULL,           /* Em */
+       NULL,           /* Eo */
+       NULL,           /* Fx */
+       NULL,           /* Ms */
+       NULL,           /* No */
+       post_ns,        /* Ns */
+       NULL,           /* Nx */
+       NULL,           /* Ox */
+       NULL,           /* Pc */
+       NULL,           /* Pf */
+       NULL,           /* Po */
+       NULL,           /* Pq */
+       NULL,           /* Qc */
+       NULL,           /* Ql */
+       NULL,           /* Qo */
+       NULL,           /* Qq */
+       NULL,           /* Re */
+       post_rs,        /* Rs */
+       NULL,           /* Sc */
+       NULL,           /* So */
+       NULL,           /* Sq */
+       post_sm,        /* Sm */
+       post_hyph,      /* Sx */
+       NULL,           /* Sy */
+       NULL,           /* Tn */
+       NULL,           /* Ux */
+       NULL,           /* Xc */
+       NULL,           /* Xo */
+       post_fo,        /* Fo */
+       NULL,           /* Fc */
+       NULL,           /* Oo */
+       NULL,           /* Oc */
+       post_bk,        /* Bk */
+       NULL,           /* Ek */
+       post_eoln,      /* Bt */
+       NULL,           /* Hf */
+       post_obsolete,  /* Fr */
+       post_eoln,      /* Ud */
+       post_lb,        /* Lb */
+       post_par,       /* Lp */
+       NULL,           /* Lk */
+       post_defaults,  /* Mt */
+       NULL,           /* Brq */
+       NULL,           /* Bro */
+       NULL,           /* Brc */
+       NULL,           /* %C */
+       post_es,        /* Es */
+       post_en,        /* En */
+       NULL,           /* Dx */
+       NULL,           /* %Q */
+       post_par,       /* br */
+       post_par,       /* sp */
+       NULL,           /* %U */
+       NULL,           /* Ta */
+       NULL,           /* ll */
+};

 
 

-struct valids {
-       v_pre   *pre;
-       v_post  *post;
+#define        RSORD_MAX 14 /* Number of `Rs' blocks. */
+
+static const int rsord[RSORD_MAX] = {
+       MDOC__A,
+       MDOC__T,
+       MDOC__B,
+       MDOC__I,
+       MDOC__J,
+       MDOC__R,
+       MDOC__N,
+       MDOC__V,
+       MDOC__U,
+       MDOC__P,
+       MDOC__Q,
+       MDOC__C,
+       MDOC__D,
+       MDOC__O

 };
 
 };
 

-static int     pwarn(struct mdoc *, int, int, enum mwarn);
-static int     perr(struct mdoc *, int, int, enum merr);
-static int     check_parent(PRE_ARGS, int, enum mdoc_type);
-static int     check_msec(PRE_ARGS, ...);
-static int     check_sec(PRE_ARGS, ...);
-static int     check_stdarg(PRE_ARGS);
-static int     check_text(struct mdoc *, int, int, const char *);
-static int     check_argv(struct mdoc *, 
-                       const struct mdoc_node *,
-                       const struct mdoc_argv *);
-static int     check_args(struct mdoc *, 
-                       const struct mdoc_node *);
-static int     err_child_lt(struct mdoc *, const char *, int);
-static int     warn_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);
-static int     warn_print(struct mdoc *, int, int);
-static int     warn_count(struct mdoc *, const char *, 
-                       int, const char *, int);
-static int     err_count(struct mdoc *, const char *, 
-                       int, const char *, int);
-static int     pre_an(PRE_ARGS);
-static int     pre_bd(PRE_ARGS);
-static int     pre_bl(PRE_ARGS);
-static int     pre_cd(PRE_ARGS);
-static int     pre_dd(PRE_ARGS);
-static int     pre_display(PRE_ARGS);
-static int     pre_dt(PRE_ARGS);
-static int     pre_er(PRE_ARGS);
-static int     pre_ex(PRE_ARGS);
-static int     pre_fd(PRE_ARGS);
-static int     pre_it(PRE_ARGS);
-static int     pre_lb(PRE_ARGS);
-static int     pre_os(PRE_ARGS);
-static int     pre_rv(PRE_ARGS);
-static int     pre_sh(PRE_ARGS);
-static int     pre_ss(PRE_ARGS);
-static int     herr_ge1(POST_ARGS);
-static int     hwarn_le1(POST_ARGS);
-static int     herr_eq0(POST_ARGS);
-static int     eerr_eq0(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     hwarn_eq1(POST_ARGS);
-static int     ewarn_ge1(POST_ARGS);
-static int     ebool(POST_ARGS);
-static int     post_an(POST_ARGS);
-static int     post_args(POST_ARGS);
-static int     post_at(POST_ARGS);
-static int     post_bf(POST_ARGS);
-static int     post_bl(POST_ARGS);
-static int     post_bl_head(POST_ARGS);
-static int     post_it(POST_ARGS);
-static int     post_nm(POST_ARGS);
-static int     post_root(POST_ARGS);
-static int     post_sh(POST_ARGS);
-static int     post_sh_body(POST_ARGS);
-static int     post_sh_head(POST_ARGS);
-static int     post_st(POST_ARGS);
-
-#define        vwarn(m, t) nwarn((m), (m)->last, (t))
-#define        verr(m, t) nerr((m), (m)->last, (t))
-#define        nwarn(m, n, t) pwarn((m), (n)->line, (n)->pos, (t))
-#define        nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
-
-static v_pre   pres_an[] = { pre_an, NULL };
-static v_pre   pres_bd[] = { pre_display, pre_bd, NULL };
-static v_pre   pres_bl[] = { pre_bl, NULL };
-static v_pre   pres_cd[] = { pre_cd, NULL };
-static v_pre   pres_dd[] = { pre_dd, NULL };
-static v_pre   pres_d1[] = { pre_display, NULL };
-static v_pre   pres_dt[] = { pre_dt, NULL };
-static v_pre   pres_er[] = { pre_er, NULL };
-static v_pre   pres_ex[] = { pre_ex, NULL };
-static v_pre   pres_fd[] = { pre_fd, NULL };
-static v_pre   pres_it[] = { pre_it, NULL };
-static v_pre   pres_lb[] = { pre_lb, NULL };
-static v_pre   pres_os[] = { pre_os, NULL };
-static v_pre   pres_rv[] = { pre_rv, NULL };
-static v_pre   pres_sh[] = { pre_sh, NULL };
-static v_pre   pres_ss[] = { pre_ss, NULL };
-static v_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[] = { bwarn_ge1, post_bl, NULL };
-static v_post  posts_it[] = { post_it, 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_lb[] = { eerr_eq1, NULL };
-static v_post  posts_st[] = { eerr_eq1, post_st, NULL };
-static v_post  posts_pp[] = { ewarn_eq0, NULL };
-static v_post  posts_ex[] = { eerr_eq0, post_args, NULL };
-static v_post  posts_rv[] = { eerr_eq0, post_args, 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, NULL };
-static v_post  posts_nm[] = { post_nm, NULL };
-static v_post  posts_bf[] = { hwarn_le1, post_bf, NULL };
-static v_post  posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
-
-const  struct valids mdoc_valids[MDOC_MAX] = {
-       { NULL, NULL },                         /* Ap */
-       { pres_dd, posts_text },                /* Dd */
-       { pres_dt, NULL },                      /* Dt */
-       { pres_os, 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, NULL },                         /* Dv */ 
-       { pres_er, posts_text },                /* Er */ 
-       { NULL, NULL },                         /* Ev */ 
-       { pres_ex, posts_ex },                  /* Ex */ 
-       { NULL, NULL },                         /* Fa */ 
-       { pres_fd, posts_wtext },               /* Fd */
-       { NULL, NULL },                         /* Fl */
-       { NULL, posts_text },                   /* Fn */ 
-       { NULL, posts_wtext },                  /* Ft */ 
-       { NULL, posts_text },                   /* Ic */ 
-       { NULL, posts_in },                     /* In */ 
-       { NULL, NULL },                         /* Li */
-       { NULL, posts_wtext },                  /* Nd */
-       { NULL, posts_nm },                     /* Nm */
-       { NULL, posts_wline },                  /* Op */
-       { NULL, NULL },                         /* Ot */
-       { NULL, NULL },                         /* Pa */
-       { pres_rv, posts_rv },                  /* Rv */
-       { NULL, posts_st },                     /* St */ 
-       { NULL, NULL },                         /* 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, NULL },                         /* 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_wline },                  /* 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_wline },                  /* Bk */
-       { NULL, NULL },                         /* Ek */
-       { NULL, posts_notext },                 /* Bt */
-       { NULL, NULL },                         /* Hf */
-       { NULL, NULL },                         /* Fr */
-       { NULL, posts_notext },                 /* Ud */
-       { pres_lb, posts_lb },                  /* Lb */
-       { NULL, posts_pp },                     /* Lp */ 
-       { NULL, NULL },                         /* Lk */ 
-       { NULL, posts_text },                   /* Mt */ 
-       { NULL, posts_wline },                  /* Brq */ 
-       { NULL, NULL },                         /* Bro */ 
-       { NULL, NULL },                         /* Brc */ 
-       { NULL, posts_text },                   /* %C */
-       { NULL, NULL },                         /* Es */
-       { NULL, NULL },                         /* En */
-       { NULL, NULL },                         /* Dx */
-       { NULL, posts_text },                   /* %Q */
+static const char * const secnames[SEC__MAX] = {
+       NULL,
+       "NAME",
+       "LIBRARY",
+       "SYNOPSIS",
+       "DESCRIPTION",
+       "CONTEXT",
+       "IMPLEMENTATION NOTES",
+       "RETURN VALUES",
+       "ENVIRONMENT",
+       "FILES",
+       "EXIT STATUS",
+       "EXAMPLES",
+       "DIAGNOSTICS",
+       "COMPATIBILITY",
+       "ERRORS",
+       "SEE ALSO",
+       "STANDARDS",
+       "HISTORY",
+       "AUTHORS",
+       "CAVEATS",
+       "BUGS",
+       "SECURITY CONSIDERATIONS",
+       NULL

 };
 
 
 };
 
 

-#ifdef __linux__
-extern size_t  strlcat(char *, const char *, size_t);
-#endif
+void
+mdoc_node_validate(struct roff_man *mdoc)
+{
+       struct roff_node *n;
+       v_post *p;
+
+       n = mdoc->last;
+       mdoc->last = mdoc->last->child;
+       while (mdoc->last != NULL) {
+               mdoc_node_validate(mdoc);
+               if (mdoc->last == n)
+                       mdoc->last = mdoc->last->child;
+               else
+                       mdoc->last = mdoc->last->next;
+       }

 
 

+       mdoc->last = n;
+       mdoc->next = ROFF_NEXT_SIBLING;
+       switch (n->type) {
+       case ROFFT_TEXT:
+               if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd)
+                       check_text(mdoc, n->line, n->pos, n->string);
+               break;
+       case ROFFT_EQN:
+       case ROFFT_TBL:
+               break;
+       case ROFFT_ROOT:
+               post_root(mdoc);
+               break;
+       default:
+               check_args(mdoc, mdoc->last);
+
+               /*
+                * Closing delimiters are not special at the
+                * beginning of a block, opening delimiters
+                * are not special at the end.
+                */
+
+               if (n->child != NULL)
+                       n->child->flags &= ~MDOC_DELIMC;
+               if (n->last != NULL)
+                       n->last->flags &= ~MDOC_DELIMO;
+
+               /* Call the macro's postprocessor. */
+
+               p = mdoc_valids + n->tok;
+               if (*p)
+                       (*p)(mdoc);
+               if (mdoc->last == n)
+                       mdoc_state(mdoc, n);
+               break;
+       }
+}

 
 

-int
-mdoc_valid_pre(struct mdoc *mdoc, 
-               const struct mdoc_node *n)
+static void
+check_args(struct roff_man *mdoc, struct roff_node *n)

 {
 {

-       v_pre           *p;
-       int              line, pos;
-       const char      *tp;
-
-       if (MDOC_TEXT == n->type) {
-               tp = n->string;
-               line = n->line;
-               pos = n->pos;
-               return(check_text(mdoc, line, pos, tp));
-       }
+       int              i;

 
 

-       if ( ! check_args(mdoc, n))
-               return(0);
-       if (NULL == mdoc_valids[n->tok].pre)
-               return(1);
-       for (p = mdoc_valids[n->tok].pre; *p; p++)
-               if ( ! (*p)(mdoc, n)) 
-                       return(0);
-       return(1);
+       if (NULL == n->args)
+               return;
+
+       assert(n->args->argc);
+       for (i = 0; i < (int)n->args->argc; i++)
+               check_argv(mdoc, n, &n->args->argv[i]);

 }
 
 }
 

+static void
+check_argv(struct roff_man *mdoc, struct roff_node *n, struct mdoc_argv *v)
+{
+       int              i;
+
+       for (i = 0; i < (int)v->sz; i++)
+               check_text(mdoc, v->line, v->pos, v->value[i]);
+}

 
 

-int
-mdoc_valid_post(struct mdoc *mdoc)
+static void
+check_text(struct roff_man *mdoc, int ln, int pos, char *p)

 {
 {

-       v_post          *p;
+       char            *cp;
+
+       if (MDOC_LITERAL & mdoc->flags)
+               return;
+
+       for (cp = p; NULL != (p = strchr(p, '\t')); p++)
+               mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,
+                   ln, pos + (int)(p - cp), NULL);
+}
+
+static void
+post_bl_norm(POST_ARGS)
+{
+       struct roff_node *n;
+       struct mdoc_argv *argv, *wa;
+       int               i;
+       enum mdocargt     mdoclt;
+       enum mdoc_list    lt;
+
+       n = mdoc->last->parent;
+       n->norm->Bl.type = LIST__NONE;

 
        /*
 
        /*

-        * 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.
+        * First figure out which kind of list to use: bind ourselves to
+        * the first mentioned list type and warn about any remaining
+        * ones.  If we find no list type, we default to LIST_item.

         */
 
         */
 

-       if (MDOC_VALID & mdoc->last->flags)
-               return(1);
-       mdoc->last->flags |= MDOC_VALID;
+       wa = (n->args == NULL) ? NULL : n->args->argv;
+       mdoclt = MDOC_ARG_MAX;
+       for (i = 0; n->args && i < (int)n->args->argc; i++) {
+               argv = n->args->argv + i;
+               lt = LIST__NONE;
+               switch (argv->arg) {
+               /* Set list types. */
+               case MDOC_Bullet:
+                       lt = LIST_bullet;
+                       break;
+               case MDOC_Dash:
+                       lt = LIST_dash;
+                       break;
+               case MDOC_Enum:
+                       lt = LIST_enum;
+                       break;
+               case MDOC_Hyphen:
+                       lt = LIST_hyphen;
+                       break;
+               case MDOC_Item:
+                       lt = LIST_item;
+                       break;
+               case MDOC_Tag:
+                       lt = LIST_tag;
+                       break;
+               case MDOC_Diag:
+                       lt = LIST_diag;
+                       break;
+               case MDOC_Hang:
+                       lt = LIST_hang;
+                       break;
+               case MDOC_Ohang:
+                       lt = LIST_ohang;
+                       break;
+               case MDOC_Inset:
+                       lt = LIST_inset;
+                       break;
+               case MDOC_Column:
+                       lt = LIST_column;
+                       break;
+               /* Set list arguments. */
+               case MDOC_Compact:
+                       if (n->norm->Bl.comp)
+                               mandoc_msg(MANDOCERR_ARG_REP,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bl -compact");
+                       n->norm->Bl.comp = 1;
+                       break;
+               case MDOC_Width:
+                       wa = argv;
+                       if (0 == argv->sz) {
+                               mandoc_msg(MANDOCERR_ARG_EMPTY,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bl -width");
+                               n->norm->Bl.width = "0n";
+                               break;
+                       }
+                       if (NULL != n->norm->Bl.width)
+                               mandoc_vmsg(MANDOCERR_ARG_REP,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bl -width %s",
+                                   argv->value[0]);
+                       rewrite_macro2len(argv->value);
+                       n->norm->Bl.width = argv->value[0];
+                       break;
+               case MDOC_Offset:
+                       if (0 == argv->sz) {
+                               mandoc_msg(MANDOCERR_ARG_EMPTY,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bl -offset");
+                               break;
+                       }
+                       if (NULL != n->norm->Bl.offs)
+                               mandoc_vmsg(MANDOCERR_ARG_REP,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bl -offset %s",
+                                   argv->value[0]);
+                       rewrite_macro2len(argv->value);
+                       n->norm->Bl.offs = argv->value[0];
+                       break;
+               default:
+                       continue;
+               }
+               if (LIST__NONE == lt)
+                       continue;
+               mdoclt = argv->arg;

 
 

-       if (MDOC_TEXT == mdoc->last->type)
-               return(1);
-       if (MDOC_ROOT == mdoc->last->type)
-               return(post_root(mdoc));
+               /* Check: multiple list types. */

 
 

-       if (NULL == mdoc_valids[mdoc->last->tok].post)
-               return(1);
-       for (p = mdoc_valids[mdoc->last->tok].post; *p; p++)
-               if ( ! (*p)(mdoc)) 
-                       return(0);
+               if (LIST__NONE != n->norm->Bl.type) {
+                       mandoc_vmsg(MANDOCERR_BL_REP,
+                           mdoc->parse, n->line, n->pos,
+                           "Bl -%s", mdoc_argnames[argv->arg]);
+                       continue;
+               }

 
 

-       return(1);
-}
+               /* The list type should come first. */

 
 

+               if (n->norm->Bl.width ||
+                   n->norm->Bl.offs ||
+                   n->norm->Bl.comp)
+                       mandoc_vmsg(MANDOCERR_BL_LATETYPE,
+                           mdoc->parse, n->line, n->pos, "Bl -%s",
+                           mdoc_argnames[n->args->argv[0].arg]);

 
 

-static int
-perr(struct mdoc *m, int line, int pos, enum merr type)
-{
-       char             *p;
-       
-       p = NULL;
-       switch (type) {
-       case (ETOOLONG):
-               p = "text argument too long";
-               break;
-       case (EESCAPE):
-               p = "invalid escape sequence";
-               break;
-       case (EPRINT):
-               p = "invalid character";
-               break;
-       case (ENESTDISP):
-               p = "displays may not be nested";
-               break;
-       case (EBOOL):
-               p = "expected boolean value";
-               break;
-       case (EARGREP):
-               p = "argument repeated";
-               break;
-       case (EMULTIDISP):
-               p = "multiple display types specified";
-               break;
-       case (EMULTILIST):
-               p = "multiple list types specified";
-               break;
-       case (ELISTTYPE):
-               p = "missing list type";
-               break;
-       case (EDISPTYPE):
-               p = "missing display type";
-               break;
-       case (ESECNAME):
-               p = "the NAME section must come first";
-               break;
-       case (ELINE):
-               p = "expected line arguments";
-               break;
-       case (ENOPROLOGUE):
-               p = "document has no prologue";
-               break;
-       case (ENODATA):
-               p = "document has no data";
-               break;
-       case (ECOLMIS):
-               p = "column syntax style mismatch";
-               break;
-       case (EATT):
-               p = "expected valid AT&T symbol";
-               break;
-       case (ENAME):
-               p = "default name not yet set";
-               break;
+               n->norm->Bl.type = lt;
+               if (LIST_column == lt) {
+                       n->norm->Bl.ncols = argv->sz;
+                       n->norm->Bl.cols = (void *)argv->value;
+               }

        }
        }

-       assert(p);
-       return(mdoc_perr(m, line, pos, p));
-}

 
 

+       /* Allow lists to default to LIST_item. */

 
 

-static int
-pwarn(struct mdoc *m, int line, int pos, enum mwarn type)
-{
-       char             *p;
-       enum mdoc_warn    c;
-
-       c = WARN_SYNTAX;
-       p = NULL;
-       switch (type) {
-       case (WBADMSEC):
-               p = "inappropriate manual section";
-               c = WARN_COMPAT;
-               break;
-       case (WBADSEC):
-               p = "inappropriate document section";
-               c = WARN_COMPAT;
-               break;
-       case (WARGVAL):
-               p = "argument value suggested";
-               c = WARN_COMPAT;
-               break;
-       case (WPROLREP):
-               p = "prologue macros repeated";
-               c = WARN_COMPAT;
-               break;
-       case (WPROLOOO):
-               p = "prologue macros out-of-order";
-               c = WARN_COMPAT;
-               break;
-       case (WNOWIDTH):
-               p = "superfluous width argument";
-               break;
-       case (WMISSWIDTH):
-               p = "missing width argument";
-               break;
-       case (WPRINT):
-               p = "invalid character";
-               break;
-       case (WESCAPE):
-               p = "invalid escape sequence";
-               break;
-       case (WNOLINE):
-               p = "suggested no line arguments";
-               break;
-       case (WLINE):
-               p = "suggested line arguments";
-               break;
-       case (WMULTILINE):
-               p = "suggested multi-line arguments";
-               break;
-       case (WNOMULTILINE):
-               p = "suggested no multi-line arguments";
-               break;
-       case (WWRONGMSEC):
-               p = "document section in wrong manual section";
-               c = WARN_COMPAT;
+       if (LIST__NONE == n->norm->Bl.type) {
+               mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,
+                   n->line, n->pos, "Bl");
+               n->norm->Bl.type = LIST_item;
+       }
+
+       /*
+        * Validate the width field.  Some list types don't need width
+        * types and should be warned about them.  Others should have it
+        * and must also be warned.  Yet others have a default and need
+        * no warning.
+        */
+
+       switch (n->norm->Bl.type) {
+       case LIST_tag:
+               if (NULL == n->norm->Bl.width)
+                       mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,
+                           n->line, n->pos, "Bl -tag");

                break;
                break;

-       case (WSECOOO):
-               p = "document section out of conventional order";
+       case LIST_column:
+       case LIST_diag:
+       case LIST_ohang:
+       case LIST_inset:
+       case LIST_item:
+               if (n->norm->Bl.width)
+                       mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
+                           wa->line, wa->pos, "Bl -%s",
+                           mdoc_argnames[mdoclt]);

                break;
                break;

-       case (WSECREP):
-               p = "document section repeated";
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_hyphen:
+               if (NULL == n->norm->Bl.width)
+                       n->norm->Bl.width = "2n";

                break;
                break;

-       case (WBADSTAND):
-               p = "unknown standard";
+       case LIST_enum:
+               if (NULL == n->norm->Bl.width)
+                       n->norm->Bl.width = "3n";

                break;
                break;

-       case (WNAMESECINC):
-               p = "NAME section contents incomplete/badly-ordered";
+       default:

                break;
        }
                break;
        }

-       assert(p);
-       return(mdoc_pwarn(m, line, pos, c, p));

 }
 
 }
 

-
-static int
-warn_print(struct mdoc *m, int ln, int pos)
+static void
+post_bd(POST_ARGS)

 {
 {

-       if (MDOC_IGN_CHARS & m->pflags)
-               return(pwarn(m, ln, pos, WPRINT));
-       return(perr(m, ln, pos, EPRINT));
-}
+       struct roff_node *n;
+       struct mdoc_argv *argv;
+       int               i;
+       enum mdoc_disp    dt;
+
+       n = mdoc->last;
+       for (i = 0; n->args && i < (int)n->args->argc; i++) {
+               argv = n->args->argv + i;
+               dt = DISP__NONE;
+
+               switch (argv->arg) {
+               case MDOC_Centred:
+                       dt = DISP_centered;
+                       break;
+               case MDOC_Ragged:
+                       dt = DISP_ragged;
+                       break;
+               case MDOC_Unfilled:
+                       dt = DISP_unfilled;
+                       break;
+               case MDOC_Filled:
+                       dt = DISP_filled;
+                       break;
+               case MDOC_Literal:
+                       dt = DISP_literal;
+                       break;
+               case MDOC_File:
+                       mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,
+                           n->line, n->pos, NULL);
+                       break;
+               case MDOC_Offset:
+                       if (0 == argv->sz) {
+                               mandoc_msg(MANDOCERR_ARG_EMPTY,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bd -offset");
+                               break;
+                       }
+                       if (NULL != n->norm->Bd.offs)
+                               mandoc_vmsg(MANDOCERR_ARG_REP,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bd -offset %s",
+                                   argv->value[0]);
+                       rewrite_macro2len(argv->value);
+                       n->norm->Bd.offs = argv->value[0];
+                       break;
+               case MDOC_Compact:
+                       if (n->norm->Bd.comp)
+                               mandoc_msg(MANDOCERR_ARG_REP,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bd -compact");
+                       n->norm->Bd.comp = 1;
+                       break;
+               default:
+                       abort();
+               }
+               if (DISP__NONE == dt)
+                       continue;
+
+               if (DISP__NONE == n->norm->Bd.type)
+                       n->norm->Bd.type = dt;
+               else
+                       mandoc_vmsg(MANDOCERR_BD_REP,
+                           mdoc->parse, n->line, n->pos,
+                           "Bd -%s", mdoc_argnames[argv->arg]);
+       }

 
 

+       if (DISP__NONE == n->norm->Bd.type) {
+               mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse,
+                   n->line, n->pos, "Bd");
+               n->norm->Bd.type = DISP_ragged;
+       }
+}

 
 

-static inline int
-warn_count(struct mdoc *m, const char *k, 
-               int want, const char *v, int has)
+static void
+post_an_norm(POST_ARGS)

 {
 {

+       struct roff_node *n;
+       struct mdoc_argv *argv;
+       size_t   i;
+
+       n = mdoc->last;
+       if (n->args == NULL)
+               return;
+
+       for (i = 1; i < n->args->argc; i++) {
+               argv = n->args->argv + i;
+               mandoc_vmsg(MANDOCERR_AN_REP,
+                   mdoc->parse, argv->line, argv->pos,
+                   "An -%s", mdoc_argnames[argv->arg]);
+       }

 
 

-       return(mdoc_warn(m, WARN_SYNTAX, 
-               "suggests %s %s %d (has %d)", v, k, want, has));
+       argv = n->args->argv;
+       if (argv->arg == MDOC_Split)
+               n->norm->An.auth = AUTH_split;
+       else if (argv->arg == MDOC_Nosplit)
+               n->norm->An.auth = AUTH_nosplit;
+       else
+               abort();

 }
 
 }
 

+static void
+post_std(POST_ARGS)
+{
+       struct roff_node *n;
+
+       n = mdoc->last;
+       if (n->args && n->args->argc == 1)
+               if (n->args->argv[0].arg == MDOC_Std)
+                       return;
+
+       mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
+           n->line, n->pos, mdoc_macronames[n->tok]);
+}

 
 

-static inline int
-err_count(struct mdoc *m, const char *k,
-               int want, const char *v, int has)
+static void
+post_obsolete(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

-       return(mdoc_err(m, 
-               "requires %s %s %d (has %d)", v, k, want, has));
+       n = mdoc->last;
+       if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
+               mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
+                   n->line, n->pos, mdoc_macronames[n->tok]);

 }
 
 }
 

+static void
+post_bf(POST_ARGS)
+{
+       struct roff_node *np, *nch;

 
 

-/*
- * 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.
- */
+       /*
+        * Unlike other data pointers, these are "housed" by the HEAD
+        * element, which contains the goods.
+        */

 
 

-#define CHECK_CHILD_DEFN(lvl, name, ineq)                      \
-static int                                                     \
-lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz)   \
-{                                                              \
-       if (mdoc->last->nchild ineq sz)                         \
-               return(1);                                      \
-       return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \
-}
+       np = mdoc->last;
+       if (np->type != ROFFT_HEAD)
+               return;

 
 

-#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, "multi-line arguments", (num)));      \
-}
+       assert(np->parent->type == ROFFT_BLOCK);
+       assert(np->parent->tok == MDOC_Bf);

 
 

-#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 arguments", (num)));            \
-}
+       /* Check the number of arguments. */
+
+       nch = np->child;
+       if (np->parent->args == NULL) {
+               if (nch == NULL) {
+                       mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,
+                           np->line, np->pos, "Bf");
+                       return;
+               }
+               nch = nch->next;
+       }
+       if (nch != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                   nch->line, nch->pos, "Bf ... %s", nch->string);
+
+       /* Extract argument into data. */

 
 

-#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, "line arguments", (num)));            \
+       if (np->parent->args != NULL) {
+               switch (np->parent->args->argv[0].arg) {
+               case MDOC_Emphasis:
+                       np->norm->Bf.font = FONT_Em;
+                       break;
+               case MDOC_Literal:
+                       np->norm->Bf.font = FONT_Li;
+                       break;
+               case MDOC_Symbolic:
+                       np->norm->Bf.font = FONT_Sy;
+                       break;
+               default:
+                       abort();
+               }
+               return;
+       }
+
+       /* Extract parameter into data. */
+
+       if ( ! strcmp(np->child->string, "Em"))
+               np->norm->Bf.font = FONT_Em;
+       else if ( ! strcmp(np->child->string, "Li"))
+               np->norm->Bf.font = FONT_Li;
+       else if ( ! strcmp(np->child->string, "Sy"))
+               np->norm->Bf.font = FONT_Sy;
+       else
+               mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,
+                   np->child->line, np->child->pos,
+                   "Bf %s", np->child->string);

 }
 
 }
 

+static void
+post_lb(POST_ARGS)
+{
+       struct roff_node        *n;
+       const char              *stdlibname;
+       char                    *libname;

 
 

-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_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
-CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
-CHECK_ELEM_DEFN(eq1, warn, warn_child_eq, 1)   /* ewarn_eq1() */
-CHECK_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(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, warn, warn_child_lt, 2)   /* hwarn_le1() */
-CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0)     /* herr_ge1() */
-CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1)   /* hwarn_eq1() */
+       n = mdoc->last->child;
+       assert(n->type == ROFFT_TEXT);

 
 

+       if (NULL == (stdlibname = mdoc_a2lib(n->string)))
+               mandoc_asprintf(&libname,
+                   "library \\(Lq%s\\(Rq", n->string);
+       else
+               libname = mandoc_strdup(stdlibname);

 
 

-static int
-check_stdarg(PRE_ARGS)
+       free(n->string);
+       n->string = libname;
+}
+
+static void
+post_eoln(POST_ARGS)

 {
 {

+       const struct roff_node *n;
+
+       n = mdoc->last;
+       if (n->child != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                   mdoc->parse, n->line, n->pos,
+                   "%s %s", mdoc_macronames[n->tok],
+                   n->child->string);
+}

 
 

-       if (n->args && 1 == n->args->argc)
-               if (MDOC_Std == n->args->argv[0].arg)
-                       return(1);
-       return(nwarn(mdoc, n, WARGVAL));
+static void
+post_fname(POST_ARGS)
+{
+       const struct roff_node  *n;
+       const char              *cp;
+       size_t                   pos;
+
+       n = mdoc->last->child;
+       pos = strcspn(n->string, "()");
+       cp = n->string + pos;
+       if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))
+               mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse,
+                   n->line, n->pos + pos, n->string);

 }
 
 }
 

+static void
+post_fn(POST_ARGS)
+{
+
+       post_fname(mdoc);
+       post_fa(mdoc);
+}

 
 

-static int
-check_sec(PRE_ARGS, ...)
+static void
+post_fo(POST_ARGS)

 {
 {

-       enum mdoc_sec    sec;
-       va_list          ap;
+       const struct roff_node  *n;

 
 

-       va_start(ap, n);
+       n = mdoc->last;

 
 

-       for (;;) {
-               /* LINTED */
-               sec = (enum mdoc_sec)va_arg(ap, int);
-               if (SEC_CUSTOM == sec)
-                       break;
-               if (sec != mdoc->lastsec)
-                       continue;
-               va_end(ap);
-               return(1);
+       if (n->type != ROFFT_HEAD)
+               return;
+
+       if (n->child == NULL) {
+               mandoc_msg(MANDOCERR_FO_NOHEAD, mdoc->parse,
+                   n->line, n->pos, "Fo");
+               return;
+       }
+       if (n->child != n->last) {
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                   n->child->next->line, n->child->next->pos,
+                   "Fo ... %s", n->child->next->string);
+               while (n->child != n->last)
+                       roff_node_delete(mdoc, n->last);

        }
 
        }
 

-       va_end(ap);
-       return(nwarn(mdoc, n, WBADSEC));
+       post_fname(mdoc);

 }
 
 }
 

-
-static int
-check_msec(PRE_ARGS, ...)
+static void
+post_fa(POST_ARGS)

 {
 {

-       va_list          ap;
-       int              msec;
+       const struct roff_node *n;
+       const char *cp;

 
 

-       va_start(ap, n);
-       for (;;) {
-               /* LINTED */
-               if (0 == (msec = va_arg(ap, int)))
+       for (n = mdoc->last->child; n != NULL; n = n->next) {
+               for (cp = n->string; *cp != '\0'; cp++) {
+                       /* Ignore callbacks and alterations. */
+                       if (*cp == '(' || *cp == '{')
+                               break;
+                       if (*cp != ',')
+                               continue;
+                       mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse,
+                           n->line, n->pos + (cp - n->string),
+                           n->string);

                        break;
                        break;

-               if (msec != mdoc->meta.msec)
-                       continue;
-               va_end(ap);
-               return(1);
+               }

        }
        }

-
-       va_end(ap);
-       return(nwarn(mdoc, n, WBADMSEC));

 }
 
 }
 

-
-static int
-check_args(struct mdoc *m, const struct mdoc_node *n)
+static void
+post_nm(POST_ARGS)

 {
 {

-       int              i;
+       struct roff_node        *n;

 
 

-       if (NULL == n->args)
-               return(1);
+       n = mdoc->last;

 
 

-       assert(n->args->argc);
-       for (i = 0; i < (int)n->args->argc; i++)
-               if ( ! check_argv(m, n, &n->args->argv[i]))
-                       return(0);
+       if (n->last != NULL &&
+           (n->last->tok == MDOC_Pp ||
+            n->last->tok == MDOC_Lp))
+               mdoc_node_relink(mdoc, n->last);

 
 

-       return(1);
-}
+       if (mdoc->meta.name != NULL)
+               return;

 
 

+       deroff(&mdoc->meta.name, n);

 
 

-static int
-check_argv(struct mdoc *m, const struct mdoc_node *n, 
-               const struct mdoc_argv *v)
+       if (mdoc->meta.name == NULL)
+               mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
+                   n->line, n->pos, "Nm");
+}
+
+static void
+post_nd(POST_ARGS)

 {
 {

-       int              i;
+       struct roff_node        *n;

 
 

-       for (i = 0; i < (int)v->sz; i++)
-               if ( ! check_text(m, v->line, v->pos, v->value[i]))
-                       return(0);
-
-       if (MDOC_Std == v->arg) {
-               /* `Nm' name must be set. */
-               if (v->sz || m->meta.name)
-                       return(1);
-               return(nerr(m, n, ENAME));
-       }
+       n = mdoc->last;

 
 

-       return(1);
-}
+       if (n->type != ROFFT_BODY)
+               return;

 
 

+       if (n->child == NULL)
+               mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse,
+                   n->line, n->pos, "Nd");

 
 

-static int
-check_text(struct mdoc *mdoc, int line, int pos, const char *p)
+       post_hyph(mdoc);
+}
+
+static void
+post_display(POST_ARGS)

 {
 {

-       int              c;
-
-       for ( ; *p; p++, pos++) {
-               if ('\t' == *p) {
-                       if ( ! (MDOC_LITERAL & mdoc->flags))
-                               if ( ! warn_print(mdoc, line, pos))
-                                       return(0);
-               } else if ( ! isprint((u_char)*p))
-                       if ( ! warn_print(mdoc, line, pos))
-                               return(0);
-
-               if ('\\' != *p)
-                       continue;
+       struct roff_node *n, *np;

 
 

-               c = mandoc_special(p);
-               if (c) {
-                       p += c - 1;
-                       pos += c - 1;
-                       continue;
+       n = mdoc->last;
+       switch (n->type) {
+       case ROFFT_BODY:
+               if (n->end != ENDBODY_NOT)
+                       break;
+               if (n->child == NULL)
+                       mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
+                           n->line, n->pos, mdoc_macronames[n->tok]);
+               else if (n->tok == MDOC_D1)
+                       post_hyph(mdoc);
+               break;
+       case ROFFT_BLOCK:
+               if (n->tok == MDOC_Bd) {
+                       if (n->args == NULL) {
+                               mandoc_msg(MANDOCERR_BD_NOARG,
+                                   mdoc->parse, n->line, n->pos, "Bd");
+                               mdoc->next = ROFF_NEXT_SIBLING;
+                               while (n->body->child != NULL)
+                                       mdoc_node_relink(mdoc,
+                                           n->body->child);
+                               roff_node_delete(mdoc, n);
+                               break;
+                       }
+                       post_bd(mdoc);
+                       post_prevpar(mdoc);
+               }
+               for (np = n->parent; np != NULL; np = np->parent) {
+                       if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) {
+                               mandoc_vmsg(MANDOCERR_BD_NEST,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s in Bd", mdoc_macronames[n->tok]);
+                               break;
+                       }

                }
                }

-               if ( ! (MDOC_IGN_ESCAPE & mdoc->pflags))
-                       return(perr(mdoc, line, pos, EESCAPE));
-               if ( ! pwarn(mdoc, line, pos, WESCAPE))
-                       return(0);
+               break;
+       default:
+               break;

        }
        }

+}

 
 

-       return(1);
+static void
+post_defaults(POST_ARGS)
+{
+       struct roff_node *nn;
+
+       /*
+        * The `Ar' defaults to "file ..." if no value is provided as an
+        * argument; the `Mt' and `Pa' macros use "~"; the `Li' just
+        * gets an empty string.
+        */
+
+       if (mdoc->last->child != NULL)
+               return;
+
+       nn = mdoc->last;
+
+       switch (nn->tok) {
+       case MDOC_Ar:
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "file");
+               roff_word_alloc(mdoc, nn->line, nn->pos, "...");
+               break;
+       case MDOC_Pa:
+       case MDOC_Mt:
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "~");
+               break;
+       default:
+               abort();
+       }
+       mdoc->last = nn;

 }
 
 }
 

+static void
+post_at(POST_ARGS)
+{
+       struct roff_node        *n;
+       const char              *std_att;
+       char                    *att;
+
+       n = mdoc->last;
+       if (n->child == NULL) {
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
+               mdoc->last = n;
+               return;
+       }

 
 

+       /*
+        * If we have a child, look it up in the standard keys.  If a
+        * key exist, use that instead of the child; if it doesn't,
+        * prefix "AT&T UNIX " to the existing data.
+        */

 
 

+       n = n->child;
+       assert(n->type == ROFFT_TEXT);
+       if ((std_att = mdoc_a2att(n->string)) == NULL) {
+               mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
+                   n->line, n->pos, "At %s", n->string);
+               mandoc_asprintf(&att, "AT&T UNIX %s", n->string);
+       } else
+               att = mandoc_strdup(std_att);
+
+       free(n->string);
+       n->string = att;
+}

 
 

-static int
-check_parent(PRE_ARGS, int tok, enum mdoc_type t)
+static void
+post_an(POST_ARGS)

 {
 {

+       struct roff_node *np, *nch;
+
+       post_an_norm(mdoc);
+
+       np = mdoc->last;
+       nch = np->child;
+       if (np->norm->An.auth == AUTH__NONE) {
+               if (nch == NULL)
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                           np->line, np->pos, "An");
+       } else if (nch != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                   nch->line, nch->pos, "An ... %s", nch->string);
+}

 
 

-       assert(n->parent);
-       if ((MDOC_ROOT == t || tok == n->parent->tok) &&
-                       (t == n->parent->type))
-               return(1);
+static void
+post_en(POST_ARGS)
+{

 
 

-       return(mdoc_nerr(mdoc, n, "require parent %s",
-               MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]));
+       post_obsolete(mdoc);
+       if (mdoc->last->type == ROFFT_BLOCK)
+               mdoc->last->norm->Es = mdoc->last_es;

 }
 
 }
 

+static void
+post_es(POST_ARGS)
+{

 
 

+       post_obsolete(mdoc);
+       mdoc->last_es = mdoc->last;
+}

 
 

-static int
-pre_display(PRE_ARGS)
+static void
+post_it(POST_ARGS)

 {
 {

-       struct mdoc_node *node;
+       struct roff_node *nbl, *nit, *nch;
+       int               i, cols;
+       enum mdoc_list    lt;
+
+       post_prevpar(mdoc);
+
+       nit = mdoc->last;
+       if (nit->type != ROFFT_BLOCK)
+               return;
+
+       nbl = nit->parent->parent;
+       lt = nbl->norm->Bl.type;
+
+       switch (lt) {
+       case LIST_tag:
+       case LIST_hang:
+       case LIST_ohang:
+       case LIST_inset:
+       case LIST_diag:
+               if (nit->head->child == NULL)
+                       mandoc_vmsg(MANDOCERR_IT_NOHEAD,
+                           mdoc->parse, nit->line, nit->pos,
+                           "Bl -%s It",
+                           mdoc_argnames[nbl->args->argv[0].arg]);
+               break;
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_enum:
+       case LIST_hyphen:
+               if (nit->body == NULL || nit->body->child == NULL)
+                       mandoc_vmsg(MANDOCERR_IT_NOBODY,
+                           mdoc->parse, nit->line, nit->pos,
+                           "Bl -%s It",
+                           mdoc_argnames[nbl->args->argv[0].arg]);
+               /* FALLTHROUGH */
+       case LIST_item:
+               if (nit->head->child != NULL)
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                           mdoc->parse, nit->line, nit->pos,
+                           "It %s", nit->head->child->string);
+               break;
+       case LIST_column:
+               cols = (int)nbl->norm->Bl.ncols;

 
 

-       /* Display elements (`Bd', `D1'...) cannot be nested. */
+               assert(nit->head->child == NULL);

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
+               i = 0;
+               for (nch = nit->child; nch != NULL; nch = nch->next)
+                       if (nch->type == ROFFT_BODY)
+                               i++;

 
 

-       /* LINTED */
-       for (node = mdoc->last->parent; node; node = node->parent) 
-               if (MDOC_BLOCK == node->type)
-                       if (MDOC_Bd == node->tok)
-                               break;
-       if (NULL == node)
-               return(1);
+               if (i < cols || i > cols + 1)
+                       mandoc_vmsg(MANDOCERR_BL_COL,
+                           mdoc->parse, nit->line, nit->pos,
+                           "%d columns, %d cells", cols, i);
+               break;
+       default:
+               abort();
+       }
+}
+
+static void
+post_bl_block(POST_ARGS)
+{
+       struct roff_node *n, *ni, *nc;

 
 

-       return(nerr(mdoc, n, ENESTDISP));
+       post_prevpar(mdoc);
+
+       /*
+        * These are fairly complicated, so we've broken them into two
+        * functions.  post_bl_block_tag() is called when a -tag is
+        * specified, but no -width (it must be guessed).  The second
+        * when a -width is specified (macro indicators must be
+        * rewritten into real lengths).
+        */
+
+       n = mdoc->last;
+
+       if (n->norm->Bl.type == LIST_tag &&
+           n->norm->Bl.width == NULL) {
+               post_bl_block_tag(mdoc);
+               assert(n->norm->Bl.width != NULL);
+       }
+
+       for (ni = n->body->child; ni != NULL; ni = ni->next) {
+               if (ni->body == NULL)
+                       continue;
+               nc = ni->body->last;
+               while (nc != NULL) {
+                       switch (nc->tok) {
+                       case MDOC_Pp:
+                       case MDOC_Lp:
+                       case MDOC_br:
+                               break;
+                       default:
+                               nc = NULL;
+                               continue;
+                       }
+                       if (ni->next == NULL) {
+                               mandoc_msg(MANDOCERR_PAR_MOVE,
+                                   mdoc->parse, nc->line, nc->pos,
+                                   mdoc_macronames[nc->tok]);
+                               mdoc_node_relink(mdoc, nc);
+                       } else if (n->norm->Bl.comp == 0 &&
+                           n->norm->Bl.type != LIST_column) {
+                               mandoc_vmsg(MANDOCERR_PAR_SKIP,
+                                   mdoc->parse, nc->line, nc->pos,
+                                   "%s before It",
+                                   mdoc_macronames[nc->tok]);
+                               roff_node_delete(mdoc, nc);
+                       } else
+                               break;
+                       nc = ni->body->last;
+               }
+       }

 }
 
 }
 

+/*
+ * If the argument of -offset or -width is a macro,
+ * replace it with the associated default width.
+ */
+void
+rewrite_macro2len(char **arg)
+{
+       size_t            width;
+       int               tok;
+
+       if (*arg == NULL)
+               return;
+       else if ( ! strcmp(*arg, "Ds"))
+               width = 6;
+       else if ((tok = mdoc_hash_find(*arg)) == TOKEN_NONE)
+               return;
+       else
+               width = macro2len(tok);
+
+       free(*arg);
+       mandoc_asprintf(arg, "%zun", width);
+}

 
 

-static int
-pre_bl(PRE_ARGS)
+static void
+post_bl_block_tag(POST_ARGS)

 {
 {

-       int              pos, type, width, offset;
+       struct roff_node *n, *nn;
+       size_t            sz, ssz;
+       int               i;
+       char              buf[24];

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
-       if (NULL == n->args)
-               return(nerr(mdoc, n, ELISTTYPE));
+       /*
+        * Calculate the -width for a `Bl -tag' list if it hasn't been
+        * provided.  Uses the first head macro.  NOTE AGAIN: this is
+        * ONLY if the -width argument has NOT been provided.  See
+        * rewrite_macro2len() for converting the -width string.
+        */

 
 

-       /* Make sure that only one type of list is specified.  */
+       sz = 10;
+       n = mdoc->last;

 
 

-       type = offset = width = -1;
+       for (nn = n->body->child; nn != NULL; nn = nn->next) {
+               if (nn->tok != MDOC_It)
+                       continue;

 
 

-       /* LINTED */
-       for (pos = 0; pos < (int)n->args->argc; pos++)
-               switch (n->args->argv[pos].arg) {
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
-                       if (-1 != type) 
-                               return(nerr(mdoc, n, EMULTILIST));
-                       type = n->args->argv[pos].arg;
-                       break;
-               case (MDOC_Width):
-                       if (-1 != width)
-                               return(nerr(mdoc, n, EARGREP));
-                       width = n->args->argv[pos].arg;
-                       break;
-               case (MDOC_Offset):
-                       if (-1 != offset)
-                               return(nerr(mdoc, n, EARGREP));
-                       offset = n->args->argv[pos].arg;
+               assert(nn->type == ROFFT_BLOCK);
+               nn = nn->head->child;
+
+               if (nn == NULL)

                        break;
                        break;

-               default:
+
+               if (nn->type == ROFFT_TEXT) {
+                       sz = strlen(nn->string) + 1;

                        break;
                }
 
                        break;
                }
 

-       if (-1 == type)
-               return(nerr(mdoc, n, ELISTTYPE));
+               if (0 != (ssz = macro2len(nn->tok)))
+                       sz = ssz;

 
 

-       /* 
-        * Validate the width field.  Some list types don't need width
-        * types and should be warned about them.  Others should have it
-        * and must also be warned.
+               break;
+       }
+
+       /* Defaults to ten ens. */
+
+       (void)snprintf(buf, sizeof(buf), "%un", (unsigned int)sz);
+
+       /*
+        * We have to dynamically add this to the macro's argument list.
+        * We're guaranteed that a MDOC_Width doesn't already exist.

         */
 
         */
 

-       switch (type) {
-       case (MDOC_Tag):
-               if (-1 == width && ! nwarn(mdoc, n, WMISSWIDTH))
-                       return(0);
-               break;
-       case (MDOC_Column):
-               /* FALLTHROUGH */
-       case (MDOC_Diag):
-               /* FALLTHROUGH */
-       case (MDOC_Inset):
-               /* FALLTHROUGH */
-       case (MDOC_Item):
-               if (-1 != width && ! nwarn(mdoc, n, WNOWIDTH))
-                       return(0);
+       assert(n->args != NULL);
+       i = (int)(n->args->argc)++;
+
+       n->args->argv = mandoc_reallocarray(n->args->argv,
+           n->args->argc, sizeof(struct mdoc_argv));
+
+       n->args->argv[i].arg = MDOC_Width;
+       n->args->argv[i].line = n->line;
+       n->args->argv[i].pos = n->pos;
+       n->args->argv[i].sz = 1;
+       n->args->argv[i].value = mandoc_malloc(sizeof(char *));
+       n->args->argv[i].value[0] = mandoc_strdup(buf);
+
+       /* Set our width! */
+       n->norm->Bl.width = n->args->argv[i].value[0];
+}
+
+static void
+post_bl_head(POST_ARGS)
+{
+       struct roff_node *nbl, *nh, *nch, *nnext;
+       struct mdoc_argv *argv;
+       int               i, j;
+
+       post_bl_norm(mdoc);
+
+       nh = mdoc->last;
+       if (nh->norm->Bl.type != LIST_column) {
+               if ((nch = nh->child) == NULL)
+                       return;
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                   nch->line, nch->pos, "Bl ... %s", nch->string);
+               while (nch != NULL) {
+                       roff_node_delete(mdoc, nch);
+                       nch = nh->child;
+               }
+               return;
+       }
+
+       /*
+        * Append old-style lists, where the column width specifiers
+        * trail as macro parameters, to the new-style ("normal-form")
+        * lists where they're argument values following -column.
+        */
+
+       if (nh->child == NULL)
+               return;
+
+       nbl = nh->parent;
+       for (j = 0; j < (int)nbl->args->argc; j++)
+               if (nbl->args->argv[j].arg == MDOC_Column)
+                       break;
+
+       assert(j < (int)nbl->args->argc);
+
+       /*
+        * Accommodate for new-style groff column syntax.  Shuffle the
+        * child nodes, all of which must be TEXT, as arguments for the
+        * column field.  Then, delete the head children.
+        */
+
+       argv = nbl->args->argv + j;
+       i = argv->sz;
+       for (nch = nh->child; nch != NULL; nch = nch->next)
+               argv->sz++;
+       argv->value = mandoc_reallocarray(argv->value,
+           argv->sz, sizeof(char *));
+
+       nh->norm->Bl.ncols = argv->sz;
+       nh->norm->Bl.cols = (void *)argv->value;
+
+       for (nch = nh->child; nch != NULL; nch = nnext) {
+               argv->value[i++] = nch->string;
+               nch->string = NULL;
+               nnext = nch->next;
+               roff_node_delete(NULL, nch);
+       }
+       nh->child = NULL;
+}
+
+static void
+post_bl(POST_ARGS)
+{
+       struct roff_node        *nparent, *nprev; /* of the Bl block */
+       struct roff_node        *nblock, *nbody;  /* of the Bl */
+       struct roff_node        *nchild, *nnext;  /* of the Bl body */
+
+       nbody = mdoc->last;
+       switch (nbody->type) {
+       case ROFFT_BLOCK:
+               post_bl_block(mdoc);
+               return;
+       case ROFFT_HEAD:
+               post_bl_head(mdoc);
+               return;
+       case ROFFT_BODY:

                break;
        default:
                break;
        default:

-               break;
+               return;

        }
        }

+       if (nbody->end != ENDBODY_NOT)
+               return;
+
+       nchild = nbody->child;
+       if (nchild == NULL) {
+               mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
+                   nbody->line, nbody->pos, "Bl");
+               return;
+       }
+       while (nchild != NULL) {
+               if (nchild->tok == MDOC_It ||
+                   (nchild->tok == MDOC_Sm &&
+                    nchild->next != NULL &&
+                    nchild->next->tok == MDOC_It)) {
+                       nchild = nchild->next;
+                       continue;
+               }

 
 

-       return(1);
+               mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
+                   nchild->line, nchild->pos,
+                   mdoc_macronames[nchild->tok]);
+
+               /*
+                * Move the node out of the Bl block.
+                * First, collect all required node pointers.
+                */
+
+               nblock  = nbody->parent;
+               nprev   = nblock->prev;
+               nparent = nblock->parent;
+               nnext   = nchild->next;
+
+               /*
+                * Unlink this child.
+                */
+
+               assert(nchild->prev == NULL);
+               nbody->child = nnext;
+               if (nnext == NULL)
+                       nbody->last  = NULL;
+               else
+                       nnext->prev = NULL;
+
+               /*
+                * Relink this child.
+                */
+
+               nchild->parent = nparent;
+               nchild->prev   = nprev;
+               nchild->next   = nblock;
+
+               nblock->prev = nchild;
+               if (nprev == NULL)
+                       nparent->child = nchild;
+               else
+                       nprev->next = nchild;
+
+               nchild = nnext;
+       }

 }
 
 }
 

-
-static int
-pre_bd(PRE_ARGS)
+static void
+post_bk(POST_ARGS)

 {
 {

-       int              i, type, err;
-
-       if (MDOC_BLOCK != n->type)
-               return(1);
-       if (NULL == n->args) 
-               return(nerr(mdoc, n, EDISPTYPE));
-
-       /* Make sure that only one type of display is specified.  */
+       struct roff_node        *n;

 
 

-       /* LINTED */
-       for (i = 0, err = type = 0; ! err && 
-                       i < (int)n->args->argc; i++)
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       /* FALLTHROUGH */
-               case (MDOC_File):
-                       if (0 == type++) 
-                               break;
-                       return(nerr(mdoc, n, EMULTIDISP));
-               default:
-                       break;
-               }
+       n = mdoc->last;

 
 

-       if (type)
-               return(1);
-       return(nerr(mdoc, n, EDISPTYPE));
+       if (n->type == ROFFT_BLOCK && n->body->child == NULL) {
+               mandoc_msg(MANDOCERR_BLK_EMPTY,
+                   mdoc->parse, n->line, n->pos, "Bk");
+               roff_node_delete(mdoc, n);
+       }

 }
 
 }
 

-
-static int
-pre_ss(PRE_ARGS)
+static void
+post_sm(POST_ARGS)

 {
 {

+       struct roff_node        *nch;

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
-       return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
-}
+       nch = mdoc->last->child;

 
 

+       if (nch == NULL) {
+               mdoc->flags ^= MDOC_SMOFF;
+               return;
+       }

 
 

-static int
-pre_sh(PRE_ARGS)
-{
+       assert(nch->type == ROFFT_TEXT);

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
-       return(check_parent(mdoc, n, -1, MDOC_ROOT));
-}
+       if ( ! strcmp(nch->string, "on")) {
+               mdoc->flags &= ~MDOC_SMOFF;
+               return;
+       }
+       if ( ! strcmp(nch->string, "off")) {
+               mdoc->flags |= MDOC_SMOFF;
+               return;
+       }

 
 

+       mandoc_vmsg(MANDOCERR_SM_BAD,
+           mdoc->parse, nch->line, nch->pos,
+           "%s %s", mdoc_macronames[mdoc->last->tok], nch->string);
+       mdoc_node_relink(mdoc, nch);
+       return;
+}

 
 

-static int
-pre_it(PRE_ARGS)
+static void
+post_root(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
-       return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
-}
+       /* Add missing prologue data. */

 
 

+       if (mdoc->meta.date == NULL)
+               mdoc->meta.date = mdoc->quick ?
+                   mandoc_strdup("") :
+                   mandoc_normdate(mdoc->parse, NULL, 0, 0);

 
 

-static int
-pre_an(PRE_ARGS)
-{
+       if (mdoc->meta.title == NULL) {
+               mandoc_msg(MANDOCERR_DT_NOTITLE,
+                   mdoc->parse, 0, 0, "EOF");
+               mdoc->meta.title = mandoc_strdup("UNTITLED");
+       }

 
 

-       if (NULL == n->args || 1 == n->args->argc)
-               return(1);
-       return(mdoc_nerr(mdoc, n, "only one argument allowed"));
-}
+       if (mdoc->meta.vol == NULL)
+               mdoc->meta.vol = mandoc_strdup("LOCAL");

 
 

+       if (mdoc->meta.os == NULL) {
+               mandoc_msg(MANDOCERR_OS_MISSING,
+                   mdoc->parse, 0, 0, NULL);
+               mdoc->meta.os = mandoc_strdup("");
+       }

 
 

-static int
-pre_lb(PRE_ARGS)
-{
+       /* Check that we begin with a proper `Sh'. */

 
 

-       return(check_sec(mdoc, n, SEC_LIBRARY, SEC_CUSTOM));
-}
+       n = mdoc->first->child;
+       while (n != NULL && n->tok != TOKEN_NONE &&
+           mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
+               n = n->next;

 
 

+       if (n == NULL)
+               mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
+       else if (n->tok != MDOC_Sh)
+               mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
+                   n->line, n->pos, mdoc_macronames[n->tok]);
+}

 
 

-static int
-pre_rv(PRE_ARGS)
+static void
+post_st(POST_ARGS)

 {
 {

+       struct roff_node         *n, *nch;
+       const char               *p;

 
 

-       if ( ! check_msec(mdoc, n, 2, 3, 0))
-               return(0);
-       return(check_stdarg(mdoc, n));
-}
+       n = mdoc->last;
+       nch = n->child;

 
 

+       assert(nch->type == ROFFT_TEXT);

 
 

-static int
-pre_ex(PRE_ARGS)
+       if ((p = mdoc_a2st(nch->string)) == NULL) {
+               mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
+                   nch->line, nch->pos, "St %s", nch->string);
+               roff_node_delete(mdoc, n);
+       } else {
+               free(nch->string);
+               nch->string = mandoc_strdup(p);
+       }
+}
+
+static void
+post_rs(POST_ARGS)

 {
 {

+       struct roff_node *np, *nch, *next, *prev;
+       int               i, j;

 
 

-       if ( ! check_msec(mdoc, n, 1, 6, 8, 0))
-               return(0);
-       return(check_stdarg(mdoc, n));
-}
+       np = mdoc->last;

 
 

+       if (np->type != ROFFT_BODY)
+               return;

 
 

-static int
-pre_er(PRE_ARGS)
-{
+       if (np->child == NULL) {
+               mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse,
+                   np->line, np->pos, "Rs");
+               return;
+       }

 
 

-       return(check_msec(mdoc, n, 2, 3, 9, 0));
-}
+       /*
+        * The full `Rs' block needs special handling to order the
+        * sub-elements according to `rsord'.  Pick through each element
+        * and correctly order it.  This is an insertion sort.
+        */

 
 

+       next = NULL;
+       for (nch = np->child->next; nch != NULL; nch = next) {
+               /* Determine order number of this child. */
+               for (i = 0; i < RSORD_MAX; i++)
+                       if (rsord[i] == nch->tok)
+                               break;

 
 

-static int
-pre_cd(PRE_ARGS)
-{
+               if (i == RSORD_MAX) {
+                       mandoc_msg(MANDOCERR_RS_BAD,
+                           mdoc->parse, nch->line, nch->pos,
+                           mdoc_macronames[nch->tok]);
+                       i = -1;
+               } else if (nch->tok == MDOC__J || nch->tok == MDOC__B)
+                       np->norm->Rs.quote_T++;
+
+               /*
+                * Remove this child from the chain.  This somewhat
+                * repeats roff_node_unlink(), but since we're
+                * just re-ordering, there's no need for the
+                * full unlink process.
+                */
+
+               if ((next = nch->next) != NULL)
+                       next->prev = nch->prev;
+
+               if ((prev = nch->prev) != NULL)
+                       prev->next = nch->next;
+
+               nch->prev = nch->next = NULL;
+
+               /*
+                * Scan back until we reach a node that's
+                * to be ordered before this child.
+                */
+
+               for ( ; prev ; prev = prev->prev) {
+                       /* Determine order of `prev'. */
+                       for (j = 0; j < RSORD_MAX; j++)
+                               if (rsord[j] == prev->tok)
+                                       break;
+                       if (j == RSORD_MAX)
+                               j = -1;
+
+                       if (j <= i)
+                               break;
+               }

 
 

-       return(check_msec(mdoc, n, 4, 0));
+               /*
+                * Set this child back into its correct place
+                * in front of the `prev' node.
+                */
+
+               nch->prev = prev;
+
+               if (prev == NULL) {
+                       np->child->prev = nch;
+                       nch->next = np->child;
+                       np->child = nch;
+               } else {
+                       if (prev->next)
+                               prev->next->prev = nch;
+                       nch->next = prev->next;
+                       prev->next = nch;
+               }
+       }

 }
 
 }
 

-
-static int
-pre_dt(PRE_ARGS)
+/*
+ * For some arguments of some macros,
+ * convert all breakable hyphens into ASCII_HYPH.
+ */
+static void
+post_hyph(POST_ARGS)

 {
 {

+       struct roff_node        *nch;
+       char                    *cp;

 
 

-       if (0 == mdoc->meta.date || mdoc->meta.os)
-               if ( ! nwarn(mdoc, n, WPROLOOO))
-                       return(0);
-       if (mdoc->meta.title)
-               if ( ! nwarn(mdoc, n, WPROLREP))
-                       return(0);
-       return(1);
+       for (nch = mdoc->last->child; nch != NULL; nch = nch->next) {
+               if (nch->type != ROFFT_TEXT)
+                       continue;
+               cp = nch->string;
+               if (*cp == '\0')
+                       continue;
+               while (*(++cp) != '\0')
+                       if (*cp == '-' &&
+                           isalpha((unsigned char)cp[-1]) &&
+                           isalpha((unsigned char)cp[1]))
+                               *cp = ASCII_HYPH;
+       }

 }
 
 }
 

-
-static int
-pre_os(PRE_ARGS)
+static void
+post_ns(POST_ARGS)

 {
 
 {
 

-       if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
-               if ( ! nwarn(mdoc, n, WPROLOOO))
-                       return(0);
-       if (mdoc->meta.os)
-               if ( ! nwarn(mdoc, n, WPROLREP))
-                       return(0);
-       return(1);
+       if (mdoc->last->flags & MDOC_LINE)
+               mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);

 }
 
 }
 

-
-static int
-pre_dd(PRE_ARGS)
+static void
+post_sh(POST_ARGS)

 {
 
 {
 

-       if (mdoc->meta.title || mdoc->meta.os)
-               if ( ! nwarn(mdoc, n, WPROLOOO))
-                       return(0);
-       if (mdoc->meta.date)
-               if ( ! nwarn(mdoc, n, WPROLREP))
-                       return(0);
-       return(1);
-}
+       post_ignpar(mdoc);

 
 

+       switch (mdoc->last->type) {
+       case ROFFT_HEAD:
+               post_sh_head(mdoc);
+               break;
+       case ROFFT_BODY:
+               switch (mdoc->lastsec)  {
+               case SEC_NAME:
+                       post_sh_name(mdoc);
+                       break;
+               case SEC_SEE_ALSO:
+                       post_sh_see_also(mdoc);
+                       break;
+               case SEC_AUTHORS:
+                       post_sh_authors(mdoc);
+                       break;
+               default:
+                       break;
+               }
+               break;
+       default:
+               break;
+       }
+}

 
 

-static int
-post_bf(POST_ARGS)
+static void
+post_sh_name(POST_ARGS)

 {
 {

-       char             *p;
-       struct mdoc_node *head;
+       struct roff_node *n;
+       int hasnm, hasnd;

 
 

-       if (MDOC_BLOCK != mdoc->last->type)
-               return(1);
+       hasnm = hasnd = 0;

 
 

-       head = mdoc->last->head;
+       for (n = mdoc->last->child; n != NULL; n = n->next) {
+               switch (n->tok) {
+               case MDOC_Nm:
+                       hasnm = 1;
+                       break;
+               case MDOC_Nd:
+                       hasnd = 1;
+                       if (n->next != NULL)
+                               mandoc_msg(MANDOCERR_NAMESEC_ND,
+                                   mdoc->parse, n->line, n->pos, NULL);
+                       break;
+               case TOKEN_NONE:
+                       if (hasnm)
+                               break;
+                       /* FALLTHROUGH */
+               default:
+                       mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+                           n->line, n->pos, mdoc_macronames[n->tok]);
+                       break;
+               }
+       }

 
 

-       if (mdoc->last->args && head->child)
-               return(mdoc_err(mdoc, "one argument expected"));
-       else if (mdoc->last->args)
-               return(1);
+       if ( ! hasnm)
+               mandoc_msg(MANDOCERR_NAMESEC_NONM, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);
+       if ( ! hasnd)
+               mandoc_msg(MANDOCERR_NAMESEC_NOND, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);
+}

 
 

-       if (NULL == head->child || MDOC_TEXT != head->child->type)
-               return(mdoc_err(mdoc, "text argument expected"));
+static void
+post_sh_see_also(POST_ARGS)
+{
+       const struct roff_node  *n;
+       const char              *name, *sec;
+       const char              *lastname, *lastsec, *lastpunct;
+       int                      cmp;
+
+       n = mdoc->last->child;
+       lastname = lastsec = lastpunct = NULL;
+       while (n != NULL) {
+               if (n->tok != MDOC_Xr ||
+                   n->child == NULL ||
+                   n->child->next == NULL)
+                       break;

 
 

-       p = head->child->string;
+               /* Process one .Xr node. */
+
+               name = n->child->string;
+               sec = n->child->next->string;
+               if (lastsec != NULL) {
+                       if (lastpunct[0] != ',' || lastpunct[1] != '\0')
+                               mandoc_vmsg(MANDOCERR_XR_PUNCT,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s before %s(%s)", lastpunct,
+                                   name, sec);
+                       cmp = strcmp(lastsec, sec);
+                       if (cmp > 0)
+                               mandoc_vmsg(MANDOCERR_XR_ORDER,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s(%s) after %s(%s)", name,
+                                   sec, lastname, lastsec);
+                       else if (cmp == 0 &&
+                           strcasecmp(lastname, name) > 0)
+                               mandoc_vmsg(MANDOCERR_XR_ORDER,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s after %s", name, lastname);
+               }
+               lastname = name;
+               lastsec = sec;

 
 

-       if (0 == strcmp(p, "Em"))
-               return(1);
-       else if (0 == strcmp(p, "Li"))
-               return(1);
-       else if (0 == strcmp(p, "Sm"))
-               return(1);
+               /* Process the following node. */

 
 

-       return(mdoc_nerr(mdoc, head->child, "invalid font mode"));
+               n = n->next;
+               if (n == NULL)
+                       break;
+               if (n->tok == MDOC_Xr) {
+                       lastpunct = "none";
+                       continue;
+               }
+               if (n->type != ROFFT_TEXT)
+                       break;
+               for (name = n->string; *name != '\0'; name++)
+                       if (isalpha((const unsigned char)*name))
+                               return;
+               lastpunct = n->string;
+               if (n->next == NULL)
+                       mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
+                           n->line, n->pos, "%s after %s(%s)",
+                           lastpunct, lastname, lastsec);
+               n = n->next;
+       }

 }
 
 }
 

-

 static int
 static int

-post_nm(POST_ARGS)
+child_an(const struct roff_node *n)

 {
 
 {
 

-       if (mdoc->last->child)
-               return(1);
-       if (mdoc->meta.name)
-               return(1);
-       return(verr(mdoc, ENAME));
+       for (n = n->child; n != NULL; n = n->next)
+               if ((n->tok == MDOC_An && n->child != NULL) || child_an(n))
+                       return 1;
+       return 0;

 }
 
 }
 

-
-static int
-post_at(POST_ARGS)
+static void
+post_sh_authors(POST_ARGS)

 {
 
 {
 

-       if (NULL == mdoc->last->child)
-               return(1);
-       if (MDOC_TEXT != mdoc->last->child->type)
-               return(verr(mdoc, EATT));
-       if (mdoc_a2att(mdoc->last->child->string))
-               return(1);
-       return(verr(mdoc, EATT));
+       if ( ! child_an(mdoc->last))
+               mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);

 }
 
 }
 

-
-static int
-post_an(POST_ARGS)
+static void
+post_sh_head(POST_ARGS)

 {
 {

+       const char      *goodsec;
+       enum roff_sec    sec;
+
+       /*
+        * Process a new section.  Sections are either "named" or
+        * "custom".  Custom sections are user-defined, while named ones
+        * follow a conventional order and may only appear in certain
+        * manual sections.
+        */
+
+       sec = mdoc->last->sec;

 
 

-       if (mdoc->last->args) {
-               if (NULL == mdoc->last->child)
-                       return(1);
-               return(verr(mdoc, ELINE));
+       /* The NAME should be first. */
+
+       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
+               mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "Sh %s", secnames[sec]);
+
+       /* The SYNOPSIS gets special attention in other areas. */
+
+       if (sec == SEC_SYNOPSIS) {
+               roff_setreg(mdoc->roff, "nS", 1, '=');
+               mdoc->flags |= MDOC_SYNOPSIS;
+       } else {
+               roff_setreg(mdoc->roff, "nS", 0, '=');
+               mdoc->flags &= ~MDOC_SYNOPSIS;

        }
 
        }
 

-       if (mdoc->last->child)
-               return(1);
-       return(verr(mdoc, ELINE));
-}
+       /* Mark our last section. */

 
 

+       mdoc->lastsec = sec;

 
 

-static int
-post_args(POST_ARGS)
-{
+       /* We don't care about custom sections after this. */

 
 

-       if (mdoc->last->args)
-               return(1);
-       return(verr(mdoc, ELINE));
-}
+       if (sec == SEC_CUSTOM)
+               return;

 
 

+       /*
+        * Check whether our non-custom section is being repeated or is
+        * out of order.
+        */

 
 

-static int
-post_it(POST_ARGS)
-{
-       int               type, i, cols;
-       struct mdoc_node *n, *c;
+       if (sec == mdoc->lastnamed)
+               mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "Sh %s", secnames[sec]);

 
 

-       if (MDOC_BLOCK != mdoc->last->type)
-               return(1);
+       if (sec < mdoc->lastnamed)
+               mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "Sh %s", secnames[sec]);

 
 

-       n = mdoc->last->parent->parent;
-       if (NULL == n->args)
-               return(verr(mdoc, ELISTTYPE));
+       /* Mark the last named section. */

 
 

-       /* Some types require block-head, some not. */
+       mdoc->lastnamed = sec;

 
 

-       /* LINTED */
-       for (cols = type = -1, i = 0; -1 == type && 
-                       i < (int)n->args->argc; i++)
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       type = n->args->argv[i].arg;
-                       break;
-               case (MDOC_Column):
-                       type = n->args->argv[i].arg;
-                       cols = (int)n->args->argv[i].sz;
-                       break;
-               default:
-                       break;
-               }
+       /* Check particular section/manual conventions. */

 
 

-       if (-1 == type)
-               return(verr(mdoc, ELISTTYPE));
+       if (mdoc->meta.msec == NULL)
+               return;

 
 

-       switch (type) {
-       case (MDOC_Tag):
-               if (NULL == mdoc->last->head->child)
-                       if ( ! vwarn(mdoc, WLINE))
-                               return(0);
-               break;
-       case (MDOC_Hang):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               /* FALLTHROUGH */
-       case (MDOC_Inset):
-               /* FALLTHROUGH */
-       case (MDOC_Diag):
-               if (NULL == mdoc->last->head->child)
-                       if ( ! vwarn(mdoc, WLINE))
-                               return(0);
-               if (NULL == mdoc->last->body->child)
-                       if ( ! vwarn(mdoc, WMULTILINE))
-                               return(0);
-               break;
-       case (MDOC_Bullet):
-               /* FALLTHROUGH */
-       case (MDOC_Dash):
-               /* FALLTHROUGH */
-       case (MDOC_Enum):
+       goodsec = NULL;
+       switch (sec) {
+       case SEC_ERRORS:
+               if (*mdoc->meta.msec == '4')
+                       break;
+               goodsec = "2, 3, 4, 9";

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case SEC_RETURN_VALUES:
+       case SEC_LIBRARY:
+               if (*mdoc->meta.msec == '2')
+                       break;
+               if (*mdoc->meta.msec == '3')
+                       break;
+               if (NULL == goodsec)
+                       goodsec = "2, 3, 9";

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Item):
-               if (mdoc->last->head->child)
-                       if ( ! vwarn(mdoc, WNOLINE))
-                               return(0);
-               if (NULL == mdoc->last->body->child)
-                       if ( ! vwarn(mdoc, WMULTILINE))
-                               return(0);
-               break;
-       case (MDOC_Column):
-               if (NULL == mdoc->last->head->child)
-                       if ( ! vwarn(mdoc, WLINE))
-                               return(0);
-               if (mdoc->last->body->child)
-                       if ( ! vwarn(mdoc, WNOMULTILINE))
-                               return(0);
-               c = mdoc->last->child;
-               for (i = 0; c && MDOC_HEAD == c->type; c = c->next)
-                       i++;
-               if (i == cols)
+       case SEC_CONTEXT:
+               if (*mdoc->meta.msec == '9')

                        break;
                        break;

-               return(mdoc_err(mdoc, "column mismatch (have "
-                                       "%d, want %d)", i, cols));
+               if (NULL == goodsec)
+                       goodsec = "9";
+               mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "Sh %s for %s only", secnames[sec], goodsec);
+               break;

        default:
                break;
        }
        default:
                break;
        }

-
-       return(1);

 }
 
 }
 

-
-static int
-post_bl_head(POST_ARGS) 
+static void
+post_ignpar(POST_ARGS)

 {
 {

-       int                     i;
-       const struct mdoc_node *n;
+       struct roff_node *np;

 
 

-       n = mdoc->last->parent;
-       assert(n->args);
+       switch (mdoc->last->type) {
+       case ROFFT_HEAD:
+               post_hyph(mdoc);
+               return;
+       case ROFFT_BODY:
+               break;
+       default:
+               return;
+       }

 
 

-       for (i = 0; i < (int)n->args->argc; i++)
-               if (n->args->argv[i].arg == MDOC_Column)
-                       break;
+       if ((np = mdoc->last->child) != NULL)
+               if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) {
+                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
+                           mdoc->parse, np->line, np->pos,
+                           "%s after %s", mdoc_macronames[np->tok],
+                           mdoc_macronames[mdoc->last->tok]);
+                       roff_node_delete(mdoc, np);
+               }
+
+       if ((np = mdoc->last->last) != NULL)
+               if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) {
+                       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+                           np->line, np->pos, "%s at the end of %s",
+                           mdoc_macronames[np->tok],
+                           mdoc_macronames[mdoc->last->tok]);
+                       roff_node_delete(mdoc, np);
+               }
+}
+
+static void
+post_prevpar(POST_ARGS)
+{
+       struct roff_node *n;

 
 

-       if (i == (int)n->args->argc)
-               return(1);
+       n = mdoc->last;
+       if (NULL == n->prev)
+               return;
+       if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK)
+               return;

 
 

-       if (n->args->argv[i].sz && mdoc->last->child)
-               return(nerr(mdoc, n, ECOLMIS));
+       /*
+        * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
+        * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
+        */

 
 

-       return(1);
+       if (n->prev->tok != MDOC_Pp &&
+           n->prev->tok != MDOC_Lp &&
+           n->prev->tok != MDOC_br)
+               return;
+       if (n->tok == MDOC_Bl && n->norm->Bl.comp)
+               return;
+       if (n->tok == MDOC_Bd && n->norm->Bd.comp)
+               return;
+       if (n->tok == MDOC_It && n->parent->norm->Bl.comp)
+               return;
+
+       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+           n->prev->line, n->prev->pos,
+           "%s before %s", mdoc_macronames[n->prev->tok],
+           mdoc_macronames[n->tok]);
+       roff_node_delete(mdoc, n->prev);

 }
 
 }
 

+static void
+post_par(POST_ARGS)
+{
+       struct roff_node *np;
+
+       np = mdoc->last;
+       if (np->tok != MDOC_br && np->tok != MDOC_sp)
+               post_prevpar(mdoc);
+
+       if (np->tok == MDOC_sp) {
+               if (np->child != NULL && np->child->next != NULL)
+                       mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                           np->child->next->line, np->child->next->pos,
+                           "sp ... %s", np->child->next->string);
+       } else if (np->child != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                   mdoc->parse, np->line, np->pos, "%s %s",
+                   mdoc_macronames[np->tok], np->child->string);
+
+       if ((np = mdoc->last->prev) == NULL) {
+               np = mdoc->last->parent;
+               if (np->tok != MDOC_Sh && np->tok != MDOC_Ss)
+                       return;
+       } else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp &&
+           (mdoc->last->tok != MDOC_br ||
+            (np->tok != MDOC_sp && np->tok != MDOC_br)))
+               return;
+
+       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+           mdoc->last->line, mdoc->last->pos,
+           "%s after %s", mdoc_macronames[mdoc->last->tok],
+           mdoc_macronames[np->tok]);
+       roff_node_delete(mdoc, mdoc->last);
+}

 
 

-static int
-post_bl(POST_ARGS)
+static void
+post_dd(POST_ARGS)

 {
 {

-       struct mdoc_node        *n;
-
-       if (MDOC_HEAD == mdoc->last->type) 
-               return(post_bl_head(mdoc));
-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-       if (NULL == mdoc->last->child)
-               return(1);
-
-       /* LINTED */
-       for (n = mdoc->last->child; n; n = n->next) {
-               if (MDOC_BLOCK == n->type) 
-                       if (MDOC_It == n->tok)
-                               continue;
-               return(mdoc_nerr(mdoc, n, "bad child of parent %s",
-                               mdoc_macronames[mdoc->last->tok]));
+       struct roff_node *n;
+       char             *datestr;
+
+       n = mdoc->last;
+       if (mdoc->meta.date != NULL) {
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Dd");
+               free(mdoc->meta.date);
+       } else if (mdoc->flags & MDOC_PBODY)
+               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
+                   n->line, n->pos, "Dd");
+       else if (mdoc->meta.title != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dd after Dt");
+       else if (mdoc->meta.os != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dd after Os");
+
+       if (n->child == NULL || n->child->string[0] == '\0') {
+               mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
+                   mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);
+               goto out;

        }
 
        }
 

-       return(1);
+       datestr = NULL;
+       deroff(&datestr, n);
+       if (mdoc->quick)
+               mdoc->meta.date = datestr;
+       else {
+               mdoc->meta.date = mandoc_normdate(mdoc->parse,
+                   datestr, n->line, n->pos);
+               free(datestr);
+       }
+out:
+       roff_node_delete(mdoc, n);

 }
 
 }
 

-
-static int
-ebool(struct mdoc *mdoc)
+static void
+post_dt(POST_ARGS)

 {
 {

-       struct mdoc_node *n;
+       struct roff_node *nn, *n;
+       const char       *cp;
+       char             *p;

 
 

-       /* LINTED */
-       for (n = mdoc->last->child; n; n = n->next) {
-               if (MDOC_TEXT != n->type)
-                       break;
-               if (0 == strcmp(n->string, "on"))
-                       continue;
-               if (0 == strcmp(n->string, "off"))
-                       continue;
-               break;
+       n = mdoc->last;
+       if (mdoc->flags & MDOC_PBODY) {
+               mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse,
+                   n->line, n->pos, "Dt");
+               goto out;

        }
 
        }
 

-       if (NULL == n)
-               return(1);
-       return(nerr(mdoc, n, EBOOL));
-}
+       if (mdoc->meta.title != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Dt");
+       else if (mdoc->meta.os != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dt after Os");
+
+       free(mdoc->meta.title);
+       free(mdoc->meta.msec);
+       free(mdoc->meta.vol);
+       free(mdoc->meta.arch);
+
+       mdoc->meta.title = NULL;
+       mdoc->meta.msec = NULL;
+       mdoc->meta.vol = NULL;
+       mdoc->meta.arch = NULL;
+
+       /* Mandatory first argument: title. */
+
+       nn = n->child;
+       if (nn == NULL || *nn->string == '\0') {
+               mandoc_msg(MANDOCERR_DT_NOTITLE,
+                   mdoc->parse, n->line, n->pos, "Dt");
+               mdoc->meta.title = mandoc_strdup("UNTITLED");
+       } else {
+               mdoc->meta.title = mandoc_strdup(nn->string);
+
+               /* Check that all characters are uppercase. */
+
+               for (p = nn->string; *p != '\0'; p++)
+                       if (islower((unsigned char)*p)) {
+                               mandoc_vmsg(MANDOCERR_TITLE_CASE,
+                                   mdoc->parse, nn->line,
+                                   nn->pos + (p - nn->string),
+                                   "Dt %s", nn->string);
+                               break;
+                       }
+       }

 
 

+       /* Mandatory second argument: section. */

 
 

-static int
-post_root(POST_ARGS)
-{
+       if (nn != NULL)
+               nn = nn->next;

 
 

-       if (NULL == mdoc->first->child)
-               return(verr(mdoc, ENODATA));
-       if ( ! (MDOC_PBODY & mdoc->flags))
-               return(verr(mdoc, ENOPROLOGUE));
+       if (nn == NULL) {
+               mandoc_vmsg(MANDOCERR_MSEC_MISSING,
+                   mdoc->parse, n->line, n->pos,
+                   "Dt %s", mdoc->meta.title);
+               mdoc->meta.vol = mandoc_strdup("LOCAL");
+               goto out;  /* msec and arch remain NULL. */
+       }

 
 

-       if (MDOC_BLOCK != mdoc->first->child->type)
-               return(verr(mdoc, ENODATA));
-       if (MDOC_Sh != mdoc->first->child->tok)
-               return(verr(mdoc, ENODATA));
+       mdoc->meta.msec = mandoc_strdup(nn->string);

 
 

-       return(1);
-}
+       /* Infer volume title from section number. */

 
 

+       cp = mandoc_a2msec(nn->string);
+       if (cp == NULL) {
+               mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse,
+                   nn->line, nn->pos, "Dt ... %s", nn->string);
+               mdoc->meta.vol = mandoc_strdup(nn->string);
+       } else
+               mdoc->meta.vol = mandoc_strdup(cp);

 
 

-static int
-post_st(POST_ARGS)
-{
+       /* Optional third argument: architecture. */

 
 

-       if (mdoc_a2st(mdoc->last->child->string))
-               return(1);
-       return(vwarn(mdoc, WBADSTAND));
-}
+       if ((nn = nn->next) == NULL)
+               goto out;

 
 

+       for (p = nn->string; *p != '\0'; p++)
+               *p = tolower((unsigned char)*p);
+       mdoc->meta.arch = mandoc_strdup(nn->string);

 
 

-static int
-post_sh(POST_ARGS)
-{
+       /* Ignore fourth and later arguments. */

 
 

-       if (MDOC_HEAD == mdoc->last->type)
-               return(post_sh_head(mdoc));
-       if (MDOC_BODY == mdoc->last->type)
-               return(post_sh_body(mdoc));
+       if ((nn = nn->next) != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                   nn->line, nn->pos, "Dt ... %s", nn->string);

 
 

-       return(1);
+out:
+       roff_node_delete(mdoc, n);

 }
 
 }
 

-
-static int
-post_sh_body(POST_ARGS)
+static void
+post_bx(POST_ARGS)

 {
 {

-       struct mdoc_node *n;
-
-       if (SEC_NAME != mdoc->lastnamed)
-               return(1);
+       struct roff_node        *n;

 
        /*
 
        /*

-        * 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".
+        * Make `Bx's second argument always start with an uppercase
+        * letter.  Groff checks if it's an "accepted" term, but we just
+        * uppercase blindly.

         */
 
         */
 

-       if (NULL == (n = mdoc->last->child))
-               return(vwarn(mdoc, WNAMESECINC));
-
-       for ( ; n && n->next; n = n->next) {
-               if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
-                       continue;
-               if (MDOC_TEXT == n->type)
-                       continue;
-               if ( ! vwarn(mdoc, WNAMESECINC))
-                       return(0);
-       }
-
-       if (MDOC_ELEM == n->type && MDOC_Nd == n->tok)
-               return(1);
-       return(vwarn(mdoc, WNAMESECINC));
+       if ((n = mdoc->last->child) != NULL && (n = n->next) != NULL)
+               *n->string = (char)toupper((unsigned char)*n->string);

 }
 
 }
 

-
-static int
-post_sh_head(POST_ARGS)
+static void
+post_os(POST_ARGS)

 {
 {

-       char                    buf[64];
-       enum mdoc_sec           sec;
-       const struct mdoc_node *n;
+#ifndef OSNAME
+       struct utsname    utsname;
+       static char      *defbuf;
+#endif
+       struct roff_node *n;
+
+       n = mdoc->last;
+       if (mdoc->meta.os != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Os");
+       else if (mdoc->flags & MDOC_PBODY)
+               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
+                   n->line, n->pos, "Os");

 
        /*
 
        /*

-        * Process a new section.  Sections are either "named" or
-        * "custom"; custom sections are user-defined, while named ones
-        * usually follow a conventional order and may only appear in
-        * certain manual sections.
+        * Set the operating system by way of the `Os' macro.
+        * The order of precedence is:
+        * 1. the argument of the `Os' macro, unless empty
+        * 2. the -Ios=foo command line argument, if provided
+        * 3. -DOSNAME="\"foo\"", if provided during compilation
+        * 4. "sysname release" from uname(3)

         */
 
         */
 

-       buf[0] = 0;
+       free(mdoc->meta.os);
+       mdoc->meta.os = NULL;
+       deroff(&mdoc->meta.os, n);
+       if (mdoc->meta.os)
+               goto out;

 
 

-       for (n = mdoc->last->child; n; n = n->next) {
-               /* XXX - copied from compact(). */
-               assert(MDOC_TEXT == n->type);
+       if (mdoc->defos) {
+               mdoc->meta.os = mandoc_strdup(mdoc->defos);
+               goto out;
+       }

 
 

-               if (strlcat(buf, n->string, 64) >= 64)
-                       return(nerr(mdoc, n, ETOOLONG));
-               if (NULL == n->next)
-                       continue;
-               if (strlcat(buf, " ", 64) >= 64)
-                       return(nerr(mdoc, n, ETOOLONG));
+#ifdef OSNAME
+       mdoc->meta.os = mandoc_strdup(OSNAME);
+#else /*!OSNAME */
+       if (defbuf == NULL) {
+               if (uname(&utsname) == -1) {
+                       mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,
+                           n->line, n->pos, "Os");
+                       defbuf = mandoc_strdup("UNKNOWN");
+               } else
+                       mandoc_asprintf(&defbuf, "%s %s",
+                           utsname.sysname, utsname.release);

        }
        }

+       mdoc->meta.os = mandoc_strdup(defbuf);
+#endif /*!OSNAME*/

 
 

-       sec = mdoc_atosec(buf);
+out:
+       roff_node_delete(mdoc, n);
+}

 
 

-       /* 
-        * Check: NAME should always be first, CUSTOM has no roles,
-        * non-CUSTOM has a conventional order to be followed.
-        */
+/*
+ * If no argument is provided,
+ * fill in the name of the current manual page.
+ */
+static void
+post_ex(POST_ARGS)
+{
+       struct roff_node *n;

 
 

-       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
-               return(verr(mdoc, ESECNAME));
-       if (SEC_CUSTOM == sec)
-               return(1);
-       if (sec == mdoc->lastnamed)
-               return(vwarn(mdoc, WSECREP));
-       if (sec < mdoc->lastnamed)
-               return(vwarn(mdoc, WSECOOO));
+       post_std(mdoc);

 
 

-       /* 
-        * Check particular section/manual conventions.  LIBRARY can
-        * only occur in msec 2, 3 (TODO: are there more of these?).
-        */
+       n = mdoc->last;
+       if (n->child != NULL)
+               return;

 
 

-       switch (sec) {
-       case (SEC_LIBRARY):
-               switch (mdoc->meta.msec) {
-               case (2):
-                       /* FALLTHROUGH */
-               case (3):
-                       break;
-               default:
-                       return(vwarn(mdoc, WWRONGMSEC));
-               }
-               break;
-       default:
-               break;
+       if (mdoc->meta.name == NULL) {
+               mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
+                   n->line, n->pos, "Ex");
+               return;

        }
 
        }
 

-       return(1);
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
+       mdoc->last = n;

 }
 
 }
 

+enum roff_sec
+mdoc_a2sec(const char *p)
+{
+       int              i;

 
 

-static int
-pre_fd(PRE_ARGS)
+       for (i = 0; i < (int)SEC__MAX; i++)
+               if (secnames[i] && 0 == strcmp(p, secnames[i]))
+                       return (enum roff_sec)i;
+
+       return SEC_CUSTOM;
+}
+
+static size_t
+macro2len(int macro)

 {
 
 {
 

-       return(check_sec(mdoc, n, SEC_SYNOPSIS, SEC_CUSTOM));
+       switch (macro) {
+       case MDOC_Ad:
+               return 12;
+       case MDOC_Ao:
+               return 12;
+       case MDOC_An:
+               return 12;
+       case MDOC_Aq:
+               return 12;
+       case MDOC_Ar:
+               return 12;
+       case MDOC_Bo:
+               return 12;
+       case MDOC_Bq:
+               return 12;
+       case MDOC_Cd:
+               return 12;
+       case MDOC_Cm:
+               return 10;
+       case MDOC_Do:
+               return 10;
+       case MDOC_Dq:
+               return 12;
+       case MDOC_Dv:
+               return 12;
+       case MDOC_Eo:
+               return 12;
+       case MDOC_Em:
+               return 10;
+       case MDOC_Er:
+               return 17;
+       case MDOC_Ev:
+               return 15;
+       case MDOC_Fa:
+               return 12;
+       case MDOC_Fl:
+               return 10;
+       case MDOC_Fo:
+               return 16;
+       case MDOC_Fn:
+               return 16;
+       case MDOC_Ic:
+               return 10;
+       case MDOC_Li:
+               return 16;
+       case MDOC_Ms:
+               return 6;
+       case MDOC_Nm:
+               return 10;
+       case MDOC_No:
+               return 12;
+       case MDOC_Oo:
+               return 10;
+       case MDOC_Op:
+               return 14;
+       case MDOC_Pa:
+               return 32;
+       case MDOC_Pf:
+               return 12;
+       case MDOC_Po:
+               return 12;
+       case MDOC_Pq:
+               return 12;
+       case MDOC_Ql:
+               return 16;
+       case MDOC_Qo:
+               return 12;
+       case MDOC_So:
+               return 12;
+       case MDOC_Sq:
+               return 12;
+       case MDOC_Sy:
+               return 6;
+       case MDOC_Sx:
+               return 16;
+       case MDOC_Tn:
+               return 10;
+       case MDOC_Va:
+               return 12;
+       case MDOC_Vt:
+               return 12;
+       case MDOC_Xr:
+               return 10;
+       default:
+               break;
+       };
+       return 0;

 }
 }