Clean up the warnings related to document structure.

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index fc00b93aaf82f488c71a36963f69fb987afd6b79..32f141de8c943a8b05aaf74cb030853d34a4b0fb 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,7 +1,8 @@
-/*     $Id: mdoc_validate.c,v 1.154 2011/01/25 15:46:05 kristaps Exp $ */
+/*     $Id: mdoc_validate.c,v 1.217 2014/07/01 22:37:15 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * 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


@@ -19,7 +20,7 @@
 #include "config.h"
 #endif
 
 #include "config.h"
 #endif
 

-#ifndef        OSNAME
+#ifndef OSNAME

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


@@ -33,7 +34,9 @@
 #include <string.h>
 #include <time.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"
 


@@ -42,9 +45,6 @@
 #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
 

-#define        NUMSIZ    32
-#define        DATESIZE  32
-

 enum   check_ineq {
        CHECK_LT,
        CHECK_GT,
 enum   check_ineq {
        CHECK_LT,
        CHECK_GT,


@@ -64,16 +64,15 @@ struct      valids {
        v_post  *post;
 };
 
        v_post  *post;
 };
 

-static int      check_count(struct mdoc *, enum mdoc_type, 
+static int      check_count(struct mdoc *, enum mdoc_type,

                        enum check_lvl, enum check_ineq, int);
 static int      check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
 static void     check_text(struct mdoc *, int, int, char *);
                        enum check_lvl, enum check_ineq, int);
 static int      check_parent(PRE_ARGS, enum mdoct, enum mdoc_type);
 static void     check_text(struct mdoc *, int, int, char *);

-static void     check_argv(struct mdoc *, 
+static void     check_argv(struct mdoc *,

                        struct mdoc_node *, struct mdoc_argv *);
 static void     check_args(struct mdoc *, struct mdoc_node *);
                        struct mdoc_node *, struct mdoc_argv *);
 static void     check_args(struct mdoc *, struct mdoc_node *);

-
-static int      concat(struct mdoc *, char *, 
-                       const struct mdoc_node *, size_t);
+static 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      ebool(POST_ARGS);
 static int      berr_ge1(POST_ARGS);


@@ -96,16 +95,19 @@ 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_bx(POST_ARGS);
 static int      post_bl_block_tag(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_dd(POST_ARGS);
 static int      post_dt(POST_ARGS);

-static int      post_defaults(POST_ARGS);
-static int      post_literal(POST_ARGS);

 static int      post_eoln(POST_ARGS);
 static int      post_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_os(POST_ARGS);

-static int      post_ignpar(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_prol(POST_ARGS);
 static int      post_root(POST_ARGS);
 static int      post_rs(POST_ARGS);


@@ -139,26 +141,30 @@ 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_defaults[] = { post_defaults, NULL };
 static v_post   posts_bool[] = { ebool, NULL };
 static v_post   posts_eoln[] = { post_eoln, NULL };
 static v_post   posts_defaults[] = { post_defaults, NULL };

-static v_post   posts_dd[] = { ewarn_ge1, post_dd, post_prol, NULL };
+static v_post   posts_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_fo[] = { hwarn_eq1, bwarn_ge1, 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_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_lb[] = { post_lb, NULL };
 static v_post   posts_it[] = { post_it, NULL };
 static v_post   posts_lb[] = { post_lb, NULL };

-static v_post   posts_nd[] = { berr_ge1, 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_ns[] = { post_ns, NULL };

 static v_post   posts_os[] = { post_os, post_prol, 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_rs[] = { post_rs, NULL };

-static v_post   posts_sh[] = { post_ignpar, hwarn_ge1, bwarn_ge1, post_sh, NULL };
-static v_post   posts_sp[] = { ewarn_le1, NULL };
-static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, bwarn_ge1, 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_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_wline[] = { bwarn_ge1, NULL };

 static v_pre    pres_an[] = { pre_an, NULL };
 static v_pre    pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL };
 static v_pre    pres_bl[] = { pre_bl, pre_par, NULL };
 static v_pre    pres_an[] = { pre_an, NULL };
 static v_pre    pres_bd[] = { pre_display, pre_bd, pre_literal, pre_par, NULL };
 static v_pre    pres_bl[] = { pre_bl, pre_par, NULL };


@@ -166,8 +172,6 @@ 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_dl[] = { pre_literal, pre_display, NULL };
 static v_pre    pres_dd[] = { pre_dd, NULL };
 static v_pre    pres_dt[] = { pre_dt, NULL };

-static v_pre    pres_er[] = { NULL, NULL };
-static v_pre    pres_fd[] = { NULL, NULL };

 static v_pre    pres_it[] = { pre_it, pre_par, NULL };
 static v_pre    pres_os[] = { pre_os, NULL };
 static v_pre    pres_pp[] = { pre_par, NULL };
 static v_pre    pres_it[] = { pre_it, pre_par, NULL };
 static v_pre    pres_os[] = { pre_os, NULL };
 static v_pre    pres_pp[] = { pre_par, NULL };


@@ -175,37 +179,37 @@ static    v_pre    pres_sh[] = { pre_sh, NULL };
 static v_pre    pres_ss[] = { pre_ss, NULL };
 static v_pre    pres_std[] = { pre_std, 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 */
        { pres_dd, posts_dd },                  /* Dd */
        { pres_dt, posts_dt },                  /* Dt */
        { pres_os, posts_os },                  /* Os */
        { NULL, NULL },                         /* Ap */
        { pres_dd, posts_dd },                  /* Dd */
        { pres_dt, posts_dt },                  /* Dt */
        { pres_os, posts_os },                  /* Os */

-       { pres_sh, posts_sh },                  /* Sh */ 
-       { pres_ss, posts_ss },                  /* Ss */ 
-       { pres_pp, posts_notext },              /* Pp */ 
-       { pres_d1, posts_wline },               /* D1 */
+       { pres_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 */
        { pres_dl, posts_dl },                  /* Dl */
        { pres_bd, posts_bd },                  /* Bd */
        { 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, NULL },                         /* Ad */ 
-       { pres_an, posts_an },                  /* An */ 
+       { NULL, NULL },                         /* Ad */
+       { pres_an, posts_an },                  /* An */

        { NULL, posts_defaults },               /* Ar */
        { NULL, posts_defaults },               /* Ar */

-       { NULL, NULL },                         /* Cd */ 
+       { NULL, NULL },                         /* Cd */

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

-       { NULL, NULL },                         /* Dv */ 
-       { pres_er, NULL },                      /* Er */ 
-       { NULL, NULL },                         /* Ev */ 
-       { pres_std, posts_std },                /* Ex */ 
-       { NULL, NULL },                         /* Fa */ 
-       { pres_fd, posts_text },                /* 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, NULL },                         /* Fn */ 
-       { NULL, NULL },                         /* Ft */ 
-       { NULL, NULL },                         /* Ic */ 
-       { NULL, posts_text1 },                  /* In */ 
+       { 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_defaults },               /* Li */
        { NULL, posts_nd },                     /* Nd */
        { NULL, posts_nm },                     /* Nm */


@@ -213,25 +217,25 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ot */
        { NULL, posts_defaults },               /* Pa */
        { pres_std, posts_std },                /* Rv */
        { NULL, NULL },                         /* Ot */
        { NULL, posts_defaults },               /* Pa */
        { pres_std, posts_std },                /* Rv */

-       { NULL, posts_st },                     /* St */ 
+       { NULL, posts_st },                     /* St */

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

-       { NULL, posts_vt },                     /* Vt */ 
-       { NULL, posts_text },                   /* 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, NULL },                         /* Aq */
        { NULL, posts_text },                   /* %V */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */
        { NULL, NULL },                         /* Aq */

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

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


@@ -243,13 +247,13 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Do */
        { NULL, NULL },                         /* Dq */
        { NULL, NULL },                         /* Ec */
        { NULL, NULL },                         /* Do */
        { NULL, NULL },                         /* Dq */
        { 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, NULL },                         /* 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, NULL },                         /* Nx */
        { NULL, NULL },                         /* Ox */
        { NULL, NULL },                         /* Pc */


@@ -265,15 +269,15 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, NULL },                         /* Sq */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, NULL },                         /* Sq */

-       { NULL, posts_bool },                   /* Sm */ 
-       { NULL, NULL },                         /* Sx */
+       { 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 },                         /* Sy */
        { NULL, NULL },                         /* Tn */
        { 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, posts_bk },                     /* Bk */
        { NULL, NULL },                         /* Oo */
        { NULL, NULL },                         /* Oc */
        { NULL, posts_bk },                     /* Bk */


@@ -283,21 +287,22 @@ const     struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Fr */
        { NULL, posts_eoln },                   /* Ud */
        { NULL, posts_lb },                     /* Lb */
        { NULL, NULL },                         /* Fr */
        { NULL, posts_eoln },                   /* Ud */
        { NULL, posts_lb },                     /* Lb */

-       { NULL, posts_notext },                 /* Lp */ 
-       { NULL, NULL },                         /* Lk */ 
-       { NULL, posts_defaults },               /* Mt */ 
-       { NULL, NULL },                         /* 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, NULL },                         /* Es */
        { NULL, NULL },                         /* En */
        { NULL, NULL },                         /* Dx */
        { NULL, posts_text },                   /* %Q */
        { NULL, posts_text },                   /* %C */
        { NULL, NULL },                         /* Es */
        { NULL, NULL },                         /* En */
        { NULL, NULL },                         /* Dx */
        { NULL, posts_text },                   /* %Q */

-       { NULL, posts_notext },                 /* br */
-       { pres_pp, posts_sp },                  /* sp */
+       { NULL, posts_pp },                     /* br */
+       { NULL, posts_sp },                     /* sp */

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

+       { NULL, NULL },                         /* ll */

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


@@ -311,12 +316,38 @@ static    const enum mdoct rsord[RSORD_MAX] = {
        MDOC__R,
        MDOC__N,
        MDOC__V,
        MDOC__R,
        MDOC__N,
        MDOC__V,

+       MDOC__U,

        MDOC__P,
        MDOC__Q,
        MDOC__P,
        MDOC__Q,

-       MDOC__D,
-       MDOC__O,

        MDOC__C,
        MDOC__C,

-       MDOC__U
+       MDOC__D,
+       MDOC__O
+};
+
+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

 };
 
 
 };
 
 


@@ -328,15 +359,17 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
        char            *tp;
 
        switch (n->type) {
        char            *tp;
 
        switch (n->type) {

-       case (MDOC_TEXT):
+       case MDOC_TEXT:

                tp = n->string;
                line = n->line;
                pos = n->pos;
                check_text(mdoc, line, pos, tp);
                /* FALLTHROUGH */
                tp = n->string;
                line = n->line;
                pos = n->pos;
                check_text(mdoc, line, pos, tp);
                /* FALLTHROUGH */

-       case (MDOC_TBL):
+       case MDOC_TBL:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_ROOT):
+       case MDOC_EQN:
+               /* FALLTHROUGH */
+       case MDOC_ROOT:

                return(1);
        default:
                break;
                return(1);
        default:
                break;


@@ -347,12 +380,11 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *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)
 {


@@ -363,11 +395,13 @@ mdoc_valid_post(struct mdoc *mdoc)
        mdoc->last->flags |= MDOC_VALID;
 
        switch (mdoc->last->type) {
        mdoc->last->flags |= MDOC_VALID;
 
        switch (mdoc->last->type) {

-       case (MDOC_TEXT):
+       case MDOC_TEXT:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_TBL):
+       case MDOC_EQN:
+               /* FALLTHROUGH */
+       case MDOC_TBL:

                return(1);
                return(1);

-       case (MDOC_ROOT):
+       case MDOC_ROOT:

                return(post_root(mdoc));
        default:
                break;
                return(post_root(mdoc));
        default:
                break;


@@ -376,36 +410,36 @@ mdoc_valid_post(struct mdoc *mdoc)
        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);
 }
 
 static int
                        return(0);
 
        return(1);
 }
 
 static int

-check_count(struct mdoc *m, enum mdoc_type type, 
+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;
 
                enum check_lvl lvl, enum check_ineq ineq, int val)
 {
        const char      *p;
        enum mandocerr   t;
 

-       if (m->last->type != type)
+       if (mdoc->last->type != type)

                return(1);
                return(1);

-       
+

        switch (ineq) {
        switch (ineq) {

-       case (CHECK_LT):
+       case CHECK_LT:

                p = "less than ";
                p = "less than ";

-               if (m->last->nchild < val)
+               if (mdoc->last->nchild < val)

                        return(1);
                break;
                        return(1);
                break;

-       case (CHECK_GT):
+       case CHECK_GT:

                p = "more than ";
                p = "more than ";

-               if (m->last->nchild > val)
+               if (mdoc->last->nchild > val)

                        return(1);
                break;
                        return(1);
                break;

-       case (CHECK_EQ):
+       case CHECK_EQ:

                p = "";
                p = "";

-               if (val == m->last->nchild)
+               if (val == mdoc->last->nchild)

                        return(1);
                break;
        default:
                        return(1);
                break;
        default:


@@ -414,10 +448,10 @@ check_count(struct mdoc *m, enum mdoc_type type,
        }
 
        t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;
        }
 
        t = lvl == CHECK_WARN ? MANDOCERR_ARGCWARN : MANDOCERR_ARGCOUNT;

-
-       return(mdoc_vmsg(m, t, m->last->line, m->last->pos,
-                       "want %s%d children (have %d)",
-                       p, val, m->last->nchild));
+       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 int
 }
 
 static int


@@ -482,7 +516,7 @@ hwarn_le1(POST_ARGS)
 }
 
 static void
 }
 
 static void

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

 {
        int              i;
 
 {
        int              i;
 


@@ -491,53 +525,34 @@ check_args(struct mdoc *m, struct mdoc_node *n)
 
        assert(n->args->argc);
        for (i = 0; i < (int)n->args->argc; i++)
 
        assert(n->args->argc);
        for (i = 0; i < (int)n->args->argc; i++)

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

 }
 
 static void
 }
 
 static void

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

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

 
        /* FIXME: move to post_std(). */
 
        if (MDOC_Std == v->arg)
 
        /* FIXME: move to post_std(). */
 
        if (MDOC_Std == v->arg)

-               if ( ! (v->sz || m->meta.name))
-                       mdoc_nmsg(m, n, MANDOCERR_NONAME);
+               if ( ! (v->sz || mdoc->meta.name))
+                       mdoc_nmsg(mdoc, n, MANDOCERR_NONAME);

 }
 
 static void
 }
 
 static void

-check_text(struct mdoc *m, int ln, int pos, char *p)
+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;
-
-               if ('\t' == *p) {
-                       if ( ! (MDOC_LITERAL & m->flags))
-                               mdoc_pmsg(m, ln, pos, MANDOCERR_BADTAB);
-                       continue;
-               }
+       char            *cp;

 
 

-               if (0 == (c = mandoc_special(p))) {
-                       mdoc_pmsg(m, ln, pos, MANDOCERR_BADESCAPE);
-                       continue;
-               }
+       if (MDOC_LITERAL & mdoc->flags)
+               return;

 
 

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

 }
 
 static int
 }
 
 static int


@@ -549,10 +564,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);
 }
 


@@ -565,7 +579,7 @@ pre_display(PRE_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
 
        if (MDOC_BLOCK != n->type)
                return(1);
 

-       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;


@@ -576,7 +590,6 @@ pre_display(PRE_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

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


@@ -598,62 +611,66 @@ pre_bl(PRE_ARGS)
                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.
         */
 

-       /* 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):
+               case MDOC_Compact:

                        dup = n->norm->Bl.comp;
                        comp = 1;
                        break;
                        dup = n->norm->Bl.comp;
                        comp = 1;
                        break;

-               case (MDOC_Width):
-                       dup = (NULL != n->norm->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];


@@ -689,19 +706,19 @@ pre_bl(PRE_ARGS)
                        n->norm->Bl.type = lt;
                        /* Set column information, too. */
                        if (LIST_column == lt) {
                        n->norm->Bl.type = lt;
                        /* Set column information, too. */
                        if (LIST_column == lt) {

-                               n->norm->Bl.ncols = 
-                                       n->args->argv[i].sz;
-                               n->norm->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. */
 
                if (n->norm->Bl.type == LIST__NONE)
                        }
                }
 
                /* The list type should come first. */
 
                if (n->norm->Bl.type == LIST__NONE)

-                       if (n->norm->Bl.width || 
-                                       n->norm->Bl.offs || 
-                                       n->norm->Bl.comp)
+                       if (n->norm->Bl.width ||
+                           n->norm->Bl.offs ||
+                           n->norm->Bl.comp)

                                mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
 
                continue;
                                mdoc_nmsg(mdoc, n, MANDOCERR_LISTFIRST);
 
                continue;


@@ -714,30 +731,42 @@ pre_bl(PRE_ARGS)
                n->norm->Bl.type = LIST_item;
        }
 
                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->norm->Bl.type) {
         */
 
        switch (n->norm->Bl.type) {

-       case (LIST_tag):
-               if (n->norm->Bl.width)
-                       break;
-               mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);
+       case LIST_tag:
+               if (NULL == n->norm->Bl.width)
+                       mdoc_nmsg(mdoc, n, MANDOCERR_NOWIDTHARG);

                break;
                break;

-       case (LIST_column):
+       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):
+       case LIST_item:

                if (n->norm->Bl.width)
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                break;
                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;
        }


@@ -745,12 +774,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;
 


@@ -767,32 +795,31 @@ pre_bd(PRE_ARGS)
                return(1);
        }
 
                return(1);
        }
 

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


@@ -801,7 +828,7 @@ pre_bd(PRE_ARGS)
                        }
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                        break;
                        }
                        mdoc_nmsg(mdoc, n, MANDOCERR_IGNARGV);
                        break;

-               case (MDOC_Compact):
+               case MDOC_Compact:

                        comp = 1;
                        dup = n->norm->Bd.comp;
                        break;
                        comp = 1;
                        dup = n->norm->Bd.comp;
                        break;


@@ -841,7 +868,6 @@ pre_bd(PRE_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

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


@@ -851,19 +877,15 @@ 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)
 {
 static int
 pre_it(PRE_ARGS)
 {


@@ -874,7 +896,6 @@ pre_it(PRE_ARGS)
        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)
 {


@@ -882,10 +903,10 @@ pre_an(PRE_ARGS)
 
        if (NULL == n->args)
                return(1);
 
        if (NULL == n->args)
                return(1);

-       
+

        for (i = 1; i < (int)n->args->argc; i++)
        for (i = 1; i < (int)n->args->argc; i++)

-               mdoc_pmsg(mdoc, n->args->argv[i].line, 
-                       n->args->argv[i].pos, MANDOCERR_IGNARGV);
+               mdoc_pmsg(mdoc, n->args->argv[i].line,
+                   n->args->argv[i].pos, MANDOCERR_IGNARGV);

 
        if (MDOC_Split == n->args->argv[0].arg)
                n->norm->An.auth = AUTH_split;
 
        if (MDOC_Split == n->args->argv[0].arg)
                n->norm->An.auth = AUTH_split;


@@ -913,11 +934,13 @@ static int
 pre_dt(PRE_ARGS)
 {
 
 pre_dt(PRE_ARGS)
 {
 

-       if (0 == mdoc->meta.date || mdoc->meta.os)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);
+       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)

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

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


@@ -926,11 +949,13 @@ static int
 pre_os(PRE_ARGS)
 {
 
 pre_os(PRE_ARGS)
 {
 

-       if (NULL == mdoc->meta.title || 0 == mdoc->meta.date)
-               mdoc_nmsg(mdoc, n, MANDOCERR_PROLOGOOO);
+       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)

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

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


@@ -940,15 +965,16 @@ pre_dd(PRE_ARGS)
 {
 
        if (mdoc->meta.title || mdoc->meta.os)
 {
 
        if (mdoc->meta.title || mdoc->meta.os)

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

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

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


@@ -966,7 +992,7 @@ 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);
                        np = mdoc->last->head;
 
                assert(np);


@@ -979,9 +1005,9 @@ post_bf(POST_ARGS)
        assert(MDOC_BLOCK == np->parent->type);
        assert(MDOC_Bf == np->parent->tok);
 
        assert(MDOC_BLOCK == np->parent->type);
        assert(MDOC_Bf == np->parent->tok);
 

-       /* 
+       /*

         * 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) {
         */
 
        if (np->parent->args && np->child) {


@@ -993,7 +1019,7 @@ post_bf(POST_ARGS)
        }
 
        /* 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)


@@ -1015,7 +1041,7 @@ post_bf(POST_ARGS)
                np->norm->Bf.font = FONT_Li;
        else if (0 == strcmp(np->child->string, "Sy"))
                np->norm->Bf.font = FONT_Sy;
                np->norm->Bf.font = FONT_Li;
        else if (0 == strcmp(np->child->string, "Sy"))
                np->norm->Bf.font = FONT_Sy;

-       else 
+       else

                mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
 
        return(1);
                mdoc_nmsg(mdoc, np, MANDOCERR_FONTTYPE);
 
        return(1);


@@ -1024,34 +1050,25 @@ post_bf(POST_ARGS)
 static int
 post_lb(POST_ARGS)
 {
 static int
 post_lb(POST_ARGS)
 {

-       const char      *p;
-       char            *buf;
-       size_t           sz;
+       struct mdoc_node        *n;
+       const char              *stdlibname;
+       char                    *libname;

 
        check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1);
 
 
        check_count(mdoc, MDOC_ELEM, CHECK_WARN, CHECK_EQ, 1);
 

-       assert(mdoc->last->child);
-       assert(MDOC_TEXT == mdoc->last->child->type);
-
-       p = mdoc_a2lib(mdoc->last->child->string);
-
-       /* If lookup ok, replace with table value. */
+       n = mdoc->last->child;

 
 

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

 
 

-       /* If not, use "library ``xxxx''. */
+       if (NULL == (stdlibname = mdoc_a2lib(n->string)))
+               mandoc_asprintf(&libname,
+                   "library \\(lq%s\\(rq", n->string);
+       else
+               libname = mandoc_strdup(stdlibname);

 
 

-       sz = strlen(mdoc->last->child->string) +
-               2 + strlen("\\(lqlibrary\\(rq");
-       buf = mandoc_malloc(sz);
-       snprintf(buf, sz, "library \\(lq%s\\(rq", 
-                       mdoc->last->child->string);
-       free(mdoc->last->child->string);
-       mdoc->last->child->string = buf;
+       free(n->string);
+       n->string = libname;

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


@@ -1064,7 +1081,6 @@ post_eoln(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

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


@@ -1080,42 +1096,34 @@ post_vt(POST_ARGS)
 
        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_TEXT != n->type)

                        mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
 
        return(1);
 }
 
                        mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
 
        return(1);
 }
 

-

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

-       char             buf[BUFSIZ];

 
 

-       /* If no child specified, make sure we have the meta name. */
-
-       if (NULL == mdoc->last->child && NULL == mdoc->meta.name) {
-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);
+       if (NULL != mdoc->meta.name)

                return(1);
                return(1);

-       } else if (mdoc->meta.name)
-               return(1);
-
-       /* If no meta name, set it from the child. */

 
 

-       if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
-               return(0);
-
-       mdoc->meta.name = mandoc_strdup(buf);
+       mdoc_deroff(&mdoc->meta.name, mdoc->last);

 
 

+       if (NULL == mdoc->meta.name) {
+               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NONAME);
+               mdoc->meta.name = mandoc_strdup("UNKNOWN");
+       }

        return(1);
 }
 
 static int
 post_literal(POST_ARGS)
 {
        return(1);
 }
 
 static int
 post_literal(POST_ARGS)
 {

-       
+

        /*
         * The `Dl' (note "el" not "one") and `Bd' macros unset the
         * MDOC_LITERAL flag as they leave.  Note that `Bd' only sets
        /*
         * The `Dl' (note "el" not "one") and `Bd' macros unset the
         * MDOC_LITERAL flag as they leave.  Note that `Bd' only sets


@@ -1142,37 +1150,37 @@ post_defaults(POST_ARGS)
 
        if (mdoc->last->child)
                return(1);
 
        if (mdoc->last->child)
                return(1);

-       
+

        nn = mdoc->last;
        mdoc->next = MDOC_NEXT_CHILD;
 
        switch (nn->tok) {
        nn = mdoc->last;
        mdoc->next = MDOC_NEXT_CHILD;
 
        switch (nn->tok) {

-       case (MDOC_Ar):
+       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;
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "file"))
                        return(0);
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))
                        return(0);
                break;

-       case (MDOC_At):
+       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;
                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;

-       case (MDOC_Li):
+       case MDOC_Li:

                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
                        return(0);
                break;
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
                        return(0);
                break;

-       case (MDOC_Pa):
+       case MDOC_Pa:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Mt):
+       case MDOC_Mt:

                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))
                        return(0);
                break;
        default:
                abort();
                /* NOTREACHED */
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "~"))
                        return(0);
                break;
        default:
                abort();
                /* NOTREACHED */

-       } 
+       }

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


@@ -1181,37 +1189,28 @@ post_defaults(POST_ARGS)
 static int
 post_at(POST_ARGS)
 {
 static int
 post_at(POST_ARGS)
 {

-       const char       *p, *q;
-       char             *buf;
-       size_t            sz;
+       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 we have a child, look it up in the standard keys.  If a
         * key exist, use that instead of the child; if it doesn't,
         * prefix "AT&T UNIX " to the existing data.
         */

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

 
 

-       assert(MDOC_TEXT == mdoc->last->child->type);
-       p = mdoc_a2att(mdoc->last->child->string);
+       if (NULL == (n = mdoc->last->child))
+               return(1);

 
 

-       if (p) {
-               free(mdoc->last->child->string);
-               mdoc->last->child->string = mandoc_strdup(p);
-       } else {
+       assert(MDOC_TEXT == n->type);
+       if (NULL == (std_att = mdoc_a2att(n->string))) {

                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);
                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADATT);

-               p = "AT&T UNIX ";
-               q = mdoc->last->child->string;
-               sz = strlen(p) + strlen(q) + 1;
-               buf = mandoc_malloc(sz);
-               strlcpy(buf, p, sz);
-               strlcat(buf, q, sz);
-               free(mdoc->last->child->string);
-               mdoc->last->child->string = buf;
-       }
+               mandoc_asprintf(&att, "AT&T UNIX %s", n->string);
+       } else
+               att = mandoc_strdup(std_att);

 
 

+       free(n->string);
+       n->string = att;

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


@@ -1230,11 +1229,10 @@ post_an(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

 static int
 post_it(POST_ARGS)
 {
 static int
 post_it(POST_ARGS)
 {

-       int               i, cols, rc;
+       int               i, cols;

        enum mdoc_list    lt;
        struct mdoc_node *n, *c;
        enum mandocerr    er;
        enum mdoc_list    lt;
        struct mdoc_node *n, *c;
        enum mandocerr    er;


@@ -1251,37 +1249,37 @@ post_it(POST_ARGS)
        }
 
        switch (lt) {
        }
 
        switch (lt) {

-       case (LIST_tag):
+       case LIST_tag:

                if (mdoc->last->head->child)
                        break;
                /* FIXME: give this a dummy value. */
                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
                break;
                if (mdoc->last->head->child)
                        break;
                /* FIXME: give this a dummy value. */
                mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
                break;

-       case (LIST_hang):
+       case LIST_hang:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_ohang):
+       case LIST_ohang:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_inset):
+       case LIST_inset:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_diag):
+       case LIST_diag:

                if (NULL == mdoc->last->head->child)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
                break;
                if (NULL == mdoc->last->head->child)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOARGS);
                break;

-       case (LIST_bullet):
+       case LIST_bullet:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_dash):
+       case LIST_dash:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_enum):
+       case LIST_enum:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (LIST_hyphen):
+       case LIST_hyphen:

                if (NULL == mdoc->last->body->child)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);
                /* FALLTHROUGH */
                if (NULL == mdoc->last->body->child)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NOBODY);
                /* FALLTHROUGH */

-       case (LIST_item):
+       case LIST_item:

                if (mdoc->last->head->child)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
                break;
                if (mdoc->last->head->child)
                        mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_ARGSLOST);
                break;

-       case (LIST_column):
+       case LIST_column:

                cols = (int)n->norm->Bl.ncols;
 
                assert(NULL == mdoc->last->head->child);
                cols = (int)n->norm->Bl.ncols;
 
                assert(NULL == mdoc->last->head->child);


@@ -1300,10 +1298,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;
        }


@@ -1312,9 +1310,9 @@ post_it(POST_ARGS)
 }
 
 static int
 }
 
 static int

-post_bl_block(POST_ARGS) 
+post_bl_block(POST_ARGS)

 {
 {

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

 
        /*
         * These are fairly complicated, so we've broken them into two
 
        /*
         * These are fairly complicated, so we've broken them into two


@@ -1326,17 +1324,46 @@ post_bl_block(POST_ARGS)
 
        n = mdoc->last;
 
 
        n = mdoc->last;
 

-       if (LIST_tag == n->norm->Bl.type && 
-                       NULL == n->norm->Bl.width) {
+       if (LIST_tag == n->norm->Bl.type &&
+           NULL == n->norm->Bl.width) {

                if ( ! post_bl_block_tag(mdoc))
                        return(0);
                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);
        } else if (NULL != n->norm->Bl.width) {
                if ( ! post_bl_block_width(mdoc))
                        return(0);

-       } else 
-               return(1);
+               assert(n->norm->Bl.width);
+       }

 
 

-       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) {
+                               mdoc_nmsg(mdoc, nc, MANDOCERR_MOVEPAR);
+                               if ( ! mdoc_node_relink(mdoc, nc))
+                                       return(0);
+                       } else if (0 == n->norm->Bl.comp &&
+                           LIST_column != n->norm->Bl.type) {
+                               mdoc_nmsg(mdoc, nc, MANDOCERR_IGNPAR);
+                               mdoc_node_delete(mdoc, nc);
+                       } else
+                               break;
+                       nc = ni->body->last;
+               }
+       }

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


@@ -1347,7 +1374,7 @@ post_bl_block_width(POST_ARGS)
        int               i;
        enum mdoct        tok;
        struct mdoc_node *n;
        int               i;
        enum mdoct        tok;
        struct mdoc_node *n;

-       char              buf[NUMSIZ];
+       char              buf[24];

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


@@ -1364,7 +1391,7 @@ post_bl_block_width(POST_ARGS)
                width = 6;
        else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
                return(1);
                width = 6;
        else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
                return(1);

-       else if (0 == (width = mdoc_macro2len(tok)))  {
+       else if (0 == (width = macro2len(tok)))  {

                mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
                return(1);
        }
                mdoc_nmsg(mdoc, n, MANDOCERR_BADWIDTH);
                return(1);
        }


@@ -1373,13 +1400,13 @@ post_bl_block_width(POST_ARGS)
 
        assert(n->args);
 
 
        assert(n->args);
 

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

                if (MDOC_Width == n->args->argv[i].arg)
                        break;
 
        assert(i < (int)n->args->argc);
 
                if (MDOC_Width == n->args->argv[i].arg)
                        break;
 
        assert(i < (int)n->args->argc);
 

-       snprintf(buf, NUMSIZ, "%zun", width);
+       (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);
 
        free(n->args->argv[i].value[0]);
        n->args->argv[i].value[0] = mandoc_strdup(buf);
 


@@ -1394,7 +1421,7 @@ post_bl_block_tag(POST_ARGS)
        struct mdoc_node *n, *nn;
        size_t            sz, ssz;
        int               i;
        struct mdoc_node *n, *nn;
        size_t            sz, ssz;
        int               i;

-       char              buf[NUMSIZ];
+       char              buf[24];

 
        /*
         * Calculate the -width for a `Bl -tag' list if it hasn't been
 
        /*
         * Calculate the -width for a `Bl -tag' list if it hasn't been


@@ -1421,15 +1448,15 @@ post_bl_block_tag(POST_ARGS)
                        break;
                }
 
                        break;
                }
 

-               if (0 != (ssz = mdoc_macro2len(nn->tok)))
+               if (0 != (ssz = macro2len(nn->tok)))

                        sz = ssz;
 
                break;
                        sz = ssz;
 
                break;

-       } 
+       }

 
        /* Defaults to ten ens. */
 
 
        /* Defaults to ten ens. */
 

-       snprintf(buf, NUMSIZ, "%zun", sz);
+       (void)snprintf(buf, sizeof(buf), "%un", (unsigned int)sz);

 
        /*
         * We have to dynamically add this to the macro's argument list.
 
        /*
         * We have to dynamically add this to the macro's argument list.


@@ -1439,8 +1466,8 @@ post_bl_block_tag(POST_ARGS)
        assert(n->args);
        i = (int)(n->args->argc)++;
 
        assert(n->args);
        i = (int)(n->args->argc)++;
 

-       n->args->argv = mandoc_realloc(n->args->argv, 
-                       n->args->argc * sizeof(struct mdoc_argv));
+       n->args->argv = 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].arg = MDOC_Width;
        n->args->argv[i].line = n->line;


@@ -1454,9 +1481,8 @@ post_bl_block_tag(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-

 static int
 static int

-post_bl_head(POST_ARGS) 
+post_bl_head(POST_ARGS)

 {
        struct mdoc_node *np, *nn, *nnp;
        int               i, j;
 {
        struct mdoc_node *np, *nn, *nnp;
        int               i, j;


@@ -1473,7 +1499,7 @@ post_bl_head(POST_ARGS)
 
        /* First, disallow both types and allow normal-form. */
 
 
        /* 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.
         */
         * TODO: technically, we can accept both and just merge the two
         * lists, but I'll leave that for another day.
         */


@@ -1487,7 +1513,7 @@ post_bl_head(POST_ARGS)
        np = mdoc->last->parent;
        assert(np->args);
 
        np = mdoc->last->parent;
        assert(np->args);
 

-       for (j = 0; j < (int)np->args->argc; j++) 
+       for (j = 0; j < (int)np->args->argc; j++)

                if (MDOC_Column == np->args->argv[j].arg)
                        break;
 
                if (MDOC_Column == np->args->argv[j].arg)
                        break;
 


@@ -1495,17 +1521,17 @@ post_bl_head(POST_ARGS)
        assert(0 == np->args->argv[j].sz);
 
        /*
        assert(0 == np->args->argv[j].sz);
 
        /*

-        * Accomodate for new-style groff column syntax.  Shuffle the
+        * 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;
         * 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_malloc
-               ((size_t)mdoc->last->nchild * sizeof(char *));
+       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.ncols = np->args->argv[j].sz;

-       mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value;
+       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;
 
        for (i = 0, nn = mdoc->last->child; nn; i++) {
                np->args->argv[j].value[i] = nn->string;


@@ -1524,32 +1550,71 @@ post_bl_head(POST_ARGS)
 static int
 post_bl(POST_ARGS)
 {
 static int
 post_bl(POST_ARGS)
 {

-       struct mdoc_node        *n;
+       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 */

 
 

-       if (MDOC_HEAD == mdoc->last->type) 
-               return(post_bl_head(mdoc));
-       if (MDOC_BLOCK == mdoc->last->type)
+       nbody = mdoc->last;
+       switch (nbody->type) {
+       case MDOC_BLOCK:

                return(post_bl_block(mdoc));
                return(post_bl_block(mdoc));

-       if (MDOC_BODY != mdoc->last->type)
+       case MDOC_HEAD:
+               return(post_bl_head(mdoc));
+       case MDOC_BODY:
+               break;
+       default:

                return(1);
                return(1);

+       }

 
 

-       for (n = mdoc->last->child; n; n = n->next) {
-               switch (n->tok) {
-               case (MDOC_Lp):
-                       /* FALLTHROUGH */
-               case (MDOC_Pp):
-                       mdoc_nmsg(mdoc, n, MANDOCERR_CHILD);
-                       /* FALLTHROUGH */
-               case (MDOC_It):
-                       /* FALLTHROUGH */
-               case (MDOC_Sm):
+       nchild = nbody->child;
+       while (NULL != nchild) {
+               if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {
+                       nchild = nchild->next;

                        continue;
                        continue;

-               default:
-                       break;

                }
 
                }
 

-               mdoc_nmsg(mdoc, n, MANDOCERR_SYNTCHILD);
-               return(0);
+               mdoc_nmsg(mdoc, nchild, MANDOCERR_CHILD);
+
+               /*
+                * 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);
        }
 
        return(1);


@@ -1568,10 +1633,16 @@ ebool(struct mdoc *mdoc)
 
        assert(MDOC_TEXT == mdoc->last->child->type);
 
 
        assert(MDOC_TEXT == mdoc->last->child->type);
 

-       if (0 == strcmp(mdoc->last->child->string, "on"))
+       if (0 == strcmp(mdoc->last->child->string, "on")) {
+               if (MDOC_Sm == mdoc->last->tok)
+                       mdoc->flags &= ~MDOC_SMOFF;

                return(1);
                return(1);

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

                return(1);
                return(1);

+       }

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


@@ -1580,34 +1651,31 @@ ebool(struct mdoc *mdoc)
 static int
 post_root(POST_ARGS)
 {
 static int
 post_root(POST_ARGS)
 {

-       int               erc;
+       int               ret;

        struct mdoc_node *n;
 
        struct mdoc_node *n;
 

-       erc = 0;
+       ret = 1;

 
        /* Check that we have a finished prologue. */
 
        if ( ! (MDOC_PBODY & mdoc->flags)) {
 
        /* Check that we have a finished prologue. */
 
        if ( ! (MDOC_PBODY & mdoc->flags)) {

-               erc++;
+               ret = 0;

                mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
        }
 
        n = mdoc->first;
        assert(n);
                mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
        }
 
        n = mdoc->first;
        assert(n);

-       
+

        /* Check that we begin with a proper `Sh'. */
 
        /* Check that we begin with a proper `Sh'. */
 

-       if (NULL == n->child) {
-               erc++;
-               mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
-       } else if (MDOC_BLOCK != n->child->type || 
-                       MDOC_Sh != n->child->tok) {
-               erc++;
-               /* Can this be lifted?  See rxdebug.1 for example. */
-               mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
-       }
+       if (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(erc ? 0 : 1);
+       return(ret);

 }
 
 static int
 }
 
 static int


@@ -1642,10 +1710,10 @@ post_rs(POST_ARGS)
        int               i, j;
 
        switch (mdoc->last->type) {
        int               i, j;
 
        switch (mdoc->last->type) {

-       case (MDOC_HEAD):
+       case MDOC_HEAD:

                check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0);
                return(1);
                check_count(mdoc, MDOC_HEAD, CHECK_WARN, CHECK_EQ, 0);
                return(1);

-       case (MDOC_BODY):
+       case MDOC_BODY:

                if (mdoc->last->child)
                        break;
                check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0);
                if (mdoc->last->child)
                        break;
                check_count(mdoc, MDOC_BODY, CHECK_WARN, CHECK_GT, 0);


@@ -1678,6 +1746,14 @@ post_rs(POST_ARGS)
                mdoc_node_delete(mdoc, nn);
        }
 
                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
        /*
         * The full `Rs' block needs special handling to order the
         * sub-elements according to `rsord'.  Pick through each element


@@ -1691,13 +1767,13 @@ post_rs(POST_ARGS)
                        if (rsord[i] == nn->tok)
                                break;
 
                        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.
                 */
                 * 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 != (next = nn->next))
                        next->prev = nn->prev;
 


@@ -1706,7 +1782,7 @@ post_rs(POST_ARGS)
 
                nn->prev = nn->next = NULL;
 
 
                nn->prev = nn->next = NULL;
 

-               /* 
+               /*

                 * Scan back until we reach a node that's
                 * ordered before `nn'.
                 */
                 * Scan back until we reach a node that's
                 * ordered before `nn'.
                 */


@@ -1743,6 +1819,56 @@ post_rs(POST_ARGS)
        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_IGNNS);
+       return(1);
+}
+

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


@@ -1770,7 +1896,8 @@ post_sh_body(POST_ARGS)
         */
 
        if (NULL == (n = mdoc->last->child)) {
         */
 
        if (NULL == (n = mdoc->last->child)) {

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC);
+               mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, "empty");

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


@@ -1779,21 +1906,25 @@ post_sh_body(POST_ARGS)
                        continue;
                if (MDOC_TEXT == n->type)
                        continue;
                        continue;
                if (MDOC_TEXT == n->type)
                        continue;

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_BADNAMESEC);
+               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);
 

-       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)
 {
        return(1);
 }
 
 static int
 post_sh_head(POST_ARGS)
 {

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

        enum mdoc_sec    sec;
 
        /*
        enum mdoc_sec    sec;
 
        /*


@@ -1803,31 +1934,51 @@ post_sh_head(POST_ARGS)
         * manual sections.
         */
 
         * manual sections.
         */
 

-       if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ))
-               return(0);
-
-       sec = mdoc_str2sec(buf);
+       secname = NULL;
+       sec = SEC_CUSTOM;
+       mdoc_deroff(&secname, mdoc->last);
+       sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);

 
        /* The NAME should be first. */
 
        if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
 
        /* The NAME should be first. */
 
        if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_NAMESECFIRST);
+               mandoc_msg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, secname);

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

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

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

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

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

+       }

 
        /* Mark our last section. */
 
        mdoc->lastsec = sec;
 
 
        /* Mark our last section. */
 
        mdoc->lastsec = sec;
 

+       /*
+        * 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.
+        */
+
+       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. */
 
        /* 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
 
        /*
         * Check whether our non-custom section is being repeated or is


@@ -1835,10 +1986,12 @@ post_sh_head(POST_ARGS)
         */
 
        if (sec == mdoc->lastnamed)
         */
 
        if (sec == mdoc->lastnamed)

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

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

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

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


@@ -1848,24 +2001,37 @@ post_sh_head(POST_ARGS)
 
        assert(mdoc->meta.msec);
 
 
        assert(mdoc->meta.msec);
 

+       goodsec = NULL;

        switch (sec) {
        switch (sec) {

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (SEC_ERRORS):
+       case SEC_RETURN_VALUES:

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (SEC_LIBRARY):
+       case SEC_LIBRARY:

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

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

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

-               mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_SECMSEC);
+               if (NULL == goodsec)
+                       goodsec = "9";
+               mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos,
+                   "%s for %s only", secname, goodsec);

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

+       free(secname);

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


@@ -1901,12 +2067,14 @@ pre_par(PRE_ARGS)
        if (MDOC_ELEM != n->type && MDOC_BLOCK != n->type)
                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'.
         */
 
         * 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)
+       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);
                return(1);
        if (MDOC_Bl == n->tok && n->norm->Bl.comp)
                return(1);


@@ -1920,6 +2088,32 @@ pre_par(PRE_ARGS)
        return(1);
 }
 
        return(1);
 }
 

+static int
+post_par(POST_ARGS)
+{
+
+       if (MDOC_ELEM != mdoc->last->type &&
+           MDOC_BLOCK != mdoc->last->type)
+               return(1);
+
+       if (NULL == mdoc->last->prev) {
+               if (MDOC_Sh != mdoc->last->parent->tok &&
+                   MDOC_Ss != mdoc->last->parent->tok)
+                       return(1);
+       } else {
+               if (MDOC_Pp != mdoc->last->prev->tok &&
+                   MDOC_Lp != mdoc->last->prev->tok &&
+                   (MDOC_br != mdoc->last->tok ||
+                    (MDOC_sp != mdoc->last->prev->tok &&
+                     MDOC_br != mdoc->last->prev->tok)))
+                       return(1);
+       }
+
+       mdoc_nmsg(mdoc, mdoc->last, MANDOCERR_IGNPAR);
+       mdoc_node_delete(mdoc, mdoc->last);
+       return(1);
+}
+

 static int
 pre_literal(PRE_ARGS)
 {
 static int
 pre_literal(PRE_ARGS)
 {


@@ -1933,10 +2127,10 @@ pre_literal(PRE_ARGS)
         */
 
        switch (n->tok) {
         */
 
        switch (n->tok) {

-       case (MDOC_Dl):
+       case MDOC_Dl:

                mdoc->flags |= MDOC_LITERAL;
                break;
                mdoc->flags |= MDOC_LITERAL;
                break;

-       case (MDOC_Bd):
+       case MDOC_Bd:

                if (DISP_literal == n->norm->Bd.type)
                        mdoc->flags |= MDOC_LITERAL;
                if (DISP_unfilled == n->norm->Bd.type)
                if (DISP_literal == n->norm->Bd.type)
                        mdoc->flags |= MDOC_LITERAL;
                if (DISP_unfilled == n->norm->Bd.type)


@@ -1946,34 +2140,35 @@ pre_literal(PRE_ARGS)
                abort();
                /* NOTREACHED */
        }
                abort();
                /* NOTREACHED */
        }

-       
+

        return(1);
 }
 
 static int
 post_dd(POST_ARGS)
 {
        return(1);
 }
 
 static int
 post_dd(POST_ARGS)
 {

-       char              buf[DATESIZE];

        struct mdoc_node *n;
        struct mdoc_node *n;

+       char             *datestr;

 
 

-       n = mdoc->last;
+       if (mdoc->meta.date)
+               free(mdoc->meta.date);

 
 

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

-       if ( ! concat(mdoc, buf, n->child, DATESIZE))
-               return(0);
-
-       mdoc->meta.date = mandoc_a2time
-               (MTIME_MDOCDATE | MTIME_CANONICAL, buf);
-
-       if (0 == mdoc->meta.date) {
-               mdoc_nmsg(mdoc, n, MANDOCERR_BADDATE);
-               mdoc->meta.date = time(NULL);
+       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);
 }
 
        return(1);
 }
 


@@ -1995,23 +2190,21 @@ post_dt(POST_ARGS)
 
        mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;
 
 
        mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;
 

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

 
        if (NULL != (nn = n->child))
                for (p = nn->string; *p; p++) {
 
        if (NULL != (nn = n->child))
                for (p = nn->string; *p; p++) {

-                       if (toupper((u_char)*p) == *p)
+                       if (toupper((unsigned char)*p) == *p)

                                continue;
                                continue;

-
-                       /* 
-                        * FIXME: don't be lazy: have this make all
-                        * characters be uppercase and just warn once.
-                        */
-                       mdoc_nmsg(mdoc, nn, MANDOCERR_UPPERCASE);
+                       mandoc_msg(MANDOCERR_TITLE_CASE,
+                           mdoc->parse, nn->line,
+                           nn->pos + (p - nn->string),
+                           nn->string);

                        break;
                }
 
                        break;
                }
 

-       /* Handles: `.Dt' 
-        *   --> title = unknown, volume = local, msec = 0, arch = NULL
+       /* Handles: `.Dt'
+        * title = unknown, volume = local, msec = 0, arch = NULL

         */
 
        if (NULL == (nn = n->child)) {
         */
 
        if (NULL == (nn = n->child)) {


@@ -2023,12 +2216,12 @@ post_dt(POST_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       /* Handles: `.Dt TITLE' 
-        *   --> title = TITLE, volume = local, msec = 0, arch = NULL
+       /* Handles: `.Dt TITLE'
+        * title = TITLE, volume = local, msec = 0, arch = NULL

         */
 
         */
 

-       mdoc->meta.title = mandoc_strdup
-               ('\0' == nn->string[0] ? "UNKNOWN" : nn->string);
+       mdoc->meta.title = mandoc_strdup(
+           '\0' == nn->string[0] ? "UNKNOWN" : nn->string);

 
        if (NULL == (nn = nn->next)) {
                /* FIXME: warn about missing msec. */
 
        if (NULL == (nn = nn->next)) {
                /* FIXME: warn about missing msec. */


@@ -2039,30 +2232,31 @@ post_dt(POST_ARGS)
        }
 
        /* Handles: `.Dt TITLE SEC'
        }
 
        /* Handles: `.Dt TITLE SEC'

-        *   --> title = TITLE, volume = SEC is msec ? 
-        *           format(msec) : SEC,
-        *       msec = SEC is msec ? atoi(msec) : 0,
-        *       arch = NULL
+        * title = TITLE,
+        * volume = SEC is msec ? format(msec) : SEC,
+        * msec = SEC is msec ? atoi(msec) : 0,
+        * arch = NULL

         */
 
         */
 

-       cp = mdoc_a2msec(nn->string);
+       cp = mandoc_a2msec(nn->string);

        if (cp) {
                mdoc->meta.vol = mandoc_strdup(cp);
                mdoc->meta.msec = mandoc_strdup(nn->string);
        } else {
        if (cp) {
                mdoc->meta.vol = mandoc_strdup(cp);
                mdoc->meta.msec = mandoc_strdup(nn->string);
        } else {

-               mdoc_nmsg(mdoc, n, MANDOCERR_BADMSEC);
+               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);
                mdoc->meta.vol = mandoc_strdup(nn->string);
                mdoc->meta.msec = mandoc_strdup(nn->string);

-       } 
+       }

 
        if (NULL == (nn = nn->next))
                return(1);
 
        /* Handles: `.Dt TITLE SEC VOL'
 
        if (NULL == (nn = nn->next))
                return(1);
 
        /* Handles: `.Dt TITLE SEC VOL'

-        *   --> title = TITLE, volume = VOL is vol ?
-        *       format(VOL) : 
-        *           VOL is arch ? format(arch) : 
-        *               VOL
+        * title = TITLE,
+        * volume = VOL is vol ? format(VOL) :
+        *          VOL is arch ? format(arch) :
+        *          VOL

         */
 
        cp = mdoc_a2vol(nn->string);
         */
 
        cp = mdoc_a2vol(nn->string);


@@ -2070,14 +2264,15 @@ post_dt(POST_ARGS)
                free(mdoc->meta.vol);
                mdoc->meta.vol = mandoc_strdup(cp);
        } else {
                free(mdoc->meta.vol);
                mdoc->meta.vol = mandoc_strdup(cp);
        } else {

-               /* FIXME: warn about bad arch. */

                cp = mdoc_a2arch(nn->string);
                if (NULL == cp) {
                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);
                        free(mdoc->meta.vol);
                        mdoc->meta.vol = mandoc_strdup(nn->string);

-               } else 
+               } else

                        mdoc->meta.arch = mandoc_strdup(cp);
                        mdoc->meta.arch = mandoc_strdup(cp);

-       }       
+       }

 
        /* Ignore any subsequent parameters... */
        /* FIXME: warn about subsequent parameters. */
 
        /* Ignore any subsequent parameters... */
        /* FIXME: warn about subsequent parameters. */


@@ -2106,7 +2301,7 @@ post_bx(POST_ARGS)
 {
        struct mdoc_node        *n;
 
 {
        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.
         * Make `Bx's second argument always start with an uppercase
         * letter.  Groff checks if it's an "accepted" term, but we just
         * uppercase blindly.


@@ -2114,7 +2309,7 @@ post_bx(POST_ARGS)
 
        n = mdoc->last->child;
        if (n && NULL != (n = n->next))
 
        n = mdoc->last->child;
        if (n && NULL != (n = n->next))

-               *n->string = toupper((unsigned char)*n->string);
+               *n->string = (char)toupper((unsigned char)*n->string);

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


@@ -2122,60 +2317,47 @@ post_bx(POST_ARGS)
 static int
 post_os(POST_ARGS)
 {
 static int
 post_os(POST_ARGS)
 {

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

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

+       static char      *defbuf;

 #endif
 #endif

+       struct mdoc_node *n;

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

-        * Set the operating system by way of the `Os' macro.  Note that
-        * if an argument isn't provided and -DOSNAME="\"foo\"" is
-        * provided during compilation, this value will be used instead
-        * of filling in "sysname release" from uname().
-        */
+        * Set the operating system by way of the `Os' macro.
+        * The order of precedence is:
+        * 1. the argument of the `Os' macro, unless empty
+        * 2. the -Ios=foo command line argument, if provided
+        * 3. -DOSNAME="\"foo\"", if provided during compilation
+        * 4. "sysname release" from uname(3)
+        */

 
 

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

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

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

 
 

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

 
 

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

 #ifdef OSNAME
 #ifdef OSNAME

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

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

-               if (uname(&utsname)) {
+       if (NULL == defbuf) {
+               if (-1 == uname(&utsname)) {

                        mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);
                        mdoc_nmsg(mdoc, n, MANDOCERR_UNAME);

-                        mdoc->meta.os = mandoc_strdup("UNKNOWN");
-                        return(post_prol(mdoc));
-                }
-
-               if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-               if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-               if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
-                       mdoc_nmsg(mdoc, n, MANDOCERR_MEM);
-                       return(0);
-               }
-#endif /*!OSNAME*/
+                       defbuf = mandoc_strdup("UNKNOWN");
+               } else
+                       mandoc_asprintf(&defbuf, "%s %s",
+                           utsname.sysname, utsname.release);

        }
        }

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

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


@@ -2197,7 +2379,7 @@ post_std(POST_ARGS)
 
        if (NULL == mdoc->meta.name)
                return(1);
 
        if (NULL == mdoc->meta.name)
                return(1);

-       
+

        nn = n;
        mdoc->next = MDOC_NEXT_CHILD;
 
        nn = n;
        mdoc->next = MDOC_NEXT_CHILD;
 


@@ -2208,36 +2390,107 @@ post_std(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 

-static int
-concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
+static enum mdoc_sec
+a2sec(const char *p)

 {
 {

+       int              i;

 
 

-       p[0] = '\0';
-
-       /*
-        * Concatenate sibling nodes together.  All siblings must be of
-        * type MDOC_TEXT or an assertion is raised.  Concatenation is
-        * separated by a single whitespace.  Returns 0 on fatal (string
-        * overrun) error.
-        */
-
-       for ( ; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
-
-               if (strlcat(p, n->string, sz) >= sz) {
-                       mdoc_nmsg(m, n, MANDOCERR_MEM);
-                       return(0);
-               }
+       for (i = 0; i < (int)SEC__MAX; i++)
+               if (secnames[i] && 0 == strcmp(p, secnames[i]))
+                       return((enum mdoc_sec)i);

 
 

-               if (NULL == n->next)
-                       continue;
+       return(SEC_CUSTOM);
+}

 
 

-               if (strlcat(p, " ", sz) >= sz) {
-                       mdoc_nmsg(m, n, MANDOCERR_MEM);
-                       return(0);
-               }
-       }
+static size_t
+macro2len(enum mdoct macro)
+{

 
 

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

 }
 }

-