libmdoc.h no longer needs mdoc.h

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index 4941865cf9cb5fe1a0ec594fb88e6a31ea7bf6a9..7a7457b92aa64a6f8c2e23114665b057954b259c 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_validate.c,v 1.288 2015/04/19 14:00:20 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.364 2018/12/04 02:53:51 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2018 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -33,6 +33,7 @@
 
 #include "mandoc_aux.h"
 #include "mandoc.h"
 
 #include "mandoc_aux.h"
 #include "mandoc.h"

+#include "mandoc_xr.h"

 #include "roff.h"
 #include "mdoc.h"
 #include "libmandoc.h"
 #include "roff.h"
 #include "mdoc.h"
 #include "libmandoc.h"


@@ -41,7 +42,6 @@
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 

-#define        PRE_ARGS  struct roff_man *mdoc, struct roff_node *n

 #define        POST_ARGS struct roff_man *mdoc
 
 enum   check_ineq {
 #define        POST_ARGS struct roff_man *mdoc
 
 enum   check_ineq {


@@ -50,35 +50,37 @@ enum        check_ineq {
        CHECK_EQ
 };
 
        CHECK_EQ
 };
 

-typedef        void    (*v_pre)(PRE_ARGS);

 typedef        void    (*v_post)(POST_ARGS);
 
 typedef        void    (*v_post)(POST_ARGS);
 

-struct valids {
-       v_pre    pre;
-       v_post   post;
-};
-
-static void     check_text(struct roff_man *, int, int, char *);
+static int      build_list(struct roff_man *, int);

 static void     check_argv(struct roff_man *,
                        struct roff_node *, struct mdoc_argv *);
 static void     check_args(struct roff_man *, struct roff_node *);
 static void     check_argv(struct roff_man *,
                        struct roff_node *, struct mdoc_argv *);
 static void     check_args(struct roff_man *, struct roff_node *);

+static void     check_text(struct roff_man *, int, int, char *);
+static void     check_text_em(struct roff_man *, int, int, char *);
+static void     check_toptext(struct roff_man *, int, int, const char *);

 static int      child_an(const struct roff_node *);
 static int      child_an(const struct roff_node *);

-static enum roff_sec   a2sec(const char *);
-static size_t          macro2len(int);
-static void     rewrite_macro2len(char **);
+static size_t          macro2len(enum roff_tok);
+static void     rewrite_macro2len(struct roff_man *, char **);
+static int      similar(const char *, const char *);

 
 

+static void     post_abort(POST_ARGS);

 static void     post_an(POST_ARGS);
 static void     post_an(POST_ARGS);

+static void     post_an_norm(POST_ARGS);

 static void     post_at(POST_ARGS);
 static void     post_at(POST_ARGS);

+static void     post_bd(POST_ARGS);

 static void     post_bf(POST_ARGS);
 static void     post_bk(POST_ARGS);
 static void     post_bl(POST_ARGS);
 static void     post_bl_block(POST_ARGS);
 static void     post_bf(POST_ARGS);
 static void     post_bk(POST_ARGS);
 static void     post_bl(POST_ARGS);
 static void     post_bl_block(POST_ARGS);

-static void     post_bl_block_tag(POST_ARGS);

 static void     post_bl_head(POST_ARGS);
 static void     post_bl_head(POST_ARGS);

+static void     post_bl_norm(POST_ARGS);

 static void     post_bx(POST_ARGS);
 static void     post_bx(POST_ARGS);

-static void     post_d1(POST_ARGS);

 static void     post_defaults(POST_ARGS);
 static void     post_defaults(POST_ARGS);

+static void     post_display(POST_ARGS);

 static void     post_dd(POST_ARGS);
 static void     post_dd(POST_ARGS);

+static void     post_delim(POST_ARGS);
+static void     post_delim_nb(POST_ARGS);

 static void     post_dt(POST_ARGS);
 static void     post_en(POST_ARGS);
 static void     post_es(POST_ARGS);
 static void     post_dt(POST_ARGS);
 static void     post_en(POST_ARGS);
 static void     post_es(POST_ARGS);


@@ -92,14 +94,16 @@ static      void     post_hyph(POST_ARGS);
 static void     post_ignpar(POST_ARGS);
 static void     post_it(POST_ARGS);
 static void     post_lb(POST_ARGS);
 static void     post_ignpar(POST_ARGS);
 static void     post_it(POST_ARGS);
 static void     post_lb(POST_ARGS);

-static void     post_literal(POST_ARGS);

 static void     post_nd(POST_ARGS);
 static void     post_nm(POST_ARGS);
 static void     post_ns(POST_ARGS);
 static void     post_nd(POST_ARGS);
 static void     post_nm(POST_ARGS);
 static void     post_ns(POST_ARGS);

+static void     post_obsolete(POST_ARGS);

 static void     post_os(POST_ARGS);
 static void     post_par(POST_ARGS);
 static void     post_os(POST_ARGS);
 static void     post_par(POST_ARGS);

+static void     post_prevpar(POST_ARGS);

 static void     post_root(POST_ARGS);
 static void     post_rs(POST_ARGS);
 static void     post_root(POST_ARGS);
 static void     post_rs(POST_ARGS);

+static void     post_rv(POST_ARGS);

 static void     post_sh(POST_ARGS);
 static void     post_sh_head(POST_ARGS);
 static void     post_sh_name(POST_ARGS);
 static void     post_sh(POST_ARGS);
 static void     post_sh_head(POST_ARGS);
 static void     post_sh_name(POST_ARGS);


@@ -107,149 +111,138 @@ static  void     post_sh_see_also(POST_ARGS);
 static void     post_sh_authors(POST_ARGS);
 static void     post_sm(POST_ARGS);
 static void     post_st(POST_ARGS);
 static void     post_sh_authors(POST_ARGS);
 static void     post_sm(POST_ARGS);
 static void     post_st(POST_ARGS);

-static void     post_vt(POST_ARGS);
-
-static void     pre_an(PRE_ARGS);
-static void     pre_bd(PRE_ARGS);
-static void     pre_bl(PRE_ARGS);
-static void     pre_dd(PRE_ARGS);
-static void     pre_display(PRE_ARGS);
-static void     pre_dt(PRE_ARGS);
-static void     pre_literal(PRE_ARGS);
-static void     pre_obsolete(PRE_ARGS);
-static void     pre_os(PRE_ARGS);
-static void     pre_par(PRE_ARGS);
-static void     pre_std(PRE_ARGS);
-
-static const struct valids mdoc_valids[MDOC_MAX] = {
-       { NULL, NULL },                         /* Ap */
-       { pre_dd, post_dd },                    /* Dd */
-       { pre_dt, post_dt },                    /* Dt */
-       { pre_os, post_os },                    /* Os */
-       { NULL, post_sh },                      /* Sh */
-       { NULL, post_ignpar },                  /* Ss */
-       { pre_par, post_par },                  /* Pp */
-       { pre_display, post_d1 },               /* D1 */
-       { pre_literal, post_literal },          /* Dl */
-       { pre_bd, post_literal },               /* Bd */
-       { NULL, NULL },                         /* Ed */
-       { pre_bl, post_bl },                    /* Bl */
-       { NULL, NULL },                         /* El */
-       { pre_par, post_it },                   /* It */
-       { NULL, NULL },                         /* Ad */
-       { pre_an, post_an },                    /* An */
-       { NULL, post_defaults },                /* Ar */
-       { NULL, NULL },                         /* Cd */
-       { NULL, NULL },                         /* Cm */
-       { NULL, NULL },                         /* Dv */
-       { NULL, NULL },                         /* Er */
-       { NULL, NULL },                         /* Ev */
-       { pre_std, post_ex },                   /* Ex */
-       { NULL, post_fa },                      /* Fa */
-       { NULL, NULL },                         /* Fd */
-       { NULL, NULL },                         /* Fl */
-       { NULL, post_fn },                      /* Fn */
-       { NULL, NULL },                         /* Ft */
-       { NULL, NULL },                         /* Ic */
-       { NULL, NULL },                         /* In */
-       { NULL, post_defaults },                /* Li */
-       { NULL, post_nd },                      /* Nd */
-       { NULL, post_nm },                      /* Nm */
-       { NULL, NULL },                         /* Op */
-       { pre_obsolete, NULL },                 /* Ot */
-       { NULL, post_defaults },                /* Pa */
-       { pre_std, NULL },                      /* Rv */
-       { NULL, post_st },                      /* St */
-       { NULL, NULL },                         /* Va */
-       { NULL, post_vt },                      /* Vt */
-       { NULL, NULL },                         /* Xr */
-       { NULL, NULL },                         /* %A */
-       { NULL, post_hyph },                    /* %B */ /* FIXME: can be used outside Rs/Re. */
-       { NULL, NULL },                         /* %D */
-       { NULL, NULL },                         /* %I */
-       { NULL, NULL },                         /* %J */
-       { NULL, post_hyph },                    /* %N */
-       { NULL, post_hyph },                    /* %O */
-       { NULL, NULL },                         /* %P */
-       { NULL, post_hyph },                    /* %R */
-       { NULL, post_hyph },                    /* %T */ /* FIXME: can be used outside Rs/Re. */
-       { NULL, NULL },                         /* %V */
-       { NULL, NULL },                         /* Ac */
-       { NULL, NULL },                         /* Ao */
-       { NULL, NULL },                         /* Aq */
-       { NULL, post_at },                      /* At */
-       { NULL, NULL },                         /* Bc */
-       { NULL, post_bf },                      /* Bf */
-       { NULL, NULL },                         /* Bo */
-       { NULL, NULL },                         /* Bq */
-       { NULL, NULL },                         /* Bsx */
-       { NULL, post_bx },                      /* Bx */
-       { pre_obsolete, NULL },                 /* Db */
-       { NULL, NULL },                         /* Dc */
-       { NULL, NULL },                         /* Do */
-       { NULL, NULL },                         /* Dq */
-       { NULL, NULL },                         /* Ec */
-       { NULL, NULL },                         /* Ef */
-       { NULL, NULL },                         /* Em */
-       { NULL, NULL },                         /* Eo */
-       { NULL, NULL },                         /* Fx */
-       { NULL, NULL },                         /* Ms */
-       { NULL, NULL },                         /* No */
-       { NULL, post_ns },                      /* Ns */
-       { NULL, NULL },                         /* Nx */
-       { NULL, NULL },                         /* Ox */
-       { NULL, NULL },                         /* Pc */
-       { NULL, NULL },                         /* Pf */
-       { NULL, NULL },                         /* Po */
-       { NULL, NULL },                         /* Pq */
-       { NULL, NULL },                         /* Qc */
-       { NULL, NULL },                         /* Ql */
-       { NULL, NULL },                         /* Qo */
-       { NULL, NULL },                         /* Qq */
-       { NULL, NULL },                         /* Re */
-       { NULL, post_rs },                      /* Rs */
-       { NULL, NULL },                         /* Sc */
-       { NULL, NULL },                         /* So */
-       { NULL, NULL },                         /* Sq */
-       { NULL, post_sm },                      /* Sm */
-       { NULL, post_hyph },                    /* Sx */
-       { NULL, NULL },                         /* Sy */
-       { NULL, NULL },                         /* Tn */
-       { NULL, NULL },                         /* Ux */
-       { NULL, NULL },                         /* Xc */
-       { NULL, NULL },                         /* Xo */
-       { NULL, post_fo },                      /* Fo */
-       { NULL, NULL },                         /* Fc */
-       { NULL, NULL },                         /* Oo */
-       { NULL, NULL },                         /* Oc */
-       { NULL, post_bk },                      /* Bk */
-       { NULL, NULL },                         /* Ek */
-       { NULL, post_eoln },                    /* Bt */
-       { NULL, NULL },                         /* Hf */
-       { pre_obsolete, NULL },                 /* Fr */
-       { NULL, post_eoln },                    /* Ud */
-       { NULL, post_lb },                      /* Lb */
-       { pre_par, post_par },                  /* Lp */
-       { NULL, NULL },                         /* Lk */
-       { NULL, post_defaults },                /* Mt */
-       { NULL, NULL },                         /* Brq */
-       { NULL, NULL },                         /* Bro */
-       { NULL, NULL },                         /* Brc */
-       { NULL, NULL },                         /* %C */
-       { pre_obsolete, post_es },              /* Es */
-       { pre_obsolete, post_en },              /* En */
-       { NULL, NULL },                         /* Dx */
-       { NULL, NULL },                         /* %Q */
-       { NULL, post_par },                     /* br */
-       { NULL, post_par },                     /* sp */
-       { NULL, NULL },                         /* %U */
-       { NULL, NULL },                         /* Ta */
-       { NULL, NULL },                         /* ll */
+static void     post_std(POST_ARGS);
+static void     post_sx(POST_ARGS);
+static void     post_useless(POST_ARGS);
+static void     post_xr(POST_ARGS);
+static void     post_xx(POST_ARGS);
+
+static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] = {
+       post_dd,        /* Dd */
+       post_dt,        /* Dt */
+       post_os,        /* Os */
+       post_sh,        /* Sh */
+       post_ignpar,    /* Ss */
+       post_par,       /* Pp */
+       post_display,   /* D1 */
+       post_display,   /* Dl */
+       post_display,   /* Bd */
+       NULL,           /* Ed */
+       post_bl,        /* Bl */
+       NULL,           /* El */
+       post_it,        /* It */
+       post_delim_nb,  /* Ad */
+       post_an,        /* An */
+       NULL,           /* Ap */
+       post_defaults,  /* Ar */
+       NULL,           /* Cd */
+       post_delim_nb,  /* Cm */
+       post_delim_nb,  /* Dv */
+       post_delim_nb,  /* Er */
+       post_delim_nb,  /* Ev */
+       post_ex,        /* Ex */
+       post_fa,        /* Fa */
+       NULL,           /* Fd */
+       post_delim_nb,  /* Fl */
+       post_fn,        /* Fn */
+       post_delim_nb,  /* Ft */
+       post_delim_nb,  /* Ic */
+       post_delim_nb,  /* In */
+       post_defaults,  /* Li */
+       post_nd,        /* Nd */
+       post_nm,        /* Nm */
+       post_delim_nb,  /* Op */
+       post_abort,     /* Ot */
+       post_defaults,  /* Pa */
+       post_rv,        /* Rv */
+       post_st,        /* St */
+       post_delim_nb,  /* Va */
+       post_delim_nb,  /* Vt */
+       post_xr,        /* Xr */
+       NULL,           /* %A */
+       post_hyph,      /* %B */ /* FIXME: can be used outside Rs/Re. */
+       NULL,           /* %D */
+       NULL,           /* %I */
+       NULL,           /* %J */
+       post_hyph,      /* %N */
+       post_hyph,      /* %O */
+       NULL,           /* %P */
+       post_hyph,      /* %R */
+       post_hyph,      /* %T */ /* FIXME: can be used outside Rs/Re. */
+       NULL,           /* %V */
+       NULL,           /* Ac */
+       NULL,           /* Ao */
+       post_delim_nb,  /* Aq */
+       post_at,        /* At */
+       NULL,           /* Bc */
+       post_bf,        /* Bf */
+       NULL,           /* Bo */
+       NULL,           /* Bq */
+       post_xx,        /* Bsx */
+       post_bx,        /* Bx */
+       post_obsolete,  /* Db */
+       NULL,           /* Dc */
+       NULL,           /* Do */
+       NULL,           /* Dq */
+       NULL,           /* Ec */
+       NULL,           /* Ef */
+       post_delim_nb,  /* Em */
+       NULL,           /* Eo */
+       post_xx,        /* Fx */
+       post_delim_nb,  /* Ms */
+       NULL,           /* No */
+       post_ns,        /* Ns */
+       post_xx,        /* Nx */
+       post_xx,        /* Ox */
+       NULL,           /* Pc */
+       NULL,           /* Pf */
+       NULL,           /* Po */
+       post_delim_nb,  /* Pq */
+       NULL,           /* Qc */
+       post_delim_nb,  /* Ql */
+       NULL,           /* Qo */
+       post_delim_nb,  /* Qq */
+       NULL,           /* Re */
+       post_rs,        /* Rs */
+       NULL,           /* Sc */
+       NULL,           /* So */
+       post_delim_nb,  /* Sq */
+       post_sm,        /* Sm */
+       post_sx,        /* Sx */
+       post_delim_nb,  /* Sy */
+       post_useless,   /* Tn */
+       post_xx,        /* Ux */
+       NULL,           /* Xc */
+       NULL,           /* Xo */
+       post_fo,        /* Fo */
+       NULL,           /* Fc */
+       NULL,           /* Oo */
+       NULL,           /* Oc */
+       post_bk,        /* Bk */
+       NULL,           /* Ek */
+       post_eoln,      /* Bt */
+       post_obsolete,  /* Hf */
+       post_obsolete,  /* Fr */
+       post_eoln,      /* Ud */
+       post_lb,        /* Lb */
+       post_abort,     /* Lp */
+       post_delim_nb,  /* Lk */
+       post_defaults,  /* Mt */
+       post_delim_nb,  /* Brq */
+       NULL,           /* Bro */
+       NULL,           /* Brc */
+       NULL,           /* %C */
+       post_es,        /* Es */
+       post_en,        /* En */
+       post_xx,        /* Dx */
+       NULL,           /* %Q */
+       NULL,           /* %U */
+       NULL,           /* Ta */

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

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

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


@@ -293,54 +286,75 @@ static    const char * const secnames[SEC__MAX] = {
 };
 
 
 };
 
 

+/* Validate the subtree rooted at mdoc->last. */

 void
 void

-mdoc_valid_pre(struct roff_man *mdoc, struct roff_node *n)
+mdoc_node_validate(struct roff_man *mdoc)

 {
 {

-       v_pre    p;
+       struct roff_node *n, *np;
+       const v_post *p;

 
 

-       switch (n->type) {
-       case ROFFT_TEXT:
-               if (n->sec != SEC_SYNOPSIS || n->parent->tok != MDOC_Fd)
-                       check_text(mdoc, n->line, n->pos, n->string);
-               /* FALLTHROUGH */
-       case ROFFT_TBL:
-               /* FALLTHROUGH */
-       case ROFFT_EQN:
-               /* FALLTHROUGH */
-       case ROFFT_ROOT:
-               return;
+       /*
+        * Translate obsolete macros to modern macros first
+        * such that later code does not need to look
+        * for the obsolete versions.
+        */
+
+       n = mdoc->last;
+       switch (n->tok) {
+       case MDOC_Lp:
+               n->tok = MDOC_Pp;
+               break;
+       case MDOC_Ot:
+               post_obsolete(mdoc);
+               n->tok = MDOC_Ft;
+               break;

        default:
                break;
        }
 
        default:
                break;
        }
 

-       check_args(mdoc, n);
-       p = mdoc_valids[n->tok].pre;
-       if (*p)
-               (*p)(mdoc, n);
-}
+       /*
+        * Iterate over all children, recursing into each one
+        * in turn, depth-first.
+        */

 
 

-void
-mdoc_valid_post(struct roff_man *mdoc)
-{
-       struct roff_node *n;
-       v_post p;
+       mdoc->last = mdoc->last->child;
+       while (mdoc->last != NULL) {
+               mdoc_node_validate(mdoc);
+               if (mdoc->last == n)
+                       mdoc->last = mdoc->last->child;
+               else
+                       mdoc->last = mdoc->last->next;
+       }

 
 

-       n = mdoc->last;
-       if (n->flags & MDOC_VALID)
-               return;
-       n->flags |= MDOC_VALID | MDOC_ENDED;
+       /* Finally validate the macro itself. */

 
 

+       mdoc->last = n;
+       mdoc->next = ROFF_NEXT_SIBLING;

        switch (n->type) {
        case ROFFT_TEXT:
        switch (n->type) {
        case ROFFT_TEXT:

-               /* FALLTHROUGH */
+               np = n->parent;
+               if (n->sec != SEC_SYNOPSIS ||
+                   (np->tok != MDOC_Cd && np->tok != MDOC_Fd))
+                       check_text(mdoc, n->line, n->pos, n->string);
+               if (np->tok != MDOC_Ql && np->tok != MDOC_Dl &&
+                   (np->tok != MDOC_Bd ||
+                    (mdoc->flags & MDOC_LITERAL) == 0) &&
+                   (np->tok != MDOC_It || np->type != ROFFT_HEAD ||
+                    np->parent->parent->norm->Bl.type != LIST_diag))
+                       check_text_em(mdoc, n->line, n->pos, n->string);
+               if (np->tok == MDOC_It || (np->type == ROFFT_BODY &&
+                   (np->tok == MDOC_Sh || np->tok == MDOC_Ss)))
+                       check_toptext(mdoc, n->line, n->pos, n->string);
+               break;
+       case ROFFT_COMMENT:

        case ROFFT_EQN:
        case ROFFT_EQN:

-               /* FALLTHROUGH */

        case ROFFT_TBL:
                break;
        case ROFFT_ROOT:
                post_root(mdoc);
                break;
        default:
        case ROFFT_TBL:
                break;
        case ROFFT_ROOT:
                post_root(mdoc);
                break;
        default:

+               check_args(mdoc, mdoc->last);

 
                /*
                 * Closing delimiters are not special at the
 
                /*
                 * Closing delimiters are not special at the


@@ -349,15 +363,23 @@ mdoc_valid_post(struct roff_man *mdoc)
                 */
 
                if (n->child != NULL)
                 */
 
                if (n->child != NULL)

-                       n->child->flags &= ~MDOC_DELIMC;
+                       n->child->flags &= ~NODE_DELIMC;

                if (n->last != NULL)
                if (n->last != NULL)

-                       n->last->flags &= ~MDOC_DELIMO;
+                       n->last->flags &= ~NODE_DELIMO;

 
                /* Call the macro's postprocessor. */
 
 
                /* Call the macro's postprocessor. */
 

-               p = mdoc_valids[n->tok].post;
+               if (n->tok < ROFF_MAX) {
+                       roff_validate(mdoc);
+                       break;
+               }
+
+               assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+               p = mdoc_valids + (n->tok - MDOC_Dd);

                if (*p)
                        (*p)(mdoc);
                if (*p)
                        (*p)(mdoc);

+               if (mdoc->last == n)
+                       mdoc_state(mdoc, n);

                break;
        }
 }
                break;
        }
 }


@@ -398,34 +420,230 @@ check_text(struct roff_man *mdoc, int ln, int pos, char *p)
 }
 
 static void
 }
 
 static void

-pre_display(PRE_ARGS)
+check_text_em(struct roff_man *mdoc, int ln, int pos, char *p)

 {
 {

-       struct roff_node *node;
+       const struct roff_node  *np, *nn;
+       char                    *cp;
+
+       np = mdoc->last->prev;
+       nn = mdoc->last->next;
+
+       /* Look for em-dashes wrongly encoded as "--". */
+
+       for (cp = p; *cp != '\0'; cp++) {
+               if (cp[0] != '-' || cp[1] != '-')
+                       continue;
+               cp++;
+
+               /* Skip input sequences of more than two '-'. */
+
+               if (cp[1] == '-') {
+                       while (cp[1] == '-')
+                               cp++;
+                       continue;
+               }
+
+               /* Skip "--" directly attached to something else. */

 
 

-       if (n->type != ROFFT_BLOCK)
+               if ((cp - p > 1 && cp[-2] != ' ') ||
+                   (cp[1] != '\0' && cp[1] != ' '))
+                       continue;
+
+               /* Require a letter right before or right afterwards. */
+
+               if ((cp - p > 2 ?
+                    isalpha((unsigned char)cp[-3]) :
+                    np != NULL &&
+                    np->type == ROFFT_TEXT &&
+                    *np->string != '\0' &&
+                    isalpha((unsigned char)np->string[
+                      strlen(np->string) - 1])) ||
+                   (cp[1] != '\0' && cp[2] != '\0' ?
+                    isalpha((unsigned char)cp[2]) :
+                    nn != NULL &&
+                    nn->type == ROFFT_TEXT &&
+                    isalpha((unsigned char)*nn->string))) {
+                       mandoc_msg(MANDOCERR_DASHDASH, mdoc->parse,
+                           ln, pos + (int)(cp - p) - 1, NULL);
+                       break;
+               }
+       }
+}
+
+static void
+check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p)
+{
+       const char      *cp, *cpr;
+
+       if (*p == '\0')

                return;
 
                return;
 

-       for (node = mdoc->last->parent; node; node = node->parent)
-               if (node->type == ROFFT_BLOCK)
-                       if (MDOC_Bd == node->tok)
+       if ((cp = strstr(p, "OpenBSD")) != NULL)
+               mandoc_msg(MANDOCERR_BX, mdoc->parse,
+                   ln, pos + (cp - p), "Ox");
+       if ((cp = strstr(p, "NetBSD")) != NULL)
+               mandoc_msg(MANDOCERR_BX, mdoc->parse,
+                   ln, pos + (cp - p), "Nx");
+       if ((cp = strstr(p, "FreeBSD")) != NULL)
+               mandoc_msg(MANDOCERR_BX, mdoc->parse,
+                   ln, pos + (cp - p), "Fx");
+       if ((cp = strstr(p, "DragonFly")) != NULL)
+               mandoc_msg(MANDOCERR_BX, mdoc->parse,
+                   ln, pos + (cp - p), "Dx");
+
+       cp = p;
+       while ((cp = strstr(cp + 1, "()")) != NULL) {
+               for (cpr = cp - 1; cpr >= p; cpr--)
+                       if (*cpr != '_' && !isalnum((unsigned char)*cpr))

                                break;
                                break;

+               if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) {
+                       cpr++;
+                       mandoc_vmsg(MANDOCERR_FUNC, mdoc->parse,
+                           ln, pos + (cpr - p),
+                           "%.*s()", (int)(cp - cpr), cpr);
+               }
+       }
+}

 
 

-       if (node)
-               mandoc_vmsg(MANDOCERR_BD_NEST,
-                   mdoc->parse, n->line, n->pos,
-                   "%s in Bd", mdoc_macronames[n->tok]);
+static void
+post_abort(POST_ARGS)
+{
+       abort();
+}
+
+static void
+post_delim(POST_ARGS)
+{
+       const struct roff_node  *nch;
+       const char              *lc;
+       enum mdelim              delim;
+       enum roff_tok            tok;
+
+       tok = mdoc->last->tok;
+       nch = mdoc->last->last;
+       if (nch == NULL || nch->type != ROFFT_TEXT)
+               return;
+       lc = strchr(nch->string, '\0') - 1;
+       if (lc < nch->string)
+               return;
+       delim = mdoc_isdelim(lc);
+       if (delim == DELIM_NONE || delim == DELIM_OPEN)
+               return;
+       if (*lc == ')' && (tok == MDOC_Nd || tok == MDOC_Sh ||
+           tok == MDOC_Ss || tok == MDOC_Fo))
+               return;
+
+       mandoc_vmsg(MANDOCERR_DELIM, mdoc->parse,
+           nch->line, nch->pos + (lc - nch->string),
+           "%s%s %s", roff_name[tok],
+           nch == mdoc->last->child ? "" : " ...", nch->string);
+}
+
+static void
+post_delim_nb(POST_ARGS)
+{
+       const struct roff_node  *nch;
+       const char              *lc, *cp;
+       int                      nw;
+       enum mdelim              delim;
+       enum roff_tok            tok;
+
+       /*
+        * Find candidates: at least two bytes,
+        * the last one a closing or middle delimiter.
+        */
+
+       tok = mdoc->last->tok;
+       nch = mdoc->last->last;
+       if (nch == NULL || nch->type != ROFFT_TEXT)
+               return;
+       lc = strchr(nch->string, '\0') - 1;
+       if (lc <= nch->string)
+               return;
+       delim = mdoc_isdelim(lc);
+       if (delim == DELIM_NONE || delim == DELIM_OPEN)
+               return;
+
+       /*
+        * Reduce false positives by allowing various cases.
+        */
+
+       /* Escaped delimiters. */
+       if (lc > nch->string + 1 && lc[-2] == '\\' &&
+           (lc[-1] == '&' || lc[-1] == 'e'))
+               return;
+
+       /* Specific byte sequences. */
+       switch (*lc) {
+       case ')':
+               for (cp = lc; cp >= nch->string; cp--)
+                       if (*cp == '(')
+                               return;
+               break;
+       case '.':
+               if (lc > nch->string + 1 && lc[-2] == '.' && lc[-1] == '.')
+                       return;
+               if (lc[-1] == '.')
+                       return;
+               break;
+       case ';':
+               if (tok == MDOC_Vt)
+                       return;
+               break;
+       case '?':
+               if (lc[-1] == '?')
+                       return;
+               break;
+       case ']':
+               for (cp = lc; cp >= nch->string; cp--)
+                       if (*cp == '[')
+                               return;
+               break;
+       case '|':
+               if (lc == nch->string + 1 && lc[-1] == '|')
+                       return;
+       default:
+               break;
+       }
+
+       /* Exactly two non-alphanumeric bytes. */
+       if (lc == nch->string + 1 && !isalnum((unsigned char)lc[-1]))
+               return;
+
+       /* At least three alphabetic words with a sentence ending. */
+       if (strchr("!.:?", *lc) != NULL && (tok == MDOC_Em ||
+           tok == MDOC_Li || tok == MDOC_Pq || tok == MDOC_Sy)) {
+               nw = 0;
+               for (cp = lc - 1; cp >= nch->string; cp--) {
+                       if (*cp == ' ') {
+                               nw++;
+                               if (cp > nch->string && cp[-1] == ',')
+                                       cp--;
+                       } else if (isalpha((unsigned int)*cp)) {
+                               if (nw > 1)
+                                       return;
+                       } else
+                               break;
+               }
+       }
+
+       mandoc_vmsg(MANDOCERR_DELIM_NB, mdoc->parse,
+           nch->line, nch->pos + (lc - nch->string),
+           "%s%s %s", roff_name[tok],
+           nch == mdoc->last->child ? "" : " ...", nch->string);

 }
 
 static void
 }
 
 static void

-pre_bl(PRE_ARGS)
+post_bl_norm(POST_ARGS)

 {
 {

+       struct roff_node *n;

        struct mdoc_argv *argv, *wa;
        int               i;
        enum mdocargt     mdoclt;
        enum mdoc_list    lt;
 
        struct mdoc_argv *argv, *wa;
        int               i;
        enum mdocargt     mdoclt;
        enum mdoc_list    lt;
 

-       if (n->type != ROFFT_BLOCK)
-               return;
+       n = mdoc->last->parent;
+       n->norm->Bl.type = LIST__NONE;

 
        /*
         * First figure out which kind of list to use: bind ourselves to
 
        /*
         * First figure out which kind of list to use: bind ourselves to


@@ -495,7 +713,7 @@ pre_bl(PRE_ARGS)
                                    mdoc->parse, argv->line,
                                    argv->pos, "Bl -width %s",
                                    argv->value[0]);
                                    mdoc->parse, argv->line,
                                    argv->pos, "Bl -width %s",
                                    argv->value[0]);

-                       rewrite_macro2len(argv->value);
+                       rewrite_macro2len(mdoc, argv->value);

                        n->norm->Bl.width = argv->value[0];
                        break;
                case MDOC_Offset:
                        n->norm->Bl.width = argv->value[0];
                        break;
                case MDOC_Offset:


@@ -510,7 +728,7 @@ pre_bl(PRE_ARGS)
                                    mdoc->parse, argv->line,
                                    argv->pos, "Bl -offset %s",
                                    argv->value[0]);
                                    mdoc->parse, argv->line,
                                    argv->pos, "Bl -offset %s",
                                    argv->value[0]);

-                       rewrite_macro2len(argv->value);
+                       rewrite_macro2len(mdoc, argv->value);

                        n->norm->Bl.offs = argv->value[0];
                        break;
                default:
                        n->norm->Bl.offs = argv->value[0];
                        break;
                default:


@@ -551,6 +769,7 @@ pre_bl(PRE_ARGS)
                mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,
                    n->line, n->pos, "Bl");
                n->norm->Bl.type = LIST_item;
                mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,
                    n->line, n->pos, "Bl");
                n->norm->Bl.type = LIST_item;

+               mdoclt = MDOC_Item;

        }
 
        /*
        }
 
        /*


@@ -562,54 +781,45 @@ pre_bl(PRE_ARGS)
 
        switch (n->norm->Bl.type) {
        case LIST_tag:
 
        switch (n->norm->Bl.type) {
        case LIST_tag:

-               if (NULL == n->norm->Bl.width)
+               if (n->norm->Bl.width == NULL)

                        mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,
                            n->line, n->pos, "Bl -tag");
                break;
        case LIST_column:
                        mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,
                            n->line, n->pos, "Bl -tag");
                break;
        case LIST_column:

-               /* FALLTHROUGH */

        case LIST_diag:
        case LIST_diag:

-               /* FALLTHROUGH */

        case LIST_ohang:
        case LIST_ohang:

-               /* FALLTHROUGH */

        case LIST_inset:
        case LIST_inset:

-               /* FALLTHROUGH */

        case LIST_item:
        case LIST_item:

-               if (n->norm->Bl.width)
+               if (n->norm->Bl.width != NULL)

                        mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
                            wa->line, wa->pos, "Bl -%s",
                            mdoc_argnames[mdoclt]);
                        mandoc_vmsg(MANDOCERR_BL_SKIPW, mdoc->parse,
                            wa->line, wa->pos, "Bl -%s",
                            mdoc_argnames[mdoclt]);

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

                break;
        case LIST_bullet:
                break;
        case LIST_bullet:

-               /* FALLTHROUGH */

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_hyphen:
        case LIST_hyphen:

-               if (NULL == n->norm->Bl.width)
+               if (n->norm->Bl.width == NULL)

                        n->norm->Bl.width = "2n";
                break;
        case LIST_enum:
                        n->norm->Bl.width = "2n";
                break;
        case LIST_enum:

-               if (NULL == n->norm->Bl.width)
+               if (n->norm->Bl.width == NULL)

                        n->norm->Bl.width = "3n";
                break;
        default:
                break;
        }
                        n->norm->Bl.width = "3n";
                break;
        default:
                break;
        }

-       pre_par(mdoc, n);

 }
 
 static void
 }
 
 static void

-pre_bd(PRE_ARGS)
+post_bd(POST_ARGS)

 {
 {

+       struct roff_node *n;

        struct mdoc_argv *argv;
        int               i;
        enum mdoc_disp    dt;
 
        struct mdoc_argv *argv;
        int               i;
        enum mdoc_disp    dt;
 

-       pre_literal(mdoc, n);
-
-       if (n->type != ROFFT_BLOCK)
-               return;
-
+       n = mdoc->last;

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


@@ -646,7 +856,7 @@ pre_bd(PRE_ARGS)
                                    mdoc->parse, argv->line,
                                    argv->pos, "Bd -offset %s",
                                    argv->value[0]);
                                    mdoc->parse, argv->line,
                                    argv->pos, "Bd -offset %s",
                                    argv->value[0]);

-                       rewrite_macro2len(argv->value);
+                       rewrite_macro2len(mdoc, argv->value);

                        n->norm->Bd.offs = argv->value[0];
                        break;
                case MDOC_Compact:
                        n->norm->Bd.offs = argv->value[0];
                        break;
                case MDOC_Compact:


@@ -658,7 +868,6 @@ pre_bd(PRE_ARGS)
                        break;
                default:
                        abort();
                        break;
                default:
                        abort();

-                       /* NOTREACHED */

                }
                if (DISP__NONE == dt)
                        continue;
                }
                if (DISP__NONE == dt)
                        continue;


@@ -676,15 +885,20 @@ pre_bd(PRE_ARGS)
                    n->line, n->pos, "Bd");
                n->norm->Bd.type = DISP_ragged;
        }
                    n->line, n->pos, "Bd");
                n->norm->Bd.type = DISP_ragged;
        }

-       pre_par(mdoc, n);

 }
 
 }
 

+/*
+ * Stand-alone line macros.
+ */
+

 static void
 static void

-pre_an(PRE_ARGS)
+post_an_norm(POST_ARGS)

 {
 {

+       struct roff_node *n;

        struct mdoc_argv *argv;
        size_t   i;
 
        struct mdoc_argv *argv;
        size_t   i;
 

+       n = mdoc->last;

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


@@ -705,73 +919,231 @@ pre_an(PRE_ARGS)
 }
 
 static void
 }
 
 static void

-pre_std(PRE_ARGS)
+post_eoln(POST_ARGS)

 {
 {

+       struct roff_node        *n;

 
 

-       if (n->args && 1 == n->args->argc)
-               if (MDOC_Std == n->args->argv[0].arg)
-                       return;
+       post_useless(mdoc);
+       n = mdoc->last;
+       if (n->child != NULL)
+               mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line,
+                   n->pos, "%s %s", roff_name[n->tok], n->child->string);

 
 

-       mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
-           n->line, n->pos, mdoc_macronames[n->tok]);
+       while (n->child != NULL)
+               roff_node_delete(mdoc, n->child);
+
+       roff_word_alloc(mdoc, n->line, n->pos, n->tok == MDOC_Bt ?
+           "is currently in beta test." : "currently under development.");
+       mdoc->last->flags |= NODE_EOS | NODE_NOSRC;
+       mdoc->last = n;
+}
+
+static int
+build_list(struct roff_man *mdoc, int tok)
+{
+       struct roff_node        *n;
+       int                      ic;
+
+       n = mdoc->last->next;
+       for (ic = 1;; ic++) {
+               roff_elem_alloc(mdoc, n->line, n->pos, tok);
+               mdoc->last->flags |= NODE_NOSRC;
+               roff_node_relink(mdoc, n);
+               n = mdoc->last = mdoc->last->parent;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               if (n->next == NULL)
+                       return ic;
+               if (ic > 1 || n->next->next != NULL) {
+                       roff_word_alloc(mdoc, n->line, n->pos, ",");
+                       mdoc->last->flags |= NODE_DELIMC | NODE_NOSRC;
+               }
+               n = mdoc->last->next;
+               if (n->next == NULL) {
+                       roff_word_alloc(mdoc, n->line, n->pos, "and");
+                       mdoc->last->flags |= NODE_NOSRC;
+               }
+       }

 }
 
 static void
 }
 
 static void

-pre_obsolete(PRE_ARGS)
+post_ex(POST_ARGS)

 {
 {

+       struct roff_node        *n;
+       int                      ic;

 
 

-       if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
-               mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
-                   n->line, n->pos, mdoc_macronames[n->tok]);
+       post_std(mdoc);
+
+       n = mdoc->last;
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, "The");
+       mdoc->last->flags |= NODE_NOSRC;
+
+       if (mdoc->last->next != NULL)
+               ic = build_list(mdoc, MDOC_Nm);
+       else if (mdoc->meta.name != NULL) {
+               roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Nm);
+               mdoc->last->flags |= NODE_NOSRC;
+               roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
+               mdoc->last->flags |= NODE_NOSRC;
+               mdoc->last = mdoc->last->parent;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               ic = 1;
+       } else {
+               mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
+                   n->line, n->pos, "Ex");
+               ic = 0;
+       }
+
+       roff_word_alloc(mdoc, n->line, n->pos,
+           ic > 1 ? "utilities exit\\~0" : "utility exits\\~0");
+       mdoc->last->flags |= NODE_NOSRC;
+       roff_word_alloc(mdoc, n->line, n->pos,
+           "on success, and\\~>0 if an error occurs.");
+       mdoc->last->flags |= NODE_EOS | NODE_NOSRC;
+       mdoc->last = n;

 }
 
 static void
 }
 
 static void

-pre_dt(PRE_ARGS)
+post_lb(POST_ARGS)

 {
 {

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

 
 

-       if (mdoc->meta.title != NULL)
-               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
-                   n->line, n->pos, "Dt");
-       else if (mdoc->meta.os != NULL)
-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
-                   n->line, n->pos, "Dt after Os");
+       post_delim_nb(mdoc);
+
+       n = mdoc->last;
+       assert(n->child->type == ROFFT_TEXT);
+       mdoc->next = ROFF_NEXT_CHILD;
+
+       if ((p = mdoc_a2lib(n->child->string)) != NULL) {
+               n->child->flags |= NODE_NOPRT;
+               roff_word_alloc(mdoc, n->line, n->pos, p);
+               mdoc->last->flags = NODE_NOSRC;
+               mdoc->last = n;
+               return;
+       }
+
+       mandoc_vmsg(MANDOCERR_LB_BAD, mdoc->parse, n->child->line,
+           n->child->pos, "Lb %s", n->child->string);
+
+       roff_word_alloc(mdoc, n->line, n->pos, "library");
+       mdoc->last->flags = NODE_NOSRC;
+       roff_word_alloc(mdoc, n->line, n->pos, "\\(lq");
+       mdoc->last->flags = NODE_DELIMO | NODE_NOSRC;
+       mdoc->last = mdoc->last->next;
+       roff_word_alloc(mdoc, n->line, n->pos, "\\(rq");
+       mdoc->last->flags = NODE_DELIMC | NODE_NOSRC;
+       mdoc->last = n;

 }
 
 static void
 }
 
 static void

-pre_os(PRE_ARGS)
+post_rv(POST_ARGS)

 {
 {

+       struct roff_node        *n;
+       int                      ic;

 
 

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

 }
 
 static void
 }
 
 static void

-pre_dd(PRE_ARGS)
+post_std(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

-       if (mdoc->meta.date != NULL)
-               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
-                   n->line, n->pos, "Dd");
-       else if (mdoc->flags & MDOC_PBODY)
-               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
-                   n->line, n->pos, "Dd");
-       else if (mdoc->meta.title != NULL)
-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
-                   n->line, n->pos, "Dd after Dt");
-       else if (mdoc->meta.os != NULL)
-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
-                   n->line, n->pos, "Dd after Os");
+       post_delim(mdoc);
+
+       n = mdoc->last;
+       if (n->args && n->args->argc == 1)
+               if (n->args->argv[0].arg == MDOC_Std)
+                       return;
+
+       mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
+           n->line, n->pos, roff_name[n->tok]);

 }
 
 }
 

+static void
+post_st(POST_ARGS)
+{
+       struct roff_node         *n, *nch;
+       const char               *p;
+
+       n = mdoc->last;
+       nch = n->child;
+       assert(nch->type == ROFFT_TEXT);
+
+       if ((p = mdoc_a2st(nch->string)) == NULL) {
+               mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
+                   nch->line, nch->pos, "St %s", nch->string);
+               roff_node_delete(mdoc, n);
+               return;
+       }
+
+       nch->flags |= NODE_NOPRT;
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, nch->line, nch->pos, p);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last= n;
+}
+
+static void
+post_obsolete(POST_ARGS)
+{
+       struct roff_node *n;
+
+       n = mdoc->last;
+       if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
+               mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
+                   n->line, n->pos, roff_name[n->tok]);
+}
+
+static void
+post_useless(POST_ARGS)
+{
+       struct roff_node *n;
+
+       n = mdoc->last;
+       mandoc_msg(MANDOCERR_MACRO_USELESS, mdoc->parse,
+           n->line, n->pos, roff_name[n->tok]);
+}
+
+/*
+ * Block macros.
+ */
+

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

-       enum mdocargt     arg;

 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD
 
        /*
         * Unlike other data pointers, these are "housed" by the HEAD


@@ -783,45 +1155,49 @@ post_bf(POST_ARGS)
                return;
 
        assert(np->parent->type == ROFFT_BLOCK);
                return;
 
        assert(np->parent->type == ROFFT_BLOCK);

-       assert(MDOC_Bf == np->parent->tok);
+       assert(np->parent->tok == MDOC_Bf);

 
        /* Check the number of arguments. */
 
        nch = np->child;
 
        /* Check the number of arguments. */
 
        nch = np->child;

-       if (NULL == np->parent->args) {
-               if (NULL == nch) {
+       if (np->parent->args == NULL) {
+               if (nch == NULL) {

                        mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,
                            np->line, np->pos, "Bf");
                        return;
                }
                nch = nch->next;
        }
                        mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,
                            np->line, np->pos, "Bf");
                        return;
                }
                nch = nch->next;
        }

-       if (NULL != nch)
+       if (nch != NULL)

                mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
                    nch->line, nch->pos, "Bf ... %s", nch->string);
 
        /* Extract argument into data. */
 
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
                    nch->line, nch->pos, "Bf ... %s", nch->string);
 
        /* Extract argument into data. */
 

-       if (np->parent->args) {
-               arg = np->parent->args->argv[0].arg;
-               if (MDOC_Emphasis == arg)
+       if (np->parent->args != NULL) {
+               switch (np->parent->args->argv[0].arg) {
+               case MDOC_Emphasis:

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

-               else if (MDOC_Literal == arg)
+                       break;
+               case MDOC_Literal:

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

-               else if (MDOC_Symbolic == arg)
+                       break;
+               case MDOC_Symbolic:

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

-               else
+                       break;
+               default:

                        abort();
                        abort();

+               }

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

-       if (0 == strcmp(np->child->string, "Em"))
+       if ( ! strcmp(np->child->string, "Em"))

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

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

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

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

                np->norm->Bf.font = FONT_Sy;
        else
                mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,
                np->norm->Bf.font = FONT_Sy;
        else
                mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,


@@ -829,39 +1205,6 @@ post_bf(POST_ARGS)
                    "Bf %s", np->child->string);
 }
 
                    "Bf %s", np->child->string);
 }
 

-static void
-post_lb(POST_ARGS)
-{
-       struct roff_node        *n;
-       const char              *stdlibname;
-       char                    *libname;
-
-       n = mdoc->last->child;
-       assert(n->type == ROFFT_TEXT);
-
-       if (NULL == (stdlibname = mdoc_a2lib(n->string)))
-               mandoc_asprintf(&libname,
-                   "library \\(Lq%s\\(Rq", n->string);
-       else
-               libname = mandoc_strdup(stdlibname);
-
-       free(n->string);
-       n->string = libname;
-}
-
-static void
-post_eoln(POST_ARGS)
-{
-       const struct roff_node *n;
-
-       n = mdoc->last;
-       if (n->child)
-               mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                   mdoc->parse, n->line, n->pos,
-                   "%s %s", mdoc_macronames[n->tok],
-                   n->child->string);
-}
-

 static void
 post_fname(POST_ARGS)
 {
 static void
 post_fname(POST_ARGS)
 {


@@ -906,7 +1249,8 @@ post_fo(POST_ARGS)
                    "Fo ... %s", n->child->next->string);
                while (n->child != n->last)
                        roff_node_delete(mdoc, n->last);
                    "Fo ... %s", n->child->next->string);
                while (n->child != n->last)
                        roff_node_delete(mdoc, n->last);

-       }
+       } else
+               post_delim(mdoc);

 
        post_fname(mdoc);
 }
 
        post_fname(mdoc);
 }


@@ -930,28 +1274,7 @@ post_fa(POST_ARGS)
                        break;
                }
        }
                        break;
                }
        }

-}
-
-static void
-post_vt(POST_ARGS)
-{
-       const struct roff_node *n;
-
-       /*
-        * The Vt macro comes in both ELEM and BLOCK form, both of which
-        * have different syntaxes (yet more context-sensitive
-        * behaviour).  ELEM types must have a child, which is already
-        * guaranteed by the in_line parsing routine; BLOCK types,
-        * specifically the BODY, should only have TEXT children.
-        */
-
-       if (mdoc->last->type != ROFFT_BODY)
-               return;
-
-       for (n = mdoc->last->child; n; n = n->next)
-               if (n->type != ROFFT_TEXT)
-                       mandoc_msg(MANDOCERR_VT_CHILD, mdoc->parse,
-                           n->line, n->pos, mdoc_macronames[n->tok]);
+       post_delim_nb(mdoc);

 }
 
 static void
 }
 
 static void


@@ -961,40 +1284,44 @@ post_nm(POST_ARGS)
 
        n = mdoc->last;
 
 
        n = mdoc->last;
 

-       if (n->last != NULL &&
-           (n->last->tok == MDOC_Pp ||
-            n->last->tok == MDOC_Lp))
-               mdoc_node_relink(mdoc, n->last);
+       if (n->sec == SEC_NAME && n->child != NULL &&
+           n->child->type == ROFFT_TEXT && mdoc->meta.msec != NULL)
+               mandoc_xr_add(mdoc->meta.msec, n->child->string, -1, -1);

 
 

-       if (NULL != mdoc->meta.name)
-               return;
+       if (n->last != NULL && n->last->tok == MDOC_Pp)
+               roff_node_relink(mdoc, n->last);

 
 

-       mdoc_deroff(&mdoc->meta.name, n);
+       if (mdoc->meta.name == NULL)
+               deroff(&mdoc->meta.name, n);

 
 

-       if (NULL == mdoc->meta.name)
+       if (mdoc->meta.name == NULL ||
+           (mdoc->lastsec == SEC_NAME && n->child == NULL))

                mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
                    n->line, n->pos, "Nm");
                mandoc_msg(MANDOCERR_NM_NONAME, mdoc->parse,
                    n->line, n->pos, "Nm");

-}
-
-static void
-post_nd(POST_ARGS)
-{
-       struct roff_node        *n;

 
 

-       n = mdoc->last;
-
-       if (n->type != ROFFT_BODY)
+       switch (n->type) {
+       case ROFFT_ELEM:
+               post_delim_nb(mdoc);
+               break;
+       case ROFFT_HEAD:
+               post_delim(mdoc);
+               break;
+       default:

                return;
                return;

+       }

 
 

-       if (n->child == NULL)
-               mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse,
-                   n->line, n->pos, "Nd");
+       if ((n->child != NULL && n->child->type == ROFFT_TEXT) ||
+           mdoc->meta.name == NULL)
+               return;

 
 

-       post_hyph(mdoc);
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;

 }
 
 static void
 }
 
 static void

-post_d1(POST_ARGS)
+post_nd(POST_ARGS)

 {
        struct roff_node        *n;
 
 {
        struct roff_node        *n;
 


@@ -1003,33 +1330,64 @@ post_d1(POST_ARGS)
        if (n->type != ROFFT_BODY)
                return;
 
        if (n->type != ROFFT_BODY)
                return;
 

+       if (n->sec != SEC_NAME)
+               mandoc_msg(MANDOCERR_ND_LATE, mdoc->parse,
+                   n->line, n->pos, "Nd");
+

        if (n->child == NULL)
        if (n->child == NULL)

-               mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
-                   n->line, n->pos, "D1");
+               mandoc_msg(MANDOCERR_ND_EMPTY, mdoc->parse,
+                   n->line, n->pos, "Nd");
+       else
+               post_delim(mdoc);

 
        post_hyph(mdoc);
 }
 
 static void
 
        post_hyph(mdoc);
 }
 
 static void

-post_literal(POST_ARGS)
+post_display(POST_ARGS)

 {
 {

-       struct roff_node        *n;
+       struct roff_node *n, *np;

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

-
-       if (n->type != ROFFT_BODY)
-               return;
-
-       if (n->child == NULL)
-               mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
-                   n->line, n->pos, mdoc_macronames[n->tok]);
-
-       if (n->tok == MDOC_Bd &&
-           n->norm->Bd.type != DISP_literal &&
-           n->norm->Bd.type != DISP_unfilled)
-               return;
-
-       mdoc->flags &= ~MDOC_LITERAL;
+       switch (n->type) {
+       case ROFFT_BODY:
+               if (n->end != ENDBODY_NOT) {
+                       if (n->tok == MDOC_Bd &&
+                           n->body->parent->args == NULL)
+                               roff_node_delete(mdoc, n);
+               } else if (n->child == NULL)
+                       mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
+                           n->line, n->pos, roff_name[n->tok]);
+               else if (n->tok == MDOC_D1)
+                       post_hyph(mdoc);
+               break;
+       case ROFFT_BLOCK:
+               if (n->tok == MDOC_Bd) {
+                       if (n->args == NULL) {
+                               mandoc_msg(MANDOCERR_BD_NOARG,
+                                   mdoc->parse, n->line, n->pos, "Bd");
+                               mdoc->next = ROFF_NEXT_SIBLING;
+                               while (n->body->child != NULL)
+                                       roff_node_relink(mdoc,
+                                           n->body->child);
+                               roff_node_delete(mdoc, n);
+                               break;
+                       }
+                       post_bd(mdoc);
+                       post_prevpar(mdoc);
+               }
+               for (np = n->parent; np != NULL; np = np->parent) {
+                       if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) {
+                               mandoc_vmsg(MANDOCERR_BD_NEST,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s in Bd", roff_name[n->tok]);
+                               break;
+                       }
+               }
+               break;
+       default:
+               break;
+       }

 }
 
 static void
 }
 
 static void


@@ -1037,31 +1395,34 @@ post_defaults(POST_ARGS)
 {
        struct roff_node *nn;
 
 {
        struct roff_node *nn;
 

+       if (mdoc->last->child != NULL) {
+               post_delim_nb(mdoc);
+               return;
+       }
+

        /*
         * The `Ar' defaults to "file ..." if no value is provided as an
         * argument; the `Mt' and `Pa' macros use "~"; the `Li' just
         * gets an empty string.
         */
 
        /*
         * The `Ar' defaults to "file ..." if no value is provided as an
         * argument; the `Mt' and `Pa' macros use "~"; the `Li' just
         * gets an empty string.
         */
 

-       if (mdoc->last->child)
-               return;
-

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

-       mdoc->next = ROFF_NEXT_CHILD;
-

        switch (nn->tok) {
        case MDOC_Ar:
        switch (nn->tok) {
        case MDOC_Ar:

-               mdoc_word_alloc(mdoc, nn->line, nn->pos, "file");
-               mdoc_word_alloc(mdoc, nn->line, nn->pos, "...");
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "file");
+               mdoc->last->flags |= NODE_NOSRC;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "...");
+               mdoc->last->flags |= NODE_NOSRC;

                break;
        case MDOC_Pa:
                break;
        case MDOC_Pa:

-               /* FALLTHROUGH */

        case MDOC_Mt:
        case MDOC_Mt:

-               mdoc_word_alloc(mdoc, nn->line, nn->pos, "~");
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, nn->line, nn->pos, "~");
+               mdoc->last->flags |= NODE_NOSRC;

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

-               /* NOTREACHED */

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


@@ -1069,17 +1430,11 @@ post_defaults(POST_ARGS)
 static void
 post_at(POST_ARGS)
 {
 static void
 post_at(POST_ARGS)
 {

-       struct roff_node        *n;
-       const char              *std_att;
-       char                    *att;
+       struct roff_node        *n, *nch;
+       const char              *att;

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

-       if (n->child == NULL) {
-               mdoc->next = ROFF_NEXT_CHILD;
-               mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
-               mdoc->last = n;
-               return;
-       }
+       nch = n->child;

 
        /*
         * If we have a child, look it up in the standard keys.  If a
 
        /*
         * If we have a child, look it up in the standard keys.  If a


@@ -1087,17 +1442,19 @@ post_at(POST_ARGS)
         * prefix "AT&T UNIX " to the existing data.
         */
 
         * prefix "AT&T UNIX " to the existing data.
         */
 

-       n = n->child;
-       assert(n->type == ROFFT_TEXT);
-       if (NULL == (std_att = mdoc_a2att(n->string))) {
+       att = NULL;
+       if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL))

                mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
                mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,

-                   n->line, n->pos, "At %s", n->string);
-               mandoc_asprintf(&att, "AT&T UNIX %s", n->string);
-       } else
-               att = mandoc_strdup(std_att);
+                   nch->line, nch->pos, "At %s", nch->string);

 
 

-       free(n->string);
-       n->string = att;
+       mdoc->next = ROFF_NEXT_CHILD;
+       if (att != NULL) {
+               roff_word_alloc(mdoc, nch->line, nch->pos, att);
+               nch->flags |= NODE_NOPRT;
+       } else
+               roff_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX");
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;

 }
 
 static void
 }
 
 static void


@@ -1105,12 +1462,16 @@ post_an(POST_ARGS)
 {
        struct roff_node *np, *nch;
 
 {
        struct roff_node *np, *nch;
 

+       post_an_norm(mdoc);
+

        np = mdoc->last;
        nch = np->child;
        if (np->norm->An.auth == AUTH__NONE) {
                if (nch == NULL)
                        mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
                            np->line, np->pos, "An");
        np = mdoc->last;
        nch = np->child;
        if (np->norm->An.auth == AUTH__NONE) {
                if (nch == NULL)
                        mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
                            np->line, np->pos, "An");

+               else
+                       post_delim_nb(mdoc);

        } else if (nch != NULL)
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
                    nch->line, nch->pos, "An ... %s", nch->string);
        } else if (nch != NULL)
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
                    nch->line, nch->pos, "An ... %s", nch->string);


@@ -1120,6 +1481,7 @@ static void
 post_en(POST_ARGS)
 {
 
 post_en(POST_ARGS)
 {
 

+       post_obsolete(mdoc);

        if (mdoc->last->type == ROFFT_BLOCK)
                mdoc->last->norm->Es = mdoc->last_es;
 }
        if (mdoc->last->type == ROFFT_BLOCK)
                mdoc->last->norm->Es = mdoc->last_es;
 }


@@ -1128,9 +1490,62 @@ static void
 post_es(POST_ARGS)
 {
 
 post_es(POST_ARGS)
 {
 

+       post_obsolete(mdoc);

        mdoc->last_es = mdoc->last;
 }
 
        mdoc->last_es = mdoc->last;
 }
 

+static void
+post_xx(POST_ARGS)
+{
+       struct roff_node        *n;
+       const char              *os;
+       char                    *v;
+
+       post_delim_nb(mdoc);
+
+       n = mdoc->last;
+       switch (n->tok) {
+       case MDOC_Bsx:
+               os = "BSD/OS";
+               break;
+       case MDOC_Dx:
+               os = "DragonFly";
+               break;
+       case MDOC_Fx:
+               os = "FreeBSD";
+               break;
+       case MDOC_Nx:
+               os = "NetBSD";
+               if (n->child == NULL)
+                       break;
+               v = n->child->string;
+               if ((v[0] != '0' && v[0] != '1') || v[1] != '.' ||
+                   v[2] < '0' || v[2] > '9' ||
+                   v[3] < 'a' || v[3] > 'z' || v[4] != '\0')
+                       break;
+               n->child->flags |= NODE_NOPRT;
+               mdoc->next = ROFF_NEXT_CHILD;
+               roff_word_alloc(mdoc, n->child->line, n->child->pos, v);
+               v = mdoc->last->string;
+               v[3] = toupper((unsigned char)v[3]);
+               mdoc->last->flags |= NODE_NOSRC;
+               mdoc->last = n;
+               break;
+       case MDOC_Ox:
+               os = "OpenBSD";
+               break;
+       case MDOC_Ux:
+               os = "UNIX";
+               break;
+       default:
+               abort();
+       }
+       mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, os);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;
+}
+

 static void
 post_it(POST_ARGS)
 {
 static void
 post_it(POST_ARGS)
 {


@@ -1138,6 +1553,8 @@ post_it(POST_ARGS)
        int               i, cols;
        enum mdoc_list    lt;
 
        int               i, cols;
        enum mdoc_list    lt;
 

+       post_prevpar(mdoc);
+

        nit = mdoc->last;
        if (nit->type != ROFFT_BLOCK)
                return;
        nit = mdoc->last;
        if (nit->type != ROFFT_BLOCK)
                return;


@@ -1147,13 +1564,9 @@ post_it(POST_ARGS)
 
        switch (lt) {
        case LIST_tag:
 
        switch (lt) {
        case LIST_tag:

-               /* FALLTHROUGH */

        case LIST_hang:
        case LIST_hang:

-               /* FALLTHROUGH */

        case LIST_ohang:
        case LIST_ohang:

-               /* FALLTHROUGH */

        case LIST_inset:
        case LIST_inset:

-               /* FALLTHROUGH */

        case LIST_diag:
                if (nit->head->child == NULL)
                        mandoc_vmsg(MANDOCERR_IT_NOHEAD,
        case LIST_diag:
                if (nit->head->child == NULL)
                        mandoc_vmsg(MANDOCERR_IT_NOHEAD,


@@ -1162,11 +1575,8 @@ post_it(POST_ARGS)
                            mdoc_argnames[nbl->args->argv[0].arg]);
                break;
        case LIST_bullet:
                            mdoc_argnames[nbl->args->argv[0].arg]);
                break;
        case LIST_bullet:

-               /* FALLTHROUGH */

        case LIST_dash:
        case LIST_dash:

-               /* FALLTHROUGH */

        case LIST_enum:
        case LIST_enum:

-               /* FALLTHROUGH */

        case LIST_hyphen:
                if (nit->body == NULL || nit->body->child == NULL)
                        mandoc_vmsg(MANDOCERR_IT_NOBODY,
        case LIST_hyphen:
                if (nit->body == NULL || nit->body->child == NULL)
                        mandoc_vmsg(MANDOCERR_IT_NOBODY,


@@ -1175,24 +1585,41 @@ post_it(POST_ARGS)
                            mdoc_argnames[nbl->args->argv[0].arg]);
                /* FALLTHROUGH */
        case LIST_item:
                            mdoc_argnames[nbl->args->argv[0].arg]);
                /* FALLTHROUGH */
        case LIST_item:

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

                break;
        case LIST_column:
                cols = (int)nbl->norm->Bl.ncols;
 
                assert(nit->head->child == NULL);
 
                break;
        case LIST_column:
                cols = (int)nbl->norm->Bl.ncols;
 
                assert(nit->head->child == NULL);
 

-               for (i = 0, nch = nit->child; nch; nch = nch->next)
-                       if (nch->type == ROFFT_BODY)
-                               i++;
+               if (nit->head->next->child == NULL &&
+                   nit->head->next->next == NULL) {
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                           nit->line, nit->pos, "It");
+                       roff_node_delete(mdoc, nit);
+                       break;
+               }

 
 

+               i = 0;
+               for (nch = nit->child; nch != NULL; nch = nch->next) {
+                       if (nch->type != ROFFT_BODY)
+                               continue;
+                       if (i++ && nch->flags & NODE_LINE)
+                               mandoc_msg(MANDOCERR_TA_LINE, mdoc->parse,
+                                   nch->line, nch->pos, "Ta");
+               }

                if (i < cols || i > cols + 1)
                        mandoc_vmsg(MANDOCERR_BL_COL,
                            mdoc->parse, nit->line, nit->pos,
                            "%d columns, %d cells", cols, i);
                if (i < cols || i > cols + 1)
                        mandoc_vmsg(MANDOCERR_BL_COL,
                            mdoc->parse, nit->line, nit->pos,
                            "%d columns, %d cells", cols, i);

+               else if (nit->head->next->child != NULL &&
+                   nit->head->next->child->line > nit->line)
+                       mandoc_msg(MANDOCERR_IT_NOARG, mdoc->parse,
+                           nit->line, nit->pos, "Bl -column It");

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


@@ -1204,49 +1631,32 @@ post_bl_block(POST_ARGS)
 {
        struct roff_node *n, *ni, *nc;
 
 {
        struct roff_node *n, *ni, *nc;
 

-       /*
-        * These are fairly complicated, so we've broken them into two
-        * functions.  post_bl_block_tag() is called when a -tag is
-        * specified, but no -width (it must be guessed).  The second
-        * when a -width is specified (macro indicators must be
-        * rewritten into real lengths).
-        */
+       post_prevpar(mdoc);

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

-
-       if (LIST_tag == n->norm->Bl.type &&
-           NULL == n->norm->Bl.width) {
-               post_bl_block_tag(mdoc);
-               assert(n->norm->Bl.width);
-       }
-
-       for (ni = n->body->child; ni; ni = ni->next) {
-               if (NULL == ni->body)
+       for (ni = n->body->child; ni != NULL; ni = ni->next) {
+               if (ni->body == NULL)

                        continue;
                nc = ni->body->last;
                        continue;
                nc = ni->body->last;

-               while (NULL != nc) {
+               while (nc != NULL) {

                        switch (nc->tok) {
                        case MDOC_Pp:
                        switch (nc->tok) {
                        case MDOC_Pp:

-                               /* FALLTHROUGH */
-                       case MDOC_Lp:
-                               /* FALLTHROUGH */
-                       case MDOC_br:
+                       case ROFF_br:

                                break;
                        default:
                                nc = NULL;
                                continue;
                        }
                                break;
                        default:
                                nc = NULL;
                                continue;
                        }

-                       if (NULL == ni->next) {
+                       if (ni->next == NULL) {

                                mandoc_msg(MANDOCERR_PAR_MOVE,
                                    mdoc->parse, nc->line, nc->pos,
                                mandoc_msg(MANDOCERR_PAR_MOVE,
                                    mdoc->parse, nc->line, nc->pos,

-                                   mdoc_macronames[nc->tok]);
-                               mdoc_node_relink(mdoc, nc);
-                       } else if (0 == n->norm->Bl.comp &&
-                           LIST_column != n->norm->Bl.type) {
+                                   roff_name[nc->tok]);
+                               roff_node_relink(mdoc, nc);
+                       } else if (n->norm->Bl.comp == 0 &&
+                           n->norm->Bl.type != LIST_column) {

                                mandoc_vmsg(MANDOCERR_PAR_SKIP,
                                    mdoc->parse, nc->line, nc->pos,
                                mandoc_vmsg(MANDOCERR_PAR_SKIP,
                                    mdoc->parse, nc->line, nc->pos,

-                                   "%s before It",
-                                   mdoc_macronames[nc->tok]);
+                                   "%s before It", roff_name[nc->tok]);

                                roff_node_delete(mdoc, nc);
                        } else
                                break;
                                roff_node_delete(mdoc, nc);
                        } else
                                break;


@@ -1259,17 +1669,17 @@ post_bl_block(POST_ARGS)
  * If the argument of -offset or -width is a macro,
  * replace it with the associated default width.
  */
  * If the argument of -offset or -width is a macro,
  * replace it with the associated default width.
  */

-void
-rewrite_macro2len(char **arg)
+static void
+rewrite_macro2len(struct roff_man *mdoc, char **arg)

 {
        size_t            width;
 {
        size_t            width;

-       int               tok;
+       enum roff_tok     tok;

 
        if (*arg == NULL)
                return;
        else if ( ! strcmp(*arg, "Ds"))
                width = 6;
 
        if (*arg == NULL)
                return;
        else if ( ! strcmp(*arg, "Ds"))
                width = 6;

-       else if ((tok = mdoc_hash_find(*arg)) == TOKEN_NONE)
+       else if ((tok = roffhash_find(mdoc->mdocmac, *arg, 0)) == TOKEN_NONE)

                return;
        else
                width = macro2len(tok);
                return;
        else
                width = macro2len(tok);


@@ -1278,71 +1688,6 @@ rewrite_macro2len(char **arg)
        mandoc_asprintf(arg, "%zun", width);
 }
 
        mandoc_asprintf(arg, "%zun", width);
 }
 

-static void
-post_bl_block_tag(POST_ARGS)
-{
-       struct roff_node *n, *nn;
-       size_t            sz, ssz;
-       int               i;
-       char              buf[24];
-
-       /*
-        * Calculate the -width for a `Bl -tag' list if it hasn't been
-        * provided.  Uses the first head macro.  NOTE AGAIN: this is
-        * ONLY if the -width argument has NOT been provided.  See
-        * rewrite_macro2len() for converting the -width string.
-        */
-
-       sz = 10;
-       n = mdoc->last;
-
-       for (nn = n->body->child; nn; nn = nn->next) {
-               if (MDOC_It != nn->tok)
-                       continue;
-
-               assert(nn->type == ROFFT_BLOCK);
-               nn = nn->head->child;
-
-               if (nn == NULL)
-                       break;
-
-               if (nn->type == ROFFT_TEXT) {
-                       sz = strlen(nn->string) + 1;
-                       break;
-               }
-
-               if (0 != (ssz = macro2len(nn->tok)))
-                       sz = ssz;
-
-               break;
-       }
-
-       /* Defaults to ten ens. */
-
-       (void)snprintf(buf, sizeof(buf), "%un", (unsigned int)sz);
-
-       /*
-        * We have to dynamically add this to the macro's argument list.
-        * We're guaranteed that a MDOC_Width doesn't already exist.
-        */
-
-       assert(n->args);
-       i = (int)(n->args->argc)++;
-
-       n->args->argv = mandoc_reallocarray(n->args->argv,
-           n->args->argc, sizeof(struct mdoc_argv));
-
-       n->args->argv[i].arg = MDOC_Width;
-       n->args->argv[i].line = n->line;
-       n->args->argv[i].pos = n->pos;
-       n->args->argv[i].sz = 1;
-       n->args->argv[i].value = mandoc_malloc(sizeof(char *));
-       n->args->argv[i].value[0] = mandoc_strdup(buf);
-
-       /* Set our width! */
-       n->norm->Bl.width = n->args->argv[i].value[0];
-}
-

 static void
 post_bl_head(POST_ARGS)
 {
 static void
 post_bl_head(POST_ARGS)
 {


@@ -1350,8 +1695,9 @@ post_bl_head(POST_ARGS)
        struct mdoc_argv *argv;
        int               i, j;
 
        struct mdoc_argv *argv;
        int               i, j;
 

-       nh = mdoc->last;
+       post_bl_norm(mdoc);

 
 

+       nh = mdoc->last;

        if (nh->norm->Bl.type != LIST_column) {
                if ((nch = nh->child) == NULL)
                        return;
        if (nh->norm->Bl.type != LIST_column) {
                if ((nch = nh->child) == NULL)
                        return;


@@ -1388,7 +1734,8 @@ post_bl_head(POST_ARGS)
 
        argv = nbl->args->argv + j;
        i = argv->sz;
 
        argv = nbl->args->argv + j;
        i = argv->sz;

-       argv->sz += nh->nchild;
+       for (nch = nh->child; nch != NULL; nch = nch->next)
+               argv->sz++;

        argv->value = mandoc_reallocarray(argv->value,
            argv->sz, sizeof(char *));
 
        argv->value = mandoc_reallocarray(argv->value,
            argv->sz, sizeof(char *));
 


@@ -1401,7 +1748,6 @@ post_bl_head(POST_ARGS)
                nnext = nch->next;
                roff_node_delete(NULL, nch);
        }
                nnext = nch->next;
                roff_node_delete(NULL, nch);
        }

-       nh->nchild = 0;

        nh->child = NULL;
 }
 
        nh->child = NULL;
 }
 


@@ -1411,6 +1757,8 @@ post_bl(POST_ARGS)
        struct roff_node        *nparent, *nprev; /* of the Bl block */
        struct roff_node        *nblock, *nbody;  /* of the Bl */
        struct roff_node        *nchild, *nnext;  /* of the Bl body */
        struct roff_node        *nparent, *nprev; /* of the Bl block */
        struct roff_node        *nblock, *nbody;  /* of the Bl */
        struct roff_node        *nchild, *nnext;  /* of the Bl body */

+       const char              *prev_Er;
+       int                      order;

 
        nbody = mdoc->last;
        switch (nbody->type) {
 
        nbody = mdoc->last;
        switch (nbody->type) {


@@ -1425,6 +1773,8 @@ post_bl(POST_ARGS)
        default:
                return;
        }
        default:
                return;
        }

+       if (nbody->end != ENDBODY_NOT)
+               return;

 
        nchild = nbody->child;
        if (nchild == NULL) {
 
        nchild = nbody->child;
        if (nchild == NULL) {


@@ -1433,17 +1783,46 @@ post_bl(POST_ARGS)
                return;
        }
        while (nchild != NULL) {
                return;
        }
        while (nchild != NULL) {

+               nnext = nchild->next;

                if (nchild->tok == MDOC_It ||
                    (nchild->tok == MDOC_Sm &&
                if (nchild->tok == MDOC_It ||
                    (nchild->tok == MDOC_Sm &&

-                    nchild->next != NULL &&
-                    nchild->next->tok == MDOC_It)) {
-                       nchild = nchild->next;
+                    nnext != NULL && nnext->tok == MDOC_It)) {
+                       nchild = nnext;
+                       continue;
+               }
+
+               /*
+                * In .Bl -column, the first rows may be implicit,
+                * that is, they may not start with .It macros.
+                * Such rows may be followed by nodes generated on the
+                * roff level, for example .TS, which cannot be moved
+                * out of the list.  In that case, wrap such roff nodes
+                * into an implicit row.
+                */
+
+               if (nchild->prev != NULL) {
+                       mdoc->last = nchild;
+                       mdoc->next = ROFF_NEXT_SIBLING;
+                       roff_block_alloc(mdoc, nchild->line,
+                           nchild->pos, MDOC_It);
+                       roff_head_alloc(mdoc, nchild->line,
+                           nchild->pos, MDOC_It);
+                       mdoc->next = ROFF_NEXT_SIBLING;
+                       roff_body_alloc(mdoc, nchild->line,
+                           nchild->pos, MDOC_It);
+                       while (nchild->tok != MDOC_It) {
+                               roff_node_relink(mdoc, nchild);
+                               if ((nchild = nnext) == NULL)
+                                       break;
+                               nnext = nchild->next;
+                               mdoc->next = ROFF_NEXT_SIBLING;
+                       }
+                       mdoc->last = nbody;

                        continue;
                }
 
                mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
                        continue;
                }
 
                mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,

-                   nchild->line, nchild->pos,
-                   mdoc_macronames[nchild->tok]);
+                   nchild->line, nchild->pos, roff_name[nchild->tok]);

 
                /*
                 * Move the node out of the Bl block.
 
                /*
                 * Move the node out of the Bl block.


@@ -1453,21 +1832,16 @@ post_bl(POST_ARGS)
                nblock  = nbody->parent;
                nprev   = nblock->prev;
                nparent = nblock->parent;
                nblock  = nbody->parent;
                nprev   = nblock->prev;
                nparent = nblock->parent;

-               nnext   = nchild->next;

 
                /*
                 * Unlink this child.
                 */
 
 
                /*
                 * Unlink this child.
                 */
 

-               assert(NULL == nchild->prev);
-               if (0 == --nbody->nchild) {
-                       nbody->child = NULL;
+               nbody->child = nnext;
+               if (nnext == NULL)

                        nbody->last  = NULL;
                        nbody->last  = NULL;

-                       assert(NULL == nnext);
-               } else {
-                       nbody->child = nnext;
+               else

                        nnext->prev = NULL;
                        nnext->prev = NULL;

-               }

 
                /*
                 * Relink this child.
 
                /*
                 * Relink this child.


@@ -1478,14 +1852,42 @@ post_bl(POST_ARGS)
                nchild->next   = nblock;
 
                nblock->prev = nchild;
                nchild->next   = nblock;
 
                nblock->prev = nchild;

-               nparent->nchild++;
-               if (NULL == nprev)
+               if (nprev == NULL)

                        nparent->child = nchild;
                else
                        nprev->next = nchild;
 
                nchild = nnext;
        }
                        nparent->child = nchild;
                else
                        nprev->next = nchild;
 
                nchild = nnext;
        }

+
+       if (mdoc->meta.os_e != MANDOC_OS_NETBSD)
+               return;
+
+       prev_Er = NULL;
+       for (nchild = nbody->child; nchild != NULL; nchild = nchild->next) {
+               if (nchild->tok != MDOC_It)
+                       continue;
+               if ((nnext = nchild->head->child) == NULL)
+                       continue;
+               if (nnext->type == ROFFT_BLOCK)
+                       nnext = nnext->body->child;
+               if (nnext == NULL || nnext->tok != MDOC_Er)
+                       continue;
+               nnext = nnext->child;
+               if (prev_Er != NULL) {
+                       order = strcmp(prev_Er, nnext->string);
+                       if (order > 0)
+                               mandoc_vmsg(MANDOCERR_ER_ORDER,
+                                   mdoc->parse, nnext->line, nnext->pos,
+                                   "Er %s %s (NetBSD)",
+                                   prev_Er, nnext->string);
+                       else if (order == 0)
+                               mandoc_vmsg(MANDOCERR_ER_REP,
+                                   mdoc->parse, nnext->line, nnext->pos,
+                                   "Er %s (NetBSD)", prev_Er);
+               }
+               prev_Er = nnext->string;
+       }

 }
 
 static void
 }
 
 static void


@@ -1503,7 +1905,7 @@ post_bk(POST_ARGS)
 }
 
 static void
 }
 
 static void

-post_sm(struct roff_man *mdoc)
+post_sm(POST_ARGS)

 {
        struct roff_node        *nch;
 
 {
        struct roff_node        *nch;
 


@@ -1527,22 +1929,43 @@ post_sm(struct roff_man *mdoc)
 
        mandoc_vmsg(MANDOCERR_SM_BAD,
            mdoc->parse, nch->line, nch->pos,
 
        mandoc_vmsg(MANDOCERR_SM_BAD,
            mdoc->parse, nch->line, nch->pos,

-           "%s %s", mdoc_macronames[mdoc->last->tok], nch->string);
-       mdoc_node_relink(mdoc, nch);
+           "%s %s", roff_name[mdoc->last->tok], nch->string);
+       roff_node_relink(mdoc, nch);

        return;
 }
 
 static void
 post_root(POST_ARGS)
 {
        return;
 }
 
 static void
 post_root(POST_ARGS)
 {

+       const char *openbsd_arch[] = {
+               "alpha", "amd64", "arm64", "armv7", "hppa", "i386",
+               "landisk", "loongson", "luna88k", "macppc", "mips64",
+               "octeon", "sgi", "socppc", "sparc64", NULL
+       };
+       const char *netbsd_arch[] = {
+               "acorn26", "acorn32", "algor", "alpha", "amiga",
+               "arc", "atari",
+               "bebox", "cats", "cesfic", "cobalt", "dreamcast",
+               "emips", "evbarm", "evbmips", "evbppc", "evbsh3", "evbsh5",
+               "hp300", "hpcarm", "hpcmips", "hpcsh", "hppa",
+               "i386", "ibmnws", "luna68k",
+               "mac68k", "macppc", "mipsco", "mmeye", "mvme68k", "mvmeppc",
+               "netwinder", "news68k", "newsmips", "next68k",
+               "pc532", "playstation2", "pmax", "pmppc", "prep",
+               "sandpoint", "sbmips", "sgimips", "shark",
+               "sparc", "sparc64", "sun2", "sun3",
+               "vax", "walnut", "x68k", "x86", "x86_64", "xen", NULL
+        };
+       const char **arches[] = { NULL, netbsd_arch, openbsd_arch };
+

        struct roff_node *n;
        struct roff_node *n;

+       const char **arch;

 
        /* Add missing prologue data. */
 
        if (mdoc->meta.date == NULL)
 
        /* Add missing prologue data. */
 
        if (mdoc->meta.date == NULL)

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

 
        if (mdoc->meta.title == NULL) {
                mandoc_msg(MANDOCERR_DT_NOTITLE,
 
        if (mdoc->meta.title == NULL) {
                mandoc_msg(MANDOCERR_DT_NOTITLE,


@@ -1557,40 +1980,46 @@ post_root(POST_ARGS)
                mandoc_msg(MANDOCERR_OS_MISSING,
                    mdoc->parse, 0, 0, NULL);
                mdoc->meta.os = mandoc_strdup("");
                mandoc_msg(MANDOCERR_OS_MISSING,
                    mdoc->parse, 0, 0, NULL);
                mdoc->meta.os = mandoc_strdup("");

+       } else if (mdoc->meta.os_e &&
+           (mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0)
+               mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0,
+                   mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
+                   "(OpenBSD)" : "(NetBSD)");
+
+       if (mdoc->meta.arch != NULL &&
+           (arch = arches[mdoc->meta.os_e]) != NULL) {
+               while (*arch != NULL && strcmp(*arch, mdoc->meta.arch))
+                       arch++;
+               if (*arch == NULL) {
+                       n = mdoc->first->child;
+                       while (n->tok != MDOC_Dt ||
+                           n->child == NULL ||
+                           n->child->next == NULL ||
+                           n->child->next->next == NULL)
+                               n = n->next;
+                       n = n->child->next->next;
+                       mandoc_vmsg(MANDOCERR_ARCH_BAD,
+                           mdoc->parse, n->line, n->pos,
+                           "Dt ... %s %s", mdoc->meta.arch,
+                           mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
+                           "(OpenBSD)" : "(NetBSD)");
+               }

        }
 
        /* Check that we begin with a proper `Sh'. */
 
        n = mdoc->first->child;
        }
 
        /* Check that we begin with a proper `Sh'. */
 
        n = mdoc->first->child;

-       while (n != NULL && mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
+       while (n != NULL &&
+           (n->type == ROFFT_COMMENT ||
+            (n->tok >= MDOC_Dd &&
+             mdoc_macro(n->tok)->flags & MDOC_PROLOGUE)))

                n = n->next;
 
        if (n == NULL)
                mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
        else if (n->tok != MDOC_Sh)
                mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
                n = n->next;
 
        if (n == NULL)
                mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
        else if (n->tok != MDOC_Sh)
                mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,

-                   n->line, n->pos, mdoc_macronames[n->tok]);
-}
-
-static void
-post_st(POST_ARGS)
-{
-       struct roff_node         *n, *nch;
-       const char               *p;
-
-       n = mdoc->last;
-       nch = n->child;
-
-       assert(nch->type == ROFFT_TEXT);
-
-       if (NULL == (p = mdoc_a2st(nch->string))) {
-               mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
-                   nch->line, nch->pos, "St %s", nch->string);
-               roff_node_delete(mdoc, n);
-       } else {
-               free(nch->string);
-               nch->string = mandoc_strdup(p);
-       }
+                   n->line, n->pos, roff_name[n->tok]);

 }
 
 static void
 }
 
 static void


@@ -1624,9 +2053,8 @@ post_rs(POST_ARGS)
                                break;
 
                if (i == RSORD_MAX) {
                                break;
 
                if (i == RSORD_MAX) {

-                       mandoc_msg(MANDOCERR_RS_BAD,
-                           mdoc->parse, nch->line, nch->pos,
-                           mdoc_macronames[nch->tok]);
+                       mandoc_msg(MANDOCERR_RS_BAD, mdoc->parse,
+                           nch->line, nch->pos, roff_name[nch->tok]);

                        i = -1;
                } else if (nch->tok == MDOC__J || nch->tok == MDOC__B)
                        np->norm->Rs.quote_T++;
                        i = -1;
                } else if (nch->tok == MDOC__J || nch->tok == MDOC__B)
                        np->norm->Rs.quote_T++;


@@ -1710,10 +2138,20 @@ post_hyph(POST_ARGS)
 static void
 post_ns(POST_ARGS)
 {
 static void
 post_ns(POST_ARGS)
 {

+       struct roff_node        *n;

 
 

-       if (MDOC_LINE & mdoc->last->flags)
+       n = mdoc->last;
+       if (n->flags & NODE_LINE ||
+           (n->next != NULL && n->next->flags & NODE_DELIMC))

                mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,
                mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,

-                   mdoc->last->line, mdoc->last->pos, NULL);
+                   n->line, n->pos, NULL);
+}
+
+static void
+post_sx(POST_ARGS)
+{
+       post_delim(mdoc);
+       post_hyph(mdoc);

 }
 
 static void
 }
 
 static void


@@ -1757,8 +2195,12 @@ post_sh_name(POST_ARGS)
        for (n = mdoc->last->child; n != NULL; n = n->next) {
                switch (n->tok) {
                case MDOC_Nm:
        for (n = mdoc->last->child; n != NULL; n = n->next) {
                switch (n->tok) {
                case MDOC_Nm:

+                       if (hasnm && n->child != NULL)
+                               mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT,
+                                   mdoc->parse, n->line, n->pos,
+                                   "Nm %s", n->child->string);

                        hasnm = 1;
                        hasnm = 1;

-                       break;
+                       continue;

                case MDOC_Nd:
                        hasnd = 1;
                        if (n->next != NULL)
                case MDOC_Nd:
                        hasnd = 1;
                        if (n->next != NULL)


@@ -1766,14 +2208,19 @@ post_sh_name(POST_ARGS)
                                    mdoc->parse, n->line, n->pos, NULL);
                        break;
                case TOKEN_NONE:
                                    mdoc->parse, n->line, n->pos, NULL);
                        break;
                case TOKEN_NONE:

-                       if (hasnm)
-                               break;
+                       if (n->type == ROFFT_TEXT &&
+                           n->string[0] == ',' && n->string[1] == '\0' &&
+                           n->next != NULL && n->next->tok == MDOC_Nm) {
+                               n = n->next;
+                               continue;
+                       }

                        /* FALLTHROUGH */
                default:
                        mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
                        /* FALLTHROUGH */
                default:
                        mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,

-                           n->line, n->pos, mdoc_macronames[n->tok]);
-                       break;
+                           n->line, n->pos, roff_name[n->tok]);
+                       continue;

                }
                }

+               break;

        }
 
        if ( ! hasnm)
        }
 
        if ( ! hasnm)


@@ -1795,7 +2242,9 @@ post_sh_see_also(POST_ARGS)
        n = mdoc->last->child;
        lastname = lastsec = lastpunct = NULL;
        while (n != NULL) {
        n = mdoc->last->child;
        lastname = lastsec = lastpunct = NULL;
        while (n != NULL) {

-               if (n->tok != MDOC_Xr || n->nchild < 2)
+               if (n->tok != MDOC_Xr ||
+                   n->child == NULL ||
+                   n->child->next == NULL)

                        break;
 
                /* Process one .Xr node. */
                        break;
 
                /* Process one .Xr node. */


@@ -1838,7 +2287,7 @@ post_sh_see_also(POST_ARGS)
                        if (isalpha((const unsigned char)*name))
                                return;
                lastpunct = n->string;
                        if (isalpha((const unsigned char)*name))
                                return;
                lastpunct = n->string;

-               if (n->next == NULL)
+               if (n->next == NULL || n->next->tok == MDOC_Rs)

                        mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
                            n->line, n->pos, "%s after %s(%s)",
                            lastpunct, lastname, lastsec);
                        mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
                            n->line, n->pos, "%s after %s(%s)",
                            lastpunct, lastname, lastsec);


@@ -1851,9 +2300,9 @@ child_an(const struct roff_node *n)
 {
 
        for (n = n->child; n != NULL; n = n->next)
 {
 
        for (n = n->child; n != NULL; n = n->next)

-               if ((n->tok == MDOC_An && n->nchild) || child_an(n))
-                       return(1);
-       return(0);
+               if ((n->tok == MDOC_An && n->child != NULL) || child_an(n))
+                       return 1;
+       return 0;

 }
 
 static void
 }
 
 static void


@@ -1865,13 +2314,55 @@ post_sh_authors(POST_ARGS)
                    mdoc->last->line, mdoc->last->pos, NULL);
 }
 
                    mdoc->last->line, mdoc->last->pos, NULL);
 }
 

+/*
+ * Return an upper bound for the string distance (allowing
+ * transpositions).  Not a full Levenshtein implementation
+ * because Levenshtein is quadratic in the string length
+ * and this function is called for every standard name,
+ * so the check for each custom name would be cubic.
+ * The following crude heuristics is linear, resulting
+ * in quadratic behaviour for checking one custom name,
+ * which does not cause measurable slowdown.
+ */
+static int
+similar(const char *s1, const char *s2)
+{
+       const int       maxdist = 3;
+       int             dist = 0;
+
+       while (s1[0] != '\0' && s2[0] != '\0') {
+               if (s1[0] == s2[0]) {
+                       s1++;
+                       s2++;
+                       continue;
+               }
+               if (++dist > maxdist)
+                       return INT_MAX;
+               if (s1[1] == s2[1]) {  /* replacement */
+                       s1++;
+                       s2++;
+               } else if (s1[0] == s2[1] && s1[1] == s2[0]) {
+                       s1 += 2;        /* transposition */
+                       s2 += 2;
+               } else if (s1[0] == s2[1])  /* insertion */
+                       s2++;
+               else if (s1[1] == s2[0])  /* deletion */
+                       s1++;
+               else
+                       return INT_MAX;
+       }
+       dist += strlen(s1) + strlen(s2);
+       return dist > maxdist ? INT_MAX : dist;
+}
+

 static void
 post_sh_head(POST_ARGS)
 {
 static void
 post_sh_head(POST_ARGS)
 {

-       struct roff_node *n;
-       const char      *goodsec;
-       char            *secname;
-       enum roff_sec    sec;
+       struct roff_node        *nch;
+       const char              *goodsec;
+       const char *const       *testsec;
+       int                      dist, mindist;
+       enum roff_sec            sec;

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


@@ -1880,21 +2371,21 @@ post_sh_head(POST_ARGS)
         * manual sections.
         */
 
         * manual sections.
         */
 

-       secname = NULL;
-       sec = SEC_CUSTOM;
-       mdoc_deroff(&secname, mdoc->last);
-       sec = NULL == secname ? SEC_CUSTOM : a2sec(secname);
+       sec = mdoc->last->sec;

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

-       if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed)
+       if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)

                mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,
                mandoc_vmsg(MANDOCERR_NAMESEC_FIRST, mdoc->parse,

-                   mdoc->last->line, mdoc->last->pos,
-                   "Sh %s", secname);
+                   mdoc->last->line, mdoc->last->pos, "Sh %s",
+                   sec != SEC_CUSTOM ? secnames[sec] :
+                   (nch = mdoc->last->child) == NULL ? "" :
+                   nch->type == ROFFT_TEXT ? nch->string :
+                   roff_name[nch->tok]);

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

-       if (SEC_SYNOPSIS == sec) {
+       if (sec == SEC_SYNOPSIS) {

                roff_setreg(mdoc->roff, "nS", 1, '=');
                mdoc->flags |= MDOC_SYNOPSIS;
        } else {
                roff_setreg(mdoc->roff, "nS", 1, '=');
                mdoc->flags |= MDOC_SYNOPSIS;
        } else {


@@ -1906,24 +2397,25 @@ post_sh_head(POST_ARGS)
 
        mdoc->lastsec = sec;
 
 
        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) {
-               free(secname);
+       if (sec == SEC_CUSTOM) {
+               if ((nch = mdoc->last->child) == NULL ||
+                   nch->type != ROFFT_TEXT || nch->next != NULL)
+                       return;
+               goodsec = NULL;
+               mindist = INT_MAX;
+               for (testsec = secnames + 1; *testsec != NULL; testsec++) {
+                       dist = similar(nch->string, *testsec);
+                       if (dist < mindist) {
+                               goodsec = *testsec;
+                               mindist = dist;
+                       }
+               }
+               if (goodsec != NULL)
+                       mandoc_vmsg(MANDOCERR_SEC_TYPO, mdoc->parse,
+                           nch->line, nch->pos, "Sh %s instead of %s",
+                           nch->string, goodsec);

                return;
        }
 
                return;
        }
 


@@ -1935,12 +2427,12 @@ post_sh_head(POST_ARGS)
        if (sec == mdoc->lastnamed)
                mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
                    mdoc->last->line, mdoc->last->pos,
        if (sec == mdoc->lastnamed)
                mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
                    mdoc->last->line, mdoc->last->pos,

-                   "Sh %s", secname);
+                   "Sh %s", secnames[sec]);

 
        if (sec < mdoc->lastnamed)
                mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
                    mdoc->last->line, mdoc->last->pos,
 
        if (sec < mdoc->lastnamed)
                mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
                    mdoc->last->line, mdoc->last->pos,

-                   "Sh %s", secname);
+                   "Sh %s", secnames[sec]);

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


@@ -1948,10 +2440,8 @@ post_sh_head(POST_ARGS)
 
        /* Check particular section/manual conventions. */
 
 
        /* Check particular section/manual conventions. */
 

-       if (mdoc->meta.msec == NULL) {
-               free(secname);
+       if (mdoc->meta.msec == NULL)

                return;
                return;

-       }

 
        goodsec = NULL;
        switch (sec) {
 
        goodsec = NULL;
        switch (sec) {


@@ -1961,7 +2451,6 @@ post_sh_head(POST_ARGS)
                goodsec = "2, 3, 4, 9";
                /* FALLTHROUGH */
        case SEC_RETURN_VALUES:
                goodsec = "2, 3, 4, 9";
                /* FALLTHROUGH */
        case SEC_RETURN_VALUES:

-               /* FALLTHROUGH */

        case SEC_LIBRARY:
                if (*mdoc->meta.msec == '2')
                        break;
        case SEC_LIBRARY:
                if (*mdoc->meta.msec == '2')
                        break;


@@ -1977,12 +2466,32 @@ post_sh_head(POST_ARGS)
                        goodsec = "9";
                mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
                    mdoc->last->line, mdoc->last->pos,
                        goodsec = "9";
                mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
                    mdoc->last->line, mdoc->last->pos,

-                   "Sh %s for %s only", secname, goodsec);
+                   "Sh %s for %s only", secnames[sec], goodsec);

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

-       free(secname);
+}
+
+static void
+post_xr(POST_ARGS)
+{
+       struct roff_node *n, *nch;
+
+       n = mdoc->last;
+       nch = n->child;
+       if (nch->next == NULL) {
+               mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse,
+                   n->line, n->pos, "Xr %s", nch->string);
+       } else {
+               assert(nch->next == n->last);
+               if(mandoc_xr_add(nch->next->string, nch->string,
+                   nch->line, nch->pos))
+                       mandoc_vmsg(MANDOCERR_XR_SELF, mdoc->parse,
+                           nch->line, nch->pos, "Xr %s %s",
+                           nch->string, nch->next->string);
+       }
+       post_delim_nb(mdoc);

 }
 
 static void
 }
 
 static void


@@ -1991,7 +2500,11 @@ post_ignpar(POST_ARGS)
        struct roff_node *np;
 
        switch (mdoc->last->type) {
        struct roff_node *np;
 
        switch (mdoc->last->type) {

+       case ROFFT_BLOCK:
+               post_prevpar(mdoc);
+               return;

        case ROFFT_HEAD:
        case ROFFT_HEAD:

+               post_delim(mdoc);

                post_hyph(mdoc);
                return;
        case ROFFT_BODY:
                post_hyph(mdoc);
                return;
        case ROFFT_BODY:


@@ -2000,55 +2513,55 @@ post_ignpar(POST_ARGS)
                return;
        }
 
                return;
        }
 

-       if (NULL != (np = mdoc->last->child))
-               if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+       if ((np = mdoc->last->child) != NULL)
+               if (np->tok == MDOC_Pp ||
+                   np->tok == ROFF_br || np->tok == ROFF_sp) {

                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            mdoc->parse, np->line, np->pos,
                        mandoc_vmsg(MANDOCERR_PAR_SKIP,
                            mdoc->parse, np->line, np->pos,

-                           "%s after %s", mdoc_macronames[np->tok],
-                           mdoc_macronames[mdoc->last->tok]);
+                           "%s after %s", roff_name[np->tok],
+                           roff_name[mdoc->last->tok]);

                        roff_node_delete(mdoc, np);
                }
 
                        roff_node_delete(mdoc, np);
                }
 

-       if (NULL != (np = mdoc->last->last))
-               if (MDOC_Pp == np->tok || MDOC_Lp == np->tok) {
+       if ((np = mdoc->last->last) != NULL)
+               if (np->tok == MDOC_Pp || np->tok == ROFF_br) {

                        mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
                            np->line, np->pos, "%s at the end of %s",
                        mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
                            np->line, np->pos, "%s at the end of %s",

-                           mdoc_macronames[np->tok],
-                           mdoc_macronames[mdoc->last->tok]);
+                           roff_name[np->tok],
+                           roff_name[mdoc->last->tok]);

                        roff_node_delete(mdoc, np);
                }
 }
 
 static void
                        roff_node_delete(mdoc, np);
                }
 }
 
 static void

-pre_par(PRE_ARGS)
+post_prevpar(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

-       if (NULL == mdoc->last)
+       n = mdoc->last;
+       if (NULL == n->prev)

                return;
        if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK)
                return;
 
        /*
                return;
        if (n->type != ROFFT_ELEM && n->type != ROFFT_BLOCK)
                return;
 
        /*

-        * Don't allow prior `Lp' or `Pp' prior to a paragraph-type
-        * block:  `Lp', `Pp', or non-compact `Bd' or `Bl'.
+        * Don't allow `Pp' prior to a paragraph-type
+        * block: `Pp' or non-compact `Bd' or `Bl'.

         */
 
         */
 

-       if (MDOC_Pp != mdoc->last->tok &&
-           MDOC_Lp != mdoc->last->tok &&
-           MDOC_br != mdoc->last->tok)
+       if (n->prev->tok != MDOC_Pp && n->prev->tok != ROFF_br)

                return;
                return;

-       if (MDOC_Bl == n->tok && n->norm->Bl.comp)
+       if (n->tok == MDOC_Bl && n->norm->Bl.comp)

                return;
                return;

-       if (MDOC_Bd == n->tok && n->norm->Bd.comp)
+       if (n->tok == MDOC_Bd && n->norm->Bd.comp)

                return;
                return;

-       if (MDOC_It == n->tok && n->parent->norm->Bl.comp)
+       if (n->tok == MDOC_It && n->parent->norm->Bl.comp)

                return;
 
        mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
                return;
 
        mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,

-           mdoc->last->line, mdoc->last->pos,
-           "%s before %s", mdoc_macronames[mdoc->last->tok],
-           mdoc_macronames[n->tok]);
-       roff_node_delete(mdoc, mdoc->last);
+           n->prev->line, n->prev->pos, "%s before %s",
+           roff_name[n->prev->tok], roff_name[n->tok]);
+       roff_node_delete(mdoc, n->prev);

 }
 
 static void
 }
 
 static void


@@ -2056,62 +2569,13 @@ post_par(POST_ARGS)
 {
        struct roff_node *np;
 
 {
        struct roff_node *np;
 

-       np = mdoc->last;
+       post_prevpar(mdoc);

 
 

-       if (np->tok == MDOC_sp) {
-               if (np->nchild > 1)
-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
-                           np->child->next->line, np->child->next->pos,
-                           "sp ... %s", np->child->next->string);
-       } else if (np->child != NULL)
+       np = mdoc->last;
+       if (np->child != NULL)

                mandoc_vmsg(MANDOCERR_ARG_SKIP,
                    mdoc->parse, np->line, np->pos, "%s %s",
                mandoc_vmsg(MANDOCERR_ARG_SKIP,
                    mdoc->parse, np->line, np->pos, "%s %s",

-                   mdoc_macronames[np->tok], np->child->string);
-
-       if (NULL == (np = mdoc->last->prev)) {
-               np = mdoc->last->parent;
-               if (MDOC_Sh != np->tok && MDOC_Ss != np->tok)
-                       return;
-       } else if (MDOC_Pp != np->tok && MDOC_Lp != np->tok &&
-           (MDOC_br != mdoc->last->tok ||
-            (MDOC_sp != np->tok && MDOC_br != np->tok)))
-               return;
-
-       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
-           mdoc->last->line, mdoc->last->pos,
-           "%s after %s", mdoc_macronames[mdoc->last->tok],
-           mdoc_macronames[np->tok]);
-       roff_node_delete(mdoc, mdoc->last);
-}
-
-static void
-pre_literal(PRE_ARGS)
-{
-
-       pre_display(mdoc, n);
-
-       if (n->type != ROFFT_BODY)
-               return;
-
-       /*
-        * The `Dl' (note "el" not "one") and `Bd -literal' and `Bd
-        * -unfilled' macros set MDOC_LITERAL on entrance to the body.
-        */
-
-       switch (n->tok) {
-       case MDOC_Dl:
-               mdoc->flags |= MDOC_LITERAL;
-               break;
-       case MDOC_Bd:
-               if (DISP_literal == n->norm->Bd.type)
-                       mdoc->flags |= MDOC_LITERAL;
-               if (DISP_unfilled == n->norm->Bd.type)
-                       mdoc->flags |= MDOC_LITERAL;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
+                   roff_name[np->tok], np->child->string);

 }
 
 static void
 }
 
 static void


@@ -2120,27 +2584,38 @@ post_dd(POST_ARGS)
        struct roff_node *n;
        char             *datestr;
 
        struct roff_node *n;
        char             *datestr;
 

-       if (mdoc->meta.date)
+       n = mdoc->last;
+       n->flags |= NODE_NOPRT;
+
+       if (mdoc->meta.date != NULL) {
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Dd");

                free(mdoc->meta.date);
                free(mdoc->meta.date);

+       } else if (mdoc->flags & MDOC_PBODY)
+               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
+                   n->line, n->pos, "Dd");
+       else if (mdoc->meta.title != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dd after Dt");
+       else if (mdoc->meta.os != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dd after Os");

 
 

-       n = mdoc->last;
-       if (NULL == n->child || '\0' == n->child->string[0]) {
+       if (n->child == NULL || n->child->string[0] == '\0') {

                mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
                mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :

-                   mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);
-               goto out;
+                   mandoc_normdate(mdoc, NULL, n->line, n->pos);
+               return;

        }
 
        datestr = NULL;
        }
 
        datestr = NULL;

-       mdoc_deroff(&datestr, n);
+       deroff(&datestr, n);

        if (mdoc->quick)
                mdoc->meta.date = datestr;
        else {
        if (mdoc->quick)
                mdoc->meta.date = datestr;
        else {

-               mdoc->meta.date = mandoc_normdate(mdoc->parse,
+               mdoc->meta.date = mandoc_normdate(mdoc,

                    datestr, n->line, n->pos);
                free(datestr);
        }
                    datestr, n->line, n->pos);
                free(datestr);
        }

-out:
-       roff_node_delete(mdoc, n);

 }
 
 static void
 }
 
 static void


@@ -2151,6 +2626,20 @@ post_dt(POST_ARGS)
        char             *p;
 
        n = mdoc->last;
        char             *p;
 
        n = mdoc->last;

+       n->flags |= NODE_NOPRT;
+
+       if (mdoc->flags & MDOC_PBODY) {
+               mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse,
+                   n->line, n->pos, "Dt");
+               return;
+       }
+
+       if (mdoc->meta.title != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Dt");
+       else if (mdoc->meta.os != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+                   n->line, n->pos, "Dt after Os");

 
        free(mdoc->meta.title);
        free(mdoc->meta.msec);
 
        free(mdoc->meta.title);
        free(mdoc->meta.msec);


@@ -2184,7 +2673,7 @@ post_dt(POST_ARGS)
                        }
        }
 
                        }
        }
 

-       /* Mandatory second argument: section. */
+       /* Mandatory second argument: section. */

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


@@ -2194,7 +2683,7 @@ post_dt(POST_ARGS)
                    mdoc->parse, n->line, n->pos,
                    "Dt %s", mdoc->meta.title);
                mdoc->meta.vol = mandoc_strdup("LOCAL");
                    mdoc->parse, n->line, n->pos,
                    "Dt %s", mdoc->meta.title);
                mdoc->meta.vol = mandoc_strdup("LOCAL");

-               goto out;  /* msec and arch remain NULL. */
+               return;  /* msec and arch remain NULL. */

        }
 
        mdoc->meta.msec = mandoc_strdup(nn->string);
        }
 
        mdoc->meta.msec = mandoc_strdup(nn->string);


@@ -2212,7 +2701,7 @@ post_dt(POST_ARGS)
        /* Optional third argument: architecture. */
 
        if ((nn = nn->next) == NULL)
        /* Optional third argument: architecture. */
 
        if ((nn = nn->next) == NULL)

-               goto out;
+               return;

 
        for (p = nn->string; *p != '\0'; p++)
                *p = tolower((unsigned char)*p);
 
        for (p = nn->string; *p != '\0'; p++)
                *p = tolower((unsigned char)*p);


@@ -2223,15 +2712,51 @@ post_dt(POST_ARGS)
        if ((nn = nn->next) != NULL)
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
                    nn->line, nn->pos, "Dt ... %s", nn->string);
        if ((nn = nn->next) != NULL)
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
                    nn->line, nn->pos, "Dt ... %s", nn->string);

-
-out:
-       roff_node_delete(mdoc, n);

 }
 
 static void
 post_bx(POST_ARGS)
 {
 }
 
 static void
 post_bx(POST_ARGS)
 {

-       struct roff_node        *n;
+       struct roff_node        *n, *nch;
+       const char              *macro;
+
+       post_delim_nb(mdoc);
+
+       n = mdoc->last;
+       nch = n->child;
+
+       if (nch != NULL) {
+               macro = !strcmp(nch->string, "Open") ? "Ox" :
+                   !strcmp(nch->string, "Net") ? "Nx" :
+                   !strcmp(nch->string, "Free") ? "Fx" :
+                   !strcmp(nch->string, "DragonFly") ? "Dx" : NULL;
+               if (macro != NULL)
+                       mandoc_msg(MANDOCERR_BX, mdoc->parse,
+                           n->line, n->pos, macro);
+               mdoc->last = nch;
+               nch = nch->next;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns);
+               mdoc->last->flags |= NODE_NOSRC;
+               mdoc->next = ROFF_NEXT_SIBLING;
+       } else
+               mdoc->next = ROFF_NEXT_CHILD;
+       roff_word_alloc(mdoc, n->line, n->pos, "BSD");
+       mdoc->last->flags |= NODE_NOSRC;
+
+       if (nch == NULL) {
+               mdoc->last = n;
+               return;
+       }
+
+       roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->next = ROFF_NEXT_SIBLING;
+       roff_word_alloc(mdoc, n->line, n->pos, "-");
+       mdoc->last->flags |= NODE_NOSRC;
+       roff_elem_alloc(mdoc, n->line, n->pos, MDOC_Ns);
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;

 
        /*
         * Make `Bx's second argument always start with an uppercase
 
        /*
         * Make `Bx's second argument always start with an uppercase


@@ -2239,9 +2764,7 @@ post_bx(POST_ARGS)
         * uppercase blindly.
         */
 
         * uppercase blindly.
         */
 

-       n = mdoc->last->child;
-       if (n && NULL != (n = n->next))
-               *n->string = (char)toupper((unsigned char)*n->string);
+       *nch->string = (char)toupper((unsigned char)*nch->string);

 }
 
 static void
 }
 
 static void


@@ -2254,6 +2777,16 @@ post_os(POST_ARGS)
        struct roff_node *n;
 
        n = mdoc->last;
        struct roff_node *n;
 
        n = mdoc->last;

+       n->flags |= NODE_NOPRT;
+
+       if (mdoc->meta.os != NULL)
+               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
+                   n->line, n->pos, "Os");
+       else if (mdoc->flags & MDOC_PBODY)
+               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
+                   n->line, n->pos, "Os");
+
+       post_delim(mdoc);

 
        /*
         * Set the operating system by way of the `Os' macro.
 
        /*
         * Set the operating system by way of the `Os' macro.


@@ -2266,20 +2799,20 @@ post_os(POST_ARGS)
 
        free(mdoc->meta.os);
        mdoc->meta.os = NULL;
 
        free(mdoc->meta.os);
        mdoc->meta.os = NULL;

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

        if (mdoc->meta.os)
                goto out;
 
        if (mdoc->meta.os)
                goto out;
 

-       if (mdoc->defos) {
-               mdoc->meta.os = mandoc_strdup(mdoc->defos);
+       if (mdoc->os_s != NULL) {
+               mdoc->meta.os = mandoc_strdup(mdoc->os_s);

                goto out;
        }
 
 #ifdef OSNAME
        mdoc->meta.os = mandoc_strdup(OSNAME);
 #else /*!OSNAME */
                goto out;
        }
 
 #ifdef OSNAME
        mdoc->meta.os = mandoc_strdup(OSNAME);
 #else /*!OSNAME */

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

                        mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,
                            n->line, n->pos, "Os");
                        defbuf = mandoc_strdup("UNKNOWN");
                        mandoc_msg(MANDOCERR_OS_UNAME, mdoc->parse,
                            n->line, n->pos, "Os");
                        defbuf = mandoc_strdup("UNKNOWN");


@@ -2291,135 +2824,145 @@ post_os(POST_ARGS)
 #endif /*!OSNAME*/
 
 out:
 #endif /*!OSNAME*/
 
 out:

-       roff_node_delete(mdoc, n);
-}
-
-/*
- * If no argument is provided,
- * fill in the name of the current manual page.
- */
-static void
-post_ex(POST_ARGS)
-{
-       struct roff_node *n;
+       if (mdoc->meta.os_e == MANDOC_OS_OTHER) {
+               if (strstr(mdoc->meta.os, "OpenBSD") != NULL)
+                       mdoc->meta.os_e = MANDOC_OS_OPENBSD;
+               else if (strstr(mdoc->meta.os, "NetBSD") != NULL)
+                       mdoc->meta.os_e = MANDOC_OS_NETBSD;
+       }

 
 

-       n = mdoc->last;
+       /*
+        * This is the earliest point where we can check
+        * Mdocdate conventions because we don't know
+        * the operating system earlier.
+        */

 
 

-       if (n->child)
-               return;
+       if (n->child != NULL)
+               mandoc_vmsg(MANDOCERR_OS_ARG, mdoc->parse,
+                   n->child->line, n->child->pos,
+                   "Os %s (%s)", n->child->string,
+                   mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
+                   "OpenBSD" : "NetBSD");

 
 

-       if (mdoc->meta.name == NULL) {
-               mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
-                   n->line, n->pos, "Ex");
+       while (n->tok != MDOC_Dd)
+               if ((n = n->prev) == NULL)
+                       return;
+       if ((n = n->child) == NULL)

                return;
                return;

+       if (strncmp(n->string, "$" "Mdocdate", 9)) {
+               if (mdoc->meta.os_e == MANDOC_OS_OPENBSD)
+                       mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING,
+                           mdoc->parse, n->line, n->pos,
+                           "Dd %s (OpenBSD)", n->string);
+       } else {
+               if (mdoc->meta.os_e == MANDOC_OS_NETBSD)
+                       mandoc_vmsg(MANDOCERR_MDOCDATE,
+                           mdoc->parse, n->line, n->pos,
+                           "Dd %s (NetBSD)", n->string);

        }
        }

-
-       mdoc->next = ROFF_NEXT_CHILD;
-       mdoc_word_alloc(mdoc, n->line, n->pos, mdoc->meta.name);
-       mdoc->last = n;

 }
 
 }
 

-static enum roff_sec
-a2sec(const char *p)
+enum roff_sec
+mdoc_a2sec(const char *p)

 {
        int              i;
 
        for (i = 0; i < (int)SEC__MAX; i++)
                if (secnames[i] && 0 == strcmp(p, secnames[i]))
 {
        int              i;
 
        for (i = 0; i < (int)SEC__MAX; i++)
                if (secnames[i] && 0 == strcmp(p, secnames[i]))

-                       return((enum roff_sec)i);
+                       return (enum roff_sec)i;

 
 

-       return(SEC_CUSTOM);
+       return SEC_CUSTOM;

 }
 
 static size_t
 }
 
 static size_t

-macro2len(int macro)
+macro2len(enum roff_tok macro)

 {
 
        switch (macro) {
        case MDOC_Ad:
 {
 
        switch (macro) {
        case MDOC_Ad:

-               return(12);
+               return 12;

        case MDOC_Ao:
        case MDOC_Ao:

-               return(12);
+               return 12;

        case MDOC_An:
        case MDOC_An:

-               return(12);
+               return 12;

        case MDOC_Aq:
        case MDOC_Aq:

-               return(12);
+               return 12;

        case MDOC_Ar:
        case MDOC_Ar:

-               return(12);
+               return 12;

        case MDOC_Bo:
        case MDOC_Bo:

-               return(12);
+               return 12;

        case MDOC_Bq:
        case MDOC_Bq:

-               return(12);
+               return 12;

        case MDOC_Cd:
        case MDOC_Cd:

-               return(12);
+               return 12;

        case MDOC_Cm:
        case MDOC_Cm:

-               return(10);
+               return 10;

        case MDOC_Do:
        case MDOC_Do:

-               return(10);
+               return 10;

        case MDOC_Dq:
        case MDOC_Dq:

-               return(12);
+               return 12;

        case MDOC_Dv:
        case MDOC_Dv:

-               return(12);
+               return 12;

        case MDOC_Eo:
        case MDOC_Eo:

-               return(12);
+               return 12;

        case MDOC_Em:
        case MDOC_Em:

-               return(10);
+               return 10;

        case MDOC_Er:
        case MDOC_Er:

-               return(17);
+               return 17;

        case MDOC_Ev:
        case MDOC_Ev:

-               return(15);
+               return 15;

        case MDOC_Fa:
        case MDOC_Fa:

-               return(12);
+               return 12;

        case MDOC_Fl:
        case MDOC_Fl:

-               return(10);
+               return 10;

        case MDOC_Fo:
        case MDOC_Fo:

-               return(16);
+               return 16;

        case MDOC_Fn:
        case MDOC_Fn:

-               return(16);
+               return 16;

        case MDOC_Ic:
        case MDOC_Ic:

-               return(10);
+               return 10;

        case MDOC_Li:
        case MDOC_Li:

-               return(16);
+               return 16;

        case MDOC_Ms:
        case MDOC_Ms:

-               return(6);
+               return 6;

        case MDOC_Nm:
        case MDOC_Nm:

-               return(10);
+               return 10;

        case MDOC_No:
        case MDOC_No:

-               return(12);
+               return 12;

        case MDOC_Oo:
        case MDOC_Oo:

-               return(10);
+               return 10;

        case MDOC_Op:
        case MDOC_Op:

-               return(14);
+               return 14;

        case MDOC_Pa:
        case MDOC_Pa:

-               return(32);
+               return 32;

        case MDOC_Pf:
        case MDOC_Pf:

-               return(12);
+               return 12;

        case MDOC_Po:
        case MDOC_Po:

-               return(12);
+               return 12;

        case MDOC_Pq:
        case MDOC_Pq:

-               return(12);
+               return 12;

        case MDOC_Ql:
        case MDOC_Ql:

-               return(16);
+               return 16;

        case MDOC_Qo:
        case MDOC_Qo:

-               return(12);
+               return 12;

        case MDOC_So:
        case MDOC_So:

-               return(12);
+               return 12;

        case MDOC_Sq:
        case MDOC_Sq:

-               return(12);
+               return 12;

        case MDOC_Sy:
        case MDOC_Sy:

-               return(6);
+               return 6;

        case MDOC_Sx:
        case MDOC_Sx:

-               return(16);
+               return 16;

        case MDOC_Tn:
        case MDOC_Tn:

-               return(10);
+               return 10;

        case MDOC_Va:
        case MDOC_Va:

-               return(12);
+               return 12;

        case MDOC_Vt:
        case MDOC_Vt:

-               return(12);
+               return 12;

        case MDOC_Xr:
        case MDOC_Xr:

-               return(10);
+               return 10;

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

-       return(0);
+       return 0;

 }
 }