When .Sm is called without an argument, groff toggles the spacing mode,

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 783f2c7811af6e8ba1d50ada8822fb4686deb930..e43e00df0323996115b193bd2cf4236add2a6734 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,6 +1,8 @@
-/*     $Id: mdoc_validate.c,v 1.117 2010/09/27 09:26:27 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.222 2014/07/02 19:55:10 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2014 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -18,6 +20,10 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

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

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


@@ -26,8 +32,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>

 
 

+#include "mdoc.h"

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

+#include "mandoc_aux.h"

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


@@ -36,6 +45,17 @@
 #define        PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define        POST_ARGS struct mdoc *mdoc
 
 #define        PRE_ARGS  struct mdoc *mdoc, struct mdoc_node *n
 #define        POST_ARGS struct mdoc *mdoc
 

+enum   check_ineq {
+       CHECK_LT,
+       CHECK_GT,
+       CHECK_EQ
+};
+
+enum   check_lvl {
+       CHECK_WARN,
+       CHECK_ERROR,
+};
+

 typedef        int     (*v_pre)(PRE_ARGS);
 typedef        int     (*v_post)(POST_ARGS);
 
 typedef        int     (*v_pre)(PRE_ARGS);
 typedef        int     (*v_post)(POST_ARGS);
 


@@ -44,53 +64,60 @@ struct      valids {
        v_post  *post;
 };
 
        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 int      check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);

-static int      check_stdarg(PRE_ARGS);
-static int      check_text(struct mdoc *, int, int, char *);
-static int      check_argv(struct mdoc *, 
+static void     check_text(struct mdoc *, int, int, char *);
+static void     check_argv(struct mdoc *,

                        struct mdoc_node *, struct mdoc_argv *);
                        struct mdoc_node *, struct mdoc_argv *);

-static int      check_args(struct mdoc *, struct mdoc_node *);
-static int      err_child_lt(struct mdoc *, const char *, int);
-static int      warn_child_lt(struct mdoc *, const char *, int);
-static int      err_child_gt(struct mdoc *, const char *, int);
-static int      warn_child_gt(struct mdoc *, const char *, int);
-static int      err_child_eq(struct mdoc *, const char *, int);
-static int      warn_child_eq(struct mdoc *, const char *, int);
-static int      warn_count(struct mdoc *, const char *, 
-                       int, const char *, int);
-static int      err_count(struct mdoc *, const char *, 
-                       int, const char *, int);
+static void     check_args(struct mdoc *, struct mdoc_node *);
+static enum mdoc_sec   a2sec(const char *);
+static size_t          macro2len(enum mdoct);

 
 

+static int      ebool(POST_ARGS);

 static int      berr_ge1(POST_ARGS);
 static int      bwarn_ge1(POST_ARGS);
 static int      berr_ge1(POST_ARGS);
 static int      bwarn_ge1(POST_ARGS);

-static int      ebool(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_eq0(POST_ARGS);

+static int      ewarn_eq1(POST_ARGS);

 static int      ewarn_ge1(POST_ARGS);
 static int      ewarn_ge1(POST_ARGS);

-static int      herr_eq0(POST_ARGS);
-static int      herr_ge1(POST_ARGS);
-static int      hwarn_eq1(POST_ARGS);
+static int      ewarn_le1(POST_ARGS);

 static int      hwarn_eq0(POST_ARGS);
 static int      hwarn_eq0(POST_ARGS);

+static int      hwarn_eq1(POST_ARGS);
+static int      hwarn_ge1(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      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_bl_head(POST_ARGS);

+static int      post_bx(POST_ARGS);
+static int      post_defaults(POST_ARGS);
+static int      post_dd(POST_ARGS);

 static int      post_dt(POST_ARGS);
 static int      post_dt(POST_ARGS);

+static int      post_en(POST_ARGS);
+static int      post_es(POST_ARGS);
+static int      post_eoln(POST_ARGS);
+static int      post_hyph(POST_ARGS);
+static int      post_ignpar(POST_ARGS);

 static int      post_it(POST_ARGS);
 static int      post_lb(POST_ARGS);
 static int      post_it(POST_ARGS);
 static int      post_lb(POST_ARGS);

+static int      post_literal(POST_ARGS);

 static int      post_nm(POST_ARGS);
 static int      post_nm(POST_ARGS);

+static int      post_ns(POST_ARGS);
+static int      post_os(POST_ARGS);
+static int      post_par(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_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_eoln(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      post_vt(POST_ARGS);
 static int      pre_an(PRE_ARGS);
 static int      pre_bd(PRE_ARGS);


@@ -99,175 +126,234 @@ 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_display(PRE_ARGS);
 static int      pre_dt(PRE_ARGS);
 static int      pre_it(PRE_ARGS);

+static int      pre_literal(PRE_ARGS);
+static int      pre_obsolete(PRE_ARGS);

 static int      pre_os(PRE_ARGS);
 static int      pre_os(PRE_ARGS);

-static int      pre_pp(PRE_ARGS);
-static int      pre_rv(PRE_ARGS);
+static int      pre_par(PRE_ARGS);

 static int      pre_sh(PRE_ARGS);
 static int      pre_ss(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_an[] = { post_an, NULL };

-static v_post   posts_at[] = { post_at, NULL };
-static v_post   posts_bd_bk[] = { hwarn_eq0, bwarn_ge1, 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_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_bl[] = { bwarn_ge1, post_bl, NULL };

-static v_post   posts_bool[] = { eerr_eq1, ebool, NULL };
+static v_post   posts_bx[] = { post_bx, NULL };
+static v_post   posts_bool[] = { ebool, NULL };

 static v_post   posts_eoln[] = { post_eoln, NULL };
 static v_post   posts_eoln[] = { post_eoln, NULL };

-static v_post   posts_dt[] = { post_dt, NULL };
+static v_post   posts_defaults[] = { post_defaults, NULL };
+static v_post   posts_d1[] = { bwarn_ge1, post_hyph, NULL };
+static v_post   posts_dd[] = { post_dd, post_prol, NULL };
+static v_post   posts_dl[] = { post_literal, bwarn_ge1, NULL };
+static v_post   posts_dt[] = { post_dt, post_prol, NULL };
+static v_post   posts_en[] = { post_en, NULL };
+static v_post   posts_es[] = { post_es, NULL };

 static v_post   posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
 static v_post   posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };

+static v_post   posts_hyph[] = { post_hyph, NULL };
+static v_post   posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL };

 static v_post   posts_it[] = { post_it, 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_lb[] = { post_lb, NULL };
+static v_post   posts_nd[] = { berr_ge1, post_hyph, NULL };

 static v_post   posts_nm[] = { post_nm, NULL };
 static v_post   posts_notext[] = { ewarn_eq0, NULL };
 static v_post   posts_nm[] = { post_nm, NULL };
 static v_post   posts_notext[] = { ewarn_eq0, 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_text[] = { eerr_ge1, NULL };
-static v_post   posts_text1[] = { eerr_eq1, NULL };
+static v_post   posts_ns[] = { post_ns, NULL };
+static v_post   posts_os[] = { post_os, post_prol, NULL };
+static v_post   posts_pp[] = { post_par, ewarn_eq0, NULL };
+static v_post   posts_rs[] = { post_rs, NULL };
+static v_post   posts_sh[] = { post_ignpar,hwarn_ge1,post_sh,post_hyph,NULL };
+static v_post   posts_sp[] = { post_par, ewarn_le1, NULL };
+static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL };
+static v_post   posts_st[] = { post_st, NULL };
+static v_post   posts_std[] = { post_std, NULL };
+static v_post   posts_text[] = { ewarn_ge1, NULL };
+static v_post   posts_text1[] = { ewarn_eq1, NULL };

 static v_post   posts_vt[] = { post_vt, 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_an[] = { pre_an, NULL };

-static v_pre    pres_bd[] = { pre_display, pre_bd, pre_pp, NULL };
-static v_pre    pres_bl[] = { pre_bl, pre_pp, 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_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_dd[] = { pre_dd, NULL };
 static v_pre    pres_dt[] = { pre_dt, NULL };

-static v_pre    pres_er[] = { NULL, NULL };
-static v_pre    pres_ex[] = { NULL, NULL };
-static v_pre    pres_fd[] = { NULL, NULL };
-static v_pre    pres_it[] = { pre_it, NULL };
+static v_pre    pres_it[] = { pre_it, pre_par, NULL };
+static v_pre    pres_obsolete[] = { pre_obsolete, NULL };

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

-static v_pre    pres_pp[] = { pre_pp, NULL };
-static v_pre    pres_rv[] = { pre_rv, 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_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] = {
+static const struct valids mdoc_valids[MDOC_MAX] = {

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

-       { pres_dd, posts_wtext },               /* Dd */
+       { pres_dd, posts_dd },                  /* Dd */

        { pres_dt, posts_dt },                  /* Dt */
        { pres_dt, posts_dt },                  /* Dt */

-       { pres_os, NULL },                      /* Os */
-       { pres_sh, posts_sh },                  /* Sh */ 
-       { pres_ss, posts_ss },                  /* Ss */ 
-       { pres_pp, posts_notext },              /* Pp */ 
-       { pres_d1, posts_wline },               /* D1 */
-       { pres_d1, posts_wline },               /* Dl */
-       { pres_bd, posts_bd_bk },               /* Bd */
+       { pres_os, posts_os },                  /* Os */
+       { pres_sh, posts_sh },                  /* Sh */
+       { pres_ss, posts_ss },                  /* Ss */
+       { pres_pp, posts_pp },                  /* Pp */
+       { pres_d1, posts_d1 },                  /* D1 */
+       { pres_dl, posts_dl },                  /* Dl */
+       { pres_bd, posts_bd },                  /* Bd */

        { NULL, NULL },                         /* Ed */
        { NULL, NULL },                         /* Ed */

-       { pres_bl, posts_bl },                  /* Bl */ 
+       { pres_bl, posts_bl },                  /* Bl */

        { NULL, NULL },                         /* El */
        { pres_it, posts_it },                  /* It */
        { NULL, NULL },                         /* El */
        { pres_it, posts_it },                  /* It */

-       { NULL, posts_text },                   /* Ad */ 
-       { pres_an, posts_an },                  /* An */ 
-       { NULL, NULL },                         /* Ar */
-       { NULL, posts_text },                   /* Cd */ 
+       { NULL, NULL },                         /* Ad */
+       { pres_an, posts_an },                  /* An */
+       { NULL, posts_defaults },               /* Ar */
+       { NULL, NULL },                         /* Cd */

        { NULL, NULL },                         /* Cm */
        { NULL, NULL },                         /* Cm */

-       { NULL, NULL },                         /* Dv */ 
-       { pres_er, posts_text },                /* Er */ 
-       { NULL, NULL },                         /* Ev */ 
-       { pres_ex, NULL },                      /* Ex */ 
-       { NULL, NULL },                         /* Fa */ 
-       { pres_fd, posts_wtext },               /* Fd */
+       { NULL, NULL },                         /* Dv */
+       { NULL, NULL },                         /* Er */
+       { NULL, NULL },                         /* Ev */
+       { pres_std, posts_std },                /* Ex */
+       { NULL, NULL },                         /* Fa */
+       { NULL, posts_text },                   /* Fd */

        { NULL, NULL },                         /* Fl */
        { NULL, NULL },                         /* Fl */

-       { NULL, posts_text },                   /* Fn */ 
-       { NULL, posts_wtext },                  /* Ft */ 
-       { NULL, posts_text },                   /* Ic */ 
-       { NULL, posts_text1 },                  /* In */ 
-       { NULL, NULL },                         /* Li */
+       { NULL, NULL },                         /* Fn */
+       { NULL, NULL },                         /* Ft */
+       { NULL, NULL },                         /* Ic */
+       { NULL, posts_text1 },                  /* In */
+       { NULL, posts_defaults },               /* Li */

        { NULL, posts_nd },                     /* Nd */
        { NULL, posts_nm },                     /* Nm */
        { NULL, posts_nd },                     /* Nd */
        { NULL, posts_nm },                     /* Nm */

-       { NULL, posts_wline },                  /* Op */
-       { NULL, NULL },                         /* Ot */
-       { NULL, NULL },                         /* Pa */
-       { pres_rv, NULL },                      /* Rv */
-       { NULL, posts_st },                     /* St */ 
+       { NULL, NULL },                         /* Op */
+       { pres_obsolete, NULL },                /* Ot */
+       { NULL, posts_defaults },               /* Pa */
+       { pres_std, posts_std },                /* Rv */
+       { NULL, posts_st },                     /* St */

        { NULL, NULL },                         /* Va */
        { NULL, NULL },                         /* Va */

-       { NULL, posts_vt },                     /* Vt */ 
-       { NULL, posts_wtext },                  /* Xr */ 
+       { NULL, posts_vt },                     /* Vt */
+       { NULL, posts_text },                   /* Xr */

        { NULL, posts_text },                   /* %A */
        { 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_hyphtext },               /* %B */ /* FIXME: can be used outside Rs/Re. */
+       { NULL, posts_text },                   /* %D */

        { NULL, posts_text },                   /* %I */
        { NULL, posts_text },                   /* %J */
        { NULL, posts_text },                   /* %I */
        { NULL, posts_text },                   /* %J */

-       { NULL, posts_text },                   /* %N */
-       { NULL, posts_text },                   /* %O */
+       { NULL, posts_hyphtext },               /* %N */
+       { NULL, posts_hyphtext },               /* %O */

        { NULL, posts_text },                   /* %P */
        { NULL, posts_text },                   /* %P */

-       { NULL, posts_text },                   /* %R */
-       { NULL, posts_text },                   /* %T */ /* FIXME: can be used outside Rs/Re. */
+       { NULL, posts_hyphtext },               /* %R */
+       { NULL, posts_hyphtext },               /* %T */ /* FIXME: can be used outside Rs/Re. */

        { NULL, posts_text },                   /* %V */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */
        { NULL, posts_text },                   /* %V */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */

-       { NULL, posts_wline },                  /* Aq */
-       { NULL, posts_at },                     /* At */ 
+       { NULL, NULL },                         /* Aq */
+       { NULL, posts_at },                     /* At */

        { NULL, NULL },                         /* Bc */
        { NULL, posts_bf },                     /* Bf */
        { NULL, NULL },                         /* Bo */
        { NULL, NULL },                         /* Bc */
        { NULL, posts_bf },                     /* Bf */
        { NULL, NULL },                         /* Bo */

-       { NULL, posts_wline },                  /* Bq */
+       { NULL, NULL },                         /* Bq */

        { NULL, NULL },                         /* Bsx */
        { NULL, NULL },                         /* Bsx */

-       { NULL, NULL },                         /* Bx */
+       { NULL, posts_bx },                     /* Bx */

        { NULL, posts_bool },                   /* Db */
        { NULL, NULL },                         /* Dc */
        { NULL, NULL },                         /* Do */
        { NULL, posts_bool },                   /* Db */
        { NULL, NULL },                         /* Dc */
        { NULL, NULL },                         /* Do */

-       { NULL, posts_wline },                  /* Dq */
+       { NULL, NULL },                         /* Dq */

        { NULL, NULL },                         /* Ec */
        { NULL, NULL },                         /* Ec */

-       { NULL, NULL },                         /* Ef */ 
-       { NULL, NULL },                         /* Em */ 
+       { NULL, NULL },                         /* Ef */
+       { NULL, NULL },                         /* Em */

        { NULL, NULL },                         /* Eo */
        { NULL, NULL },                         /* Fx */
        { NULL, NULL },                         /* Eo */
        { NULL, NULL },                         /* Fx */

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

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

-       { NULL, posts_notext },                 /* Ns */
+       { NULL, posts_ns },                     /* Ns */

        { NULL, NULL },                         /* Nx */
        { NULL, NULL },                         /* Ox */
        { NULL, NULL },                         /* Pc */
        { NULL, posts_text1 },                  /* Pf */
        { NULL, NULL },                         /* Po */
        { NULL, NULL },                         /* Nx */
        { NULL, NULL },                         /* Ox */
        { NULL, NULL },                         /* Pc */
        { NULL, posts_text1 },                  /* Pf */
        { NULL, NULL },                         /* Po */

-       { NULL, posts_wline },                  /* Pq */
+       { NULL, NULL },                         /* Pq */

        { NULL, NULL },                         /* Qc */
        { NULL, NULL },                         /* Qc */

-       { NULL, posts_wline },                  /* Ql */
+       { NULL, NULL },                         /* Ql */

        { NULL, NULL },                         /* Qo */
        { NULL, NULL },                         /* Qo */

-       { NULL, posts_wline },                  /* Qq */
+       { NULL, NULL },                         /* Qq */

        { NULL, NULL },                         /* Re */
        { NULL, posts_rs },                     /* Rs */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, NULL },                         /* Re */
        { NULL, posts_rs },                     /* Rs */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */

-       { NULL, posts_wline },                  /* Sq */
-       { NULL, posts_bool },                   /* Sm */ 
-       { NULL, posts_text },                   /* Sx */
-       { NULL, posts_text },                   /* Sy */
-       { NULL, posts_text },                   /* Tn */
+       { NULL, NULL },                         /* Sq */
+       { NULL, posts_bool },                   /* Sm */
+       { NULL, posts_hyph },                   /* Sx */
+       { NULL, NULL },                         /* Sy */
+       { NULL, NULL },                         /* Tn */

        { NULL, NULL },                         /* Ux */
        { NULL, NULL },                         /* Xc */
        { NULL, NULL },                         /* Xo */
        { NULL, NULL },                         /* Ux */
        { NULL, NULL },                         /* Xc */
        { NULL, NULL },                         /* Xo */

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

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

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

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

-       { NULL, NULL },                         /* Fr */
+       { pres_obsolete, NULL },                /* Fr */

        { NULL, posts_eoln },                   /* Ud */
        { NULL, posts_lb },                     /* Lb */
        { NULL, posts_eoln },                   /* Ud */
        { NULL, posts_lb },                     /* Lb */

-       { NULL, posts_notext },                 /* Lp */ 
-       { NULL, posts_text },                   /* Lk */ 
-       { NULL, posts_text },                   /* Mt */ 
-       { NULL, posts_wline },                  /* Brq */ 
-       { NULL, NULL },                         /* Bro */ 
-       { NULL, NULL },                         /* Brc */ 
+       { pres_pp, posts_pp },                  /* Lp */
+       { NULL, NULL },                         /* Lk */
+       { NULL, posts_defaults },               /* Mt */
+       { NULL, NULL },                         /* Brq */
+       { NULL, NULL },                         /* Bro */
+       { NULL, NULL },                         /* Brc */

        { NULL, posts_text },                   /* %C */
        { NULL, posts_text },                   /* %C */

-       { NULL, NULL },                         /* Es */
-       { NULL, NULL },                         /* En */
+       { pres_obsolete, posts_es },            /* Es */
+       { pres_obsolete, posts_en },            /* En */

        { NULL, NULL },                         /* Dx */
        { NULL, posts_text },                   /* %Q */
        { NULL, NULL },                         /* Dx */
        { NULL, posts_text },                   /* %Q */

-       { NULL, posts_notext },                 /* br */
+       { NULL, posts_pp },                     /* br */

        { NULL, posts_sp },                     /* sp */
        { NULL, posts_text1 },                  /* %U */
        { NULL, NULL },                         /* Ta */
        { NULL, posts_sp },                     /* sp */
        { NULL, posts_text1 },                  /* %U */
        { NULL, NULL },                         /* Ta */

+       { NULL, NULL },                         /* ll */
+};
+
+#define        RSORD_MAX 14 /* Number of `Rs' blocks. */
+
+static const enum mdoct rsord[RSORD_MAX] = {
+       MDOC__A,
+       MDOC__T,
+       MDOC__B,
+       MDOC__I,
+       MDOC__J,
+       MDOC__R,
+       MDOC__N,
+       MDOC__V,
+       MDOC__U,
+       MDOC__P,
+       MDOC__Q,
+       MDOC__C,
+       MDOC__D,
+       MDOC__O
+};
+
+static 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

 };
 
 
 };
 
 


@@ -278,24 +364,33 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
        int              line, pos;
        char            *tp;
 
        int              line, pos;
        char            *tp;
 

-       if (MDOC_TEXT == n->type) {
+       switch (n->type) {
+       case MDOC_TEXT:

                tp = n->string;
                line = n->line;
                pos = n->pos;
                tp = n->string;
                line = n->line;
                pos = n->pos;

-               return(check_text(mdoc, line, pos, tp));
+               check_text(mdoc, line, pos, tp);
+               /* FALLTHROUGH */
+       case MDOC_TBL:
+               /* FALLTHROUGH */
+       case MDOC_EQN:
+               /* FALLTHROUGH */
+       case MDOC_ROOT:
+               return(1);
+       default:
+               break;

        }
 
        }
 

-       if ( ! check_args(mdoc, n))
-               return(0);
+       check_args(mdoc, n);
+

        if (NULL == mdoc_valids[n->tok].pre)
                return(1);
        for (p = mdoc_valids[n->tok].pre; *p; p++)
        if (NULL == mdoc_valids[n->tok].pre)
                return(1);
        for (p = mdoc_valids[n->tok].pre; *p; p++)

-               if ( ! (*p)(mdoc, n)) 
+               if ( ! (*p)(mdoc, n))

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

-

 int
 mdoc_valid_post(struct mdoc *mdoc)
 {
 int
 mdoc_valid_post(struct mdoc *mdoc)
 {


@@ -305,192 +400,167 @@ mdoc_valid_post(struct mdoc *mdoc)
                return(1);
        mdoc->last->flags |= MDOC_VALID;
 
                return(1);
        mdoc->last->flags |= MDOC_VALID;
 

-       if (MDOC_TEXT == mdoc->last->type)
+       switch (mdoc->last->type) {
+       case MDOC_TEXT:
+               /* FALLTHROUGH */
+       case MDOC_EQN:
+               /* FALLTHROUGH */
+       case MDOC_TBL:

                return(1);
                return(1);

-       if (MDOC_ROOT == mdoc->last->type)
+       case MDOC_ROOT:

                return(post_root(mdoc));
                return(post_root(mdoc));

+       default:
+               break;
+       }

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

-               if ( ! (*p)(mdoc)) 
+               if ( ! (*p)(mdoc))

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

-
-static inline int
-warn_count(struct mdoc *m, const char *k, 
-               int want, const char *v, int has)
+static int
+check_count(struct mdoc *mdoc, enum mdoc_type type,
+               enum check_lvl lvl, enum check_ineq ineq, int val)

 {
 {

+       const char      *p;
+       enum mandocerr   t;

 
 

-       return(mdoc_vmsg(m, MANDOCERR_ARGCOUNT, 
-                               m->last->line, m->last->pos, 
-                               "%s %s %d (have %d)", v, k, want, has));
-}
+       if (mdoc->last->type != type)
+               return(1);
+
+       switch (ineq) {
+       case CHECK_LT:
+               p = "less than ";
+               if (mdoc->last->nchild < val)
+                       return(1);
+               break;
+       case CHECK_GT:
+               p = "more than ";
+               if (mdoc->last->nchild > val)
+                       return(1);
+               break;
+       case CHECK_EQ:
+               p = "";
+               if (val == mdoc->last->nchild)
+                       return(1);
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }

 
 

+       t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
+       mandoc_vmsg(t, mdoc->parse, mdoc->last->line,
+           mdoc->last->pos, "want %s%d children (have %d)",
+           p, val, mdoc->last->nchild);
+       return(1);
+}

 
 

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

 {
 
 {
 

-       mdoc_vmsg(m, MANDOCERR_SYNTARGCOUNT, 
-                       m->last->line, m->last->pos, 
-                       "%s %s %d (have %d)", 
-                       v, k, want, has);
-       return(0);
+       return(check_count(mdoc, MDOC_BODY, CHECK_ERROR, CHECK_GT, 0));

 }
 
 }
 

+static int
+bwarn_ge1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0));
+}

 
 

-/*
- * Build these up with macros because they're basically the same check
- * for different inequalities.  Yes, this could be done with functions,
- * but this is reasonable for now.
- */
+static int
+ewarn_eq0(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0));
+}
+
+static int
+ewarn_eq1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1));
+}

 
 

-#define CHECK_CHILD_DEFN(lvl, name, ineq)                      \
-static int                                                     \
-lvl##_child_##name(struct mdoc *mdoc, const char *p, int sz)   \
-{                                                              \
-       if (mdoc->last->nchild ineq sz)                         \
-               return(1);                                      \
-       return(lvl##_count(mdoc, #ineq, sz, p, mdoc->last->nchild)); \
-}
-
-#define CHECK_BODY_DEFN(name, lvl, func, num)                  \
-static int                                                     \
-b##lvl##_##name(POST_ARGS)                                     \
-{                                                              \
-       if (MDOC_BODY != mdoc->last->type)                      \
-               return(1);                                      \
-       return(func(mdoc, "multi-line arguments", (num)));      \
-}
-
-#define CHECK_ELEM_DEFN(name, lvl, func, num)                  \
-static int                                                     \
-e##lvl##_##name(POST_ARGS)                                     \
-{                                                              \
-       assert(MDOC_ELEM == mdoc->last->type);                  \
-       return(func(mdoc, "line arguments", (num)));            \
-}
-
-#define CHECK_HEAD_DEFN(name, lvl, func, num)                  \
-static int                                                     \
-h##lvl##_##name(POST_ARGS)                                     \
-{                                                              \
-       if (MDOC_HEAD != mdoc->last->type)                      \
-               return(1);                                      \
-       return(func(mdoc, "line arguments", (num)));            \
-}
-
-
-CHECK_CHILD_DEFN(warn, gt, >)                  /* warn_child_gt() */
-CHECK_CHILD_DEFN(err, gt, >)                   /* err_child_gt() */
-CHECK_CHILD_DEFN(warn, eq, ==)                 /* warn_child_eq() */
-CHECK_CHILD_DEFN(err, eq, ==)                  /* err_child_eq() */
-CHECK_CHILD_DEFN(err, lt, <)                   /* err_child_lt() */
-CHECK_CHILD_DEFN(warn, lt, <)                  /* warn_child_lt() */
-CHECK_BODY_DEFN(ge1, warn, warn_child_gt, 0)   /* bwarn_ge1() */
-CHECK_BODY_DEFN(ge1, err, err_child_gt, 0)     /* berr_ge1() */
-CHECK_ELEM_DEFN(eq0, warn, warn_child_eq, 0)   /* ewarn_eq0() */
-CHECK_ELEM_DEFN(ge1, warn, warn_child_gt, 0)   /* ewarn_ge1() */
-CHECK_ELEM_DEFN(eq1, err, err_child_eq, 1)     /* eerr_eq1() */
-CHECK_ELEM_DEFN(le1, err, err_child_lt, 2)     /* eerr_le1() */
-CHECK_ELEM_DEFN(ge1, err, err_child_gt, 0)     /* eerr_ge1() */
-CHECK_HEAD_DEFN(eq0, err, err_child_eq, 0)     /* herr_eq0() */
-CHECK_HEAD_DEFN(le1, warn, warn_child_lt, 2)   /* hwarn_le1() */
-CHECK_HEAD_DEFN(ge1, err, err_child_gt, 0)     /* herr_ge1() */
-CHECK_HEAD_DEFN(eq1, warn, warn_child_eq, 1)   /* hwarn_eq1() */
-CHECK_HEAD_DEFN(eq0, warn, warn_child_eq, 0)   /* hwarn_eq0() */
+static int
+ewarn_ge1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0));
+}

 
 

+static int
+ewarn_le1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2));
+}

 
 static int
 
 static int

-check_stdarg(PRE_ARGS)
+hwarn_eq0(POST_ARGS)

 {
 {

+       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0));
+}

 
 

-       if (n->args && 1 == n->args->argc)
-               if (MDOC_Std == n->args->argv[0].arg)
-                       return(1);
-       return(mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV));
+static int
+hwarn_eq1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 1));

 }
 
 }
 

+static int
+hwarn_ge1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_GT, 0));
+}

 
 static int
 
 static int

-check_args(struct mdoc *m, struct mdoc_node *n)
+hwarn_le1(POST_ARGS)
+{
+       return(check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_LT, 2));
+}
+
+static void
+check_args(struct mdoc *mdoc, struct mdoc_node *n)

 {
        int              i;
 
        if (NULL == n->args)
 {
        int              i;
 
        if (NULL == n->args)

-               return(1);
+               return;

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

-               if ( ! check_argv(m, n, &n->args->argv[i]))
-                       return(0);
-
-       return(1);
+               check_argv(mdoc, n, &n->args->argv[i]);

 }
 
 }
 

-
-static int
-check_argv(struct mdoc *m, struct mdoc_node *n, struct mdoc_argv *v)
+static void
+check_argv(struct mdoc *mdoc, struct mdoc_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++)

-               if ( ! check_text(m, v->line, v->pos, v->value[i]))
-                       return(0);
+               check_text(mdoc, v->line, v->pos, v->value[i]);

 
 

-       if (MDOC_Std == v->arg) {
-               if (v->sz || m->meta.name)
-                       return(1);
-               if ( ! mdoc_nmsg(m, n, MANDOCERR_NONAME))
-                       return(0);
-       }
+       /* FIXME: move to post_std(). */

 
 

-       return(1);
+       if (MDOC_Std == v->arg)
+               if ( ! (v->sz || mdoc->meta.name))
+                       mdoc_nmsg(mdoc, n, MANDOCERR_NONAME);

 }
 
 }
 

-
-static int
-check_text(struct mdoc *m, int ln, int pos, char *p)
+static void
+check_text(struct mdoc *mdoc, 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;
+       char            *cp;

 
 

-               if ('\t' == *p) {
-                       if (MDOC_LITERAL & m->flags)
-                               continue;
-                       if (mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB))
-                               continue;
-                       return(0);
-               }
-
-               /* Check the special character. */
-
-               c = mandoc_special(p);
-               if (c) {
-                       p += c - 1;
-                       pos += c - 1;
-               } else
-                       mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
-       }
+       if (MDOC_LITERAL & mdoc->flags)
+               return;

 
 

-       return(1);
+       for (cp = p; NULL != (p = strchr(p, '\t')); p++)
+               mdoc_pmsg(mdoc, ln, pos + (int)(p - cp), MANDOCERR_BADTAB);

 }
 
 }
 

-

 static int
 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 {
 static int
 check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
 {


@@ -500,10 +570,9 @@ check_parent(PRE_ARGS, enum mdoct tok, enum mdoc_type t)
                        (t == n->parent->type))
                return(1);
 
                        (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]);
+       mandoc_vmsg(MANDOCERR_SYNTCHILD, mdoc->parse,
+           n->line, n->pos, "want parent %s",
+           MDOC_ROOT == t ? "<root>" : mdoc_macronames[tok]);

        return(0);
 }
 
        return(0);
 }
 


@@ -513,23 +582,21 @@ pre_display(PRE_ARGS)
 {
        struct mdoc_node *node;
 
 {
        struct mdoc_node *node;
 

-       /* Display elements (`Bd', `D1'...) cannot be nested. */
-

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

-       /* LINTED */
-       for (node = mdoc->last->parent; node; node = node->parent) 
+       for (node = mdoc->last->parent; node; node = node->parent)

                if (MDOC_BLOCK == node->type)
                        if (MDOC_Bd == node->tok)
                                break;
                if (MDOC_BLOCK == node->type)
                        if (MDOC_Bd == node->tok)
                                break;

-       if (NULL == node)
-               return(1);

 
 

-       mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);
-       return(0);
-}
+       if (node)
+               mandoc_vmsg(MANDOCERR_BD_NEST,
+                   mdoc->parse, n->line, n->pos,
+                   "%s in Bd", mdoc_macronames[n->tok]);

 
 

+       return(1);
+}

 
 static int
 pre_bl(PRE_ARGS)
 
 static int
 pre_bl(PRE_ARGS)


@@ -549,78 +616,76 @@ pre_bl(PRE_ARGS)
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bl == np->tok);
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bl == np->tok);

-               assert(np->data.Bl);
-               n->data.Bl = np->data.Bl;

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

-       /* 
+       /*

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

        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                lt = LIST__NONE;
                dup = comp = 0;
                width = offs = NULL;
                switch (n->args->argv[i].arg) {
                /* Set list types. */
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                lt = LIST__NONE;
                dup = comp = 0;
                width = offs = NULL;
                switch (n->args->argv[i].arg) {
                /* 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;
+               case MDOC_Compact:
+                       dup = n->norm->Bl.comp;

                        comp = 1;
                        break;
                        comp = 1;
                        break;

-               case (MDOC_Width):
-                       dup = (NULL != n->data.Bl->width);
-                       width = n->args->argv[i].value[0];
+               case MDOC_Width:
+                       /* NB: this can be empty! */
+                       if (n->args->argv[i].sz) {
+                               width = n->args->argv[i].value[0];
+                               dup = (NULL != n->norm->Bl.width);
+                               break;
+                       }
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

                        break;
                        break;

-               case (MDOC_Offset):
+               case MDOC_Offset:

                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];
                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];

-                               dup = (NULL != n->data.Bl->offs);
+                               dup = (NULL != n->norm->Bl.offs);

                                break;
                        }
                                break;
                        }

-                       if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
-                               return(0);
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

                        break;
                default:
                        continue;
                        break;
                default:
                        continue;


@@ -628,82 +693,88 @@ pre_bl(PRE_ARGS)
 
                /* Check: duplicate auxiliary arguments. */
 
 
                /* Check: duplicate auxiliary arguments. */
 

-               if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
-                       return(0);
+               if (dup)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);

 
                if (comp && ! dup)
 
                if (comp && ! dup)

-                       n->data.Bl->comp = comp;
+                       n->norm->Bl.comp = comp;

                if (offs && ! dup)
                if (offs && ! dup)

-                       n->data.Bl->offs = offs;
+                       n->norm->Bl.offs = offs;

                if (width && ! dup)
                if (width && ! dup)

-                       n->data.Bl->width = width;
+                       n->norm->Bl.width = width;

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

-               if (LIST__NONE != lt && n->data.Bl->type != LIST__NONE)
-                       if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP))
-                               return(0);
+               if (LIST__NONE != lt && n->norm->Bl.type != LIST__NONE)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_LISTREP);

 
                /* Assign list type. */
 
 
                /* Assign list type. */
 

-               if (LIST__NONE != lt && n->data.Bl->type == LIST__NONE) {
-                       n->data.Bl->type = lt;
+               if (LIST__NONE != lt && n->norm->Bl.type == LIST__NONE) {
+                       n->norm->Bl.type = lt;

                        /* Set column information, too. */
                        if (LIST_column == 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;
+                               n->norm->Bl.ncols =
+                                   n->args->argv[i].sz;
+                               n->norm->Bl.cols = (void *)
+                                   n->args->argv[i].value;

                        }
                }
 
                /* 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)
-                               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST))
-                                       return(0);
+               if (n->norm->Bl.type == LIST__NONE)
+                       if (n->norm->Bl.width ||
+                           n->norm->Bl.offs ||
+                           n->norm->Bl.comp)
+                               mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);

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

-       if (LIST__NONE == n->data.Bl->type) {
-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE))
-                       return(0);
-               n->data.Bl->type = LIST_item;
+       if (LIST__NONE == n->norm->Bl.type) {
+               mdoc_nmsg(mdoc, n, MANDOCERR_LISTTYPE);
+               n->norm->Bl.type = LIST_item;

        }
 
        }
 

-       /* 
+       /*

         * Validate the width field.  Some list types don't need width
         * types and should be warned about them.  Others should have it
         * 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;
-               if (mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG))
-                       break;
-               return(0);
-       case (LIST_column):
+       switch (n->norm->Bl.type) {
+       case LIST_tag:
+               if (NULL == n->norm->Bl.width)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
+               break;
+       case LIST_column:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_diag):
+       case LIST_diag:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_ohang):
+       case LIST_ohang:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_inset):
+       case LIST_inset:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_item):
-               if (NULL == n->data.Bl->width)
-                       break;
-               if (mdoc_nmsg(mdoc, n, MANDOCERR_WIDTHARG))
-                       break;
-               return(0);
+       case LIST_item:
+               if (n->norm->Bl.width)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
+               break;
+       case LIST_bullet:
+               /* FALLTHROUGH */
+       case LIST_dash:
+               /* FALLTHROUGH */
+       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;
        }
        default:
                break;
        }


@@ -711,12 +782,11 @@ pre_bl(PRE_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

 static int
 pre_bd(PRE_ARGS)
 {
        int               i, dup, comp;
 static int
 pre_bd(PRE_ARGS)
 {
        int               i, dup, comp;

-       enum mdoc_disp    dt;
+       enum mdoc_disp    dt;

        const char       *offs;
        struct mdoc_node *np;
 
        const char       *offs;
        struct mdoc_node *np;
 


@@ -730,52 +800,45 @@ pre_bd(PRE_ARGS)
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bd == np->tok);
                assert(np);
                assert(MDOC_BLOCK == np->type);
                assert(MDOC_Bd == np->tok);

-               assert(np->data.Bd);
-               n->data.Bd = np->data.Bd;

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

-       assert(NULL == n->data.Bd);
-       n->data.Bd = mandoc_calloc(1, sizeof(struct mdoc_bd));
-
-       /* LINTED */

        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                dt = DISP__NONE;
                dup = comp = 0;
                offs = NULL;
 
                switch (n->args->argv[i].arg) {
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                dt = DISP__NONE;
                dup = comp = 0;
                offs = NULL;
 
                switch (n->args->argv[i].arg) {

-               case (MDOC_Centred):
+               case MDOC_Centred:

                        dt = DISP_centred;
                        break;
                        dt = DISP_centred;
                        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):
+               case MDOC_File:

                        mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);
                        return(0);
                        mdoc_nmsg(mdoc, n, MANDOCERR_BADDISP);
                        return(0);

-               case (MDOC_Offset):
+               case MDOC_Offset:

                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];
                        /* NB: this can be empty! */
                        if (n->args->argv[i].sz) {
                                offs = n->args->argv[i].value[0];

-                               dup = (NULL != n->data.Bd->offs);
+                               dup = (NULL != n->norm->Bd.offs);

                                break;
                        }
                                break;
                        }

-                       if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV))
-                               return(0);
+                       mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);

                        break;
                        break;

-               case (MDOC_Compact):
+               case MDOC_Compact:

                        comp = 1;
                        comp = 1;

-                       dup = n->data.Bd->comp;
+                       dup = n->norm->Bd.comp;

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


@@ -784,38 +847,35 @@ pre_bd(PRE_ARGS)
 
                /* Check whether we have duplicates. */
 
 
                /* Check whether we have duplicates. */
 

-               if (dup && ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP))
-                       return(0);
+               if (dup)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_ARGVREP);

 
                /* Make our auxiliary assignments. */
 
                if (offs && ! dup)
 
                /* Make our auxiliary assignments. */
 
                if (offs && ! dup)

-                       n->data.Bd->offs = offs;
+                       n->norm->Bd.offs = offs;

                if (comp && ! dup)
                if (comp && ! dup)

-                       n->data.Bd->comp = comp;
+                       n->norm->Bd.comp = comp;

 
                /* Check whether a type has already been assigned. */
 
 
                /* Check whether a type has already been assigned. */
 

-               if (DISP__NONE != dt && n->data.Bd->type != DISP__NONE)
-                       if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP))
-                               return(0);
+               if (DISP__NONE != dt && n->norm->Bd.type != DISP__NONE)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_DISPREP);

 
                /* Make our type assignment. */
 
 
                /* Make our type assignment. */
 

-               if (DISP__NONE != dt && n->data.Bd->type == DISP__NONE)
-                       n->data.Bd->type = dt;
+               if (DISP__NONE != dt && n->norm->Bd.type == DISP__NONE)
+                       n->norm->Bd.type = dt;

        }
 
        }
 

-       if (DISP__NONE == n->data.Bd->type) {
-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE))
-                       return(0);
-               n->data.Bd->type = DISP_ragged;
+       if (DISP__NONE == n->norm->Bd.type) {
+               mdoc_nmsg(mdoc, n, MANDOCERR_DISPTYPE);
+               n->norm->Bd.type = DISP_ragged;

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

-

 static int
 pre_ss(PRE_ARGS)
 {
 static int
 pre_ss(PRE_ARGS)
 {


@@ -825,123 +885,114 @@ pre_ss(PRE_ARGS)
        return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
 }
 
        return(check_parent(mdoc, n, MDOC_Sh, MDOC_BODY));
 }
 

-

 static int
 pre_sh(PRE_ARGS)
 {
 
        if (MDOC_BLOCK != n->type)
                return(1);
 static int
 pre_sh(PRE_ARGS)
 {
 
        if (MDOC_BLOCK != n->type)
                return(1);

-
-       mdoc->regs->regs[(int)REG_nS].set = 0;

        return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }
 
        return(check_parent(mdoc, n, MDOC_MAX, MDOC_ROOT));
 }
 

-

 static int
 pre_it(PRE_ARGS)
 {
 
        if (MDOC_BLOCK != n->type)
                return(1);
 static int
 pre_it(PRE_ARGS)
 {
 
        if (MDOC_BLOCK != n->type)
                return(1);

-       /* 
-        * 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));
 }
 
        return(check_parent(mdoc, n, MDOC_Bl, MDOC_BODY));
 }
 

-

 static int
 pre_an(PRE_ARGS)
 {
 static int
 pre_an(PRE_ARGS)
 {

+       int              i;

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

-       if (n->args->argc > 1)
-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_ARGCOUNT))
-                       return(0);
+
+       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)
 
        if (MDOC_Split == n->args->argv[0].arg)

-               n->data.An.auth = AUTH_split;
+               n->norm->An.auth = AUTH_split;

        else if (MDOC_Nosplit == n->args->argv[0].arg)
        else if (MDOC_Nosplit == n->args->argv[0].arg)

-               n->data.An.auth = AUTH_nosplit;
+               n->norm->An.auth = AUTH_nosplit;

        else
                abort();
 
        return(1);
 }
 
        else
                abort();
 
        return(1);
 }
 

-

 static int
 static int

-pre_rv(PRE_ARGS)
+pre_std(PRE_ARGS)

 {
 
 {
 

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

 
 

+       mdoc_nmsg(mdoc, n, MANDOCERR_NOARGV);
+       return(1);
+}

 
 static int
 
 static int

-post_dt(POST_ARGS)
+pre_obsolete(PRE_ARGS)

 {
 {

-       const struct mdoc_node *nn;
-       const char      *p;
-
-       if (NULL != (nn = mdoc->last->child))
-               for (p = nn->string; *p; p++) {
-                       if (toupper((u_char)*p) == *p)
-                               continue;
-                       if ( ! mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE))
-                               return(0);
-                       break;
-               }

 
 

+       if (MDOC_ELEM == n->type || MDOC_BLOCK == n->type)
+               mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
+                   n->line, n->pos, mdoc_macronames[n->tok]);

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

-

 static int
 pre_dt(PRE_ARGS)
 {
 
 static int
 pre_dt(PRE_ARGS)
 {
 

-       if (0 == mdoc->meta.date || mdoc->meta.os)
-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))
-                       return(0);
+       if (NULL == mdoc->meta.date || mdoc->meta.os)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dt");
+

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

-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP))
-                       return(0);
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Dt");
+

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

-

 static int
 pre_os(PRE_ARGS)
 {
 
 static int
 pre_os(PRE_ARGS)
 {
 

-       if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))
-                       return(0);
+       if (NULL == mdoc->meta.title || NULL == mdoc->meta.date)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Os");
+

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

-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP))
-                       return(0);
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Os");
+

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

-

 static int
 pre_dd(PRE_ARGS)
 {
 
        if (mdoc->meta.title || mdoc->meta.os)
 static int
 pre_dd(PRE_ARGS)
 {
 
        if (mdoc->meta.title || mdoc->meta.os)

-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO))
-                       return(0);
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dd");
+

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

-               if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGREP))
-                       return(0);
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Dd");
+

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

-

 static int
 post_bf(POST_ARGS)
 {
 static int
 post_bf(POST_ARGS)
 {


@@ -959,43 +1010,42 @@ post_bf(POST_ARGS)
                        np = mdoc->last->pending->parent->head;
                } else if (MDOC_BLOCK != mdoc->last->type) {
                        np = mdoc->last->parent->head;
                        np = mdoc->last->pending->parent->head;
                } else if (MDOC_BLOCK != mdoc->last->type) {
                        np = mdoc->last->parent->head;

-               } else 
+               } else

                        np = mdoc->last->head;
 
                assert(np);
                assert(MDOC_HEAD == np->type);
                assert(MDOC_Bf == np->tok);
                        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;
        assert(MDOC_BLOCK == np->parent->type);
        assert(MDOC_Bf == np->parent->tok);
                return(1);
        }
 
        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));

 
 

-       /* 
+       /*

         * Cannot have both argument and parameter.
         * Cannot have both argument and parameter.

-        * If neither is specified, let it through with a warning. 
+        * If neither is specified, let it through with a warning.

         */
 
        if (np->parent->args && np->child) {
                mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);
                return(0);
         */
 
        if (np->parent->args && np->child) {
                mdoc_nmsg(mdoc, np, MANDOCERR_SYNTARGVCOUNT);
                return(0);

-       } else if (NULL == np->parent->args && NULL == np->child)
-               return(mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE));
+       } else if (NULL == np->parent->args && NULL == np->child) {
+               mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
+               return(1);
+       }

 
        /* Extract argument into data. */
 
        /* Extract argument into data. */

-       
+

        if (np->parent->args) {
                arg = np->parent->args->argv[0].arg;
                if (MDOC_Emphasis == arg)
        if (np->parent->args) {
                arg = np->parent->args->argv[0].arg;
                if (MDOC_Emphasis == arg)

-                       np->data.Bf->font = FONT_Em;
+                       np->norm->Bf.font = FONT_Em;

                else if (MDOC_Literal == arg)
                else if (MDOC_Literal == arg)

-                       np->data.Bf->font = FONT_Li;
+                       np->norm->Bf.font = FONT_Li;

                else if (MDOC_Symbolic == arg)
                else if (MDOC_Symbolic == arg)

-                       np->data.Bf->font = FONT_Sy;
+                       np->norm->Bf.font = FONT_Sy;

                else
                        abort();
                return(1);
                else
                        abort();
                return(1);


@@ -1004,38 +1054,51 @@ post_bf(POST_ARGS)
        /* Extract parameter into data. */
 
        if (0 == strcmp(np->child->string, "Em"))
        /* Extract parameter into data. */
 
        if (0 == strcmp(np->child->string, "Em"))

-               np->data.Bf->font = FONT_Em;
+               np->norm->Bf.font = FONT_Em;

        else if (0 == strcmp(np->child->string, "Li"))
        else if (0 == strcmp(np->child->string, "Li"))

-               np->data.Bf->font = FONT_Li;
+               np->norm->Bf.font = FONT_Li;

        else if (0 == strcmp(np->child->string, "Sy"))
        else if (0 == strcmp(np->child->string, "Sy"))

-               np->data.Bf->font = FONT_Sy;
-       else if ( ! mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE))
-               return(0);
+               np->norm->Bf.font = FONT_Sy;
+       else
+               mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);

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

-

 static int
 post_lb(POST_ARGS)
 {
 static int
 post_lb(POST_ARGS)
 {

+       struct mdoc_node        *n;
+       const char              *stdlibname;
+       char                    *libname;

 
 

-       if (mdoc_a2lib(mdoc->last->child->string))
-               return(1);
-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADLIB));
-}
+       check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1);
+
+       n = mdoc->last->child;
+
+       assert(n);
+       assert(MDOC_TEXT == n->type);

 
 

+       if (NULL == (stdlibname = mdoc_a2lib(n->string)))
+               mandoc_asprintf(&libname,
+                   "library \\(lq%s\\(rq", n->string);
+       else
+               libname = mandoc_strdup(stdlibname);
+
+       free(n->string);
+       n->string = libname;
+       return(1);
+}

 
 static int
 post_eoln(POST_ARGS)
 {
 
 
 static int
 post_eoln(POST_ARGS)
 {
 

-       if (NULL == mdoc->last->child)
-               return(1);
-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST));
+       if (mdoc->last->child)
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
+       return(1);

 }
 
 }
 

-

 static int
 post_vt(POST_ARGS)
 {
 static int
 post_vt(POST_ARGS)
 {


@@ -1044,126 +1107,221 @@ post_vt(POST_ARGS)
        /*
         * The Vt macro comes in both ELEM and BLOCK form, both of which
         * have different syntaxes (yet more context-sensitive
        /*
         * 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,
+        * behaviour).  ELEM types must have a child, which is already
+        * guaranteed by the in_line parsing routine; BLOCK types,

         * specifically the BODY, should only have TEXT children.
         */
 
         * specifically the BODY, should only have TEXT children.
         */
 

-       if (MDOC_ELEM == mdoc->last->type)
-               return(eerr_ge1(mdoc));

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

-       
+

        for (n = mdoc->last->child; n; n = n->next)
        for (n = mdoc->last->child; n; n = n->next)

-               if (MDOC_TEXT != n->type) 
-                       if ( ! mdoc_nmsg(mdoc, n, MANDOCERR_CHILD))
-                               return(0);
+               if (MDOC_TEXT != n->type)
+                       mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
+                           n->line, n->pos, mdoc_macronames[n->tok]);

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

-

 static int
 post_nm(POST_ARGS)
 {
 
 static int
 post_nm(POST_ARGS)
 {
 

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

                return(1);
                return(1);

-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME));
-}
-

 
 

-static int
-post_at(POST_ARGS)
-{
+       mdoc_deroff(&mdoc->meta.name, mdoc->last);

 
 

-       if (NULL == mdoc->last->child)
-               return(1);
-       assert(MDOC_TEXT == mdoc->last->child->type);
-       if (mdoc_a2att(mdoc->last->child->string))
-               return(1);
-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT));
+       if (NULL == mdoc->meta.name) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);
+               mdoc->meta.name = mandoc_strdup("UNKNOWN");
+       }
+       return(1);

 }
 
 }
 

-

 static int
 static int

-post_an(POST_ARGS)
+post_literal(POST_ARGS)

 {
 {

-       struct mdoc_node *np;

 
 

-       np = mdoc->last;
-       if (AUTH__NONE != np->data.An.auth && np->child)
-               return(mdoc_nmsg(mdoc, np, MANDOCERR_ARGCOUNT));
-       if (AUTH__NONE != np->data.An.auth || np->child)
-               return(1);
-       return(mdoc_nmsg(mdoc, np, MANDOCERR_NOARGS));
-}
+       /*
+        * 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.
+        */
+
+       if (MDOC_BODY == mdoc->last->type)
+               mdoc->flags &= ~MDOC_LITERAL;

 
 

+       return(1);
+}

 
 static int
 
 static int

-post_it(POST_ARGS)
+post_defaults(POST_ARGS)

 {
 {

-       int               i, cols, rc;
-       enum mdoc_list    lt;
-       struct mdoc_node *n, *c;
-       enum mandocerr    er;
+       struct mdoc_node *nn;

 
 

-       if (MDOC_BLOCK != mdoc->last->type)
-               return(1);
+       /*
+        * The `Ar' defaults to "file ..." if no value is provided as an
+        * argument; the `Mt' and `Pa' macros use "~"; the `Li' just
+        * gets an empty string.
+        */

 
 

-       n = mdoc->last->parent->parent;
-       assert(n->data.Bl);
-       lt = n->data.Bl->type;
+       if (mdoc->last->child)
+               return(1);

 
 

-       if (LIST__NONE == lt) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
-               return(0);
-       }
+       nn = mdoc->last;
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

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

-       case (LIST_hang):
-               /* FALLTHROUGH */
-       case (LIST_ohang):
-               /* FALLTHROUGH */
-       case (LIST_inset):
-               /* FALLTHROUGH */
-       case (LIST_diag):
-               if (NULL == mdoc->last->head->child)
-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS))
-                               return(0);
+       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);

                break;
                break;

-       case (LIST_bullet):
-               /* FALLTHROUGH */
-       case (LIST_dash):
+       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);
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       mdoc->last = nn;
+       return(1);
+}
+
+static int
+post_at(POST_ARGS)
+{
+       struct mdoc_node        *n;
+       const char              *std_att;
+       char                    *att;
+
+       /*
+        * 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 == (n = mdoc->last->child))
+               return(1);
+
+       assert(MDOC_TEXT == n->type);
+       if (NULL == (std_att = mdoc_a2att(n->string))) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);
+               mandoc_asprintf(&att, "AT&T UNIX %s", n->string);
+       } else
+               att = mandoc_strdup(std_att);
+
+       free(n->string);
+       n->string = att;
+       return(1);
+}
+
+static int
+post_an(POST_ARGS)
+{
+       struct mdoc_node *np;
+
+       np = mdoc->last;
+       if (AUTH__NONE == np->norm->An.auth) {
+               if (0 == np->child)
+                       check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_GT, 0);
+       } else if (np->child)
+               check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 0);
+
+       return(1);
+}
+
+static int
+post_en(POST_ARGS)
+{
+
+       if (MDOC_BLOCK == mdoc->last->type)
+               mdoc->last->norm->Es = mdoc->last_es;
+       return(1);
+}
+
+static int
+post_es(POST_ARGS)
+{
+
+       mdoc->last_es = mdoc->last;
+       return(1);
+}
+
+static int
+post_it(POST_ARGS)
+{
+       int               i, cols;
+       enum mdoc_list    lt;
+       struct mdoc_node *n, *c;
+       enum mandocerr    er;
+
+       if (MDOC_BLOCK != mdoc->last->type)
+               return(1);
+
+       n = mdoc->last->parent->parent;
+       lt = n->norm->Bl.type;
+
+       if (LIST__NONE == lt) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_LISTTYPE);
+               return(1);
+       }
+
+       switch (lt) {
+       case LIST_tag:
+               if (mdoc->last->head->child)
+                       break;
+               /* FIXME: give this a dummy value. */
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
+               break;
+       case LIST_hang:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_enum):
+       case LIST_ohang:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_hyphen):
+       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)
                if (NULL == mdoc->last->body->child)

-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-                               return(0);
+                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_item):
+       case LIST_item:

                if (mdoc->last->head->child)
                if (mdoc->last->head->child)

-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST))
-                               return(0);
+                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);

                break;
                break;

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

 
                assert(NULL == mdoc->last->head->child);
 
                if (NULL == mdoc->last->body->child)
 
                assert(NULL == mdoc->last->head->child);
 
                if (NULL == mdoc->last->body->child)

-                       if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY))
-                               return(0);
+                       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);

 
                for (i = 0, c = mdoc->last->child; c; c = c->next)
                        if (MDOC_BODY == c->type)
 
                for (i = 0, c = mdoc->last->child; c; c = c->next)
                        if (MDOC_BODY == c->type)


@@ -1176,10 +1334,10 @@ post_it(POST_ARGS)
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 
                else
                        er = MANDOCERR_SYNTARGCOUNT;
 

-               rc = mdoc_vmsg(mdoc, er, 
-                               mdoc->last->line, mdoc->last->pos, 
-                               "columns == %d (have %d)", cols, i);
-               return(rc);
+               mandoc_vmsg(er, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "columns == %d (have %d)", cols, i);
+               return(MANDOCERR_ARGCOUNT == er);

        default:
                break;
        }
        default:
                break;
        }


@@ -1187,159 +1345,574 @@ post_it(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+static int
+post_bl_block(POST_ARGS)
+{
+       struct mdoc_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).
+        */
+
+       n = mdoc->last;
+
+       if (LIST_tag == n->norm->Bl.type &&
+           NULL == n->norm->Bl.width) {
+               if ( ! post_bl_block_tag(mdoc))
+                       return(0);
+               assert(n->norm->Bl.width);
+       } else if (NULL != n->norm->Bl.width) {
+               if ( ! post_bl_block_width(mdoc))
+                       return(0);
+               assert(n->norm->Bl.width);
+       }
+
+       for (ni = n->body->child; ni; ni = ni->next) {
+               if (NULL == ni->body)
+                       continue;
+               nc = ni->body->last;
+               while (NULL != nc) {
+                       switch (nc->tok) {
+                       case MDOC_Pp:
+                               /* FALLTHROUGH */
+                       case MDOC_Lp:
+                               /* FALLTHROUGH */
+                       case MDOC_br:
+                               break;
+                       default:
+                               nc = NULL;
+                               continue;
+                       }
+                       if (NULL == ni->next) {
+                               mandoc_msg(MANDOCERR_PAR_MOVE,
+                                   mdoc->parse, nc->line, nc->pos,
+                                   mdoc_macronames[nc->tok]);
+                               if ( ! mdoc_node_relink(mdoc, nc))
+                                       return(0);
+                       } else if (0 == n->norm->Bl.comp &&
+                           LIST_column != n->norm->Bl.type) {
+                               mandoc_vmsg(MANDOCERR_PAR_SKIP,
+                                   mdoc->parse, nc->line, nc->pos,
+                                   "%s before It",
+                                   mdoc_macronames[nc->tok]);
+                               mdoc_node_delete(mdoc, nc);
+                       } else
+                               break;
+                       nc = ni->body->last;
+               }
+       }
+       return(1);
+}

 
 static int
 
 static int

-post_bl_head(POST_ARGS) 
+post_bl_block_width(POST_ARGS)

 {
 {

+       size_t            width;

        int               i;
        int               i;

+       enum mdoct        tok;

        struct mdoc_node *n;
        struct mdoc_node *n;

+       char              buf[24];

 
 

-       assert(mdoc->last->parent);
-       n = mdoc->last->parent;
+       n = mdoc->last;

 
 

-       if (LIST_column == n->data.Bl->type) {
-               if (n->data.Bl->ncols && mdoc->last->nchild) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_COLUMNS);
-                       return(0);
-               }
+       /*
+        * 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.
+        */
+
+       if (0 == strcmp(n->norm->Bl.width, "Ds"))
+               width = 6;
+       else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
+               return(1);
+       else if (0 == (width = macro2len(tok)))  {
+               mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);

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

-       if (0 == (i = mdoc->last->nchild))
-               return(1);
-       return(warn_count(mdoc, "==", 0, "line arguments", i));
+       /* 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);
+
+       (void)snprintf(buf, sizeof(buf), "%un", (unsigned int)width);
+       free(n->args->argv[i].value[0]);
+       n->args->argv[i].value[0] = mandoc_strdup(buf);
+
+       /* Set our width! */
+       n->norm->Bl.width = n->args->argv[i].value[0];
+       return(1);

 }
 
 }
 

+static int
+post_bl_block_tag(POST_ARGS)
+{
+       struct mdoc_node *n, *nn;
+       size_t            sz, ssz;
+       int               i;
+       char              buf[24];
+
+       /*
+        * 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.
+        */
+
+       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 (nn == NULL)
+                       break;
+
+               if (MDOC_TEXT == nn->type) {
+                       sz = strlen(nn->string) + 1;
+                       break;
+               }
+
+               if (0 != (ssz = macro2len(nn->tok)))
+                       sz = ssz;
+
+               break;
+       }
+
+       /* Defaults to ten ens. */
+
+       (void)snprintf(buf, sizeof(buf), "%un", (unsigned int)sz);
+
+       /*
+        * We have to dynamically add this to the macro's argument list.
+        * We're guaranteed that a MDOC_Width doesn't already exist.
+        */
+
+       assert(n->args);
+       i = (int)(n->args->argc)++;
+
+       n->args->argv = mandoc_reallocarray(n->args->argv,
+           n->args->argc, sizeof(struct mdoc_argv));
+
+       n->args->argv[i].arg = MDOC_Width;
+       n->args->argv[i].line = n->line;
+       n->args->argv[i].pos = n->pos;
+       n->args->argv[i].sz = 1;
+       n->args->argv[i].value = mandoc_malloc(sizeof(char *));
+       n->args->argv[i].value[0] = mandoc_strdup(buf);
+
+       /* Set our width! */
+       n->norm->Bl.width = n->args->argv[i].value[0];
+       return(1);
+}

 
 static int
 
 static int

-post_bl(POST_ARGS)
+post_bl_head(POST_ARGS)

 {
 {

-       struct mdoc_node        *n;
+       struct mdoc_node *np, *nn, *nnp;
+       int               i, j;

 
 

-       if (MDOC_HEAD == mdoc->last->type) 
-               return(post_bl_head(mdoc));
-       if (MDOC_BODY != mdoc->last->type)
-               return(1);
-       if (NULL == mdoc->last->child)
-               return(1);
+       if (LIST_column != mdoc->last->norm->Bl.type)
+               /* FIXME: this should be ERROR class... */
+               return(hwarn_eq0(mdoc));

 
        /*
 
        /*

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

         */
 
         */
 

-       /* 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);
+       /* First, disallow both types and allow normal-form. */
+
+       /*
+        * TODO: technically, we can accept both and just merge the two
+        * lists, but I'll leave that for another day.
+        */
+
+       if (mdoc->last->norm->Bl.ncols && mdoc->last->nchild) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_COLUMNS);

                return(0);
                return(0);

+       } else if (NULL == mdoc->last->child)
+               return(1);
+
+       np = mdoc->last->parent;
+       assert(np->args);
+
+       for (j = 0; j < (int)np->args->argc; j++)
+               if (MDOC_Column == np->args->argv[j].arg)
+                       break;
+
+       assert(j < (int)np->args->argc);
+       assert(0 == np->args->argv[j].sz);
+
+       /*
+        * 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.
+        */
+
+       np->args->argv[j].sz = (size_t)mdoc->last->nchild;
+       np->args->argv[j].value = mandoc_reallocarray(NULL,
+           (size_t)mdoc->last->nchild, sizeof(char *));
+
+       mdoc->last->norm->Bl.ncols = np->args->argv[j].sz;
+       mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value;
+
+       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);

        }
 
        }
 

+       mdoc->last->nchild = 0;
+       mdoc->last->child = NULL;
+

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

+static int
+post_bl(POST_ARGS)
+{
+       struct mdoc_node        *nparent, *nprev; /* of the Bl block */
+       struct mdoc_node        *nblock, *nbody;  /* of the Bl */
+       struct mdoc_node        *nchild, *nnext;  /* of the Bl body */
+
+       nbody = mdoc->last;
+       switch (nbody->type) {
+       case MDOC_BLOCK:
+               return(post_bl_block(mdoc));
+       case MDOC_HEAD:
+               return(post_bl_head(mdoc));
+       case MDOC_BODY:
+               break;
+       default:
+               return(1);
+       }
+
+       nchild = nbody->child;
+       while (NULL != nchild) {
+               if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {
+                       nchild = nchild->next;
+                       continue;
+               }
+
+               mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
+                   nchild->line, nchild->pos,
+                   mdoc_macronames[nchild->tok]);
+
+               /*
+                * Move the node out of the Bl block.
+                * First, collect all required node pointers.
+                */
+
+               nblock  = nbody->parent;
+               nprev   = nblock->prev;
+               nparent = nblock->parent;
+               nnext   = nchild->next;
+
+               /*
+                * Unlink this child.
+                */
+
+               assert(NULL == nchild->prev);
+               if (0 == --nbody->nchild) {
+                       nbody->child = NULL;
+                       nbody->last  = NULL;
+                       assert(NULL == nnext);
+               } else {
+                       nbody->child = nnext;
+                       nnext->prev = NULL;
+               }
+
+               /*
+                * Relink this child.
+                */
+
+               nchild->parent = nparent;
+               nchild->prev   = nprev;
+               nchild->next   = nblock;
+
+               nblock->prev = nchild;
+               nparent->nchild++;
+               if (NULL == nprev)
+                       nparent->child = nchild;
+               else
+                       nprev->next = nchild;
+
+               nchild = nnext;
+       }
+
+       return(1);
+}

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

-       struct mdoc_node *n;

 
 

-       /* LINTED */
-       for (n = mdoc->last->child; n; n = n->next) {
-               if (MDOC_TEXT != n->type)
-                       break;
-               if (0 == strcmp(n->string, "on"))
-                       continue;
-               if (0 == strcmp(n->string, "off"))
-                       continue;
-               break;
+       if (NULL == mdoc->last->child) {
+               if (MDOC_Sm == mdoc->last->tok)
+                       mdoc->flags ^= MDOC_SMOFF;
+               return(1);

        }
 
        }
 

-       if (NULL == n)
+       check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_LT, 2);
+
+       assert(MDOC_TEXT == mdoc->last->child->type);
+
+       if (0 == strcmp(mdoc->last->child->string, "on")) {
+               if (MDOC_Sm == mdoc->last->tok)
+                       mdoc->flags &= ~MDOC_SMOFF;

                return(1);
                return(1);

-       return(mdoc_nmsg(mdoc, n, MANDOCERR_BADBOOL));
-}
+       }
+       if (0 == strcmp(mdoc->last->child->string, "off")) {
+               if (MDOC_Sm == mdoc->last->tok)
+                       mdoc->flags |= MDOC_SMOFF;
+               return(1);
+       }

 
 

+       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADBOOL);
+       return(1);
+}

 
 static int
 post_root(POST_ARGS)
 {
 
 static int
 post_root(POST_ARGS)
 {

+       int               ret;
+       struct mdoc_node *n;
+
+       ret = 1;
+
+       /* Check that we have a finished prologue. */

 
 

-       if (NULL == mdoc->first->child)
-               mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY);
-       else if ( ! (MDOC_PBODY & mdoc->flags))
+       if ( ! (MDOC_PBODY & mdoc->flags)) {
+               ret = 0;

                mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
                mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);

-       else if (MDOC_BLOCK != mdoc->first->child->type)
-               mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY);
-       else if (MDOC_Sh != mdoc->first->child->tok)
-               mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCBODY);
-       else
-               return(1);
+       }

 
 

-       return(0);
-}
+       n = mdoc->first;
+       assert(n);
+
+       /* Check that we begin with a proper `Sh'. */
+
+       if (NULL == n->child)
+               mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY);
+       else if (MDOC_Sh != n->child->tok)
+               mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
+                   n->child->line, n->child->pos,
+                   mdoc_macronames[n->child->tok]);

 
 

+       return(ret);
+}

 
 static int
 post_st(POST_ARGS)
 {
 
 static int
 post_st(POST_ARGS)
 {

+       struct mdoc_node         *ch;
+       const char               *p;

 
 

-       if (mdoc_a2st(mdoc->last->child->string))
+       if (NULL == (ch = mdoc->last->child)) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_MACROEMPTY);
+               mdoc_node_delete(mdoc, mdoc->last);

                return(1);
                return(1);

-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD));
-}
+       }

 
 

+       assert(MDOC_TEXT == ch->type);
+
+       if (NULL == (p = mdoc_a2st(ch->string))) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADSTANDARD);
+               mdoc_node_delete(mdoc, mdoc->last);
+       } else {
+               free(ch->string);
+               ch->string = mandoc_strdup(p);
+       }
+
+       return(1);
+}

 
 static int
 post_rs(POST_ARGS)
 {
 
 static int
 post_rs(POST_ARGS)
 {

-       struct mdoc_node        *nn;
+       struct mdoc_node *nn, *next, *prev;
+       int               i, j;

 
 

-       if (MDOC_BODY != mdoc->last->type)
+       switch (mdoc->last->type) {
+       case MDOC_HEAD:
+               check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0);

                return(1);
                return(1);

-
-       for (nn = mdoc->last->child; nn; nn = nn->next)
-               switch (nn->tok) {
-               case(MDOC__U):
-                       /* FALLTHROUGH */
-               case(MDOC__Q):
-                       /* FALLTHROUGH */
-               case(MDOC__C):
-                       /* FALLTHROUGH */
-               case(MDOC__A):
-                       /* FALLTHROUGH */
-               case(MDOC__B):
-                       /* FALLTHROUGH */
-               case(MDOC__D):
-                       /* FALLTHROUGH */
-               case(MDOC__I):
-                       /* FALLTHROUGH */
-               case(MDOC__J):
-                       /* FALLTHROUGH */
-               case(MDOC__N):
-                       /* FALLTHROUGH */
-               case(MDOC__O):
-                       /* FALLTHROUGH */
-               case(MDOC__P):
-                       /* FALLTHROUGH */
-               case(MDOC__R):
-                       /* FALLTHROUGH */
-               case(MDOC__T):
-                       /* FALLTHROUGH */
-               case(MDOC__V):
+       case MDOC_BODY:
+               if (mdoc->last->child)

                        break;
                        break;

-               default:
-                       mdoc_nmsg(mdoc, nn, MANDOCERR_SYNTCHILD);
-                       return(0);
+               check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0);
+               return(1);
+       default:
+               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;
+
+               if (i < RSORD_MAX) {
+                       if (MDOC__J == rsord[i] || MDOC__B == rsord[i])
+                               mdoc->last->norm->Rs.quote_T++;
+                       next = nn->next;
+                       continue;
+               }
+
+               next = nn->next;
+               mandoc_msg(MANDOCERR_RS_SKIP, mdoc->parse,
+                   nn->line, nn->pos, mdoc_macronames[nn->tok]);
+               mdoc_node_delete(mdoc, nn);
+       }
+
+       /*
+        * Nothing to sort if only invalid nodes were found
+        * inside the `Rs' body.
+        */
+
+       if (NULL == mdoc->last->child)
+               return(1);
+
+       /*
+        * 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.
+        */
+
+       next = NULL;
+       for (nn = mdoc->last->child->next; nn; nn = next) {
+               /* Determine order of `nn'. */
+               for (i = 0; i < RSORD_MAX; i++)
+                       if (rsord[i] == nn->tok)
+                               break;
+
+               /*
+                * Remove `nn' from the chain.  This somewhat
+                * repeats mdoc_node_unlink(), but since we're
+                * 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;
+
+               nn->prev = nn->next = NULL;
+
+               /*
+                * Scan back until we reach a node that's
+                * ordered before `nn'.
+                */
+
+               for ( ; prev ; prev = prev->prev) {
+                       /* Determine order of `prev'. */
+                       for (j = 0; j < RSORD_MAX; j++)
+                               if (rsord[j] == prev->tok)
+                                       break;
+
+                       if (j <= i)
+                               break;
+               }
+
+               /*
+                * Set `nn' back into its correct place in front
+                * of the `prev' node.
+                */
+
+               nn->prev = prev;
+
+               if (prev) {
+                       if (prev->next)
+                               prev->next->prev = nn;
+                       nn->next = prev->next;
+                       prev->next = nn;
+               } else {
+                       mdoc->last->child->prev = nn;
+                       nn->next = mdoc->last->child;
+                       mdoc->last->child = nn;

                }
                }

+       }

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

+/*
+ * For some arguments of some macros,
+ * convert all breakable hyphens into ASCII_HYPH.
+ */
+static int
+post_hyph(POST_ARGS)
+{
+       struct mdoc_node        *n, *nch;
+       char                    *cp;
+
+       n = mdoc->last;
+       switch (n->type) {
+       case MDOC_HEAD:
+               if (MDOC_Sh == n->tok || MDOC_Ss == n->tok)
+                       break;
+               return(1);
+       case MDOC_BODY:
+               if (MDOC_D1 == n->tok || MDOC_Nd == n->tok)
+                       break;
+               return(1);
+       case MDOC_ELEM:
+               break;
+       default:
+               return(1);
+       }
+
+       for (nch = n->child; nch; nch = nch->next) {
+               if (MDOC_TEXT != nch->type)
+                       continue;
+               cp = nch->string;
+               if ('\0' == *cp)
+                       continue;
+               while ('\0' != *(++cp))
+                       if ('-' == *cp &&
+                           isalpha((unsigned char)cp[-1]) &&
+                           isalpha((unsigned char)cp[1]))
+                               *cp = ASCII_HYPH;
+       }
+       return(1);
+}
+
+static int
+post_ns(POST_ARGS)
+{
+
+       if (MDOC_LINE & mdoc->last->flags)
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NS_SKIP);
+       return(1);
+}

 
 static int
 post_sh(POST_ARGS)
 
 static int
 post_sh(POST_ARGS)


@@ -1353,7 +1926,6 @@ post_sh(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

 static int
 post_sh_body(POST_ARGS)
 {
 static int
 post_sh_body(POST_ARGS)
 {


@@ -1368,120 +1940,613 @@ post_sh_body(POST_ARGS)
         * children of the BODY declaration can also be "text".
         */
 
         * children of the BODY declaration can also be "text".
         */
 

-       if (NULL == (n = mdoc->last->child))
-               return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC));
+       if (NULL == (n = mdoc->last->child)) {
+               mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, "empty");
+               return(1);
+       }

 
        for ( ; n && n->next; n = n->next) {
                if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
                        continue;
                if (MDOC_TEXT == n->type)
                        continue;
 
        for ( ; n && n->next; n = n->next) {
                if (MDOC_ELEM == n->type && MDOC_Nm == n->tok)
                        continue;
                if (MDOC_TEXT == n->type)
                        continue;

-               if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC))
-                       return(0);
+               mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+                   n->line, n->pos, mdoc_macronames[n->tok]);

        }
 
        assert(n);
        if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)
                return(1);
        }
 
        assert(n);
        if (MDOC_BLOCK == n->type && MDOC_Nd == n->tok)
                return(1);

-       return(mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC));
-}

 
 

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

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

-       char                    buf[BUFSIZ];
-       enum mdoc_sec           sec;
-       const struct mdoc_node *n;
+       struct mdoc_node *n;
+       const char      *goodsec;
+       char            *secname;
+       enum mdoc_sec    sec;

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

-        * "custom"; custom sections are user-defined, while named ones
-        * usually follow a conventional order and may only appear in
-        * certain manual sections.
+        * "custom".  Custom sections are user-defined, while named ones
+        * follow a conventional order and may only appear in certain
+        * manual sections.

         */
 
         */
 

-       buf[0] = '\0';
+       secname = NULL;
+       sec = SEC_CUSTOM;
+       mdoc_deroff(&secname, mdoc->last);
+       sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);

 
 

-       /*
-        * FIXME: yes, these can use a dynamic buffer, but I don't do so
-        * in the interests of simplicity.
-        */
+       /* The NAME should be first. */

 
 

-       for (n = mdoc->last->child; n; n = n->next) {
-               /* XXX - copied from compact(). */
-               assert(MDOC_TEXT == n->type);
+       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
+               mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, secname);

 
 

-               if (strlcat(buf, n->string, BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-               if (NULL == n->next)
-                       continue;
-               if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
+       /* The SYNOPSIS gets special attention in other areas. */
+
+       if (SEC_SYNOPSIS == sec) {
+               roff_setreg(mdoc->roff, "nS", 1, '=');
+               mdoc->flags |= MDOC_SYNOPSIS;
+       } else {
+               roff_setreg(mdoc->roff, "nS", 0, '=');
+               mdoc->flags &= ~MDOC_SYNOPSIS;

        }
 
        }
 

-       sec = mdoc_str2sec(buf);
+       /* Mark our last section. */
+
+       mdoc->lastsec = sec;

 
 

-       /* 
-        * Check: NAME should always be first, CUSTOM has no roles,
-        * non-CUSTOM has a conventional order to be followed.
+       /*
+        * Set the section attribute for the current HEAD, for its
+        * parent BLOCK, and for the HEAD children; the latter can
+        * only be TEXT nodes, so no recursion is needed.
+        * For other blocks and elements, including .Sh BODY, this is
+        * done when allocating the node data structures, but for .Sh
+        * BLOCK and HEAD, the section is still unknown at that time.

         */
 
         */
 

-       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
-               if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST))
-                       return(0);
+       mdoc->last->parent->sec = sec;
+       mdoc->last->sec = sec;
+       for (n = mdoc->last->child; n; n = n->next)
+               n->sec = sec;
+
+       /* We don't care about custom sections after this. */

 
 

-       if (SEC_CUSTOM == sec)
+       if (SEC_CUSTOM == sec) {
+               free(secname);

                return(1);
                return(1);

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

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

-               if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECREP))
-                       return(0);
+               mandoc_msg(MANDOCERR_SEC_REP, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, secname);

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

-               if ( ! mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECOOO))
-                       return(0);
+               mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, secname);

 
 

-       /* 
-        * Check particular section/manual conventions.  LIBRARY can
-        * only occur in manual section 2, 3, and 9.
-        */
+       /* Mark the last named section. */
+
+       mdoc->lastnamed = sec;

 
 

+       /* Check particular section/manual conventions. */
+
+       assert(mdoc->meta.msec);
+
+       goodsec = NULL;

        switch (sec) {
        switch (sec) {

-       case (SEC_LIBRARY):
-               assert(mdoc->meta.msec);
+       case SEC_ERRORS:
+               if (*mdoc->meta.msec == '4')
+                       break;
+               goodsec = "2, 3, 4, 9";
+               /* FALLTHROUGH */
+       case SEC_RETURN_VALUES:
+               /* FALLTHROUGH */
+       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;

-               return(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,
+                   "%s for %s only", secname, goodsec);
+               break;

        default:
                break;
        }
 
        default:
                break;
        }
 

+       free(secname);
+       return(1);
+}
+
+static int
+post_ignpar(POST_ARGS)
+{
+       struct mdoc_node *np;
+
+       if (MDOC_BODY != mdoc->last->type)
+               return(1);
+
+       if (NULL != (np = mdoc->last->child))
+               if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
+                           mdoc->parse, np->line, np->pos,
+                           "%s after %s", mdoc_macronames[np->tok],
+                           mdoc_macronames[mdoc->last->tok]);
+                       mdoc_node_delete(mdoc, np);
+               }
+
+       if (NULL != (np = mdoc->last->last))
+               if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+                       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]);
+                       mdoc_node_delete(mdoc, np);
+               }
+
+       return(1);
+}
+
+static int
+pre_par(PRE_ARGS)
+{
+
+       if (NULL == mdoc->last)
+               return(1);
+       if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type)
+               return(1);
+
+       /*
+        * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
+        * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
+        */
+
+       if (MDOC_Pp != mdoc->last->tok &&
+           MDOC_Lp != mdoc->last->tok &&
+           MDOC_br != mdoc->last->tok)
+               return(1);
+       if (MDOC_Bl == n->tok && n->norm->Bl.comp)
+               return(1);
+       if (MDOC_Bd == n->tok && n->norm->Bd.comp)
+               return(1);
+       if (MDOC_It == n->tok && n->parent->norm->Bl.comp)
+               return(1);
+
+       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
+           mdoc->last->line, mdoc->last->pos,
+           "%s before %s", mdoc_macronames[mdoc->last->tok],
+           mdoc_macronames[n->tok]);
+       mdoc_node_delete(mdoc, mdoc->last);
+       return(1);
+}
+
+static int
+post_par(POST_ARGS)
+{
+       struct mdoc_node *np;
+
+       if (MDOC_ELEM != mdoc->last->type &&
+           MDOC_BLOCK != mdoc->last->type)
+               return(1);
+
+       if (NULL == (np = mdoc->last->prev)) {
+               np = mdoc->last->parent;
+               if (MDOC_Sh != np->tok && MDOC_Ss != np->tok)
+                       return(1);
+       } else {
+               if (MDOC_Pp != np->tok && MDOC_Lp != np->tok &&
+                   (MDOC_br != mdoc->last->tok ||
+                    (MDOC_sp != np->tok && MDOC_br != np->tok)))
+                       return(1);
+       }
+
+       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]);
+       mdoc_node_delete(mdoc, mdoc->last);
+       return(1);
+}
+
+static int
+pre_literal(PRE_ARGS)
+{
+
+       if (MDOC_BODY != n->type)
+               return(1);
+
+       /*
+        * The `Dl' (note "el" not "one") and `Bd -literal' and `Bd
+        * -unfilled' macros set MDOC_LITERAL on entrance to the body.
+        */
+
+       switch (n->tok) {
+       case MDOC_Dl:
+               mdoc->flags |= MDOC_LITERAL;
+               break;
+       case MDOC_Bd:
+               if (DISP_literal == n->norm->Bd.type)
+                       mdoc->flags |= MDOC_LITERAL;
+               if (DISP_unfilled == n->norm->Bd.type)
+                       mdoc->flags |= MDOC_LITERAL;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+

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

+static int
+post_dd(POST_ARGS)
+{
+       struct mdoc_node *n;
+       char             *datestr;
+
+       if (mdoc->meta.date)
+               free(mdoc->meta.date);
+
+       n = mdoc->last;
+       if (NULL == n->child || '\0' == n->child->string[0]) {
+               mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
+                   mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);
+               return(1);
+       }
+
+       datestr = NULL;
+       mdoc_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);
+       }
+       return(1);
+}

 
 static int
 
 static int

-pre_pp(PRE_ARGS)
+post_dt(POST_ARGS)

 {
 {

+       struct mdoc_node *nn, *n;
+       const char       *cp;
+       char             *p;
+
+       n = mdoc->last;
+
+       if (mdoc->meta.title)
+               free(mdoc->meta.title);
+       if (mdoc->meta.vol)
+               free(mdoc->meta.vol);
+       if (mdoc->meta.arch)
+               free(mdoc->meta.arch);
+
+       mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;

 
 

-       if (NULL == mdoc->last || MDOC_Pp != mdoc->last->tok)
+       /* First check that all characters are uppercase. */
+
+       if (NULL != (nn = n->child))
+               for (p = nn->string; *p; p++) {
+                       if (toupper((unsigned char)*p) == *p)
+                               continue;
+                       mandoc_msg(MANDOCERR_TITLE_CASE,
+                           mdoc->parse, nn->line,
+                           nn->pos + (p - nn->string),
+                           nn->string);
+                       break;
+               }
+
+       /* Handles: `.Dt'
+        * title = unknown, volume = local, msec = 0, arch = NULL
+        */
+
+       if (NULL == (nn = n->child)) {
+               /* XXX: make these macro values. */
+               /* FIXME: warn about missing values. */
+               mdoc->meta.title = mandoc_strdup("UNKNOWN");
+               mdoc->meta.vol = mandoc_strdup("LOCAL");
+               mdoc->meta.msec = mandoc_strdup("1");

                return(1);
                return(1);

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

 
 

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

-       if (MDOC_Bd == n->tok && n->data.Bd->comp)
+       }
+
+       /* Handles: `.Dt TITLE SEC'
+        * title = TITLE,
+        * volume = SEC is msec ? format(msec) : SEC,
+        * msec = SEC is msec ? atoi(msec) : 0,
+        * arch = NULL
+        */
+
+       cp = mandoc_a2msec(nn->string);
+       if (cp) {
+               mdoc->meta.vol = mandoc_strdup(cp);
+               mdoc->meta.msec = mandoc_strdup(nn->string);
+       } else {
+               mandoc_msg(MANDOCERR_MSEC_BAD, mdoc->parse,
+                   nn->line, nn->pos, nn->string);
+               mdoc->meta.vol = mandoc_strdup(nn->string);
+               mdoc->meta.msec = mandoc_strdup(nn->string);
+       }
+
+       if (NULL == (nn = nn->next))

                return(1);
 
                return(1);
 

-       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
+       /* Handles: `.Dt TITLE SEC VOL'
+        * title = TITLE,
+        * volume = VOL is vol ? format(VOL) :
+        *          VOL is arch ? format(arch) :
+        *          VOL
+        */
+
+       cp = mdoc_a2vol(nn->string);
+       if (cp) {
+               free(mdoc->meta.vol);
+               mdoc->meta.vol = mandoc_strdup(cp);
+       } else {
+               cp = mdoc_a2arch(nn->string);
+               if (NULL == cp) {
+                       mandoc_msg(MANDOCERR_ARCH_BAD, mdoc->parse,
+                           nn->line, nn->pos, nn->string);
+                       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);
+}
+
+static int
+post_prol(POST_ARGS)
+{
+       /*
+        * Remove prologue macros from the document after they're
+        * processed.  The final document uses mdoc_meta for these
+        * values and discards the originals.
+        */
+

        mdoc_node_delete(mdoc, mdoc->last);
        mdoc_node_delete(mdoc, mdoc->last);

+       if (mdoc->meta.title && mdoc->meta.date && mdoc->meta.os)
+               mdoc->flags |= MDOC_PBODY;
+
+       return(1);
+}
+
+static int
+post_bx(POST_ARGS)
+{
+       struct mdoc_node        *n;
+
+       /*
+        * Make `Bx's second argument always start with an uppercase
+        * letter.  Groff checks if it's an "accepted" term, but we just
+        * uppercase blindly.
+        */
+
+       n = mdoc->last->child;
+       if (n && NULL != (n = n->next))
+               *n->string = (char)toupper((unsigned char)*n->string);
+

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

+
+static int
+post_os(POST_ARGS)
+{
+#ifndef OSNAME
+       struct utsname    utsname;
+       static char      *defbuf;
+#endif
+       struct mdoc_node *n;
+
+       n = mdoc->last;
+
+       /*
+        * 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;
+       mdoc_deroff(&mdoc->meta.os, n);
+       if (mdoc->meta.os)
+               return(1);
+
+       if (mdoc->defos) {
+               mdoc->meta.os = mandoc_strdup(mdoc->defos);
+               return(1);
+       }
+
+#ifdef OSNAME
+       mdoc->meta.os = mandoc_strdup(OSNAME);
+#else /*!OSNAME */
+       if (NULL == defbuf) {
+               if (-1 == uname(&utsname)) {
+                       mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);
+                       defbuf = mandoc_strdup("UNKNOWN");
+               } else
+                       mandoc_asprintf(&defbuf, "%s %s",
+                           utsname.sysname, utsname.release);
+       }
+       mdoc->meta.os = mandoc_strdup(defbuf);
+#endif /*!OSNAME*/
+       return(1);
+}
+
+static int
+post_std(POST_ARGS)
+{
+       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;
+
+       if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name))
+               return(0);
+
+       mdoc->last = nn;
+       return(1);
+}
+
+static enum mdoc_sec
+a2sec(const char *p)
+{
+       int              i;
+
+       for (i = 0; i < (int)SEC__MAX; i++)
+               if (secnames[i] && 0 == strcmp(p, secnames[i]))
+                       return((enum mdoc_sec)i);
+
+       return(SEC_CUSTOM);
+}
+
+static size_t
+macro2len(enum mdoct macro)
+{
+
+       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);
+}