]> git.cameronkatri.com Git - mandoc.git/blobdiff - man_validate.c
Rename the compile-time configuration variable $HOMEBREWDIR to
[mandoc.git] / man_validate.c
index 7f0581c585b3cad6ea4087f133206192af1112f2..57f05b25e8ff9b47f8dde98d98986805513231fd 100644 (file)
@@ -1,23 +1,23 @@
-/*     $Id: man_validate.c,v 1.72 2011/07/26 14:09:01 kristaps Exp $ */
+/* $Id: man_validate.c,v 1.155 2020/10/30 13:24:33 schwarze Exp $ */
 /*
+ * Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Validation module for man(7) syntax trees used by mandoc(1).
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "man.h"
+#include "mandoc_aux.h"
 #include "mandoc.h"
-#include "libman.h"
+#include "roff.h"
+#include "man.h"
 #include "libmandoc.h"
+#include "roff_int.h"
+#include "libman.h"
+#include "tag.h"
 
-#define        CHKARGS   struct man *m, struct man_node *n
-
-typedef        int     (*v_check)(CHKARGS);
+#define        CHKARGS   struct roff_man *man, struct roff_node *n
 
-struct man_valid {
-       v_check  *pres;
-       v_check  *posts;
-};
+typedef        void    (*v_check)(CHKARGS);
 
-static int       check_bline(CHKARGS);
-static int       check_eq0(CHKARGS);
-static int       check_ft(CHKARGS);
-static int       check_le1(CHKARGS);
-static int       check_ge2(CHKARGS);
-static int       check_le5(CHKARGS);
-static int       check_par(CHKARGS);
-static int       check_part(CHKARGS);
-static int       check_root(CHKARGS);
-static int       check_sec(CHKARGS);
+static void      check_abort(CHKARGS) __attribute__((__noreturn__));
+static void      check_par(CHKARGS);
+static void      check_part(CHKARGS);
+static void      check_root(CHKARGS);
+static void      check_tag(struct roff_node *, struct roff_node *);
 static void      check_text(CHKARGS);
 
-static int       post_AT(CHKARGS);
-static int       post_vs(CHKARGS);
-static int       post_fi(CHKARGS);
-static int       post_nf(CHKARGS);
-static int       post_TH(CHKARGS);
-static int       post_UC(CHKARGS);
-
-static v_check   posts_at[] = { post_AT, NULL };
-static v_check   posts_br[] = { post_vs, check_eq0, NULL };
-static v_check   posts_eq0[] = { check_eq0, NULL };
-static v_check   posts_fi[] = { check_eq0, post_fi, NULL };
-static v_check   posts_ft[] = { check_ft, NULL };
-static v_check   posts_nf[] = { check_eq0, post_nf, NULL };
-static v_check   posts_par[] = { check_par, NULL };
-static v_check   posts_part[] = { check_part, NULL };
-static v_check   posts_sec[] = { check_sec, NULL };
-static v_check   posts_sp[] = { post_vs, check_le1, NULL };
-static v_check   posts_th[] = { check_ge2, check_le5, post_TH, NULL };
-static v_check   posts_uc[] = { post_UC, NULL };
-static v_check   pres_bline[] = { check_bline, NULL };
-
-static const struct man_valid man_valids[MAN_MAX] = {
-       { NULL, posts_br }, /* br */
-       { pres_bline, posts_th }, /* TH */
-       { pres_bline, posts_sec }, /* SH */
-       { pres_bline, posts_sec }, /* SS */
-       { pres_bline, NULL }, /* TP */
-       { pres_bline, posts_par }, /* LP */
-       { pres_bline, posts_par }, /* PP */
-       { pres_bline, posts_par }, /* P */
-       { pres_bline, NULL }, /* IP */
-       { pres_bline, NULL }, /* HP */
-       { NULL, NULL }, /* SM */
-       { NULL, NULL }, /* SB */
-       { NULL, NULL }, /* BI */
-       { NULL, NULL }, /* IB */
-       { NULL, NULL }, /* BR */
-       { NULL, NULL }, /* RB */
-       { NULL, NULL }, /* R */
-       { NULL, NULL }, /* B */
-       { NULL, NULL }, /* I */
-       { NULL, NULL }, /* IR */
-       { NULL, NULL }, /* RI */
-       { NULL, posts_eq0 }, /* na */ /* FIXME: should warn only. */
-       { NULL, posts_sp }, /* sp */ /* FIXME: should warn only. */
-       { pres_bline, posts_nf }, /* nf */
-       { pres_bline, posts_fi }, /* fi */
-       { NULL, NULL }, /* RE */
-       { NULL, posts_part }, /* RS */
-       { NULL, NULL }, /* DT */
-       { NULL, posts_uc }, /* UC */
-       { NULL, NULL }, /* PD */
-       { NULL, posts_at }, /* AT */
-       { NULL, NULL }, /* in */
-       { NULL, posts_ft }, /* ft */
+static void      post_AT(CHKARGS);
+static void      post_EE(CHKARGS);
+static void      post_EX(CHKARGS);
+static void      post_IP(CHKARGS);
+static void      post_OP(CHKARGS);
+static void      post_SH(CHKARGS);
+static void      post_TH(CHKARGS);
+static void      post_TP(CHKARGS);
+static void      post_UC(CHKARGS);
+static void      post_UR(CHKARGS);
+static void      post_in(CHKARGS);
+
+static const v_check man_valids[MAN_MAX - MAN_TH] = {
+       post_TH,    /* TH */
+       post_SH,    /* SH */
+       post_SH,    /* SS */
+       post_TP,    /* TP */
+       post_TP,    /* TQ */
+       check_abort,/* LP */
+       check_par,  /* PP */
+       check_abort,/* P */
+       post_IP,    /* IP */
+       NULL,       /* HP */
+       NULL,       /* SM */
+       NULL,       /* SB */
+       NULL,       /* BI */
+       NULL,       /* IB */
+       NULL,       /* BR */
+       NULL,       /* RB */
+       NULL,       /* R */
+       NULL,       /* B */
+       NULL,       /* I */
+       NULL,       /* IR */
+       NULL,       /* RI */
+       NULL,       /* RE */
+       check_part, /* RS */
+       NULL,       /* DT */
+       post_UC,    /* UC */
+       NULL,       /* PD */
+       post_AT,    /* AT */
+       post_in,    /* in */
+       NULL,       /* SY */
+       NULL,       /* YS */
+       post_OP,    /* OP */
+       post_EX,    /* EX */
+       post_EE,    /* EE */
+       post_UR,    /* UR */
+       NULL,       /* UE */
+       post_UR,    /* MT */
+       NULL,       /* ME */
 };
 
 
-int
-man_valid_pre(struct man *m, struct man_node *n)
+/* Validate the subtree rooted at man->last. */
+void
+man_validate(struct roff_man *man)
 {
-       v_check         *cp;
+       struct roff_node *n;
+       const v_check    *cp;
 
-       switch (n->type) {
-       case (MAN_TEXT):
-               /* FALLTHROUGH */
-       case (MAN_ROOT):
-               /* FALLTHROUGH */
-       case (MAN_EQN):
-               /* FALLTHROUGH */
-       case (MAN_TBL):
-               return(1);
+       /*
+        * Translate obsolete macros such that later code
+        * does not need to look for them.
+        */
+
+       n = man->last;
+       switch (n->tok) {
+       case MAN_LP:
+       case MAN_P:
+               n->tok = MAN_PP;
+               break;
        default:
                break;
        }
 
-       if (NULL == (cp = man_valids[n->tok].pres))
-               return(1);
-       for ( ; *cp; cp++)
-               if ( ! (*cp)(m, n)) 
-                       return(0);
-       return(1);
-}
+       /*
+        * Iterate over all children, recursing into each one
+        * in turn, depth-first.
+        */
 
+       man->last = man->last->child;
+       while (man->last != NULL) {
+               man_validate(man);
+               if (man->last == n)
+                       man->last = man->last->child;
+               else
+                       man->last = man->last->next;
+       }
 
-int
-man_valid_post(struct man *m)
-{
-       v_check         *cp;
-
-       if (MAN_VALID & m->last->flags)
-               return(1);
-       m->last->flags |= MAN_VALID;
-
-       switch (m->last->type) {
-       case (MAN_TEXT): 
-               check_text(m, m->last);
-               return(1);
-       case (MAN_ROOT):
-               return(check_root(m, m->last));
-       case (MAN_EQN):
-               /* FALLTHROUGH */
-       case (MAN_TBL):
-               return(1);
+       /* Finally validate the macro itself. */
+
+       man->last = n;
+       man->next = ROFF_NEXT_SIBLING;
+       switch (n->type) {
+       case ROFFT_TEXT:
+               check_text(man, n);
+               break;
+       case ROFFT_ROOT:
+               check_root(man, n);
+               break;
+       case ROFFT_COMMENT:
+       case ROFFT_EQN:
+       case ROFFT_TBL:
+               break;
        default:
+               if (n->tok < ROFF_MAX) {
+                       roff_validate(man);
+                       break;
+               }
+               assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
+               cp = man_valids + (n->tok - MAN_TH);
+               if (*cp)
+                       (*cp)(man, n);
+               if (man->last == n)
+                       n->flags |= NODE_VALID;
                break;
        }
-
-       if (NULL == (cp = man_valids[m->last->tok].posts))
-               return(1);
-       for ( ; *cp; cp++)
-               if ( ! (*cp)(m, m->last))
-                       return(0);
-
-       return(1);
 }
 
-
-static int
-check_root(CHKARGS) 
+static void
+check_root(CHKARGS)
 {
+       assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 
-       if (MAN_BLINE & m->flags)
-               man_nmsg(m, n, MANDOCERR_SCOPEEXIT);
-       else if (MAN_ELINE & m->flags)
-               man_nmsg(m, n, MANDOCERR_SCOPEEXIT);
-
-       m->flags &= ~MAN_BLINE;
-       m->flags &= ~MAN_ELINE;
+       if (n->last == NULL || n->last->type == ROFFT_COMMENT)
+               mandoc_msg(MANDOCERR_DOC_EMPTY, n->line, n->pos, NULL);
+       else
+               man->meta.hasbody = 1;
 
-       if (NULL == m->first->child) {
-               man_nmsg(m, n, MANDOCERR_NODOCBODY);
-               return(0);
-       } else if (NULL == m->meta.title) {
-               man_nmsg(m, n, MANDOCERR_NOTITLE);
+       if (NULL == man->meta.title) {
+               mandoc_msg(MANDOCERR_TH_NOTITLE, n->line, n->pos, NULL);
 
                /*
                 * If a title hasn't been set, do so now (by
                 * implication, date and section also aren't set).
                 */
 
-               m->meta.title = mandoc_strdup("unknown");
-               m->meta.msec = mandoc_strdup("1");
-               m->meta.date = mandoc_normdate
-                       (m->parse, NULL, n->line, n->pos);
+               man->meta.title = mandoc_strdup("");
+               man->meta.msec = mandoc_strdup("");
+               man->meta.date = mandoc_normdate(NULL, NULL);
        }
 
-       return(1);
+       if (man->meta.os_e &&
+           (man->meta.rcsids & (1 << man->meta.os_e)) == 0)
+               mandoc_msg(MANDOCERR_RCS_MISSING, 0, 0,
+                   man->meta.os_e == MANDOC_OS_OPENBSD ?
+                   "(OpenBSD)" : "(NetBSD)");
+}
+
+static void
+check_abort(CHKARGS)
+{
+       abort();
+}
+
+/*
+ * Skip leading whitespace, dashes, backslashes, and font escapes,
+ * then create a tag if the first following byte is a letter.
+ * Priority is high unless whitespace is present.
+ */
+static void
+check_tag(struct roff_node *n, struct roff_node *nt)
+{
+       const char      *cp, *arg;
+       int              prio, sz;
+
+       if (nt == NULL || nt->type != ROFFT_TEXT)
+               return;
+
+       cp = nt->string;
+       prio = TAG_STRONG;
+       for (;;) {
+               switch (*cp) {
+               case ' ':
+               case '\t':
+                       prio = TAG_WEAK;
+                       /* FALLTHROUGH */
+               case '-':
+                       cp++;
+                       break;
+               case '\\':
+                       cp++;
+                       switch (mandoc_escape(&cp, &arg, &sz)) {
+                       case ESCAPE_FONT:
+                       case ESCAPE_FONTBOLD:
+                       case ESCAPE_FONTITALIC:
+                       case ESCAPE_FONTBI:
+                       case ESCAPE_FONTROMAN:
+                       case ESCAPE_FONTCW:
+                       case ESCAPE_FONTPREV:
+                       case ESCAPE_IGNORE:
+                               break;
+                       case ESCAPE_SPECIAL:
+                               if (sz != 1)
+                                       return;
+                               switch (*arg) {
+                               case '-':
+                               case 'e':
+                                       break;
+                               default:
+                                       return;
+                               }
+                               break;
+                       default:
+                               return;
+                       }
+                       break;
+               default:
+                       if (isalpha((unsigned char)*cp))
+                               tag_put(cp, prio, n);
+                       return;
+               }
+       }
 }
 
 static void
@@ -211,246 +271,301 @@ check_text(CHKARGS)
 {
        char            *cp, *p;
 
-       cp = p = n->string;
-       for (cp = p; NULL != (p = strchr(p, '\t')); p++) {
-               if (MAN_LITERAL & m->flags)
-                       continue;
-               man_pmsg(m, n->line, (int)(p - cp), MANDOCERR_BADTAB);
-       }
+       if (n->flags & NODE_NOFILL)
+               return;
+
+       cp = n->string;
+       for (p = cp; NULL != (p = strchr(p, '\t')); p++)
+               mandoc_msg(MANDOCERR_FI_TAB,
+                   n->line, n->pos + (int)(p - cp), NULL);
+}
+
+static void
+post_EE(CHKARGS)
+{
+       if ((n->flags & NODE_NOFILL) == 0)
+               mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "EE");
 }
 
-#define        INEQ_DEFINE(x, ineq, name) \
-static int \
-check_##name(CHKARGS) \
-{ \
-       if (n->nchild ineq (x)) \
-               return(1); \
-       mandoc_vmsg(MANDOCERR_ARGCOUNT, m->parse, n->line, n->pos, \
-                       "line arguments %s %d (have %d)", \
-                       #ineq, (x), n->nchild); \
-       return(1); \
+static void
+post_EX(CHKARGS)
+{
+       if (n->flags & NODE_NOFILL)
+               mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "EX");
 }
 
-INEQ_DEFINE(0, ==, eq0)
-INEQ_DEFINE(1, <=, le1)
-INEQ_DEFINE(2, >=, ge2)
-INEQ_DEFINE(5, <=, le5)
+static void
+post_OP(CHKARGS)
+{
+
+       if (n->child == NULL)
+               mandoc_msg(MANDOCERR_OP_EMPTY, n->line, n->pos, "OP");
+       else if (n->child->next != NULL && n->child->next->next != NULL) {
+               n = n->child->next->next;
+               mandoc_msg(MANDOCERR_ARG_EXCESS,
+                   n->line, n->pos, "OP ... %s", n->string);
+       }
+}
 
-static int
-check_ft(CHKARGS)
+static void
+post_SH(CHKARGS)
 {
-       char    *cp;
-       int      ok;
-
-       if (0 == n->nchild)
-               return(1);
-
-       ok = 0;
-       cp = n->child->string;
-       switch (*cp) {
-       case ('1'):
-               /* FALLTHROUGH */
-       case ('2'):
-               /* FALLTHROUGH */
-       case ('3'):
-               /* FALLTHROUGH */
-       case ('4'):
-               /* FALLTHROUGH */
-       case ('I'):
-               /* FALLTHROUGH */
-       case ('P'):
-               /* FALLTHROUGH */
-       case ('R'):
-               if ('\0' == cp[1])
-                       ok = 1;
-               break;
-       case ('B'):
-               if ('\0' == cp[1] || ('I' == cp[1] && '\0' == cp[2]))
-                       ok = 1;
-               break;
-       case ('C'):
-               if ('W' == cp[1] && '\0' == cp[2])
-                       ok = 1;
-               break;
+       struct roff_node        *nc;
+       char                    *cp, *tag;
+
+       nc = n->child;
+       switch (n->type) {
+       case ROFFT_HEAD:
+               tag = NULL;
+               deroff(&tag, n);
+               if (tag != NULL) {
+                       for (cp = tag; *cp != '\0'; cp++)
+                               if (*cp == ' ')
+                                       *cp = '_';
+                       if (nc != NULL && nc->type == ROFFT_TEXT &&
+                           strcmp(nc->string, tag) == 0)
+                               tag_put(NULL, TAG_STRONG, n);
+                       else
+                               tag_put(tag, TAG_FALLBACK, n);
+                       free(tag);
+               }
+               return;
+       case ROFFT_BODY:
+               if (nc != NULL)
+                       break;
+               return;
        default:
-               break;
+               return;
        }
 
-       if (0 == ok) {
-               mandoc_vmsg
-                       (MANDOCERR_BADFONT, m->parse,
-                        n->line, n->pos, "%s", cp);
-               *cp = '\0';
+       if (nc->tok == MAN_PP && nc->body->child != NULL) {
+               while (nc->body->last != NULL) {
+                       man->next = ROFF_NEXT_CHILD;
+                       roff_node_relink(man, nc->body->last);
+                       man->last = n;
+               }
        }
 
-       if (1 < n->nchild)
-               mandoc_vmsg
-                       (MANDOCERR_ARGCOUNT, m->parse, n->line, 
-                        n->pos, "want one child (have %d)", 
-                        n->nchild);
+       if (nc->tok == MAN_PP || nc->tok == ROFF_sp || nc->tok == ROFF_br) {
+               mandoc_msg(MANDOCERR_PAR_SKIP, nc->line, nc->pos,
+                   "%s after %s", roff_name[nc->tok], roff_name[n->tok]);
+               roff_node_delete(man, nc);
+       }
 
-       return(1);
+       /*
+        * Trailing PP is empty, so it is deleted by check_par().
+        * Trailing sp is significant.
+        */
+
+       if ((nc = n->last) != NULL && nc->tok == ROFF_br) {
+               mandoc_msg(MANDOCERR_PAR_SKIP,
+                   nc->line, nc->pos, "%s at the end of %s",
+                   roff_name[nc->tok], roff_name[n->tok]);
+               roff_node_delete(man, nc);
+       }
 }
 
-static int
-check_sec(CHKARGS)
+static void
+post_UR(CHKARGS)
 {
-
-       if ( ! (MAN_HEAD == n->type && 0 == n->nchild)) 
-               return(1);
-
-       man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
-       return(0);
+       if (n->type == ROFFT_HEAD && n->child == NULL)
+               mandoc_msg(MANDOCERR_UR_NOHEAD, n->line, n->pos,
+                   "%s", roff_name[n->tok]);
+       check_part(man, n);
 }
 
-
-static int
+static void
 check_part(CHKARGS)
 {
 
-       if (MAN_BODY == n->type && 0 == n->nchild)
-               mandoc_msg(MANDOCERR_ARGCWARN, m->parse, n->line, 
-                               n->pos, "want children (have none)");
-
-       return(1);
+       if (n->type == ROFFT_BODY && n->child == NULL)
+               mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos,
+                   "%s", roff_name[n->tok]);
 }
 
-
-static int
+static void
 check_par(CHKARGS)
 {
 
        switch (n->type) {
-       case (MAN_BLOCK):
-               if (0 == n->body->nchild)
-                       man_node_delete(m, n);
+       case ROFFT_BLOCK:
+               if (n->body->child == NULL)
+                       roff_node_delete(man, n);
                break;
-       case (MAN_BODY):
-               if (0 == n->nchild)
-                       man_nmsg(m, n, MANDOCERR_IGNPAR);
+       case ROFFT_BODY:
+               if (n->child != NULL &&
+                   (n->child->tok == ROFF_sp || n->child->tok == ROFF_br)) {
+                       mandoc_msg(MANDOCERR_PAR_SKIP,
+                           n->child->line, n->child->pos,
+                           "%s after %s", roff_name[n->child->tok],
+                           roff_name[n->tok]);
+                       roff_node_delete(man, n->child);
+               }
+               if (n->child == NULL)
+                       mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos,
+                           "%s empty", roff_name[n->tok]);
                break;
-       case (MAN_HEAD):
-               if (n->nchild)
-                       man_nmsg(m, n, MANDOCERR_ARGSLOST);
+       case ROFFT_HEAD:
+               if (n->child != NULL)
+                       mandoc_msg(MANDOCERR_ARG_SKIP,
+                           n->line, n->pos, "%s %s%s",
+                           roff_name[n->tok], n->child->string,
+                           n->child->next != NULL ? " ..." : "");
                break;
        default:
                break;
        }
-
-       return(1);
 }
 
-
-static int
-check_bline(CHKARGS)
+static void
+post_IP(CHKARGS)
 {
-
-       assert( ! (MAN_ELINE & m->flags));
-       if (MAN_BLINE & m->flags) {
-               man_nmsg(m, n, MANDOCERR_SYNTLINESCOPE);
-               return(0);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               if (n->head->child == NULL && n->body->child == NULL)
+                       roff_node_delete(man, n);
+               break;
+       case ROFFT_HEAD:
+               check_tag(n, n->child);
+               break;
+       case ROFFT_BODY:
+               if (n->parent->head->child == NULL && n->child == NULL)
+                       mandoc_msg(MANDOCERR_PAR_SKIP, n->line, n->pos,
+                           "%s empty", roff_name[n->tok]);
+               break;
+       default:
+               break;
        }
+}
 
-       return(1);
+/*
+ * The first next-line element in the head is the tag.
+ * If that's a font macro, use its first child instead.
+ */
+static void
+post_TP(CHKARGS)
+{
+       struct roff_node *nt;
+
+       if (n->type != ROFFT_HEAD || (nt = n->child) == NULL)
+               return;
+
+       while ((nt->flags & NODE_LINE) == 0)
+               if ((nt = nt->next) == NULL)
+                       return;
+
+       switch (nt->tok) {
+       case MAN_B:
+       case MAN_BI:
+       case MAN_BR:
+       case MAN_I:
+       case MAN_IB:
+       case MAN_IR:
+               nt = nt->child;
+               break;
+       default:
+               break;
+       }
+       check_tag(n, nt);
 }
 
-static int
+static void
 post_TH(CHKARGS)
 {
+       struct roff_node *nb;
        const char      *p;
-       int              line, pos;
-
-       if (m->meta.title)
-               free(m->meta.title);
-       if (m->meta.vol)
-               free(m->meta.vol);
-       if (m->meta.source)
-               free(m->meta.source);
-       if (m->meta.msec)
-               free(m->meta.msec);
-       if (m->meta.date)
-               free(m->meta.date);
-
-       line = n->line;
-       pos = n->pos;
-       m->meta.title = m->meta.vol = m->meta.date =
-               m->meta.msec = m->meta.source = NULL;
-
-       /* ->TITLE<- MSEC DATE SOURCE VOL */
+
+       free(man->meta.title);
+       free(man->meta.vol);
+       free(man->meta.os);
+       free(man->meta.msec);
+       free(man->meta.date);
+
+       man->meta.title = man->meta.vol = man->meta.date =
+           man->meta.msec = man->meta.os = NULL;
+
+       nb = n;
+
+       /* ->TITLE<- MSEC DATE OS VOL */
 
        n = n->child;
-       if (n && n->string) {
-               for (p = n->string; '\0' != *p; p++) {
+       if (n != NULL && n->string != NULL) {
+               for (p = n->string; *p != '\0'; p++) {
                        /* Only warn about this once... */
-                       if (isalpha((unsigned char)*p) && 
-                                       ! isupper((unsigned char)*p)) {
-                               man_nmsg(m, n, MANDOCERR_UPPERCASE);
+                       if (isalpha((unsigned char)*p) &&
+                           ! isupper((unsigned char)*p)) {
+                               mandoc_msg(MANDOCERR_TITLE_CASE, n->line,
+                                   n->pos + (int)(p - n->string),
+                                   "TH %s", n->string);
                                break;
                        }
                }
-               m->meta.title = mandoc_strdup(n->string);
-       } else
-               m->meta.title = mandoc_strdup("");
+               man->meta.title = mandoc_strdup(n->string);
+       } else {
+               man->meta.title = mandoc_strdup("");
+               mandoc_msg(MANDOCERR_TH_NOTITLE, nb->line, nb->pos, "TH");
+       }
 
-       /* TITLE ->MSEC<- DATE SOURCE VOL */
+       /* TITLE ->MSEC<- DATE OS VOL */
 
-       if (n)
+       if (n != NULL)
                n = n->next;
-       if (n && n->string)
-               m->meta.msec = mandoc_strdup(n->string);
-       else
-               m->meta.msec = mandoc_strdup("");
+       if (n != NULL && n->string != NULL) {
+               man->meta.msec = mandoc_strdup(n->string);
+               if (man->filesec != '\0' &&
+                   man->filesec != *n->string &&
+                   *n->string >= '1' && *n->string <= '9')
+                       mandoc_msg(MANDOCERR_MSEC_FILE, n->line, n->pos,
+                           "*.%c vs TH ... %c", man->filesec, *n->string);
+       } else {
+               man->meta.msec = mandoc_strdup("");
+               mandoc_msg(MANDOCERR_MSEC_MISSING,
+                   nb->line, nb->pos, "TH %s", man->meta.title);
+       }
 
-       /* TITLE MSEC ->DATE<- SOURCE VOL */
+       /* TITLE MSEC ->DATE<- OS VOL */
 
-       if (n)
+       if (n != NULL)
                n = n->next;
-       if (n)
-               pos = n->pos;
-       m->meta.date = mandoc_normdate
-               (m->parse, n ? n->string : NULL, line, pos);
+       if (man->quick && n != NULL)
+               man->meta.date = mandoc_strdup("");
+       else
+               man->meta.date = mandoc_normdate(n, nb);
 
-       /* TITLE MSEC DATE ->SOURCE<- VOL */
+       /* TITLE MSEC DATE ->OS<- VOL */
 
        if (n && (n = n->next))
-               m->meta.source = mandoc_strdup(n->string);
+               man->meta.os = mandoc_strdup(n->string);
+       else if (man->os_s != NULL)
+               man->meta.os = mandoc_strdup(man->os_s);
+       if (man->meta.os_e == MANDOC_OS_OTHER && man->meta.os != NULL) {
+               if (strstr(man->meta.os, "OpenBSD") != NULL)
+                       man->meta.os_e = MANDOC_OS_OPENBSD;
+               else if (strstr(man->meta.os, "NetBSD") != NULL)
+                       man->meta.os_e = MANDOC_OS_NETBSD;
+       }
 
-       /* TITLE MSEC DATE SOURCE ->VOL<- */
+       /* TITLE MSEC DATE OS ->VOL<- */
+       /* If missing, use the default VOL name for MSEC. */
 
        if (n && (n = n->next))
-               m->meta.vol = mandoc_strdup(n->string);
+               man->meta.vol = mandoc_strdup(n->string);
+       else if ('\0' != man->meta.msec[0] &&
+           (NULL != (p = mandoc_a2msec(man->meta.msec))))
+               man->meta.vol = mandoc_strdup(p);
+
+       if (n != NULL && (n = n->next) != NULL)
+               mandoc_msg(MANDOCERR_ARG_EXCESS,
+                   n->line, n->pos, "TH ... %s", n->string);
 
        /*
         * Remove the `TH' node after we've processed it for our
         * meta-data.
         */
-       man_node_delete(m, m->last);
-       return(1);
-}
-
-static int
-post_nf(CHKARGS)
-{
-
-       if (MAN_LITERAL & m->flags)
-               man_nmsg(m, n, MANDOCERR_SCOPEREP);
-
-       m->flags |= MAN_LITERAL;
-       return(1);
-}
-
-static int
-post_fi(CHKARGS)
-{
-
-       if ( ! (MAN_LITERAL & m->flags))
-               man_nmsg(m, n, MANDOCERR_WNOSCOPE);
-
-       m->flags &= ~MAN_LITERAL;
-       return(1);
+       roff_node_delete(man, man->last);
 }
 
-static int
+static void
 post_UC(CHKARGS)
 {
        static const char * const bsd_versions[] = {
@@ -464,9 +579,8 @@ post_UC(CHKARGS)
        const char      *p, *s;
 
        n = n->child;
-       n = m->last->child;
 
-       if (NULL == n || MAN_TEXT != n->type)
+       if (n == NULL || n->type != ROFFT_TEXT)
                p = bsd_versions[0];
        else {
                s = n->string;
@@ -484,14 +598,11 @@ post_UC(CHKARGS)
                        p = bsd_versions[0];
        }
 
-       if (m->meta.source)
-               free(m->meta.source);
-
-       m->meta.source = mandoc_strdup(p);
-       return(1);
+       free(man->meta.os);
+       man->meta.os = mandoc_strdup(p);
 }
 
-static int
+static void
 post_AT(CHKARGS)
 {
        static const char * const unix_versions[] = {
@@ -501,12 +612,12 @@ post_AT(CHKARGS)
            "System V Release 2",
        };
 
+       struct roff_node *nn;
        const char      *p, *s;
-       struct man_node *nn;
 
        n = n->child;
 
-       if (NULL == n || MAN_TEXT != n->type)
+       if (n == NULL || n->type != ROFFT_TEXT)
                p = unix_versions[0];
        else {
                s = n->string;
@@ -516,7 +627,9 @@ post_AT(CHKARGS)
                        p = unix_versions[1];
                else if (0 == strcmp(s, "5")) {
                        nn = n->next;
-                       if (nn && MAN_TEXT == nn->type && nn->string[0])
+                       if (nn != NULL &&
+                           nn->type == ROFFT_TEXT &&
+                           nn->string[0] != '\0')
                                p = unix_versions[3];
                        else
                                p = unix_versions[2];
@@ -524,23 +637,22 @@ post_AT(CHKARGS)
                        p = unix_versions[0];
        }
 
-       if (m->meta.source)
-               free(m->meta.source);
-
-       m->meta.source = mandoc_strdup(p);
-       return(1);
+       free(man->meta.os);
+       man->meta.os = mandoc_strdup(p);
 }
 
-static int
-post_vs(CHKARGS)
+static void
+post_in(CHKARGS)
 {
-
-       /* 
-        * Don't warn about this because it occurs in pod2man and would
-        * cause considerable (unfixable) warnage.
-        */
-       if (NULL == n->prev && MAN_ROOT == n->parent->type)
-               man_node_delete(m, n);
-
-       return(1);
+       char    *s;
+
+       if (n->parent->tok != MAN_TP ||
+           n->parent->type != ROFFT_HEAD ||
+           n->child == NULL ||
+           *n->child->string == '+' ||
+           *n->child->string == '-')
+               return;
+       mandoc_asprintf(&s, "+%s", n->child->string);
+       free(n->child->string);
+       n->child->string = s;
 }