Simplify: write HTTP 303 redirects with relative locations.

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 6ffa50f5db165a0f803d12ef9932691e72cb6d29..d53187542e2ec265caeaa010c5b66e339db71b08 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,29 +1,28 @@
-/*     $Id: mdoc_validate.c,v 1.139 2010/12/09 10:32:22 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.319 2017/03/06 17:26:04 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2017 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.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 

-#ifndef        OSNAME
+#include <sys/types.h>
+#ifndef OSNAME

 #include <sys/utsname.h>
 #endif
 
 #include <sys/utsname.h>
 #endif
 

-#include <sys/types.h>
-

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


@@ -32,17 +31,17 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"

 #include "mandoc.h"
 #include "mandoc.h"

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

-#define        PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
-#define        POST_ARGS struct mdoc *mdoc
-
-#define        NUMSIZ    32
-#define        DATESIZE  32
+#define        POST_ARGS struct roff_man *mdoc

 
 enum   check_ineq {
        CHECK_LT,
 
 enum   check_ineq {
        CHECK_LT,


@@ -50,260 +49,194 @@ enum      check_ineq {
        CHECK_EQ
 };
 
        CHECK_EQ
 };
 

-enum   check_lvl {
-       CHECK_WARN,
-       CHECK_ERROR,
-       CHECK_FATAL
-};
-
-typedef        int     (*v_pre)(PRE_ARGS);
-typedef        int     (*v_post)(POST_ARGS);
-
-struct valids {
-       v_pre   *pre;
-       v_post  *post;
-};
-
-static int      check_count(struct mdoc *, enum mdoc_type, 
-                       enum check_lvl, enum check_ineq, int);
-static int      check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
-static void     check_text(struct mdoc *, int, int, char *);
-static void     check_argv(struct mdoc *, 
-                       struct mdoc_node *, struct mdoc_argv *);
-static void     check_args(struct mdoc *, struct mdoc_node *);
-
-static int      concat(struct mdoc *, char *, 
-                       const struct mdoc_node *, size_t);
-
-static int      ebool(POST_ARGS);
-static int      berr_ge1(POST_ARGS);
-static int      bwarn_ge1(POST_ARGS);
-static int      eerr_eq0(POST_ARGS);
-static int      eerr_eq1(POST_ARGS);
-static int      eerr_ge1(POST_ARGS);
-static int      eerr_le1(POST_ARGS);
-static int      ewarn_eq0(POST_ARGS);
-static int      ewarn_ge1(POST_ARGS);
-static int      herr_eq0(POST_ARGS);
-static int      herr_ge1(POST_ARGS);
-static int      hwarn_eq0(POST_ARGS);
-static int      hwarn_eq1(POST_ARGS);
-static int      hwarn_le1(POST_ARGS);
-
-static int      post_an(POST_ARGS);
-static int      post_at(POST_ARGS);
-static int      post_bf(POST_ARGS);
-static int      post_bl(POST_ARGS);
-static int      post_bl_block(POST_ARGS);
-static int      post_bl_block_width(POST_ARGS);
-static int      post_bl_block_tag(POST_ARGS);
-static int      post_bl_head(POST_ARGS);
-static int      post_dd(POST_ARGS);
-static int      post_dt(POST_ARGS);
-static int      post_defaults(POST_ARGS);
-static int      post_literal(POST_ARGS);
-static int      post_eoln(POST_ARGS);
-static int      post_it(POST_ARGS);
-static int      post_lb(POST_ARGS);
-static int      post_nm(POST_ARGS);
-static int      post_os(POST_ARGS);
-static int      post_prol(POST_ARGS);
-static int      post_root(POST_ARGS);
-static int      post_rs(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);
-static int      post_std(POST_ARGS);
-static int      post_vt(POST_ARGS);
-static int      pre_an(PRE_ARGS);
-static int      pre_bd(PRE_ARGS);
-static int      pre_bl(PRE_ARGS);
-static int      pre_dd(PRE_ARGS);
-static int      pre_display(PRE_ARGS);
-static int      pre_dt(PRE_ARGS);
-static int      pre_it(PRE_ARGS);
-static int      pre_literal(PRE_ARGS);
-static int      pre_os(PRE_ARGS);
-static int      pre_par(PRE_ARGS);
-static int      pre_sh(PRE_ARGS);
-static int      pre_ss(PRE_ARGS);
-static int      pre_std(PRE_ARGS);
-
-static v_post   posts_an[] = { post_an, NULL };
-static v_post   posts_at[] = { post_at, post_defaults, NULL };
-static v_post   posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL };
-static v_post   posts_bf[] = { hwarn_le1, post_bf, NULL };
-static v_post   posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL };
-static v_post   posts_bl[] = { bwarn_ge1, post_bl, NULL };
-static v_post   posts_bool[] = { eerr_eq1, ebool, NULL };
-static v_post   posts_eoln[] = { post_eoln, NULL };
-static v_post   posts_defaults[] = { post_defaults, NULL };
-static v_post   posts_dd[] = { ewarn_ge1, post_dd, post_prol, NULL };
-static v_post   posts_dl[] = { post_literal, bwarn_ge1, herr_eq0, NULL };
-static v_post   posts_dt[] = { post_dt, post_prol, NULL };
-static v_post   posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
-static v_post   posts_it[] = { post_it, NULL };
-static v_post   posts_lb[] = { eerr_eq1, post_lb, NULL };
-static v_post   posts_nd[] = { berr_ge1, NULL };
-static v_post   posts_nm[] = { post_nm, NULL };
-static v_post   posts_notext[] = { ewarn_eq0, NULL };
-static v_post   posts_os[] = { post_os, post_prol, NULL };
-static v_post   posts_rs[] = { berr_ge1, herr_eq0, post_rs, NULL };
-static v_post   posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
-static v_post   posts_sp[] = { eerr_le1, NULL };
-static v_post   posts_ss[] = { herr_ge1, NULL };
-static v_post   posts_st[] = { eerr_eq1, post_st, NULL };
-static v_post   posts_std[] = { post_std, NULL };
-static v_post   posts_text[] = { eerr_ge1, NULL };
-static v_post   posts_text1[] = { eerr_eq1, NULL };
-static v_post   posts_vt[] = { post_vt, NULL };
-static v_post   posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
-static v_post   posts_wtext[] = { ewarn_ge1, NULL };
-static v_pre    pres_an[] = { pre_an, NULL };
-static v_pre    pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL };
-static v_pre    pres_bl[] = { pre_bl, pre_par, NULL };
-static v_pre    pres_d1[] = { pre_display, NULL };
-static v_pre    pres_dl[] = { pre_literal, pre_display, NULL };
-static v_pre    pres_dd[] = { pre_dd, NULL };
-static v_pre    pres_dt[] = { pre_dt, NULL };
-static v_pre    pres_er[] = { NULL, NULL };
-static v_pre    pres_fd[] = { NULL, NULL };
-static v_pre    pres_it[] = { pre_it, NULL };
-static v_pre    pres_os[] = { pre_os, NULL };
-static v_pre    pres_pp[] = { pre_par, NULL };
-static v_pre    pres_sh[] = { pre_sh, NULL };
-static v_pre    pres_ss[] = { pre_ss, NULL };
-static v_pre    pres_std[] = { pre_std, NULL };
-
-const  struct valids mdoc_valids[MDOC_MAX] = {
-       { NULL, NULL },                         /* Ap */
-       { pres_dd, posts_dd },                  /* Dd */
-       { pres_dt, posts_dt },                  /* Dt */
-       { pres_os, posts_os },                  /* Os */
-       { pres_sh, posts_sh },                  /* Sh */ 
-       { pres_ss, posts_ss },                  /* Ss */ 
-       { pres_pp, posts_notext },              /* Pp */ 
-       { pres_d1, posts_wline },               /* D1 */
-       { pres_dl, posts_dl },                  /* 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, posts_defaults },               /* Ar */
-       { NULL, posts_text },                   /* Cd */ 
-       { NULL, NULL },                         /* Cm */
-       { NULL, NULL },                         /* Dv */ 
-       { pres_er, posts_text },                /* Er */ 
-       { NULL, NULL },                         /* Ev */ 
-       { pres_std, posts_std },                /* 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_text1 },                  /* In */ 
-       { NULL, posts_defaults },               /* Li */
-       { NULL, posts_nd },                     /* Nd */
-       { NULL, posts_nm },                     /* Nm */
-       { NULL, NULL },                         /* Op */
-       { NULL, NULL },                         /* Ot */
-       { NULL, posts_defaults },               /* Pa */
-       { pres_std, posts_std },                /* Rv */
-       { NULL, posts_st },                     /* St */ 
-       { NULL, NULL },                         /* Va */
-       { NULL, posts_vt },                     /* Vt */ 
-       { NULL, posts_wtext },                  /* Xr */ 
-       { NULL, posts_text },                   /* %A */
-       { NULL, posts_text },                   /* %B */ /* FIXME: can be used outside Rs/Re. */
-       { NULL, posts_text },                   /* %D */ /* FIXME: check date with mandoc_a2time(). */
-       { 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 */ /* FIXME: can be used outside Rs/Re. */
-       { NULL, posts_text },                   /* %V */
-       { NULL, NULL },                         /* Ac */
-       { NULL, NULL },                         /* Ao */
-       { NULL, NULL },                         /* Aq */
-       { NULL, posts_at },                     /* At */ 
-       { NULL, NULL },                         /* Bc */
-       { NULL, posts_bf },                     /* Bf */
-       { NULL, NULL },                         /* Bo */
-       { NULL, NULL },                         /* Bq */
-       { NULL, NULL },                         /* Bsx */
-       { NULL, NULL },                         /* Bx */
-       { NULL, posts_bool },                   /* Db */
-       { NULL, NULL },                         /* Dc */
-       { NULL, NULL },                         /* Do */
-       { NULL, NULL },                         /* 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_text1 },                  /* Pf */
-       { NULL, NULL },                         /* Po */
-       { NULL, NULL },                         /* Pq */
-       { NULL, NULL },                         /* Qc */
-       { NULL, NULL },                         /* Ql */
-       { NULL, NULL },                         /* Qo */
-       { NULL, NULL },                         /* Qq */
-       { NULL, NULL },                         /* Re */
-       { NULL, posts_rs },                     /* Rs */
-       { NULL, NULL },                         /* Sc */
-       { NULL, NULL },                         /* So */
-       { NULL, NULL },                         /* Sq */
-       { NULL, posts_bool },                   /* Sm */ 
-       { NULL, posts_text },                   /* Sx */
-       { NULL, posts_text },                   /* Sy */
-       { NULL, posts_text },                   /* Tn */
-       { NULL, NULL },                         /* Ux */
-       { NULL, NULL },                         /* Xc */
-       { NULL, NULL },                         /* Xo */
-       { NULL, posts_fo },                     /* Fo */ 
-       { NULL, NULL },                         /* Fc */ 
-       { NULL, NULL },                         /* Oo */
-       { NULL, NULL },                         /* Oc */
-       { NULL, posts_bk },                     /* Bk */
-       { NULL, NULL },                         /* Ek */
-       { NULL, posts_eoln },                   /* Bt */
-       { NULL, NULL },                         /* Hf */
-       { NULL, NULL },                         /* Fr */
-       { NULL, posts_eoln },                   /* Ud */
-       { NULL, posts_lb },                     /* Lb */
-       { NULL, posts_notext },                 /* Lp */ 
-       { NULL, posts_text },                   /* Lk */ 
-       { NULL, posts_defaults },               /* Mt */ 
-       { NULL, NULL },                         /* Brq */ 
-       { NULL, NULL },                         /* Bro */ 
-       { NULL, NULL },                         /* Brc */ 
-       { NULL, posts_text },                   /* %C */
-       { NULL, NULL },                         /* Es */
-       { NULL, NULL },                         /* En */
-       { NULL, NULL },                         /* Dx */
-       { NULL, posts_text },                   /* %Q */
-       { NULL, posts_notext },                 /* br */
-       { pres_pp, posts_sp },                  /* sp */
-       { NULL, posts_text1 },                  /* %U */
-       { NULL, NULL },                         /* Ta */
+typedef        void    (*v_post)(POST_ARGS);
+
+static int      build_list(struct roff_man *, int);
+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_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_rv(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 void     post_xr(POST_ARGS);
+static void     post_xx(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_rv,        /* Rv */
+       post_st,        /* St */
+       NULL,           /* Va */
+       NULL,           /* Vt */
+       post_xr,        /* 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 */
+       post_xx,        /* Bsx */
+       post_bx,        /* Bx */
+       post_obsolete,  /* Db */
+       NULL,           /* Dc */
+       NULL,           /* Do */
+       NULL,           /* Dq */
+       NULL,           /* Ec */
+       NULL,           /* Ef */
+       NULL,           /* Em */
+       NULL,           /* Eo */
+       post_xx,        /* Fx */
+       NULL,           /* Ms */
+       NULL,           /* No */
+       post_ns,        /* Ns */
+       post_xx,        /* Nx */
+       post_xx,        /* 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 */
+       post_xx,        /* 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 */
+       post_xx,        /* Dx */
+       NULL,           /* %Q */
+       post_par,       /* br */
+       post_par,       /* sp */
+       NULL,           /* %U */
+       NULL,           /* Ta */
+       NULL,           /* ll */

 };
 
 #define        RSORD_MAX 14 /* Number of `Rs' blocks. */
 
 };
 
 #define        RSORD_MAX 14 /* Number of `Rs' blocks. */
 

-static const enum mdoct rsord[RSORD_MAX] = {
+static const int rsord[RSORD_MAX] = {

        MDOC__A,
        MDOC__T,
        MDOC__B,
        MDOC__A,
        MDOC__T,
        MDOC__B,


@@ -312,190 +245,98 @@ static   const enum mdoct rsord[RSORD_MAX] = {
        MDOC__R,
        MDOC__N,
        MDOC__V,
        MDOC__R,
        MDOC__N,
        MDOC__V,

+       MDOC__U,

        MDOC__P,
        MDOC__Q,
        MDOC__P,
        MDOC__Q,

-       MDOC__D,
-       MDOC__O,

        MDOC__C,
        MDOC__C,

-       MDOC__U
+       MDOC__D,
+       MDOC__O

 };
 
 };
 

-
-int
-mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
-{
-       v_pre           *p;
-       int              line, pos;
-       char            *tp;
-
-       if (MDOC_TEXT == n->type) {
-               tp = n->string;
-               line = n->line;
-               pos = n->pos;
-               check_text(mdoc, line, pos, tp);
-               return(1);
-       }
-
-       check_args(mdoc, n);
-
-       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);
-}
+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
+};

 
 
 
 

-int
-mdoc_valid_post(struct mdoc *mdoc)
+void
+mdoc_node_validate(struct roff_man *mdoc)

 {
 {

-       v_post          *p;
-
-       if (MDOC_VALID & mdoc->last->flags)
-               return(1);
-       mdoc->last->flags |= MDOC_VALID;
-
-       if (MDOC_TEXT == mdoc->last->type)
-               return(1);
-       if (MDOC_ROOT == mdoc->last->type)
-               return(post_root(mdoc));
+       struct roff_node *n;
+       v_post *p;

 
 

-       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);
-
-       return(1);
-}
+       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;
+       }

 
 

-static int
-check_count(struct mdoc *m, enum mdoc_type type, 
-               enum check_lvl lvl, enum check_ineq ineq, int val)
-{
-       const char      *p;
-
-       if (m->last->type != type)
-               return(1);
-       
-       switch (ineq) {
-       case (CHECK_LT):
-               p = "less than ";
-               if (m->last->nchild < val)
-                       return(1);
+       mdoc->last = n;
+       mdoc->next = ROFF_NEXT_SIBLING;
+       switch (n->type) {
+       case ROFFT_TEXT:
+               if (n->sec != SEC_SYNOPSIS ||
+                   (n->parent->tok != MDOC_Cd && n->parent->tok != MDOC_Fd))
+                       check_text(mdoc, n->line, n->pos, n->string);

                break;
                break;

-       case (CHECK_GT):
-               p = "greater than ";
-               if (m->last->nchild > val)
-                       return(1);
+       case ROFFT_EQN:
+       case ROFFT_TBL:

                break;
                break;

-       case (CHECK_EQ):
-               p = "";
-               if (val == m->last->nchild)
-                       return(1);
+       case ROFFT_ROOT:
+               post_root(mdoc);

                break;
        default:
                break;
        default:

-               abort();
-               /* NOTREACHED */
-       }
-
-       if (CHECK_WARN == lvl) {
-               return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,
-                               m->last->line, m->last->pos,
-                               "want %s%d children (have %d)",
-                               p, val, m->last->nchild));
-       }
-
-       /* FIXME: THIS IS THE SAME AS THE ABOVE. */
-
-       return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT,
-                       m->last->line, m->last->pos,
-                       "require %s%d children (have %d)",
-                       p, val, m->last->nchild));
-}
-
-static int
-berr_ge1(POST_ARGS)
-{
-
-       return(check_count(mdoc, MDOC_BODY, CHECK_FATAL, CHECK_GT, 0));
-}
-
-static int
-bwarn_ge1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0));
-}
-
-static int
-eerr_eq0(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 0));
-}
-
-static int
-eerr_eq1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_EQ, 1));
-}
-
-static int
-eerr_ge1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_GT, 0));
-}
-
-static int
-eerr_le1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_ELEM, CHECK_FATAL, CHECK_LT, 2));
-}
-
-static int
-ewarn_eq0(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0));
-}
-
-static int
-ewarn_ge1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0));
-}
-
-static int
-herr_eq0(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_EQ, 0));
-}
+               check_args(mdoc, mdoc->last);

 
 

-static int
-herr_ge1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_HEAD, CHECK_FATAL, CHECK_GT, 0));
-}
+               /*
+                * Closing delimiters are not special at the
+                * beginning of a block, opening delimiters
+                * are not special at the end.
+                */

 
 

-static int
-hwarn_eq0(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0));
-}
+               if (n->child != NULL)
+                       n->child->flags &= ~NODE_DELIMC;
+               if (n->last != NULL)
+                       n->last->flags &= ~NODE_DELIMO;

 
 

-static int
-hwarn_eq1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 1));
-}
+               /* Call the macro's postprocessor. */

 
 

-static int
-hwarn_le1(POST_ARGS)
-{
-       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2));
+               p = mdoc_valids + n->tok;
+               if (*p)
+                       (*p)(mdoc);
+               if (mdoc->last == n)
+                       mdoc_state(mdoc, n);
+               break;
+       }

 }
 
 static void
 }
 
 static void

-check_args(struct mdoc *m, struct mdoc_node *n)
+check_args(struct roff_man *mdoc, struct roff_node *n)

 {
        int              i;
 
 {
        int              i;
 


@@ -504,664 +345,758 @@ check_args(struct mdoc *m, struct mdoc_node *n)
 
        assert(n->args->argc);
        for (i = 0; i < (int)n->args->argc; i++)
 
        assert(n->args->argc);
        for (i = 0; i < (int)n->args->argc; i++)

-               check_argv(m, n, &n->args->argv[i]);
+               check_argv(mdoc, n, &n->args->argv[i]);

 }
 
 static void
 }
 
 static void

-check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
+check_argv(struct roff_man *mdoc, struct roff_node *n, struct mdoc_argv *v)

 {
        int              i;
 
        for (i = 0; i < (int)v->sz; i++)
 {
        int              i;
 
        for (i = 0; i < (int)v->sz; i++)

-               check_text(m, v->line, v->pos, v->value[i]);
-
-       /* FIXME: move to post_std(). */
-
-       if (MDOC_Std == v->arg)
-               if ( ! (v->sz || m->meta.name))
-                       mdoc_nmsg(m, n, MANDOCERR_NONAME);
+               check_text(mdoc, v->line, v->pos, v->value[i]);

 }
 
 static void
 }
 
 static void

-check_text(struct mdoc *m, int ln, int pos, char *p)
-{
-       int              c;
-       size_t           sz;
-
-       for ( ; *p; p++, pos++) {
-               sz = strcspn(p, "\t\\");
-               p += (int)sz;
-
-               if ('\0' == *p)
-                       break;
-
-               pos += (int)sz;
-
-               if ('\t' == *p) {
-                       if ( ! (MDOC_LITERAL & m->flags))
-                               mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB);
-                       continue;
-               }
-
-               if (0 == (c = mandoc_special(p))) {
-                       mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
-                       continue;
-               }
-
-               p += c - 1;
-               pos += c - 1;
-       }
-}
-
-static int
-check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
-{
-
-       assert(n->parent);
-       if ((MDOC_ROOT == t || tok == n->parent->tok) &&
-                       (t == n->parent->type))
-               return(1);
-
-       mdoc_vmsg(mdoc, MANDOCERR_SYNTCHILD,
-                               n->line, n->pos, "want parent %s",
-                               MDOC_ROOT == t ? "<root>" : 
-                                       mdoc_macronames[tok]);
-       return(0);
-}
-
-
-static int
-pre_display(PRE_ARGS)
+check_text(struct roff_man *mdoc, int ln, int pos, char *p)

 {
 {

-       struct mdoc_node *node;
-
-       if (MDOC_BLOCK != n->type)
-               return(1);
+       char            *cp;

 
 

-       for (node = mdoc->last->parent; node; node = node->parent) 
-               if (MDOC_BLOCK == node->type)
-                       if (MDOC_Bd == node->tok)
-                               break;
-
-       if (node)
-               mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);
+       if (MDOC_LITERAL & mdoc->flags)
+               return;

 
 

-       return(1);
+       for (cp = p; NULL != (p = strchr(p, '\t')); p++)
+               mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,
+                   ln, pos + (int)(p - cp), NULL);

 }
 
 }
 

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

 {
 {

-       int               i, comp, dup;
-       const char       *offs, *width;
+       struct roff_node *n;
+       struct mdoc_argv *argv, *wa;
+       int               i;
+       enum mdocargt     mdoclt;

        enum mdoc_list    lt;
        enum mdoc_list    lt;

-       struct mdoc_node *np;

 
 

-       if (MDOC_BLOCK != n->type) {
-               if (ENDBODY_NOT != n->end) {
-                       assert(n->pending);
-                       np = n->pending->parent;
-               } else
-                       np = n->parent;
-
-               assert(np);
-               assert(MDOC_BLOCK == np->type);
-               assert(MDOC_Bl == np->tok);
-               assert(np->data.Bl);
-               n->data.Bl = np->data.Bl;
-               return(1);
-       }
+       n = mdoc->last->parent;
+       n->norm->Bl.type = LIST__NONE;

 
 

-       /* 
+       /*

         * 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.
         */
 
         * 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.
         */
 

-       assert(NULL == n->data.Bl);
-       n->data.Bl = mandoc_calloc(1, sizeof(struct mdoc_bl));
-
-       /* LINTED */
+       wa = (n->args == NULL) ? NULL : n->args->argv;
+       mdoclt = MDOC_ARG_MAX;

        for (i = 0; n->args && i < (int)n->args->argc; i++) {
        for (i = 0; n->args && i < (int)n->args->argc; i++) {

+               argv = n->args->argv + i;

                lt = LIST__NONE;
                lt = LIST__NONE;

-               dup = comp = 0;
-               width = offs = NULL;
-               switch (n->args->argv[i].arg) {
+               switch (argv->arg) {

                /* Set list types. */
                /* Set list types. */

-               case (MDOC_Bullet):
+               case MDOC_Bullet:

                        lt = LIST_bullet;
                        break;
                        lt = LIST_bullet;
                        break;

-               case (MDOC_Dash):
+               case MDOC_Dash:

                        lt = LIST_dash;
                        break;
                        lt = LIST_dash;
                        break;

-               case (MDOC_Enum):
+               case MDOC_Enum:

                        lt = LIST_enum;
                        break;
                        lt = LIST_enum;
                        break;

-               case (MDOC_Hyphen):
+               case MDOC_Hyphen:

                        lt = LIST_hyphen;
                        break;
                        lt = LIST_hyphen;
                        break;

-               case (MDOC_Item):
+               case MDOC_Item:

                        lt = LIST_item;
                        break;
                        lt = LIST_item;
                        break;

-               case (MDOC_Tag):
+               case MDOC_Tag:

                        lt = LIST_tag;
                        break;
                        lt = LIST_tag;
                        break;

-               case (MDOC_Diag):
+               case MDOC_Diag:

                        lt = LIST_diag;
                        break;
                        lt = LIST_diag;
                        break;

-               case (MDOC_Hang):
+               case MDOC_Hang:

                        lt = LIST_hang;
                        break;
                        lt = LIST_hang;
                        break;

-               case (MDOC_Ohang):
+               case MDOC_Ohang:

                        lt = LIST_ohang;
                        break;
                        lt = LIST_ohang;
                        break;

-               case (MDOC_Inset):
+               case MDOC_Inset:

                        lt = LIST_inset;
                        break;
                        lt = LIST_inset;
                        break;

-               case (MDOC_Column):
+               case MDOC_Column:

                        lt = LIST_column;
                        break;
                /* Set list arguments. */
                        lt = LIST_column;
                        break;
                /* Set list arguments. */

-               case (MDOC_Compact):
-                       dup = n->data.Bl->comp;
-                       comp = 1;
+               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;
                        break;

-               case (MDOC_Width):
-                       dup = (NULL != n->data.Bl->width);
-                       width = n->args->argv[i].value[0];
+               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;
                        break;

-               case (MDOC_Offset):
-                       /* NB: this can be empty! */
-                       if (n->args->argv[i].sz) {
-                               offs = n->args->argv[i].value[0];
-                               dup = (NULL != n->data.Bl->offs);
+               case MDOC_Offset:
+                       if (0 == argv->sz) {
+                               mandoc_msg(MANDOCERR_ARG_EMPTY,
+                                   mdoc->parse, argv->line,
+                                   argv->pos, "Bl -offset");

                                break;
                        }
                                break;
                        }

-                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
+                       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;
                }
                        break;
                default:
                        continue;
                }

-
-               /* Check: duplicate auxiliary arguments. */
-
-               if (dup)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);
-
-               if (comp && ! dup)
-                       n->data.Bl->comp = comp;
-               if (offs && ! dup)
-                       n->data.Bl->offs = offs;
-               if (width && ! dup)
-                       n->data.Bl->width = width;
+               if (LIST__NONE == lt)
+                       continue;
+               mdoclt = argv->arg;

 
                /* Check: multiple list types. */
 
 
                /* Check: multiple list types. */
 

-               if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);
-
-               /* Assign list type. */
-
-               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {
-                       n->data.Bl->type = lt;
-                       /* Set column information, too. */
-                       if (LIST_column == lt) {
-                               n->data.Bl->ncols = 
-                                       n->args->argv[i].sz;
-                               n->data.Bl->cols = (const char **)
-                                       n->args->argv[i].value;
-                       }
+               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;

                }
 
                /* The list type should come first. */
 
                }
 
                /* The list type should come first. */
 

-               if (n->data.Bl->type == LIST__NONE)
-                       if (n->data.Bl->width || 
-                                       n->data.Bl->offs || 
-                                       n->data.Bl->comp)
-                               mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
-
-               continue;
+               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]);
+
+               n->norm->Bl.type = lt;
+               if (LIST_column == lt) {
+                       n->norm->Bl.ncols = argv->sz;
+                       n->norm->Bl.cols = (void *)argv->value;
+               }

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

-       if (LIST__NONE == n->data.Bl->type) {
-               mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);
-               n->data.Bl->type = LIST_item;
+       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;
+               mdoclt = MDOC_Item;

        }
 
        }
 

-       /* 
+       /*

         * Validate the width field.  Some list types don't need width
         * types and should be warned about them.  Others should have it
         * 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.
+        * and must also be warned.  Yet others have a default and need
+        * no warning.

         */
 
         */
 

-       switch (n->data.Bl->type) {
-       case (LIST_tag):
-               if (n->data.Bl->width)
-                       break;
-               mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
+       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 (LIST_column):
-               /* FALLTHROUGH */
-       case (LIST_diag):
-               /* FALLTHROUGH */
-       case (LIST_ohang):
-               /* FALLTHROUGH */
-       case (LIST_inset):
-               /* FALLTHROUGH */
-       case (LIST_item):
-               if (n->data.Bl->width)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
+       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;
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_hyphen:
+               if (NULL == n->norm->Bl.width)
+                       n->norm->Bl.width = "2n";
+               break;
+       case LIST_enum:
+               if (NULL == n->norm->Bl.width)
+                       n->norm->Bl.width = "3n";

                break;
        default:
                break;
        }
                break;
        default:
                break;
        }

-
-       return(1);

 }
 
 }
 

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

 {
 {

-       int               i, dup, comp;
-       enum mdoc_disp    dt;
-       const char       *offs;
-       struct mdoc_node *np;
-
-       if (MDOC_BLOCK != n->type) {
-               if (ENDBODY_NOT != n->end) {
-                       assert(n->pending);
-                       np = n->pending->parent;
-               } else
-                       np = n->parent;
-
-               assert(np);
-               assert(MDOC_BLOCK == np->type);
-               assert(MDOC_Bd == np->tok);
-               assert(np->data.Bd);
-               n->data.Bd = np->data.Bd;
-               return(1);
-       }
-
-       assert(NULL == n->data.Bd);
-       n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));
+       struct roff_node *n;
+       struct mdoc_argv *argv;
+       int               i;
+       enum mdoc_disp    dt;

 
 

-       /* LINTED */
+       n = mdoc->last;

        for (i = 0; n->args && i < (int)n->args->argc; i++) {
        for (i = 0; n->args && i < (int)n->args->argc; i++) {

+               argv = n->args->argv + i;

                dt = DISP__NONE;
                dt = DISP__NONE;

-               dup = comp = 0;
-               offs = NULL;

 
 

-               switch (n->args->argv[i].arg) {
-               case (MDOC_Centred):
-                       dt = DISP_centred;
+               switch (argv->arg) {
+               case MDOC_Centred:
+                       dt = DISP_centered;

                        break;
                        break;

-               case (MDOC_Ragged):
+               case MDOC_Ragged:

                        dt = DISP_ragged;
                        break;
                        dt = DISP_ragged;
                        break;

-               case (MDOC_Unfilled):
+               case MDOC_Unfilled:

                        dt = DISP_unfilled;
                        break;
                        dt = DISP_unfilled;
                        break;

-               case (MDOC_Filled):
+               case MDOC_Filled:

                        dt = DISP_filled;
                        break;
                        dt = DISP_filled;
                        break;

-               case (MDOC_Literal):
+               case MDOC_Literal:

                        dt = DISP_literal;
                        break;
                        dt = DISP_literal;
                        break;

-               case (MDOC_File):
-                       mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);
-                       return(0);
-               case (MDOC_Offset):
-                       /* NB: this can be empty! */
-                       if (n->args->argv[i].sz) {
-                               offs = n->args->argv[i].value[0];
-                               dup = (NULL != n->data.Bd->offs);
+               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;
                        }
                                break;
                        }

-                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
+                       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;
                        break;

-               case (MDOC_Compact):
-                       comp = 1;
-                       dup = n->data.Bd->comp;
+               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();
                        break;
                default:
                        abort();

-                       /* NOTREACHED */

                }
                }

+               if (DISP__NONE == dt)
+                       continue;

 
 

-               /* Check whether we have duplicates. */
-
-               if (dup)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);
-
-               /* Make our auxiliary assignments. */
-
-               if (offs && ! dup)
-                       n->data.Bd->offs = offs;
-               if (comp && ! dup)
-                       n->data.Bd->comp = comp;
+               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]);
+       }

 
 

-               /* Check whether a type has already been assigned. */
+       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;
+       }
+}

 
 

-               if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);
+/*
+ * Stand-alone line macros.
+ */

 
 

-               /* Make our type assignment. */
+static void
+post_an_norm(POST_ARGS)
+{
+       struct roff_node *n;
+       struct mdoc_argv *argv;
+       size_t   i;

 
 

-               if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE)
-                       n->data.Bd->type = dt;
-       }
+       n = mdoc->last;
+       if (n->args == NULL)
+               return;

 
 

-       if (DISP__NONE == n->data.Bd->type) {
-               mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
-               n->data.Bd->type = DISP_ragged;
+       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(1);
+       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 int
-pre_ss(PRE_ARGS)
+static void
+post_eoln(POST_ARGS)

 {
 {

+       struct roff_node        *n;

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
-       return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
+       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);
+
+       while (n->child != NULL)
+               roff_node_delete(mdoc, n->child);
+
+       roff_word_alloc(mdoc, n->line, n->pos, n->tok == MDOC_Bt ?
+           "is currently in beta test." : "currently under development.");
+       mdoc->last->flags |= NODE_EOS | NODE_NOSRC;
+       mdoc->last = n;

 }
 
 }
 

-

 static int
 static int

-pre_sh(PRE_ARGS)
+build_list(struct roff_man *mdoc, int tok)

 {
 {

-
-       if (MDOC_BLOCK != n->type)
-               return(1);
-
-       mdoc->regs->regs[(int)REG_nS].set = 0;
-       return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
+       struct roff_node        *n;
+       int                      ic;
+
+       n = mdoc->last->next;
+       for (ic = 1;; ic++) {
+               roff_elem_alloc(mdoc, n->line, n->pos, tok);
+               mdoc->last->flags |= NODE_NOSRC;
+               mdoc_node_relink(mdoc, n);
+               n = mdoc->last = mdoc->last->parent;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               if (n->next == NULL)
+                       return ic;
+               if (ic > 1 || n->next->next != NULL) {
+                       roff_word_alloc(mdoc, n->line, n->pos, ",");
+                       mdoc->last->flags |= NODE_DELIMC | NODE_NOSRC;
+               }
+               n = mdoc->last->next;
+               if (n->next == NULL) {
+                       roff_word_alloc(mdoc, n->line, n->pos, "and");
+                       mdoc->last->flags |= NODE_NOSRC;
+               }
+       }

 }
 
 }
 

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

 {
 {

+       struct roff_node        *n;
+       int                      ic;

 
 

-       if (MDOC_BLOCK != n->type)
-               return(1);
+       post_std(mdoc);

 
 

-       /* 
-        * FIXME: this can probably be lifted if we make the It into
-        * something else on-the-fly?
-        */
-       return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
-}
+       n = mdoc->last;
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, "The");
+       mdoc->last->flags |= NODE_NOSRC;
+
+       if (mdoc->last->next != NULL)
+               ic = build_list(mdoc, MDOC_Nm);
+       else if (mdoc->meta.name != NULL) {
+               roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Nm);
+               mdoc->last->flags |= NODE_NOSRC;
+               roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
+               mdoc->last->flags |= NODE_NOSRC;
+               mdoc->last = mdoc->last->parent;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               ic = 1;
+       } else {
+               mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
+                   n->line, n->pos, "Ex");
+               ic = 0;
+       }

 
 

+       roff_word_alloc(mdoc, n->line, n->pos,
+           ic > 1 ? "utilities exit\\~0" : "utility exits\\~0");
+       mdoc->last->flags |= NODE_NOSRC;
+       roff_word_alloc(mdoc, n->line, n->pos,
+           "on success, and\\~>0 if an error occurs.");
+       mdoc->last->flags |= NODE_EOS | NODE_NOSRC;
+       mdoc->last = n;
+}

 
 

-static int
-pre_an(PRE_ARGS)
+static void
+post_lb(POST_ARGS)

 {
 {

-       int              i;
+       struct roff_node        *n;
+       const char              *p;

 
 

-       if (NULL == n->args)
-               return(1);
-       
-       for (i = 1; i < (int)n->args->argc; i++)
-               mdoc_pmsg(mdoc, n->args->argv[i].line, 
-                       n->args->argv[i].pos, MANDOCERR_IGNARGV);
-
-       if (MDOC_Split == n->args->argv[0].arg)
-               n->data.An.auth = AUTH_split;
-       else if (MDOC_Nosplit == n->args->argv[0].arg)
-               n->data.An.auth = AUTH_nosplit;
-       else
-               abort();
+       n = mdoc->last;
+       assert(n->child->type == ROFFT_TEXT);
+       mdoc->next = ROFF_NEXT_CHILD;
+
+       if ((p = mdoc_a2lib(n->child->string)) != NULL) {
+               n->child->flags |= NODE_NOPRT;
+               roff_word_alloc(mdoc, n->line, n->pos, p);
+               mdoc->last->flags = NODE_NOSRC;
+               mdoc->last = n;
+               return;
+       }

 
 

-       return(1);
+       roff_word_alloc(mdoc, n->line, n->pos, "library");
+       mdoc->last->flags = NODE_NOSRC;
+       roff_word_alloc(mdoc, n->line, n->pos, "\\(Lq");
+       mdoc->last->flags = NODE_DELIMO | NODE_NOSRC;
+       mdoc->last = mdoc->last->next;
+       roff_word_alloc(mdoc, n->line, n->pos, "\\(Rq");
+       mdoc->last->flags = NODE_DELIMC | NODE_NOSRC;
+       mdoc->last = n;

 }
 
 }
 

-static int
-pre_std(PRE_ARGS)
+static void
+post_rv(POST_ARGS)

 {
 {

+       struct roff_node        *n;
+       int                      ic;

 
 

-       if (n->args && 1 == n->args->argc)
-               if (MDOC_Std == n->args->argv[0].arg)
-                       return(1);
+       post_std(mdoc);

 
 

-       mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV);
-       return(1);
+       n = mdoc->last;
+       mdoc->next = ROFF_NEXT_CHILD;
+       if (n->child != NULL) {
+               roff_word_alloc(mdoc, n->line, n->pos, "The");
+               mdoc->last->flags |= NODE_NOSRC;
+               ic = build_list(mdoc, MDOC_Fn);
+               roff_word_alloc(mdoc, n->line, n->pos,
+                   ic > 1 ? "functions return" : "function returns");
+               mdoc->last->flags |= NODE_NOSRC;
+               roff_word_alloc(mdoc, n->line, n->pos,
+                   "the value\\~0 if successful;");
+       } else
+               roff_word_alloc(mdoc, n->line, n->pos, "Upon successful "
+                   "completion, the value\\~0 is returned;");
+       mdoc->last->flags |= NODE_NOSRC;
+
+       roff_word_alloc(mdoc, n->line, n->pos, "otherwise "
+           "the value\\~\\-1 is returned and the global variable");
+       mdoc->last->flags |= NODE_NOSRC;
+       roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Va);
+       mdoc->last->flags |= NODE_NOSRC;
+       roff_word_alloc(mdoc, n->line, n->pos, "errno");
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = mdoc->last->parent;
+       mdoc->next = ROFF_NEXT_SIBLING;
+       roff_word_alloc(mdoc, n->line, n->pos,
+           "is set to indicate the error.");
+       mdoc->last->flags |= NODE_EOS | NODE_NOSRC;
+       mdoc->last = n;

 }
 
 }
 

-static int
-pre_dt(PRE_ARGS)
+static void
+post_std(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

-       if (0 == mdoc->meta.date || mdoc->meta.os)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);
-
-       if (mdoc->meta.title)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP);
+       n = mdoc->last;
+       if (n->args && n->args->argc == 1)
+               if (n->args->argv[0].arg == MDOC_Std)
+                       return;

 
 

-       return(1);
+       mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
+           n->line, n->pos, mdoc_macronames[n->tok]);

 }
 
 }
 

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

 {
 {

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

 
 

-       if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);
+       n = mdoc->last;
+       nch = n->child;
+       assert(nch->type == ROFFT_TEXT);

 
 

-       if (mdoc->meta.os)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP);
+       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);
+               return;
+       }

 
 

-       return(1);
+       nch->flags |= NODE_NOPRT;
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, nch->line, nch->pos, p);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last= n;

 }
 
 }
 

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

 {
 {

+       struct roff_node *n;

 
 

-       if (mdoc->meta.title || mdoc->meta.os)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);
-
-       if (mdoc->meta.date)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP);
-
-       return(1);
+       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]);

 }
 
 }
 

+/*
+ * Block macros.
+ */

 
 

-static int
+static void

 post_bf(POST_ARGS)
 {
 post_bf(POST_ARGS)
 {

-       struct mdoc_node *np;
-       enum mdocargt     arg;
+       struct roff_node *np, *nch;

 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD
         * element, which contains the goods.
         */
 
 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD
         * element, which contains the goods.
         */
 

-       if (MDOC_HEAD != mdoc->last->type) {
-               if (ENDBODY_NOT != mdoc->last->end) {
-                       assert(mdoc->last->pending);
-                       np = mdoc->last->pending->parent->head;
-               } else if (MDOC_BLOCK != mdoc->last->type) {
-                       np = mdoc->last->parent->head;
-               } else 
-                       np = mdoc->last->head;
-
-               assert(np);
-               assert(MDOC_HEAD == np->type);
-               assert(MDOC_Bf == np->tok);
-               assert(np->data.Bf);
-               mdoc->last->data.Bf = np->data.Bf;
-               return(1);
-       }
-

        np = mdoc->last;
        np = mdoc->last;

-       assert(MDOC_BLOCK == np->parent->type);
-       assert(MDOC_Bf == np->parent->tok);
-       np->data.Bf = mandoc_calloc(1, sizeof(struct mdoc_bf));
+       if (np->type != ROFFT_HEAD)
+               return;

 
 

-       /* 
-        * Cannot have both argument and parameter.
-        * If neither is specified, let it through with a warning. 
-        */
+       assert(np->parent->type == ROFFT_BLOCK);
+       assert(np->parent->tok == MDOC_Bf);

 
 

-       if (np->parent->args && np->child) {
-               mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);
-               return(0);
-       } else if (NULL == np->parent->args && NULL == np->child) {
-               mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
-               return(1);
+       /* 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. */
 
        /* Extract argument into data. */

-       
-       if (np->parent->args) {
-               arg = np->parent->args->argv[0].arg;
-               if (MDOC_Emphasis == arg)
-                       np->data.Bf->font = FONT_Em;
-               else if (MDOC_Literal == arg)
-                       np->data.Bf->font = FONT_Li;
-               else if (MDOC_Symbolic == arg)
-                       np->data.Bf->font = FONT_Sy;
-               else
+
+       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();
                        abort();

-               return(1);
+               }
+               return;

        }
 
        /* Extract parameter into data. */
 
        }
 
        /* Extract parameter into data. */
 

-       if (0 == strcmp(np->child->string, "Em"))
-               np->data.Bf->font = FONT_Em;
-       else if (0 == strcmp(np->child->string, "Li"))
-               np->data.Bf->font = FONT_Li;
-       else if (0 == strcmp(np->child->string, "Sy"))
-               np->data.Bf->font = FONT_Sy;
-       else 
-               mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
-
-       return(1);
+       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 int
-post_lb(POST_ARGS)
+static void
+post_fname(POST_ARGS)

 {
 {

-       const char      *p;
-       char            *buf;
-       size_t           sz;
+       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);
+}

 
 

-       assert(mdoc->last->child);
-       assert(MDOC_TEXT == mdoc->last->child->type);
+static void
+post_fn(POST_ARGS)
+{

 
 

-       p = mdoc_a2lib(mdoc->last->child->string);
+       post_fname(mdoc);
+       post_fa(mdoc);
+}

 
 

-       /* If lookup ok, replace with table value. */
+static void
+post_fo(POST_ARGS)
+{
+       const struct roff_node  *n;

 
 

-       if (p) {
-               free(mdoc->last->child->string);
-               mdoc->last->child->string = mandoc_strdup(p);
-               return(1);
-       }
+       n = mdoc->last;

 
 

-       /* If not, use "library ``xxxx''. */
+       if (n->type != ROFFT_HEAD)
+               return;

 
 

-       sz = strlen(mdoc->last->child->string) +
-               2 + strlen("\\(lqlibrary\\(rq");
-       buf = mandoc_malloc(sz);
-       snprintf(buf, sz, "library \\(lq%s\\(rq", 
-                       mdoc->last->child->string);
-       free(mdoc->last->child->string);
-       mdoc->last->child->string = buf;
-       return(1);
+       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);
+       }
+
+       post_fname(mdoc);

 }
 
 }
 

-static int
-post_eoln(POST_ARGS)
+static void
+post_fa(POST_ARGS)

 {
 {

+       const struct roff_node *n;
+       const char *cp;

 
 

-       if (mdoc->last->child)
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
-       return(1);
+       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;
+               }
+       }

 }
 
 }
 

-
-static int
-post_vt(POST_ARGS)
+static void
+post_nm(POST_ARGS)

 {
 {

-       const struct mdoc_node *n;
+       struct roff_node        *n;

 
 

-       /*
-        * The Vt macro comes in both ELEM and BLOCK form, both of which
-        * have different syntaxes (yet more context-sensitive
-        * behaviour).  ELEM types must have a child; BLOCK types,
-        * specifically the BODY, should only have TEXT children.
-        */
+       n = mdoc->last;

 
 

-       if (MDOC_ELEM == mdoc->last->type)
-               return(eerr_ge1(mdoc));
-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-       
-       for (n = mdoc->last->child; n; n = n->next)
-               if (MDOC_TEXT != n->type) 
-                       mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
+       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)
+               deroff(&mdoc->meta.name, n);

 
 

+       if (mdoc->meta.name == NULL ||
+           (mdoc->lastsec == SEC_NAME && n->child == NULL))
+               mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
+                   n->line, n->pos, "Nm");

 
 

-static int
-post_nm(POST_ARGS)
-{
-       char             buf[BUFSIZ];
+       if ((n->type != ROFFT_ELEM && n->type != ROFFT_HEAD) ||
+           (n->child != NULL && n->child->type == ROFFT_TEXT) ||
+           mdoc->meta.name == NULL)
+               return;

 
 

-       /* If no child specified, make sure we have the meta name. */
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;
+}

 
 

-       if (NULL == mdoc->last->child && NULL == mdoc->meta.name) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);
-               return(1);
-       } else if (mdoc->meta.name)
-               return(1);
+static void
+post_nd(POST_ARGS)
+{
+       struct roff_node        *n;

 
 

-       /* If no meta name, set it from the child. */
+       n = mdoc->last;
+
+       if (n->type != ROFFT_BODY)
+               return;

 
 

-       if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
-               return(0);
+       if (n->sec != SEC_NAME)
+               mandoc_msg(MANDOCERR_ND_LATE, mdoc->parse,
+                   n->line, n->pos, "Nd");

 
 

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

 
 

-       return(1);
+       post_hyph(mdoc);

 }
 
 }
 

-static int
-post_literal(POST_ARGS)
+static void
+post_display(POST_ARGS)

 {
 {

-       
-       /*
-        * The `Dl' (note "el" not "one") and `Bd' macros unset the
-        * MDOC_LITERAL flag as they leave.  Note that `Bd' only sets
-        * this in literal mode, but it doesn't hurt to just switch it
-        * off in general since displays can't be nested.
-        */
+       struct roff_node *n, *np;

 
 

-       if (MDOC_BODY == mdoc->last->type)
-               mdoc->flags &= ~MDOC_LITERAL;
-
-       return(1);
+       n = mdoc->last;
+       switch (n->type) {
+       case ROFFT_BODY:
+               if (n->end != ENDBODY_NOT) {
+                       if (n->tok == MDOC_Bd &&
+                           n->body->parent->args == NULL)
+                               roff_node_delete(mdoc, n);
+               } else 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;
+                       }
+               }
+               break;
+       default:
+               break;
+       }

 }
 
 }
 

-static int
+static void

 post_defaults(POST_ARGS)
 {
 post_defaults(POST_ARGS)
 {

-       struct mdoc_node *nn;
+       struct roff_node *nn;

 
        /*
         * The `Ar' defaults to "file ..." if no value is provided as an
 
        /*
         * The `Ar' defaults to "file ..." if no value is provided as an


@@ -1169,559 +1104,573 @@ post_defaults(POST_ARGS)
         * gets an empty string.
         */
 
         * gets an empty string.
         */
 

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

        nn = mdoc->last;
        nn = mdoc->last;

-       mdoc->next = MDOC_NEXT_CHILD;

 
        switch (nn->tok) {
 
        switch (nn->tok) {

-       case (MDOC_Ar):
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "file"))
-                       return(0);
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))
-                       return(0);
-               break;
-       case (MDOC_At):
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "AT&T"))
-                       return(0);
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "UNIX"))
-                       return(0);
+       case MDOC_Ar:
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "file");
+               mdoc->last->flags |= NODE_NOSRC;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "...");
+               mdoc->last->flags |= NODE_NOSRC;

                break;
                break;

-       case (MDOC_Li):
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
-                       return(0);
-               break;
-       case (MDOC_Pa):
-               /* FALLTHROUGH */
-       case (MDOC_Mt):
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))
-                       return(0);
+       case MDOC_Pa:
+       case MDOC_Mt:
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "~");
+               mdoc->last->flags |= NODE_NOSRC;

                break;
        default:
                abort();
                break;
        default:
                abort();

-               /* NOTREACHED */
-       } 
-
+       }

        mdoc->last = nn;
        mdoc->last = nn;

-       return(1);

 }
 
 }
 

-static int
+static void

 post_at(POST_ARGS)
 {
 post_at(POST_ARGS)
 {

-       const char       *p, *q;
-       char             *buf;
-       size_t            sz;
+       struct roff_node        *n, *nch;
+       const char              *att;
+
+       n = mdoc->last;
+       nch = n->child;

 
        /*
         * 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.
         */
 
        /*
         * 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.
         */

-       
-       if (NULL == mdoc->last->child)
-               return(1);
-
-       assert(MDOC_TEXT == mdoc->last->child->type);
-       p = mdoc_a2att(mdoc->last->child->string);
-
-       if (p) {
-               free(mdoc->last->child->string);
-               mdoc->last->child->string = mandoc_strdup(p);
-       } else {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);
-               p = "AT&T UNIX ";
-               q = mdoc->last->child->string;
-               sz = strlen(p) + strlen(q) + 1;
-               buf = mandoc_malloc(sz);
-               strlcpy(buf, p, sz);
-               strlcat(buf, q, sz);
-               free(mdoc->last->child->string);
-               mdoc->last->child->string = buf;
-       }

 
 

-       return(1);
+       att = NULL;
+       if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL))
+               mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
+                   nch->line, nch->pos, "At %s", nch->string);
+
+       mdoc->next = ROFF_NEXT_CHILD;
+       if (att != NULL) {
+               roff_word_alloc(mdoc, nch->line, nch->pos, att);
+               nch->flags |= NODE_NOPRT;
+       } else
+               roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;

 }
 
 }
 

-static int
+static void

 post_an(POST_ARGS)
 {
 post_an(POST_ARGS)
 {

-       struct mdoc_node *np;
+       struct roff_node *np, *nch;
+
+       post_an_norm(mdoc);

 
        np = mdoc->last;
 
        np = mdoc->last;

-       if (AUTH__NONE != np->data.An.auth && np->child)
-               return(eerr_eq0(mdoc));
+       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);
+}

 
 

-       /* 
-        * FIXME: make this ewarn and make sure that the front-ends
-        * don't print the arguments.
-        */
-       if (AUTH__NONE != np->data.An.auth || np->child)
-               return(1);
+static void
+post_en(POST_ARGS)
+{

 
 

-       mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS);
-       return(1);
+       post_obsolete(mdoc);
+       if (mdoc->last->type == ROFFT_BLOCK)
+               mdoc->last->norm->Es = mdoc->last_es;

 }
 
 }
 

+static void
+post_es(POST_ARGS)
+{

 
 

-static int
+       post_obsolete(mdoc);
+       mdoc->last_es = mdoc->last;
+}
+
+static void
+post_xx(POST_ARGS)
+{
+       struct roff_node        *n;
+       const char              *os;
+
+       n = mdoc->last;
+       switch (n->tok) {
+       case MDOC_Bsx:
+               os = "BSD/OS";
+               break;
+       case MDOC_Dx:
+               os = "DragonFly";
+               break;
+       case MDOC_Fx:
+               os = "FreeBSD";
+               break;
+       case MDOC_Nx:
+               os = "NetBSD";
+               break;
+       case MDOC_Ox:
+               os = "OpenBSD";
+               break;
+       case MDOC_Ux:
+               os = "UNIX";
+               break;
+       default:
+               abort();
+       }
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, os);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;
+}
+
+static void

 post_it(POST_ARGS)
 {
 post_it(POST_ARGS)
 {

-       int               i, cols, rc;
+       struct roff_node *nbl, *nit, *nch;
+       int               i, cols;

        enum mdoc_list    lt;
        enum mdoc_list    lt;

-       struct mdoc_node *n, *c;
-       enum mandocerr    er;

 
 

-       if (MDOC_BLOCK != mdoc->last->type)
-               return(1);
+       post_prevpar(mdoc);

 
 

-       n = mdoc->last->parent->parent;
-       assert(n->data.Bl);
-       lt = n->data.Bl->type;
+       nit = mdoc->last;
+       if (nit->type != ROFFT_BLOCK)
+               return;

 
 

-       if (LIST__NONE == lt) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
-               return(1);
-       }
+       nbl = nit->parent->parent;
+       lt = nbl->norm->Bl.type;

 
        switch (lt) {
 
        switch (lt) {

-       case (LIST_tag):
-               if (mdoc->last->head->child)
-                       break;
-               /* FIXME: give this a dummy value. */
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
+       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;
                break;

-       case (LIST_hang):
-               /* FALLTHROUGH */
-       case (LIST_ohang):
-               /* FALLTHROUGH */
-       case (LIST_inset):
-               /* FALLTHROUGH */
-       case (LIST_diag):
-               if (NULL == mdoc->last->head->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
-               break;
-       case (LIST_bullet):
-               /* FALLTHROUGH */
-       case (LIST_dash):
-               /* FALLTHROUGH */
-       case (LIST_enum):
-               /* FALLTHROUGH */
-       case (LIST_hyphen):
-               if (NULL == mdoc->last->body->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);
+       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 */
                /* FALLTHROUGH */

-       case (LIST_item):
-               if (mdoc->last->head->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
+       case LIST_item:
+               if ((nch = nit->head->child) != NULL)
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                           mdoc->parse, nit->line, nit->pos,
+                           "It %s", nch->string == NULL ?
+                           mdoc_macronames[nch->tok] : nch->string);

                break;
                break;

-       case (LIST_column):
-               cols = (int)n->data.Bl->ncols;
+       case LIST_column:
+               cols = (int)nbl->norm->Bl.ncols;

 
 

-               assert(NULL == mdoc->last->head->child);
+               assert(nit->head->child == NULL);

 
 

-               if (NULL == mdoc->last->body->child)
-                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);
-
-               for (i = 0, c = mdoc->last->child; c; c = c->next)
-                       if (MDOC_BODY == c->type)
+               i = 0;
+               for (nch = nit->child; nch != NULL; nch = nch->next)
+                       if (nch->type == ROFFT_BODY)

                                i++;
 
                                i++;
 

-               if (i < cols)
-                       er = MANDOCERR_ARGCOUNT;
-               else if (i == cols || i == cols + 1)
-                       break;
-               else
-                       er = MANDOCERR_SYNTARGCOUNT;
-
-               rc = mdoc_vmsg(mdoc, er, 
-                               mdoc->last->line, mdoc->last->pos, 
-                               "columns == %d (have %d)", cols, i);
-               return(rc);
-       default:
+               if (i < cols || i > cols + 1)
+                       mandoc_vmsg(MANDOCERR_BL_COL,
+                           mdoc->parse, nit->line, nit->pos,
+                           "%d columns, %d cells", cols, i);

                break;
                break;

+       default:
+               abort();

        }
        }

-
-       return(1);

 }
 
 }
 

-static int
-post_bl_block(POST_ARGS) 
+static void
+post_bl_block(POST_ARGS)

 {
 {

-       struct mdoc_node *n;
+       struct roff_node *n, *ni, *nc;

 
 

-       /*
-        * 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).
-        */
+       post_prevpar(mdoc);

 
        n = mdoc->last;
 
        n = mdoc->last;

-
-       if (LIST_tag == n->data.Bl->type && 
-                       NULL == n->data.Bl->width) {
-               if ( ! post_bl_block_tag(mdoc))
-                       return(0);
-       } else if (NULL != n->data.Bl->width) {
-               if ( ! post_bl_block_width(mdoc))
-                       return(0);
-       } else 
-               return(1);
-
-       assert(n->data.Bl->width);
-       return(1);
+       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;
+               }
+       }

 }
 
 }
 

-static int
-post_bl_block_width(POST_ARGS)
+/*
+ * 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;
 {
        size_t            width;

-       int               i;
-       enum mdoct        tok;
-       struct mdoc_node *n;
-       char              buf[NUMSIZ];
-
-       n = mdoc->last;
-
-       /*
-        * Calculate the real width of a list from the -width string,
-        * which may contain a macro (with a known default width), a
-        * literal string, or a scaling width.
-        *
-        * If the value to -width is a macro, then we re-write it to be
-        * the macro's width as set in share/tmac/mdoc/doc-common.
-        */
+       int               tok;

 
 

-       if (0 == strcmp(n->data.Bl->width, "Ds"))
+       if (*arg == NULL)
+               return;
+       else if ( ! strcmp(*arg, "Ds"))

                width = 6;
                width = 6;

-       else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width)))
-               return(1);
-       else if (0 == (width = mdoc_macro2len(tok)))  {
-               mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
-               return(1);
-       }
-
-       /* The value already exists: free and reallocate it. */
-
-       assert(n->args);
-
-       for (i = 0; i < (int)n->args->argc; i++) 
-               if (MDOC_Width == n->args->argv[i].arg)
-                       break;
-
-       assert(i < (int)n->args->argc);
-
-       snprintf(buf, NUMSIZ, "%zun", width);
-       free(n->args->argv[i].value[0]);
-       n->args->argv[i].value[0] = mandoc_strdup(buf);
+       else if ((tok = mdoc_hash_find(*arg)) == TOKEN_NONE)
+               return;
+       else
+               width = macro2len(tok);

 
 

-       /* Set our width! */
-       n->data.Bl->width = n->args->argv[i].value[0];
-       return(1);
+       free(*arg);
+       mandoc_asprintf(arg, "%zun", width);

 }
 
 }
 

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

 {
 {

-       struct mdoc_node *n, *nn;
-       size_t            sz, ssz;
-       int               i;
-       char              buf[NUMSIZ];
+       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;
+       }

 
        /*
 
        /*

-        * 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
-        * post_bl_block_width() for converting the -width string.
+        * 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.

         */
 
         */
 

-       sz = 10;
-       n = mdoc->last;
-
-       for (nn = n->body->child; nn; nn = nn->next) {
-               if (MDOC_It != nn->tok)
-                       continue;
-
-               assert(MDOC_BLOCK == nn->type);
-               nn = nn->head->child;
+       if (nh->child == NULL)
+               return;

 
 

-               if (nn == NULL)
+       nbl = nh->parent;
+       for (j = 0; j < (int)nbl->args->argc; j++)
+               if (nbl->args->argv[j].arg == MDOC_Column)

                        break;
 
                        break;
 

-               if (MDOC_TEXT == nn->type) {
-                       sz = strlen(nn->string) + 1;
-                       break;
-               }
-
-               if (0 != (ssz = mdoc_macro2len(nn->tok)))
-                       sz = ssz;
-
-               break;
-       } 
-
-       /* Defaults to ten ens. */
-
-       snprintf(buf, NUMSIZ, "%zun", sz);
+       assert(j < (int)nbl->args->argc);

 
        /*
 
        /*

-        * We have to dynamically add this to the macro's argument list.
-        * We're guaranteed that a MDOC_Width doesn't already exist.
+        * 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.

         */
 
         */
 

-       assert(n->args);
-       i = (int)(n->args->argc)++;
-
-       n->args->argv = mandoc_realloc(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->data.Bl->width = n->args->argv[i].value[0];
-       return(1);
+       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 int
-post_bl_head(POST_ARGS) 
+static void
+post_bl(POST_ARGS)

 {
 {

-       struct mdoc_node *np, *nn, *nnp;
-       int               i, j;
+       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:
+               return;
+       }
+       if (nbody->end != ENDBODY_NOT)
+               return;

 
 

-       if (LIST_column != mdoc->last->data.Bl->type)
-               /* FIXME: this should be ERROR class... */
-               return(hwarn_eq0(mdoc));
+       nchild = nbody->child;
+       if (nchild == NULL) {
+               mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
+                   nbody->line, nbody->pos, "Bl");
+               return;
+       }
+       while (nchild != NULL) {
+               nnext = nchild->next;
+               if (nchild->tok == MDOC_It ||
+                   (nchild->tok == MDOC_Sm &&
+                    nnext != NULL && nnext->tok == MDOC_It)) {
+                       nchild = nnext;
+                       continue;
+               }

 
 

-       /*
-        * Convert 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.
-        */
+               /*
+                * In .Bl -column, the first rows may be implicit,
+                * that is, they may not start with .It macros.
+                * Such rows may be followed by nodes generated on the
+                * roff level, for example .TS, which cannot be moved
+                * out of the list.  In that case, wrap such roff nodes
+                * into an implicit row.
+                */

 
 

-       /* First, disallow both types and allow normal-form. */
+               if (nchild->prev != NULL) {
+                       mdoc->last = nchild;
+                       mdoc->next = ROFF_NEXT_SIBLING;
+                       roff_block_alloc(mdoc, nchild->line,
+                           nchild->pos, MDOC_It);
+                       roff_head_alloc(mdoc, nchild->line,
+                           nchild->pos, MDOC_It);
+                       mdoc->next = ROFF_NEXT_SIBLING;
+                       roff_body_alloc(mdoc, nchild->line,
+                           nchild->pos, MDOC_It);
+                       while (nchild->tok != MDOC_It) {
+                               mdoc_node_relink(mdoc, nchild);
+                               if ((nchild = nnext) == NULL)
+                                       break;
+                               nnext = nchild->next;
+                               mdoc->next = ROFF_NEXT_SIBLING;
+                       }
+                       mdoc->last = nbody;
+                       continue;
+               }

 
 

-       /* 
-        * TODO: technically, we can accept both and just merge the two
-        * lists, but I'll leave that for another day.
-        */
+               mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
+                   nchild->line, nchild->pos,
+                   mdoc_macronames[nchild->tok]);

 
 

-       if (mdoc->last->data.Bl->ncols && mdoc->last->nchild) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);
-               return(0);
-       } else if (NULL == mdoc->last->child)
-               return(1);
+               /*
+                * Move the node out of the Bl block.
+                * First, collect all required node pointers.
+                */

 
 

-       np = mdoc->last->parent;
-       assert(np->args);
+               nblock  = nbody->parent;
+               nprev   = nblock->prev;
+               nparent = nblock->parent;

 
 

-       for (j = 0; j < (int)np->args->argc; j++) 
-               if (MDOC_Column == np->args->argv[j].arg)
-                       break;
+               /*
+                * Unlink this child.
+                */

 
 

-       assert(j < (int)np->args->argc);
-       assert(0 == np->args->argv[j].sz);
+               nbody->child = nnext;
+               if (nnext == NULL)
+                       nbody->last  = NULL;
+               else
+                       nnext->prev = NULL;

 
 

-       /*
-        * Accomodate 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.
-        */
+               /*
+                * Relink this child.
+                */

 
 

-       np->args->argv[j].sz = (size_t)mdoc->last->nchild;
-       np->args->argv[j].value = mandoc_malloc
-               ((size_t)mdoc->last->nchild * sizeof(char *));
+               nchild->parent = nparent;
+               nchild->prev   = nprev;
+               nchild->next   = nblock;

 
 

-       mdoc->last->data.Bl->ncols = np->args->argv[j].sz;
-       mdoc->last->data.Bl->cols = (const char **)np->args->argv[j].value;
+               nblock->prev = nchild;
+               if (nprev == NULL)
+                       nparent->child = nchild;
+               else
+                       nprev->next = nchild;

 
 

-       for (i = 0, nn = mdoc->last->child; nn; i++) {
-               np->args->argv[j].value[i] = nn->string;
-               nn->string = NULL;
-               nnp = nn;
-               nn = nn->next;
-               mdoc_node_delete(NULL, nnp);
+               nchild = nnext;

        }
        }

-
-       mdoc->last->nchild = 0;
-       mdoc->last->child = NULL;
-
-       return(1);

 }
 
 }
 

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

 {
 {

-       struct mdoc_node        *n;
-
-       if (MDOC_HEAD == mdoc->last->type) 
-               return(post_bl_head(mdoc));
-       if (MDOC_BLOCK == mdoc->last->type)
-               return(post_bl_block(mdoc));
-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-       if (NULL == mdoc->last->child)
-               return(1);
+       struct roff_node        *n;

 
 

-       /*
-        * We only allow certain children of `Bl'.  This is usually on
-        * `It', but apparently `Sm' occurs here and there, so we let
-        * that one through, too.
-        */
+       n = mdoc->last;

 
 

-       /* LINTED */
-       for (n = mdoc->last->child; n; n = n->next) {
-               if (MDOC_BLOCK == n->type && MDOC_It == n->tok)
-                       continue;
-               if (MDOC_Sm == n->tok)
-                       continue;
-               mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD);
-               return(0);
+       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);

        }
        }

-
-       return(1);

 }
 
 }
 

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

 {
 {

+       struct roff_node        *nch;
+
+       nch = mdoc->last->child;

 
 

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

 
 

-       assert(MDOC_TEXT == mdoc->last->child->type);
+       assert(nch->type == ROFFT_TEXT);

 
 

-       if (0 == strcmp(mdoc->last->child->string, "on"))
-               return(1);
-       if (0 == strcmp(mdoc->last->child->string, "off"))
-               return(1);
+       if ( ! strcmp(nch->string, "on")) {
+               mdoc->flags &= ~MDOC_SMOFF;
+               return;
+       }
+       if ( ! strcmp(nch->string, "off")) {
+               mdoc->flags |= MDOC_SMOFF;
+               return;
+       }

 
 

-       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL);
-       return(1);
+       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
+static void

 post_root(POST_ARGS)
 {
 post_root(POST_ARGS)
 {

-       int               erc;
-       struct mdoc_node *n;
+       struct roff_node *n;

 
 

-       erc = 0;
+       /* Add missing prologue data. */

 
 

-       /* Check that we have a finished prologue. */
+       if (mdoc->meta.date == NULL)
+               mdoc->meta.date = mdoc->quick ?
+                   mandoc_strdup("") :
+                   mandoc_normdate(mdoc->parse, NULL, 0, 0);

 
 

-       if ( ! (MDOC_PBODY & mdoc->flags)) {
-               erc++;
-               mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
+       if (mdoc->meta.title == NULL) {
+               mandoc_msg(MANDOCERR_DT_NOTITLE,
+                   mdoc->parse, 0, 0, "EOF");
+               mdoc->meta.title = mandoc_strdup("UNTITLED");

        }
 
        }
 

-       n = mdoc->first;
-       assert(n);
-       
-       /* Check that we begin with a proper `Sh'. */
+       if (mdoc->meta.vol == NULL)
+               mdoc->meta.vol = mandoc_strdup("LOCAL");

 
 

-       if (NULL == n->child) {
-               erc++;
-               mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
-       } else if (MDOC_BLOCK != n->child->type || 
-                       MDOC_Sh != n->child->tok) {
-               erc++;
-               /* Can this be lifted?  See rxdebug.1 for example. */
-               mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
+       if (mdoc->meta.os == NULL) {
+               mandoc_msg(MANDOCERR_OS_MISSING,
+                   mdoc->parse, 0, 0, NULL);
+               mdoc->meta.os = mandoc_strdup("");

        }
 
        }
 

-       return(erc ? 0 : 1);
-}
-
-static int
-post_st(POST_ARGS)
-{
-       const char      *p;
-
-       assert(MDOC_TEXT == mdoc->last->child->type);
-
-       p = mdoc_a2st(mdoc->last->child->string);
+       /* Check that we begin with a proper `Sh'. */

 
 

-       if (p == NULL) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD);
-               mdoc_node_delete(mdoc, mdoc->last);
-       } else {
-               free(mdoc->last->child->string);
-               mdoc->last->child->string = mandoc_strdup(p);
-       }
+       n = mdoc->first->child;
+       while (n != NULL && n->tok != TOKEN_NONE &&
+           mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
+               n = n->next;

 
 

-       return(1);
+       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
+static void

 post_rs(POST_ARGS)
 {
 post_rs(POST_ARGS)
 {

-       struct mdoc_node *nn, *next, *prev;
+       struct roff_node *np, *nch, *next, *prev;

        int               i, j;
 
        int               i, j;
 

-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-
-       /*
-        * Make sure only certain types of nodes are allowed within the
-        * the `Rs' body.  Delete offending nodes and raise a warning.
-        * Do this before re-ordering for the sake of clarity.
-        */
-
-       next = NULL;
-       for (nn = mdoc->last->child; nn; nn = next) {
-               for (i = 0; i < RSORD_MAX; i++)
-                       if (nn->tok == rsord[i])
-                               break;
+       np = mdoc->last;

 
 

-               if (i < RSORD_MAX) {
-                       next = nn->next;
-                       continue;
-               }
+       if (np->type != ROFFT_BODY)
+               return;

 
 

-               next = nn->next;
-               mdoc_nmsg(mdoc, nn, MANDOCERR_CHILD);
-               mdoc_node_delete(mdoc, nn);
+       if (np->child == NULL) {
+               mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse,
+                   np->line, np->pos, "Rs");
+               return;

        }
 
        /*
         * The full `Rs' block needs special handling to order the
         * sub-elements according to `rsord'.  Pick through each element
        }
 
        /*
         * 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 a insertion sort.
+        * and correctly order it.  This is an insertion sort.

         */
 
        next = NULL;
         */
 
        next = NULL;

-       for (nn = mdoc->last->child->next; nn; nn = next) {
-               /* Determine order of `nn'. */
+       for (nch = np->child->next; nch != NULL; nch = next) {
+               /* Determine order number of this child. */

                for (i = 0; i < RSORD_MAX; i++)
                for (i = 0; i < RSORD_MAX; i++)

-                       if (rsord[i] == nn->tok)
+                       if (rsord[i] == nch->tok)

                                break;
 
                                break;
 

-               /* 
-                * Remove `nn' from the chain.  This somewhat
-                * repeats mdoc_node_unlink(), but since we're
+               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.
                 */
                 * just re-ordering, there's no need for the
                 * full unlink process.
                 */

-               
-               if (NULL != (next = nn->next))
-                       next->prev = nn->prev;

 
 

-               if (NULL != (prev = nn->prev))
-                       prev->next = nn->next;
+               if ((next = nch->next) != NULL)
+                       next->prev = nch->prev;
+
+               if ((prev = nch->prev) != NULL)
+                       prev->next = nch->next;

 
 

-               nn->prev = nn->next = NULL;
+               nch->prev = nch->next = NULL;

 
 

-               /* 
+               /*

                 * Scan back until we reach a node that's
                 * Scan back until we reach a node that's

-                * ordered before `nn'.
+                * to be ordered before this child.

                 */
 
                for ( ; prev ; prev = prev->prev) {
                 */
 
                for ( ; prev ; prev = prev->prev) {


@@ -1729,85 +1678,232 @@ post_rs(POST_ARGS)
                        for (j = 0; j < RSORD_MAX; j++)
                                if (rsord[j] == prev->tok)
                                        break;
                        for (j = 0; j < RSORD_MAX; j++)
                                if (rsord[j] == prev->tok)
                                        break;

+                       if (j == RSORD_MAX)
+                               j = -1;

 
                        if (j <= i)
                                break;
                }
 
                /*
 
                        if (j <= i)
                                break;
                }
 
                /*

-                * Set `nn' back into its correct place in front
-                * of the `prev' node.
+                * Set this child back into its correct place
+                * in front of the `prev' node.

                 */
 
                 */
 

-               nn->prev = prev;
+               nch->prev = prev;

 
 

-               if (prev) {
-                       if (prev->next)
-                               prev->next->prev = nn;
-                       nn->next = prev->next;
-                       prev->next = nn;
+               if (prev == NULL) {
+                       np->child->prev = nch;
+                       nch->next = np->child;
+                       np->child = nch;

                } else {
                } else {

-                       mdoc->last->child->prev = nn;
-                       nn->next = mdoc->last->child;
-                       mdoc->last->child = nn;
+                       if (prev->next)
+                               prev->next->prev = nch;
+                       nch->next = prev->next;
+                       prev->next = nch;

                }
        }
                }
        }

-
-       return(1);

 }
 
 }
 

-static int
-post_sh(POST_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 (MDOC_HEAD == mdoc->last->type)
-               return(post_sh_head(mdoc));
-       if (MDOC_BODY == mdoc->last->type)
-               return(post_sh_body(mdoc));
-
-       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
-post_sh_body(POST_ARGS)
+static void
+post_ns(POST_ARGS)

 {
 {

-       struct mdoc_node *n;

 
 

-       if (SEC_NAME != mdoc->lastsec)
-               return(1);
+       if (mdoc->last->flags & NODE_LINE)
+               mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);
+}

 
 

-       /*
-        * 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".
-        */
+static void
+post_sh(POST_ARGS)
+{
+
+       post_ignpar(mdoc);

 
 

-       if (NULL == (n = mdoc->last->child)) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC);
-               return(1);
+       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;

        }
        }

+}

 
 

-       for ( ; n && n->next; n = n->next) {
-               if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
+static void
+post_sh_name(POST_ARGS)
+{
+       struct roff_node *n;
+       int hasnm, hasnd;
+
+       hasnm = hasnd = 0;
+
+       for (n = mdoc->last->child; n != NULL; n = n->next) {
+               switch (n->tok) {
+               case MDOC_Nm:
+                       if (hasnm && n->child != NULL)
+                               mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT,
+                                   mdoc->parse, n->line, n->pos,
+                                   "Nm %s", n->child->string);
+                       hasnm = 1;

                        continue;
                        continue;

-               if (MDOC_TEXT == n->type)
+               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 (n->type == ROFFT_TEXT &&
+                           n->string[0] == ',' && n->string[1] == '\0' &&
+                           n->next != NULL && n->next->tok == MDOC_Nm) {
+                               n = n->next;
+                               continue;
+                       }
+                       /* FALLTHROUGH */
+               default:
+                       mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+                           n->line, n->pos, mdoc_macronames[n->tok]);

                        continue;
                        continue;

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC);
+               }
+               break;

        }
 
        }
 

-       assert(n);
-       if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)
-               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);
+}

 
 

-       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC);
-       return(1);
+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;
+
+               /* 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;
+
+               /* Process the following node. */
+
+               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

+child_an(const struct roff_node *n)
+{
+
+       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 void
+post_sh_authors(POST_ARGS)
+{
+
+       if ( ! child_an(mdoc->last))
+               mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);
+}
+
+static void

 post_sh_head(POST_ARGS)
 {
 post_sh_head(POST_ARGS)
 {

-       char             buf[BUFSIZ];
-       enum mdoc_sec    sec;
+       struct roff_node        *nch;
+       const char              *goodsec;
+       enum roff_sec            sec;

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


@@ -1816,22 +1912,27 @@ post_sh_head(POST_ARGS)
         * manual sections.
         */
 
         * manual sections.
         */
 

-       if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
-               return(0);
-
-       sec = mdoc_str2sec(buf);
+       sec = mdoc->last->sec;

 
        /* The NAME should be first. */
 
 
        /* The NAME should be first. */
 

-       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST);
+       if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)
+               mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, "Sh %s",
+                   sec != SEC_CUSTOM ? secnames[sec] :
+                   (nch = mdoc->last->child) == NULL ? "" :
+                   nch->type == ROFFT_TEXT ? nch->string :
+                   mdoc_macronames[nch->tok]);

 
        /* The SYNOPSIS gets special attention in other areas. */
 
 
        /* The SYNOPSIS gets special attention in other areas. */
 

-       if (SEC_SYNOPSIS == sec)
+       if (sec == SEC_SYNOPSIS) {
+               roff_setreg(mdoc->roff, "nS", 1, '=');

                mdoc->flags |= MDOC_SYNOPSIS;
                mdoc->flags |= MDOC_SYNOPSIS;

-       else
+       } else {
+               roff_setreg(mdoc->roff, "nS", 0, '=');

                mdoc->flags &= ~MDOC_SYNOPSIS;
                mdoc->flags &= ~MDOC_SYNOPSIS;

+       }

 
        /* Mark our last section. */
 
 
        /* Mark our last section. */
 


@@ -1839,8 +1940,8 @@ post_sh_head(POST_ARGS)
 
        /* We don't care about custom sections after this. */
 
 
        /* We don't care about custom sections after this. */
 

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

 
        /*
         * Check whether our non-custom section is being repeated or is
 
        /*
         * Check whether our non-custom section is being repeated or is


@@ -1848,10 +1949,14 @@ post_sh_head(POST_ARGS)
         */
 
        if (sec == mdoc->lastnamed)
         */
 
        if (sec == mdoc->lastnamed)

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP);
+               mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "Sh %s", secnames[sec]);

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

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO);
+               mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "Sh %s", secnames[sec]);

 
        /* Mark the last named section. */
 
 
        /* Mark the last named section. */
 


@@ -1859,355 +1964,492 @@ post_sh_head(POST_ARGS)
 
        /* Check particular section/manual conventions. */
 
 
        /* Check particular section/manual conventions. */
 

-       assert(mdoc->meta.msec);
+       if (mdoc->meta.msec == NULL)
+               return;

 
 

+       goodsec = NULL;

        switch (sec) {
        switch (sec) {

-       case (SEC_RETURN_VALUES):
-               /* FALLTHROUGH */
-       case (SEC_ERRORS):
+       case SEC_ERRORS:
+               if (*mdoc->meta.msec == '4')
+                       break;
+               goodsec = "2, 3, 4, 9";

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (SEC_LIBRARY):
+       case SEC_RETURN_VALUES:
+       case SEC_LIBRARY:

                if (*mdoc->meta.msec == '2')
                        break;
                if (*mdoc->meta.msec == '3')
                        break;
                if (*mdoc->meta.msec == '2')
                        break;
                if (*mdoc->meta.msec == '3')
                        break;

+               if (NULL == goodsec)
+                       goodsec = "2, 3, 9";
+               /* FALLTHROUGH */
+       case SEC_CONTEXT:

                if (*mdoc->meta.msec == '9')
                        break;
                if (*mdoc->meta.msec == '9')
                        break;

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC);
+               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;
        }
                break;
        default:
                break;
        }

-
-       return(1);

 }
 
 }
 

-static int
-pre_par(PRE_ARGS)
+static void
+post_xr(POST_ARGS)

 {
 {

+       struct roff_node *n, *nch;

 
 

-       if (NULL == mdoc->last)
-               return(1);
+       n = mdoc->last;
+       nch = n->child;
+       if (nch->next == NULL) {
+               mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse,
+                   n->line, n->pos, "Xr %s", nch->string);
+               return;
+       }
+       assert(nch->next == n->last);
+}

 
 

-       /* 
-        * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
-        * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
-        */
+static void
+post_ignpar(POST_ARGS)
+{
+       struct roff_node *np;

 
 

-       if (MDOC_Pp != mdoc->last->tok && MDOC_Lp != mdoc->last->tok)
-               return(1);
+       switch (mdoc->last->type) {
+       case ROFFT_HEAD:
+               post_hyph(mdoc);
+               return;
+       case ROFFT_BODY:
+               break;
+       default:
+               return;
+       }

 
 

-       if (MDOC_Bl == n->tok && n->data.Bl->comp)
-               return(1);
-       if (MDOC_Bd == n->tok && n->data.Bd->comp)
-               return(1);
+       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);
+               }

 
 

-       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
-       mdoc_node_delete(mdoc, mdoc->last);
-       return(1);
+       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 int
-pre_literal(PRE_ARGS)
+static void
+post_prevpar(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

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

 
        /*
 
        /*

-        * The `Dl' (note "el" not "one") and `Bd -literal' and `Bd
-        * -unfilled' macros set MDOC_LITERAL on entrance to the body.
+        * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
+        * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.

         */
 
         */
 

-       switch (n->tok) {
-       case (MDOC_Dl):
-               mdoc->flags |= MDOC_LITERAL;
-               break;
-       case (MDOC_Bd):
-               assert(n->data.Bd);
-               if (DISP_literal == n->data.Bd->type)
-                       mdoc->flags |= MDOC_LITERAL;
-               if (DISP_unfilled == n->data.Bd->type)
-                       mdoc->flags |= MDOC_LITERAL;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-       
-       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 int
-post_dd(POST_ARGS)
+static void
+post_par(POST_ARGS)

 {
 {

-       char              buf[DATESIZE];
-       struct mdoc_node *n;
+       struct roff_node *np;

 
 

-       n = mdoc->last;
-
-       if (NULL == n->child) {
-               mdoc->meta.date = time(NULL);
-               return(1);
-       }
+       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;

 
 

-       if ( ! concat(mdoc, buf, n->child, DATESIZE))
-               return(0);
+       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);
+}

 
 

-       mdoc->meta.date = mandoc_a2time
-               (MTIME_MDOCDATE | MTIME_CANONICAL, buf);
+static void
+post_dd(POST_ARGS)
+{
+       struct roff_node *n;
+       char             *datestr;

 
 

-       if (0 == mdoc->meta.date) {
-               mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE);
-               mdoc->meta.date = time(NULL);
+       n = mdoc->last;
+       n->flags |= NODE_NOPRT;
+
+       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);
+               return;

        }
 
        }
 

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

 }
 
 }
 

-static int
+static void

 post_dt(POST_ARGS)
 {
 post_dt(POST_ARGS)
 {

-       struct mdoc_node *nn, *n;
+       struct roff_node *nn, *n;

        const char       *cp;
        char             *p;
 
        n = mdoc->last;
        const char       *cp;
        char             *p;
 
        n = mdoc->last;

+       n->flags |= NODE_NOPRT;

 
 

-       if (mdoc->meta.title)
-               free(mdoc->meta.title);
-       if (mdoc->meta.vol)
-               free(mdoc->meta.vol);
-       if (mdoc->meta.arch)
-               free(mdoc->meta.arch);
+       if (mdoc->flags & MDOC_PBODY) {
+               mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse,
+                   n->line, n->pos, "Dt");
+               return;
+       }

 
 

-       mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;
+       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);

 
 

-       /* First make all characters uppercase. */
+               /* Check that all characters are uppercase. */

 
 

-       if (NULL != (nn = n->child))
-               for (p = nn->string; *p; p++) {
-                       if (toupper((u_char)*p) == *p)
-                               continue;
+               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;
+                       }
+       }

 
 

-                       /* 
-                        * FIXME: don't be lazy: have this make all
-                        * characters be uppercase and just warn once.
-                        */
-                       mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE);
-                       break;
-               }
+       /* Mandatory second argument: section. */

 
 

-       /* Handles: `.Dt' 
-        *   --> title = unknown, volume = local, msec = 0, arch = NULL
-        */
+       if (nn != NULL)
+               nn = nn->next;

 
 

-       if (NULL == (nn = n->child)) {
-               /* XXX: make these macro values. */
-               /* FIXME: warn about missing values. */
-               mdoc->meta.title = mandoc_strdup("UNKNOWN");
+       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");
                mdoc->meta.vol = mandoc_strdup("LOCAL");

-               mdoc->meta.msec = mandoc_strdup("1");
-               return(1);
+               return;  /* msec and arch remain NULL. */

        }
 
        }
 

-       /* Handles: `.Dt TITLE' 
-        *   --> title = TITLE, volume = local, msec = 0, arch = NULL
-        */
+       mdoc->meta.msec = mandoc_strdup(nn->string);

 
 

-       mdoc->meta.title = mandoc_strdup
-               ('\0' == nn->string[0] ? "UNKNOWN" : nn->string);
+       /* Infer volume title from section number. */

 
 

-       if (NULL == (nn = nn->next)) {
-               /* FIXME: warn about missing msec. */
-               /* XXX: make this a macro value. */
-               mdoc->meta.vol = mandoc_strdup("LOCAL");
-               mdoc->meta.msec = mandoc_strdup("1");
-               return(1);
-       }
+       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);

 
 

-       /* Handles: `.Dt TITLE SEC'
-        *   --> title = TITLE, volume = SEC is msec ? 
-        *           format(msec) : SEC,
-        *       msec = SEC is msec ? atoi(msec) : 0,
-        *       arch = NULL
-        */
+       /* Optional third argument: architecture. */

 
 

-       cp = mdoc_a2msec(nn->string);
-       if (cp) {
-               mdoc->meta.vol = mandoc_strdup(cp);
-               mdoc->meta.msec = mandoc_strdup(nn->string);
-       } else {
-               mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC);
-               mdoc->meta.vol = mandoc_strdup(nn->string);
-               mdoc->meta.msec = mandoc_strdup(nn->string);
-       } 
+       if ((nn = nn->next) == NULL)
+               return;

 
 

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

 
 

-       /* Handles: `.Dt TITLE SEC VOL'
-        *   --> title = TITLE, volume = VOL is vol ?
-        *       format(VOL) : 
-        *           VOL is arch ? format(arch) : 
-        *               VOL
-        */
+       /* Ignore fourth and later arguments. */

 
 

-       cp = mdoc_a2vol(nn->string);
-       if (cp) {
-               free(mdoc->meta.vol);
-               mdoc->meta.vol = mandoc_strdup(cp);
-       } else {
-               /* FIXME: warn about bad arch. */
-               cp = mdoc_a2arch(nn->string);
-               if (NULL == cp) {
-                       free(mdoc->meta.vol);
-                       mdoc->meta.vol = mandoc_strdup(nn->string);
-               } else 
-                       mdoc->meta.arch = mandoc_strdup(cp);
-       }       
-
-       /* Ignore any subsequent parameters... */
-       /* FIXME: warn about subsequent parameters. */
-
-       return(1);
+       if ((nn = nn->next) != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+                   nn->line, nn->pos, "Dt ... %s", nn->string);

 }
 
 }
 

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

 {
 {

+       struct roff_node        *n, *nch;
+
+       n = mdoc->last;
+       nch = n->child;
+
+       if (nch != NULL) {
+               mdoc->last = nch;
+               nch = nch->next;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns);
+               mdoc->last->flags |= NODE_NOSRC;
+               mdoc->next = ROFF_NEXT_SIBLING;
+       } else
+               mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, "BSD");
+       mdoc->last->flags |= NODE_NOSRC;
+
+       if (nch == NULL) {
+               mdoc->last = n;
+               return;
+       }
+
+       roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->next = ROFF_NEXT_SIBLING;
+       roff_word_alloc(mdoc, n->line, n->pos, "-");
+       mdoc->last->flags |= NODE_NOSRC;
+       roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;
+

        /*
        /*

-        * Remove prologue macros from the document after they're
-        * processed.  The final document uses mdoc_meta for these
-        * values and discards the originals.
+        * Make `Bx's second argument always start with an uppercase
+        * letter.  Groff checks if it's an "accepted" term, but we just
+        * uppercase blindly.

         */
 
         */
 

-       mdoc_node_delete(mdoc, mdoc->last);
-       if (mdoc->meta.title && mdoc->meta.date && mdoc->meta.os)
-               mdoc->flags |= MDOC_PBODY;
-
-       return(1);
+       *nch->string = (char)toupper((unsigned char)*nch->string);

 }
 
 }
 

-static int
+static void

 post_os(POST_ARGS)
 {
 post_os(POST_ARGS)
 {

-       struct mdoc_node *n;
-       char              buf[BUFSIZ];

 #ifndef OSNAME
        struct utsname    utsname;
 #ifndef OSNAME
        struct utsname    utsname;

+       static char      *defbuf;

 #endif
 #endif

+       struct roff_node *n;

 
        n = mdoc->last;
 
        n = mdoc->last;

+       n->flags |= NODE_NOPRT;
+
+       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");

 
        /*
 
        /*

-        * Set the operating system by way of the `Os' macro.  Note that
-        * if an argument isn't provided and -DOSNAME="\"foo\"" is
-        * provided during compilation, this value will be used instead
-        * of filling in "sysname release" from uname().
-        */
+        * 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)
+        */

 
 

+       free(mdoc->meta.os);
+       mdoc->meta.os = NULL;
+       deroff(&mdoc->meta.os, n);

        if (mdoc->meta.os)
        if (mdoc->meta.os)

-               free(mdoc->meta.os);
-
-       if ( ! concat(mdoc, buf, n->child, BUFSIZ))
-               return(0);
+               return;

 
 

-       /* XXX: yes, these can all be dynamically-adjusted buffers, but
-        * it's really not worth the extra hackery.
-        */
+       if (mdoc->defos) {
+               mdoc->meta.os = mandoc_strdup(mdoc->defos);
+               return;
+       }

 
 

-       if ('\0' == buf[0]) {

 #ifdef OSNAME
 #ifdef OSNAME

-               if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
+       mdoc->meta.os = mandoc_strdup(OSNAME);

 #else /*!OSNAME */
 #else /*!OSNAME */

-               if (uname(&utsname)) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);
-                        mdoc->meta.os = mandoc_strdup("UNKNOWN");
-                        return(post_prol(mdoc));
-                }
-
-               if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-               if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-               if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-#endif /*!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(buf);
-       return(1);
+       mdoc->meta.os = mandoc_strdup(defbuf);
+#endif /*!OSNAME*/

 }
 
 }
 

-static int
-post_std(POST_ARGS)
+enum roff_sec
+mdoc_a2sec(const char *p)

 {
 {

-       struct mdoc_node *nn, *n;
-
-       n = mdoc->last;
-
-       /*
-        * Macros accepting `-std' as an argument have the name of the
-        * current document (`Nm') filled in as the argument if it's not
-        * provided.
-        */
-
-       if (n->child)
-               return(1);
-
-       if (NULL == mdoc->meta.name)
-               return(1);
-       
-       nn = n;
-       mdoc->next = MDOC_NEXT_CHILD;
+       int              i;

 
 

-       if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name))
-               return(0);
+       for (i = 0; i < (int)SEC__MAX; i++)
+               if (secnames[i] && 0 == strcmp(p, secnames[i]))
+                       return (enum roff_sec)i;

 
 

-       mdoc->last = nn;
-       return(1);
+       return SEC_CUSTOM;

 }
 
 }
 

-static int
-concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
+static size_t
+macro2len(int macro)

 {
 
 {
 

-       p[0] = '\0';
-
-       /*
-        * Concatenate sibling nodes together.  All siblings must be of
-        * type MDOC_TEXT or an assertion is raised.  Concatenation is
-        * separated by a single whitespace.  Returns 0 on fatal (string
-        * overrun) error.
-        */
-
-       for ( ; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
-
-               if (strlcat(p, n->string, sz) >= sz) {
-                       mdoc_nmsg(m, n, MANDOCERR_MEM);
-                       return(0);
-               }
-
-               if (NULL == n->next)
-                       continue;
-
-               if (strlcat(p, " ", sz) >= sz) {
-                       mdoc_nmsg(m, n, MANDOCERR_MEM);
-                       return(0);
-               }
-       }
-
-       return(1);
+       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;

 }
 }

-