]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_validate.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
implement -h (synopsis only) for preformatted (cat) pages;
[mandoc.git] / mdoc_validate.c
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 49f1dfe4ca677891312ef83b996b8b1bcea826d7..c0ed2621f30771841c649e61cdf30e8da067079d 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_validate.c,v 1.241 2014/08/01 22:22:11 schwarze Exp $ */
+/*     $Id: mdoc_validate.c,v 1.254 2014/10/30 20:10:02 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,16 +16,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
 
 
+#include <sys/types.h>
 #ifndef OSNAME
 #include <sys/utsname.h>
 #endif
 
 #ifndef OSNAME
 #include <sys/utsname.h>
 #endif
 
-#include <sys/types.h>
-
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
 #include <assert.h>
 #include <ctype.h>
 #include <limits.h>
@@ -61,7 +58,7 @@ typedef       int     (*v_post)(POST_ARGS);
 
 struct valids {
        v_pre    pre;
 
 struct valids {
        v_pre    pre;
-       v_post  *post;
+       v_post   post;
 };
 
 static int      check_count(struct mdoc *, enum mdoc_type,
 };
 
 static int      check_count(struct mdoc *, enum mdoc_type,
@@ -70,8 +67,10 @@ static       void     check_text(struct mdoc *, int, int, char *);
 static void     check_argv(struct mdoc *,
                        struct mdoc_node *, struct mdoc_argv *);
 static void     check_args(struct mdoc *, struct mdoc_node *);
 static void     check_argv(struct mdoc *,
                        struct mdoc_node *, struct mdoc_argv *);
 static void     check_args(struct mdoc *, struct mdoc_node *);
+static int      child_an(const struct mdoc_node *);
 static enum mdoc_sec   a2sec(const char *);
 static size_t          macro2len(enum mdoct);
 static enum mdoc_sec   a2sec(const char *);
 static size_t          macro2len(enum mdoct);
+static void     rewrite_macro2len(char **);
 
 static int      ebool(POST_ARGS);
 static int      berr_ge1(POST_ARGS);
 
 static int      ebool(POST_ARGS);
 static int      berr_ge1(POST_ARGS);
@@ -87,12 +86,13 @@ static      int      hwarn_ge1(POST_ARGS);
 static int      post_an(POST_ARGS);
 static int      post_at(POST_ARGS);
 static int      post_bf(POST_ARGS);
 static int      post_an(POST_ARGS);
 static int      post_at(POST_ARGS);
 static int      post_bf(POST_ARGS);
+static int      post_bk(POST_ARGS);
 static int      post_bl(POST_ARGS);
 static int      post_bl_block(POST_ARGS);
 static int      post_bl(POST_ARGS);
 static int      post_bl_block(POST_ARGS);
-static int      post_bl_block_width(POST_ARGS);
 static int      post_bl_block_tag(POST_ARGS);
 static int      post_bl_head(POST_ARGS);
 static int      post_bx(POST_ARGS);
 static int      post_bl_block_tag(POST_ARGS);
 static int      post_bl_head(POST_ARGS);
 static int      post_bx(POST_ARGS);
+static int      post_d1(POST_ARGS);
 static int      post_defaults(POST_ARGS);
 static int      post_dd(POST_ARGS);
 static int      post_dt(POST_ARGS);
 static int      post_defaults(POST_ARGS);
 static int      post_dd(POST_ARGS);
 static int      post_dt(POST_ARGS);
@@ -100,21 +100,28 @@ static    int      post_en(POST_ARGS);
 static int      post_es(POST_ARGS);
 static int      post_eoln(POST_ARGS);
 static int      post_ex(POST_ARGS);
 static int      post_es(POST_ARGS);
 static int      post_eoln(POST_ARGS);
 static int      post_ex(POST_ARGS);
+static int      post_fa(POST_ARGS);
+static int      post_fn(POST_ARGS);
+static int      post_fname(POST_ARGS);
+static int      post_fo(POST_ARGS);
 static int      post_hyph(POST_ARGS);
 static int      post_hyph(POST_ARGS);
+static int      post_hyphtext(POST_ARGS);
 static int      post_ignpar(POST_ARGS);
 static int      post_it(POST_ARGS);
 static int      post_lb(POST_ARGS);
 static int      post_literal(POST_ARGS);
 static int      post_ignpar(POST_ARGS);
 static int      post_it(POST_ARGS);
 static int      post_lb(POST_ARGS);
 static int      post_literal(POST_ARGS);
+static int      post_nd(POST_ARGS);
 static int      post_nm(POST_ARGS);
 static int      post_ns(POST_ARGS);
 static int      post_os(POST_ARGS);
 static int      post_par(POST_ARGS);
 static int      post_nm(POST_ARGS);
 static int      post_ns(POST_ARGS);
 static int      post_os(POST_ARGS);
 static int      post_par(POST_ARGS);
-static int      post_prol(POST_ARGS);
 static int      post_root(POST_ARGS);
 static int      post_rs(POST_ARGS);
 static int      post_sh(POST_ARGS);
 static int      post_root(POST_ARGS);
 static int      post_rs(POST_ARGS);
 static int      post_sh(POST_ARGS);
-static int      post_sh_body(POST_ARGS);
 static int      post_sh_head(POST_ARGS);
 static int      post_sh_head(POST_ARGS);
+static int      post_sh_name(POST_ARGS);
+static int      post_sh_see_also(POST_ARGS);
+static int      post_sh_authors(POST_ARGS);
 static int      post_st(POST_ARGS);
 static int      post_vt(POST_ARGS);
 static int      pre_an(PRE_ARGS);
 static int      post_st(POST_ARGS);
 static int      post_vt(POST_ARGS);
 static int      pre_an(PRE_ARGS);
@@ -129,107 +136,70 @@ static   int      pre_os(PRE_ARGS);
 static int      pre_par(PRE_ARGS);
 static int      pre_std(PRE_ARGS);
 
 static int      pre_par(PRE_ARGS);
 static int      pre_std(PRE_ARGS);
 
-static v_post   posts_an[] = { post_an, NULL };
-static v_post   posts_at[] = { post_at, post_defaults, NULL };
-static v_post   posts_bd[] = { post_literal, hwarn_eq0, bwarn_ge1, NULL };
-static v_post   posts_bf[] = { post_bf, NULL };
-static v_post   posts_bk[] = { hwarn_eq0, bwarn_ge1, NULL };
-static v_post   posts_bl[] = { bwarn_ge1, post_bl, NULL };
-static v_post   posts_bx[] = { post_bx, NULL };
-static v_post   posts_bool[] = { ebool, NULL };
-static v_post   posts_eoln[] = { post_eoln, NULL };
-static v_post   posts_defaults[] = { post_defaults, NULL };
-static v_post   posts_d1[] = { bwarn_ge1, post_hyph, NULL };
-static v_post   posts_dd[] = { post_dd, post_prol, NULL };
-static v_post   posts_dl[] = { post_literal, bwarn_ge1, NULL };
-static v_post   posts_dt[] = { post_dt, post_prol, NULL };
-static v_post   posts_en[] = { post_en, NULL };
-static v_post   posts_es[] = { post_es, NULL };
-static v_post   posts_ex[] = { post_ex, NULL };
-static v_post   posts_fo[] = { hwarn_eq1, bwarn_ge1, NULL };
-static v_post   posts_hyph[] = { post_hyph, NULL };
-static v_post   posts_hyphtext[] = { ewarn_ge1, post_hyph, NULL };
-static v_post   posts_it[] = { post_it, NULL };
-static v_post   posts_lb[] = { post_lb, NULL };
-static v_post   posts_nd[] = { berr_ge1, post_hyph, NULL };
-static v_post   posts_nm[] = { post_nm, NULL };
-static v_post   posts_notext[] = { ewarn_eq0, NULL };
-static v_post   posts_ns[] = { post_ns, NULL };
-static v_post   posts_os[] = { post_os, post_prol, NULL };
-static v_post   posts_pp[] = { post_par, ewarn_eq0, NULL };
-static v_post   posts_rs[] = { post_rs, NULL };
-static v_post   posts_sh[] = { post_ignpar,hwarn_ge1,post_sh,post_hyph,NULL };
-static v_post   posts_sp[] = { post_par, ewarn_le1, NULL };
-static v_post   posts_ss[] = { post_ignpar, hwarn_ge1, post_hyph, NULL };
-static v_post   posts_st[] = { post_st, NULL };
-static v_post   posts_text[] = { ewarn_ge1, NULL };
-static v_post   posts_text1[] = { ewarn_eq1, NULL };
-static v_post   posts_vt[] = { post_vt, NULL };
-
 static const struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ap */
 static const struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Ap */
-       { pre_dd, posts_dd },                   /* Dd */
-       { pre_dt, posts_dt },                   /* Dt */
-       { pre_os, posts_os },                   /* Os */
-       { NULL, posts_sh },                     /* Sh */
-       { NULL, posts_ss },                     /* Ss */
-       { pre_par, posts_pp },                  /* Pp */
-       { pre_display, posts_d1 },              /* D1 */
-       { pre_literal, posts_dl },              /* Dl */
-       { pre_bd, posts_bd },                   /* Bd */
+       { 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 */
        { NULL, NULL },                         /* Ed */
-       { pre_bl, posts_bl },                   /* Bl */
+       { pre_bl, post_bl },                    /* Bl */
        { NULL, NULL },                         /* El */
        { NULL, NULL },                         /* El */
-       { pre_par, posts_it },                  /* It */
+       { pre_par, post_it },                   /* It */
        { NULL, NULL },                         /* Ad */
        { NULL, NULL },                         /* Ad */
-       { pre_an, posts_an },                   /* An */
-       { NULL, posts_defaults },               /* Ar */
+       { pre_an, post_an },                    /* An */
+       { NULL, post_defaults },                /* Ar */
        { NULL, NULL },                         /* Cd */
        { NULL, NULL },                         /* Cm */
        { NULL, NULL },                         /* Dv */
        { NULL, NULL },                         /* Er */
        { NULL, NULL },                         /* Ev */
        { NULL, NULL },                         /* Cd */
        { NULL, NULL },                         /* Cm */
        { NULL, NULL },                         /* Dv */
        { NULL, NULL },                         /* Er */
        { NULL, NULL },                         /* Ev */
-       { pre_std, posts_ex },                  /* Ex */
-       { NULL, NULL },                         /* Fa */
-       { NULL, posts_text },                   /* Fd */
+       { pre_std, post_ex },                   /* Ex */
+       { NULL, post_fa },                      /* Fa */
+       { NULL, ewarn_ge1 },                    /* Fd */
        { NULL, NULL },                         /* Fl */
        { NULL, NULL },                         /* Fl */
-       { NULL, NULL },                         /* Fn */
+       { NULL, post_fn },                      /* Fn */
        { NULL, NULL },                         /* Ft */
        { NULL, NULL },                         /* Ic */
        { NULL, NULL },                         /* Ft */
        { NULL, NULL },                         /* Ic */
-       { NULL, posts_text1 },                  /* In */
-       { NULL, posts_defaults },               /* Li */
-       { NULL, posts_nd },                     /* Nd */
-       { NULL, posts_nm },                     /* Nm */
+       { NULL, ewarn_eq1 },                    /* In */
+       { NULL, post_defaults },                /* Li */
+       { NULL, post_nd },                      /* Nd */
+       { NULL, post_nm },                      /* Nm */
        { NULL, NULL },                         /* Op */
        { pre_obsolete, NULL },                 /* Ot */
        { NULL, NULL },                         /* Op */
        { pre_obsolete, NULL },                 /* Ot */
-       { NULL, posts_defaults },               /* Pa */
+       { NULL, post_defaults },                /* Pa */
        { pre_std, NULL },                      /* Rv */
        { pre_std, NULL },                      /* Rv */
-       { NULL, posts_st },                     /* St */
+       { NULL, post_st },                      /* St */
        { NULL, NULL },                         /* Va */
        { NULL, NULL },                         /* Va */
-       { NULL, posts_vt },                     /* Vt */
-       { NULL, posts_text },                   /* Xr */
-       { NULL, posts_text },                   /* %A */
-       { NULL, posts_hyphtext },               /* %B */ /* FIXME: can be used outside Rs/Re. */
-       { NULL, posts_text },                   /* %D */
-       { NULL, posts_text },                   /* %I */
-       { NULL, posts_text },                   /* %J */
-       { NULL, posts_hyphtext },               /* %N */
-       { NULL, posts_hyphtext },               /* %O */
-       { NULL, posts_text },                   /* %P */
-       { NULL, posts_hyphtext },               /* %R */
-       { NULL, posts_hyphtext },               /* %T */ /* FIXME: can be used outside Rs/Re. */
-       { NULL, posts_text },                   /* %V */
+       { NULL, post_vt },                      /* Vt */
+       { NULL, ewarn_ge1 },                    /* Xr */
+       { NULL, ewarn_ge1 },                    /* %A */
+       { NULL, post_hyphtext },                /* %B */ /* FIXME: can be used outside Rs/Re. */
+       { NULL, ewarn_ge1 },                    /* %D */
+       { NULL, ewarn_ge1 },                    /* %I */
+       { NULL, ewarn_ge1 },                    /* %J */
+       { NULL, post_hyphtext },                /* %N */
+       { NULL, post_hyphtext },                /* %O */
+       { NULL, ewarn_ge1 },                    /* %P */
+       { NULL, post_hyphtext },                /* %R */
+       { NULL, post_hyphtext },                /* %T */ /* FIXME: can be used outside Rs/Re. */
+       { NULL, ewarn_ge1 },                    /* %V */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */
        { NULL, NULL },                         /* Aq */
        { NULL, NULL },                         /* Ac */
        { NULL, NULL },                         /* Ao */
        { NULL, NULL },                         /* Aq */
-       { NULL, posts_at },                     /* At */
+       { NULL, post_at },                      /* At */
        { NULL, NULL },                         /* Bc */
        { NULL, NULL },                         /* Bc */
-       { NULL, posts_bf },                     /* Bf */
+       { NULL, post_bf },                      /* Bf */
        { NULL, NULL },                         /* Bo */
        { NULL, NULL },                         /* Bq */
        { NULL, NULL },                         /* Bsx */
        { NULL, NULL },                         /* Bo */
        { NULL, NULL },                         /* Bq */
        { NULL, NULL },                         /* Bsx */
-       { NULL, posts_bx },                     /* Bx */
-       { NULL, posts_bool },                   /* Db */
+       { NULL, post_bx },                      /* Bx */
+       { NULL, ebool },                        /* Db */
        { NULL, NULL },                         /* Dc */
        { NULL, NULL },                         /* Do */
        { NULL, NULL },                         /* Dq */
        { NULL, NULL },                         /* Dc */
        { NULL, NULL },                         /* Do */
        { NULL, NULL },                         /* Dq */
@@ -239,12 +209,12 @@ static    const struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Eo */
        { NULL, NULL },                         /* Fx */
        { NULL, NULL },                         /* Ms */
        { NULL, NULL },                         /* Eo */
        { NULL, NULL },                         /* Fx */
        { NULL, NULL },                         /* Ms */
-       { NULL, posts_notext },                 /* No */
-       { NULL, posts_ns },                     /* Ns */
+       { NULL, ewarn_eq0 },                    /* No */
+       { NULL, post_ns },                      /* Ns */
        { NULL, NULL },                         /* Nx */
        { NULL, NULL },                         /* Ox */
        { NULL, NULL },                         /* Pc */
        { NULL, NULL },                         /* Nx */
        { NULL, NULL },                         /* Ox */
        { NULL, NULL },                         /* Pc */
-       { NULL, posts_text1 },                  /* Pf */
+       { NULL, ewarn_eq1 },                    /* Pf */
        { NULL, NULL },                         /* Po */
        { NULL, NULL },                         /* Pq */
        { NULL, NULL },                         /* Qc */
        { NULL, NULL },                         /* Po */
        { NULL, NULL },                         /* Pq */
        { NULL, NULL },                         /* Qc */
@@ -252,42 +222,42 @@ static    const struct valids mdoc_valids[MDOC_MAX] = {
        { NULL, NULL },                         /* Qo */
        { NULL, NULL },                         /* Qq */
        { NULL, NULL },                         /* Re */
        { NULL, NULL },                         /* Qo */
        { NULL, NULL },                         /* Qq */
        { NULL, NULL },                         /* Re */
-       { NULL, posts_rs },                     /* Rs */
+       { NULL, post_rs },                      /* Rs */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, NULL },                         /* Sq */
        { NULL, NULL },                         /* Sc */
        { NULL, NULL },                         /* So */
        { NULL, NULL },                         /* Sq */
-       { NULL, posts_bool },                   /* Sm */
-       { NULL, posts_hyph },                   /* Sx */
+       { NULL, ebool },                        /* Sm */
+       { NULL, post_hyph },                    /* Sx */
        { NULL, NULL },                         /* Sy */
        { NULL, NULL },                         /* Tn */
        { NULL, NULL },                         /* Ux */
        { NULL, NULL },                         /* Xc */
        { NULL, NULL },                         /* Xo */
        { NULL, NULL },                         /* Sy */
        { NULL, NULL },                         /* Tn */
        { NULL, NULL },                         /* Ux */
        { NULL, NULL },                         /* Xc */
        { NULL, NULL },                         /* Xo */
-       { NULL, posts_fo },                     /* Fo */
+       { NULL, post_fo },                      /* Fo */
        { NULL, NULL },                         /* Fc */
        { NULL, NULL },                         /* Oo */
        { NULL, NULL },                         /* Oc */
        { NULL, NULL },                         /* Fc */
        { NULL, NULL },                         /* Oo */
        { NULL, NULL },                         /* Oc */
-       { NULL, posts_bk },                     /* Bk */
+       { NULL, post_bk },                      /* Bk */
        { NULL, NULL },                         /* Ek */
        { NULL, NULL },                         /* Ek */
-       { NULL, posts_eoln },                   /* Bt */
+       { NULL, post_eoln },                    /* Bt */
        { NULL, NULL },                         /* Hf */
        { pre_obsolete, NULL },                 /* Fr */
        { NULL, NULL },                         /* Hf */
        { pre_obsolete, NULL },                 /* Fr */
-       { NULL, posts_eoln },                   /* Ud */
-       { NULL, posts_lb },                     /* Lb */
-       { pre_par, posts_pp },                  /* Lp */
+       { NULL, post_eoln },                    /* Ud */
+       { NULL, post_lb },                      /* Lb */
+       { pre_par, post_par },                  /* Lp */
        { NULL, NULL },                         /* Lk */
        { NULL, NULL },                         /* Lk */
-       { NULL, posts_defaults },               /* Mt */
+       { NULL, post_defaults },                /* Mt */
        { NULL, NULL },                         /* Brq */
        { NULL, NULL },                         /* Bro */
        { NULL, NULL },                         /* Brc */
        { NULL, NULL },                         /* Brq */
        { NULL, NULL },                         /* Bro */
        { NULL, NULL },                         /* Brc */
-       { NULL, posts_text },                   /* %C */
-       { pre_obsolete, posts_es },             /* Es */
-       { pre_obsolete, posts_en },             /* En */
+       { NULL, ewarn_ge1 },                    /* %C */
+       { pre_obsolete, post_es },              /* Es */
+       { pre_obsolete, post_en },              /* En */
        { NULL, NULL },                         /* Dx */
        { NULL, NULL },                         /* Dx */
-       { NULL, posts_text },                   /* %Q */
-       { NULL, posts_pp },                     /* br */
-       { NULL, posts_sp },                     /* sp */
-       { NULL, posts_text1 },                  /* %U */
+       { NULL, ewarn_ge1 },                    /* %Q */
+       { NULL, post_par },                     /* br */
+       { NULL, post_par },                     /* sp */
+       { NULL, ewarn_eq1 },                    /* %U */
        { NULL, NULL },                         /* Ta */
        { NULL, NULL },                         /* ll */
 };
        { NULL, NULL },                         /* Ta */
        { NULL, NULL },                         /* ll */
 };
@@ -365,13 +335,15 @@ mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *n)
 int
 mdoc_valid_post(struct mdoc *mdoc)
 {
 int
 mdoc_valid_post(struct mdoc *mdoc)
 {
-       v_post          *p;
+       struct mdoc_node *n;
+       v_post p;
 
 
-       if (MDOC_VALID & mdoc->last->flags)
+       n = mdoc->last;
+       if (n->flags & MDOC_VALID)
                return(1);
                return(1);
-       mdoc->last->flags |= MDOC_VALID;
+       n->flags |= MDOC_VALID;
 
 
-       switch (mdoc->last->type) {
+       switch (n->type) {
        case MDOC_TEXT:
                /* FALLTHROUGH */
        case MDOC_EQN:
        case MDOC_TEXT:
                /* FALLTHROUGH */
        case MDOC_EQN:
@@ -381,16 +353,9 @@ mdoc_valid_post(struct mdoc *mdoc)
        case MDOC_ROOT:
                return(post_root(mdoc));
        default:
        case MDOC_ROOT:
                return(post_root(mdoc));
        default:
-               break;
+               p = mdoc_valids[n->tok].post;
+               return(*p ? (*p)(mdoc) : 1);
        }
        }
-
-       if (NULL == mdoc_valids[mdoc->last->tok].post)
-               return(1);
-       for (p = mdoc_valids[mdoc->last->tok].post; *p; p++)
-               if ( ! (*p)(mdoc))
-                       return(0);
-
-       return(1);
 }
 
 static int
 }
 
 static int
@@ -570,7 +535,7 @@ pre_bl(PRE_ARGS)
         * ones.  If we find no list type, we default to LIST_item.
         */
 
         * ones.  If we find no list type, we default to LIST_item.
         */
 
-       wa = n->args->argv;
+       wa = (n->args == NULL) ? NULL : n->args->argv;
        mdoclt = MDOC_ARG_MAX;
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                argv = n->args->argv + i;
        mdoclt = MDOC_ARG_MAX;
        for (i = 0; n->args && i < (int)n->args->argc; i++) {
                argv = n->args->argv + i;
@@ -632,6 +597,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);
                        n->norm->Bl.width = argv->value[0];
                        break;
                case MDOC_Offset:
                        n->norm->Bl.width = argv->value[0];
                        break;
                case MDOC_Offset:
@@ -646,6 +612,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);
                        n->norm->Bl.offs = argv->value[0];
                        break;
                default:
                        n->norm->Bl.offs = argv->value[0];
                        break;
                default:
@@ -793,6 +760,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);
                        n->norm->Bd.offs = argv->value[0];
                        break;
                case MDOC_Compact:
                        n->norm->Bd.offs = argv->value[0];
                        break;
                case MDOC_Compact:
@@ -880,14 +848,12 @@ static int
 pre_dt(PRE_ARGS)
 {
 
 pre_dt(PRE_ARGS)
 {
 
-       if (NULL == mdoc->meta.date || mdoc->meta.os)
-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
-                   n->line, n->pos, "Dt");
-
-       if (mdoc->meta.title)
+       if (mdoc->meta.title != NULL)
                mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
                    n->line, n->pos, "Dt");
                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");
        return(1);
 }
 
        return(1);
 }
 
@@ -895,14 +861,12 @@ static int
 pre_os(PRE_ARGS)
 {
 
 pre_os(PRE_ARGS)
 {
 
-       if (NULL == mdoc->meta.title || NULL == mdoc->meta.date)
-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
-                   n->line, n->pos, "Os");
-
-       if (mdoc->meta.os)
+       if (mdoc->meta.os != NULL)
                mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
                    n->line, n->pos, "Os");
                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");
        return(1);
 }
 
        return(1);
 }
 
@@ -910,14 +874,18 @@ static int
 pre_dd(PRE_ARGS)
 {
 
 pre_dd(PRE_ARGS)
 {
 
-       if (mdoc->meta.title || mdoc->meta.os)
-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
-                   n->line, n->pos, "Dd");
-
-       if (mdoc->meta.date)
+       if (mdoc->meta.date != NULL)
                mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
                    n->line, n->pos, "Dd");
                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");
        return(1);
 }
 
        return(1);
 }
 
@@ -1036,6 +1004,64 @@ post_eoln(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 
+static int
+post_fname(POST_ARGS)
+{
+       const struct mdoc_node  *n;
+       const char              *cp;
+       size_t                   pos;
+
+       n = mdoc->last->child;
+       pos = strcspn(n->string, "()");
+       cp = n->string + pos;
+       if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))
+               mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse,
+                   n->line, n->pos + pos, n->string);
+       return(1);
+}
+
+static int
+post_fn(POST_ARGS)
+{
+
+       post_fname(mdoc);
+       post_fa(mdoc);
+       return(1);
+}
+
+static int
+post_fo(POST_ARGS)
+{
+
+       hwarn_eq1(mdoc);
+       bwarn_ge1(mdoc);
+       if (mdoc->last->type == MDOC_HEAD && mdoc->last->nchild)
+               post_fname(mdoc);
+       return(1);
+}
+
+static int
+post_fa(POST_ARGS)
+{
+       const struct mdoc_node *n;
+       const char *cp;
+
+       for (n = mdoc->last->child; n != NULL; n = n->next) {
+               for (cp = n->string; *cp != '\0'; cp++) {
+                       /* Ignore callbacks and alterations. */
+                       if (*cp == '(' || *cp == '{')
+                               break;
+                       if (*cp != ',')
+                               continue;
+                       mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse,
+                           n->line, n->pos + (cp - n->string),
+                           n->string);
+                       break;
+               }
+       }
+       return(1);
+}
+
 static int
 post_vt(POST_ARGS)
 {
 static int
 post_vt(POST_ARGS)
 {
@@ -1075,10 +1101,30 @@ post_nm(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 
+static int
+post_nd(POST_ARGS)
+{
+
+       berr_ge1(mdoc);
+       return(post_hyph(mdoc));
+}
+
+static int
+post_d1(POST_ARGS)
+{
+
+       bwarn_ge1(mdoc);
+       return(post_hyph(mdoc));
+}
+
 static int
 post_literal(POST_ARGS)
 {
 
 static int
 post_literal(POST_ARGS)
 {
 
+       if (mdoc->last->tok == MDOC_Bd)
+               hwarn_eq0(mdoc);
+       bwarn_ge1(mdoc);
+
        /*
         * The `Dl' (note "el" not "one") and `Bd' macros unset the
         * MDOC_LITERAL flag as they leave.  Note that `Bd' only sets
        /*
         * The `Dl' (note "el" not "one") and `Bd' macros unset the
         * MDOC_LITERAL flag as they leave.  Note that `Bd' only sets
@@ -1116,12 +1162,6 @@ post_defaults(POST_ARGS)
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))
                        return(0);
                break;
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "..."))
                        return(0);
                break;
-       case MDOC_At:
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "AT&T"))
-                       return(0);
-               if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, "UNIX"))
-                       return(0);
-               break;
        case MDOC_Li:
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
                        return(0);
        case MDOC_Li:
                if ( ! mdoc_word_alloc(mdoc, nn->line, nn->pos, ""))
                        return(0);
@@ -1148,15 +1188,22 @@ post_at(POST_ARGS)
        const char              *std_att;
        char                    *att;
 
        const char              *std_att;
        char                    *att;
 
+       n = mdoc->last;
+       if (n->child == NULL) {
+               mdoc->next = MDOC_NEXT_CHILD;
+               if ( ! mdoc_word_alloc(mdoc, n->line, n->pos, "AT&T UNIX"))
+                       return(0);
+               mdoc->last = n;
+               return(1);
+       }
+
        /*
         * If we have a child, look it up in the standard keys.  If a
         * key exist, use that instead of the child; if it doesn't,
         * prefix "AT&T UNIX " to the existing data.
         */
 
        /*
         * If we have a child, look it up in the standard keys.  If a
         * key exist, use that instead of the child; if it doesn't,
         * prefix "AT&T UNIX " to the existing data.
         */
 
-       if (NULL == (n = mdoc->last->child))
-               return(1);
-
+       n = n->child;
        assert(MDOC_TEXT == n->type);
        if (NULL == (std_att = mdoc_a2att(n->string))) {
                mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
        assert(MDOC_TEXT == n->type);
        if (NULL == (std_att = mdoc_a2att(n->string))) {
                mandoc_vmsg(MANDOCERR_AT_BAD, mdoc->parse,
@@ -1292,10 +1339,6 @@ post_bl_block(POST_ARGS)
                if ( ! post_bl_block_tag(mdoc))
                        return(0);
                assert(n->norm->Bl.width);
                if ( ! post_bl_block_tag(mdoc))
                        return(0);
                assert(n->norm->Bl.width);
-       } else if (NULL != n->norm->Bl.width) {
-               if ( ! post_bl_block_width(mdoc))
-                       return(0);
-               assert(n->norm->Bl.width);
        }
 
        for (ni = n->body->child; ni; ni = ni->next) {
        }
 
        for (ni = n->body->child; ni; ni = ni->next) {
@@ -1335,50 +1378,27 @@ post_bl_block(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-static int
-post_bl_block_width(POST_ARGS)
+/*
+ * If the argument of -offset or -width is a macro,
+ * replace it with the associated default width.
+ */
+void
+rewrite_macro2len(char **arg)
 {
        size_t            width;
 {
        size_t            width;
-       int               i;
        enum mdoct        tok;
        enum mdoct        tok;
-       struct mdoc_node *n;
-       char              buf[24];
-
-       n = mdoc->last;
-
-       /*
-        * Calculate the real width of a list from the -width string,
-        * which may contain a macro (with a known default width), a
-        * literal string, or a scaling width.
-        *
-        * If the value to -width is a macro, then we re-write it to be
-        * the macro's width as set in share/tmac/mdoc/doc-common.
-        */
 
 
-       if (0 == strcmp(n->norm->Bl.width, "Ds"))
+       if (*arg == NULL)
+               return;
+       else if ( ! strcmp(*arg, "Ds"))
                width = 6;
                width = 6;
-       else if (MDOC_MAX == (tok = mdoc_hash_find(n->norm->Bl.width)))
-               return(1);
+       else if ((tok = mdoc_hash_find(*arg)) == MDOC_MAX)
+               return;
        else
                width = macro2len(tok);
 
        else
                width = macro2len(tok);
 
-       /* The value already exists: free and reallocate it. */
-
-       assert(n->args);
-
-       for (i = 0; i < (int)n->args->argc; i++)
-               if (MDOC_Width == n->args->argv[i].arg)
-                       break;
-
-       assert(i < (int)n->args->argc);
-
-       (void)snprintf(buf, sizeof(buf), "%un", (unsigned int)width);
-       free(n->args->argv[i].value[0]);
-       n->args->argv[i].value[0] = mandoc_strdup(buf);
-
-       /* Set our width! */
-       n->norm->Bl.width = n->args->argv[i].value[0];
-       return(1);
+       free(*arg);
+       mandoc_asprintf(arg, "%zun", width);
 }
 
 static int
 }
 
 static int
@@ -1393,7 +1413,7 @@ post_bl_block_tag(POST_ARGS)
         * 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
         * Calculate the -width for a `Bl -tag' list if it hasn't been
         * provided.  Uses the first head macro.  NOTE AGAIN: this is
         * ONLY if the -width argument has NOT been provided.  See
-        * post_bl_block_width() for converting the -width string.
+        * rewrite_macro2len() for converting the -width string.
         */
 
        sz = 10;
         */
 
        sz = 10;
@@ -1524,6 +1544,8 @@ post_bl(POST_ARGS)
                return(1);
        }
 
                return(1);
        }
 
+       bwarn_ge1(mdoc);
+
        nchild = nbody->child;
        while (NULL != nchild) {
                if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {
        nchild = nbody->child;
        while (NULL != nchild) {
                if (MDOC_It == nchild->tok || MDOC_Sm == nchild->tok) {
@@ -1580,6 +1602,15 @@ post_bl(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 
+static int
+post_bk(POST_ARGS)
+{
+
+       hwarn_eq0(mdoc);
+       bwarn_ge1(mdoc);
+       return(1);
+}
+
 static int
 ebool(struct mdoc *mdoc)
 {
 static int
 ebool(struct mdoc *mdoc)
 {
@@ -1623,34 +1654,37 @@ post_root(POST_ARGS)
 
        /* Add missing prologue data. */
 
 
        /* Add missing prologue data. */
 
-       if ( ! (MDOC_PBODY & mdoc->flags)) {
-               mandoc_msg(MANDOCERR_PROLOG_BAD, mdoc->parse, 0, 0, "EOF");
-               if (mdoc->meta.date == NULL)
-                       mdoc->meta.date = mdoc->quick ?
-                           mandoc_strdup("") :
-                           mandoc_normdate(mdoc->parse, NULL, 0, 0);
-               if (mdoc->meta.title == NULL)
-                       mdoc->meta.title = mandoc_strdup("UNKNOWN");
-               if (mdoc->meta.vol == NULL)
-                       mdoc->meta.vol = mandoc_strdup("LOCAL");
-               if (mdoc->meta.arch == NULL)
-                       mdoc->meta.msec = mandoc_strdup("1");
-               if (mdoc->meta.os == NULL)
-                       mdoc->meta.os = mandoc_strdup("UNKNOWN");
+       if (mdoc->meta.date == NULL)
+               mdoc->meta.date = mdoc->quick ?
+                   mandoc_strdup("") :
+                   mandoc_normdate(mdoc->parse, NULL, 0, 0);
+
+       if (mdoc->meta.title == NULL) {
+               mandoc_msg(MANDOCERR_DT_NOTITLE,
+                   mdoc->parse, 0, 0, "EOF");
+               mdoc->meta.title = mandoc_strdup("UNTITLED");
        }
 
        }
 
-       n = mdoc->first;
-       assert(n);
+       if (mdoc->meta.vol == NULL)
+               mdoc->meta.vol = mandoc_strdup("LOCAL");
+
+       if (mdoc->meta.os == NULL) {
+               mandoc_msg(MANDOCERR_OS_MISSING,
+                   mdoc->parse, 0, 0, NULL);
+               mdoc->meta.os = mandoc_strdup("");
+       }
 
        /* Check that we begin with a proper `Sh'. */
 
 
        /* Check that we begin with a proper `Sh'. */
 
-       if (NULL == n->child)
-               mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse,
-                   n->line, n->pos, NULL);
-       else if (MDOC_Sh != n->child->tok)
+       n = mdoc->first->child;
+       while (n != NULL && mdoc_macros[n->tok].flags & MDOC_PROLOGUE)
+               n = n->next;
+
+       if (n == NULL)
+               mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
+       else if (n->tok != MDOC_Sh)
                mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
                mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
-                   n->child->line, n->child->pos,
-                   mdoc_macronames[n->child->tok]);
+                   n->line, n->pos, mdoc_macronames[n->tok]);
 
        return(1);
 }
 
        return(1);
 }
@@ -1820,6 +1854,14 @@ post_hyph(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 
+static int
+post_hyphtext(POST_ARGS)
+{
+
+       ewarn_ge1(mdoc);
+       return(post_hyph(mdoc));
+}
+
 static int
 post_ns(POST_ARGS)
 {
 static int
 post_ns(POST_ARGS)
 {
@@ -1834,22 +1876,35 @@ static int
 post_sh(POST_ARGS)
 {
 
 post_sh(POST_ARGS)
 {
 
-       if (MDOC_HEAD == mdoc->last->type)
+       post_ignpar(mdoc);
+
+       switch (mdoc->last->type) {
+       case MDOC_HEAD:
                return(post_sh_head(mdoc));
                return(post_sh_head(mdoc));
-       if (MDOC_BODY == mdoc->last->type)
-               return(post_sh_body(mdoc));
+       case MDOC_BODY:
+               switch (mdoc->lastsec)  {
+               case SEC_NAME:
+                       return(post_sh_name(mdoc));
+               case SEC_SEE_ALSO:
+                       return(post_sh_see_also(mdoc));
+               case SEC_AUTHORS:
+                       return(post_sh_authors(mdoc));
+               default:
+                       break;
+               }
+               break;
+       default:
+               break;
+       }
 
        return(1);
 }
 
 static int
 
        return(1);
 }
 
 static int
-post_sh_body(POST_ARGS)
+post_sh_name(POST_ARGS)
 {
        struct mdoc_node *n;
 
 {
        struct mdoc_node *n;
 
-       if (SEC_NAME != mdoc->lastsec)
-               return(1);
-
        /*
         * Warn if the NAME section doesn't contain the `Nm' and `Nd'
         * macros (can have multiple `Nm' and one `Nd').  Note that the
        /*
         * Warn if the NAME section doesn't contain the `Nm' and `Nd'
         * macros (can have multiple `Nm' and one `Nd').  Note that the
@@ -1880,6 +1935,89 @@ post_sh_body(POST_ARGS)
        return(1);
 }
 
        return(1);
 }
 
+static int
+post_sh_see_also(POST_ARGS)
+{
+       const struct mdoc_node  *n;
+       const char              *name, *sec;
+       const char              *lastname, *lastsec, *lastpunct;
+       int                      cmp;
+
+       n = mdoc->last->child;
+       lastname = lastsec = lastpunct = NULL;
+       while (n != NULL) {
+               if (n->tok != MDOC_Xr || n->nchild < 2)
+                       break;
+
+               /* Process one .Xr node. */
+
+               name = n->child->string;
+               sec = n->child->next->string;
+               if (lastsec != NULL) {
+                       if (lastpunct[0] != ',' || lastpunct[1] != '\0')
+                               mandoc_vmsg(MANDOCERR_XR_PUNCT,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s before %s(%s)", lastpunct,
+                                   name, sec);
+                       cmp = strcmp(lastsec, sec);
+                       if (cmp > 0)
+                               mandoc_vmsg(MANDOCERR_XR_ORDER,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s(%s) after %s(%s)", name,
+                                   sec, lastname, lastsec);
+                       else if (cmp == 0 &&
+                           strcasecmp(lastname, name) > 0)
+                               mandoc_vmsg(MANDOCERR_XR_ORDER,
+                                   mdoc->parse, n->line, n->pos,
+                                   "%s after %s", name, lastname);
+               }
+               lastname = name;
+               lastsec = sec;
+
+               /* Process the following node. */
+
+               n = n->next;
+               if (n == NULL)
+                       break;
+               if (n->tok == MDOC_Xr) {
+                       lastpunct = "none";
+                       continue;
+               }
+               if (n->type != MDOC_TEXT)
+                       break;
+               for (name = n->string; *name != '\0'; name++)
+                       if (isalpha((const unsigned char)*name))
+                               return(1);
+               lastpunct = n->string;
+               if (n->next == NULL)
+                       mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
+                           n->line, n->pos, "%s after %s(%s)",
+                           lastpunct, lastname, lastsec);
+               n = n->next;
+       }
+       return(1);
+}
+
+static int
+child_an(const struct mdoc_node *n)
+{
+
+       for (n = n->child; n != NULL; n = n->next)
+               if ((n->tok == MDOC_An && n->nchild) || child_an(n))
+                       return(1);
+       return(0);
+}
+
+static int
+post_sh_authors(POST_ARGS)
+{
+
+       if ( ! child_an(mdoc->last))
+               mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse,
+                   mdoc->last->line, mdoc->last->pos, NULL);
+       return(1);
+}
+
 static int
 post_sh_head(POST_ARGS)
 {
 static int
 post_sh_head(POST_ARGS)
 {
@@ -1963,7 +2101,10 @@ post_sh_head(POST_ARGS)
 
        /* Check particular section/manual conventions. */
 
 
        /* Check particular section/manual conventions. */
 
-       assert(mdoc->meta.msec);
+       if (mdoc->meta.msec == NULL) {
+               free(secname);
+               return(1);
+       }
 
        goodsec = NULL;
        switch (sec) {
 
        goodsec = NULL;
        switch (sec) {
@@ -2004,6 +2145,9 @@ post_ignpar(POST_ARGS)
 {
        struct mdoc_node *np;
 
 {
        struct mdoc_node *np;
 
+       hwarn_ge1(mdoc);
+       post_hyph(mdoc);
+
        if (MDOC_BODY != mdoc->last->type)
                return(1);
 
        if (MDOC_BODY != mdoc->last->type)
                return(1);
 
@@ -2066,6 +2210,11 @@ post_par(POST_ARGS)
 {
        struct mdoc_node *np;
 
 {
        struct mdoc_node *np;
 
+       if (mdoc->last->tok == MDOC_sp)
+               ewarn_le1(mdoc);
+       else
+               ewarn_eq0(mdoc);
+
        if (MDOC_ELEM != mdoc->last->type &&
            MDOC_BLOCK != mdoc->last->type)
                return(1);
        if (MDOC_ELEM != mdoc->last->type &&
            MDOC_BLOCK != mdoc->last->type)
                return(1);
@@ -2134,7 +2283,7 @@ post_dd(POST_ARGS)
        if (NULL == n->child || '\0' == n->child->string[0]) {
                mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
                    mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);
        if (NULL == n->child || '\0' == n->child->string[0]) {
                mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
                    mandoc_normdate(mdoc->parse, NULL, n->line, n->pos);
-               return(1);
+               goto out;
        }
 
        datestr = NULL;
        }
 
        datestr = NULL;
@@ -2146,6 +2295,8 @@ post_dd(POST_ARGS)
                    datestr, n->line, n->pos);
                free(datestr);
        }
                    datestr, n->line, n->pos);
                free(datestr);
        }
+out:
+       mdoc_node_delete(mdoc, n);
        return(1);
 }
 
        return(1);
 }
 
@@ -2158,14 +2309,15 @@ post_dt(POST_ARGS)
 
        n = mdoc->last;
 
 
        n = mdoc->last;
 
-       if (mdoc->meta.title)
-               free(mdoc->meta.title);
-       if (mdoc->meta.vol)
-               free(mdoc->meta.vol);
-       if (mdoc->meta.arch)
-               free(mdoc->meta.arch);
+       free(mdoc->meta.title);
+       free(mdoc->meta.msec);
+       free(mdoc->meta.vol);
+       free(mdoc->meta.arch);
 
 
-       mdoc->meta.title = mdoc->meta.vol = mdoc->meta.arch = NULL;
+       mdoc->meta.title = NULL;
+       mdoc->meta.msec = NULL;
+       mdoc->meta.vol = NULL;
+       mdoc->meta.arch = NULL;
 
        /* First check that all characters are uppercase. */
 
 
        /* First check that all characters are uppercase. */
 
@@ -2180,32 +2332,27 @@ post_dt(POST_ARGS)
                        break;
                }
 
                        break;
                }
 
-       /* Handles: `.Dt'
-        * title = unknown, volume = local, msec = 0, arch = NULL
-        */
+       /* No argument: msec and arch remain NULL. */
 
        if (NULL == (nn = n->child)) {
 
        if (NULL == (nn = n->child)) {
-               /* XXX: make these macro values. */
-               /* FIXME: warn about missing values. */
-               mdoc->meta.title = mandoc_strdup("UNKNOWN");
+               mandoc_msg(MANDOCERR_DT_NOTITLE,
+                   mdoc->parse, n->line, n->pos, "Dt");
+               mdoc->meta.title = mandoc_strdup("UNTITLED");
                mdoc->meta.vol = mandoc_strdup("LOCAL");
                mdoc->meta.vol = mandoc_strdup("LOCAL");
-               mdoc->meta.msec = mandoc_strdup("1");
-               return(1);
+               goto out;
        }
 
        }
 
-       /* Handles: `.Dt TITLE'
-        * title = TITLE, volume = local, msec = 0, arch = NULL
-        */
+       /* One argument: msec and arch remain NULL. */
 
        mdoc->meta.title = mandoc_strdup(
 
        mdoc->meta.title = mandoc_strdup(
-           '\0' == nn->string[0] ? "UNKNOWN" : nn->string);
+           '\0' == nn->string[0] ? "UNTITLED" : nn->string);
 
        if (NULL == (nn = nn->next)) {
 
        if (NULL == (nn = nn->next)) {
-               /* FIXME: warn about missing msec. */
-               /* XXX: make this a macro value. */
+               mandoc_vmsg(MANDOCERR_MSEC_MISSING,
+                   mdoc->parse, n->line, n->pos,
+                   "Dt %s", mdoc->meta.title);
                mdoc->meta.vol = mandoc_strdup("LOCAL");
                mdoc->meta.vol = mandoc_strdup("LOCAL");
-               mdoc->meta.msec = mandoc_strdup("1");
-               return(1);
+               goto out;
        }
 
        /* Handles: `.Dt TITLE SEC'
        }
 
        /* Handles: `.Dt TITLE SEC'
@@ -2227,7 +2374,7 @@ post_dt(POST_ARGS)
        }
 
        if (NULL == (nn = nn->next))
        }
 
        if (NULL == (nn = nn->next))
-               return(1);
+               goto out;
 
        /* Handles: `.Dt TITLE SEC VOL'
         * title = TITLE,
 
        /* Handles: `.Dt TITLE SEC VOL'
         * title = TITLE,
@@ -2253,23 +2400,8 @@ post_dt(POST_ARGS)
 
        /* Ignore any subsequent parameters... */
        /* FIXME: warn about subsequent parameters. */
 
        /* Ignore any subsequent parameters... */
        /* FIXME: warn about subsequent parameters. */
-
-       return(1);
-}
-
-static int
-post_prol(POST_ARGS)
-{
-       /*
-        * Remove prologue macros from the document after they're
-        * processed.  The final document uses mdoc_meta for these
-        * values and discards the originals.
-        */
-
-       mdoc_node_delete(mdoc, mdoc->last);
-       if (mdoc->meta.title && mdoc->meta.date && mdoc->meta.os)
-               mdoc->flags |= MDOC_PBODY;
-
+out:
+       mdoc_node_delete(mdoc, n);
        return(1);
 }
 
        return(1);
 }
 
@@ -2315,11 +2447,11 @@ post_os(POST_ARGS)
        mdoc->meta.os = NULL;
        mdoc_deroff(&mdoc->meta.os, n);
        if (mdoc->meta.os)
        mdoc->meta.os = NULL;
        mdoc_deroff(&mdoc->meta.os, n);
        if (mdoc->meta.os)
-               return(1);
+               goto out;
 
        if (mdoc->defos) {
                mdoc->meta.os = mandoc_strdup(mdoc->defos);
 
        if (mdoc->defos) {
                mdoc->meta.os = mandoc_strdup(mdoc->defos);
-               return(1);
+               goto out;
        }
 
 #ifdef OSNAME
        }
 
 #ifdef OSNAME
@@ -2336,6 +2468,9 @@ post_os(POST_ARGS)
        }
        mdoc->meta.os = mandoc_strdup(defbuf);
 #endif /*!OSNAME*/
        }
        mdoc->meta.os = mandoc_strdup(defbuf);
 #endif /*!OSNAME*/
+
+out:
+       mdoc_node_delete(mdoc, n);
        return(1);
 }
 
        return(1);
 }
 
A git conversion mirror of mandoc.bsd.lv