Promote section headers that can can be used unmodified as fragment

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 2e844d199787040c6ff191d5013120fe8b85c9f1..57f05b25e8ff9b47f8dde98d98986805513231fd 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,19 +1,21 @@
-/*     $OpenBSD$ */
+/* $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) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012, 2013, 2014 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.
  *
  *
  * 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
  * 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.
  * 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).

  */
 #include "config.h"
 
  */
 #include "config.h"
 


@@ -24,48 +26,52 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>

+#include <stdio.h>

 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 

-#include "man.h"
-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

-#include "libman.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "man.h"

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

+#include "roff_int.h"
+#include "libman.h"
+#include "tag.h"

 
 

-#define        CHKARGS   struct man *man, struct man_node *n
+#define        CHKARGS   struct roff_man *man, struct roff_node *n

 
 typedef        void    (*v_check)(CHKARGS);
 
 
 typedef        void    (*v_check)(CHKARGS);
 

-static void      check_eq0(CHKARGS);
-static void      check_eq2(CHKARGS);
-static void      check_le1(CHKARGS);
-static void      check_le5(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_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 void      post_AT(CHKARGS);
 static void      check_text(CHKARGS);
 
 static void      post_AT(CHKARGS);

+static void      post_EE(CHKARGS);
+static void      post_EX(CHKARGS);

 static void      post_IP(CHKARGS);
 static void      post_IP(CHKARGS);

-static void      post_vs(CHKARGS);
-static void      post_fi(CHKARGS);
-static void      post_ft(CHKARGS);
-static void      post_nf(CHKARGS);
+static void      post_OP(CHKARGS);
+static void      post_SH(CHKARGS);

 static void      post_TH(CHKARGS);
 static void      post_TH(CHKARGS);

+static void      post_TP(CHKARGS);

 static void      post_UC(CHKARGS);
 static void      post_UR(CHKARGS);
 static void      post_UC(CHKARGS);
 static void      post_UR(CHKARGS);

+static void      post_in(CHKARGS);

 
 

-static v_check man_valids[MAN_MAX] = {
-       post_vs,    /* br */
+static const v_check man_valids[MAN_MAX - MAN_TH] = {

        post_TH,    /* TH */
        post_TH,    /* TH */

-       NULL,       /* SH */
-       NULL,       /* SS */
-       NULL,       /* TP */
-       check_par,  /* LP */
+       post_SH,    /* SH */
+       post_SH,    /* SS */
+       post_TP,    /* TP */
+       post_TP,    /* TQ */
+       check_abort,/* LP */

        check_par,  /* PP */
        check_par,  /* PP */

-       check_par,  /* P */
+       check_abort,/* P */

        post_IP,    /* IP */
        NULL,       /* HP */
        NULL,       /* SM */
        post_IP,    /* IP */
        NULL,       /* HP */
        NULL,       /* SM */


@@ -79,52 +85,87 @@ static      v_check man_valids[MAN_MAX] = {
        NULL,       /* I */
        NULL,       /* IR */
        NULL,       /* RI */
        NULL,       /* I */
        NULL,       /* IR */
        NULL,       /* RI */

-       post_vs,    /* sp */
-       post_nf,    /* nf */
-       post_fi,    /* fi */

        NULL,       /* RE */
        check_part, /* RS */
        NULL,       /* DT */
        post_UC,    /* UC */
        NULL,       /* RE */
        check_part, /* RS */
        NULL,       /* DT */
        post_UC,    /* UC */

-       check_le1,  /* PD */
+       NULL,       /* PD */

        post_AT,    /* AT */
        post_AT,    /* AT */

-       NULL,       /* in */
-       post_ft,    /* ft */
-       check_eq2,  /* OP */
-       post_nf,    /* EX */
-       post_fi,    /* EE */
+       post_in,    /* in */
+       NULL,       /* SY */
+       NULL,       /* YS */
+       post_OP,    /* OP */
+       post_EX,    /* EX */
+       post_EE,    /* EE */

        post_UR,    /* UR */
        NULL,       /* UE */
        post_UR,    /* UR */
        NULL,       /* UE */

-       NULL,       /* ll */
+       post_UR,    /* MT */
+       NULL,       /* ME */

 };
 
 
 };
 
 

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

 void
 void

-man_valid_post(struct man *man)
+man_validate(struct roff_man *man)

 {
 {

-       struct man_node *n;
-       v_check         *cp;
+       struct roff_node *n;
+       const v_check    *cp;
+
+       /*
+        * Translate obsolete macros such that later code
+        * does not need to look for them.
+        */

 
        n = man->last;
 
        n = man->last;

-       if (n->flags & MAN_VALID)
-               return;
-       n->flags |= MAN_VALID;
+       switch (n->tok) {
+       case MAN_LP:
+       case MAN_P:
+               n->tok = MAN_PP;
+               break;
+       default:
+               break;
+       }

 
 

+       /*
+        * 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;
+       }
+
+       /* Finally validate the macro itself. */
+
+       man->last = n;
+       man->next = ROFF_NEXT_SIBLING;

        switch (n->type) {
        switch (n->type) {

-       case MAN_TEXT:
+       case ROFFT_TEXT:

                check_text(man, n);
                break;
                check_text(man, n);
                break;

-       case MAN_ROOT:
+       case ROFFT_ROOT:

                check_root(man, n);
                break;
                check_root(man, n);
                break;

-       case MAN_EQN:
-               /* FALLTHROUGH */
-       case MAN_TBL:
+       case ROFFT_COMMENT:
+       case ROFFT_EQN:
+       case ROFFT_TBL:

                break;
        default:
                break;
        default:

-               cp = man_valids + n->tok;
+               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 (*cp)
                        (*cp)(man, n);

+               if (man->last == n)
+                       n->flags |= NODE_VALID;

                break;
        }
 }
                break;
        }
 }


@@ -132,18 +173,15 @@ man_valid_post(struct man *man)
 static void
 check_root(CHKARGS)
 {
 static void
 check_root(CHKARGS)
 {

-

        assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 
        assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);
 

-       if (NULL == man->first->child)
-               mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
-                   n->line, n->pos, NULL);
+       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 == man->meta.title) {
        else
                man->meta.hasbody = 1;
 
        if (NULL == man->meta.title) {

-               mandoc_msg(MANDOCERR_TH_NOTITLE, man->parse,
-                   n->line, n->pos, NULL);
+               mandoc_msg(MANDOCERR_TH_NOTITLE, n->line, n->pos, NULL);

 
                /*
                 * If a title hasn't been set, do so now (by
 
                /*
                 * If a title hasn't been set, do so now (by


@@ -152,8 +190,79 @@ check_root(CHKARGS)
 
                man->meta.title = mandoc_strdup("");
                man->meta.msec = mandoc_strdup("");
 
                man->meta.title = mandoc_strdup("");
                man->meta.msec = mandoc_strdup("");

-               man->meta.date = man->quick ? mandoc_strdup("") :
-                   mandoc_normdate(man->parse, NULL, n->line, n->pos);
+               man->meta.date = mandoc_normdate(NULL, NULL);
+       }
+
+       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;
+               }

        }
 }
 
        }
 }
 


@@ -162,99 +271,116 @@ check_text(CHKARGS)
 {
        char            *cp, *p;
 
 {
        char            *cp, *p;
 

-       if (MAN_LITERAL & man->flags)
+       if (n->flags & NODE_NOFILL)

                return;
 
        cp = n->string;
        for (p = cp; NULL != (p = strchr(p, '\t')); p++)
                return;
 
        cp = n->string;
        for (p = cp; NULL != (p = strchr(p, '\t')); p++)

-               mandoc_msg(MANDOCERR_FI_TAB, man->parse,
-                   n->line, n->pos + (p - cp), NULL);
+               mandoc_msg(MANDOCERR_FI_TAB,
+                   n->line, n->pos + (int)(p - cp), NULL);

 }
 
 }
 

-#define        INEQ_DEFINE(x, ineq, name) \
-static void \
-check_##name(CHKARGS) \
-{ \
-       if (n->nchild ineq (x)) \
-               return; \
-       mandoc_vmsg(MANDOCERR_ARGCOUNT, man->parse, n->line, n->pos, \
-           "line arguments %s %d (have %d)", \
-           #ineq, (x), n->nchild); \
+static void
+post_EE(CHKARGS)
+{
+       if ((n->flags & NODE_NOFILL) == 0)
+               mandoc_msg(MANDOCERR_FI_SKIP, n->line, n->pos, "EE");

 }
 
 }
 

-INEQ_DEFINE(0, ==, eq0)
-INEQ_DEFINE(2, ==, eq2)
-INEQ_DEFINE(1, <=, le1)
-INEQ_DEFINE(5, <=, le5)
+static void
+post_EX(CHKARGS)
+{
+       if (n->flags & NODE_NOFILL)
+               mandoc_msg(MANDOCERR_NF_SKIP, n->line, n->pos, "EX");
+}

 
 static void
 
 static void

-post_UR(CHKARGS)
+post_OP(CHKARGS)

 {
 
 {
 

-       if (MAN_HEAD == n->type && 1 != n->nchild)
-               mandoc_vmsg(MANDOCERR_ARGCOUNT, man->parse, n->line,
-                   n->pos, "line arguments eq 1 (have %d)", n->nchild);
-       check_part(man, n);
+       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 void
 }
 
 static void

-post_ft(CHKARGS)
+post_SH(CHKARGS)

 {
 {

-       char    *cp;
-       int      ok;
+       struct roff_node        *nc;
+       char                    *cp, *tag;

 
 

-       if (0 == n->nchild)
+       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;
                return;

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

        default:
        default:

-               break;
+               return;

        }
 
        }
 

-       if (0 == ok) {
-               mandoc_vmsg(MANDOCERR_FT_BAD, man->parse,
-                   n->line, n->pos, "ft %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 (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);

        }
 
        }
 

-       if (1 < n->nchild)
-               mandoc_vmsg(MANDOCERR_ARGCOUNT, man->parse, n->line,
-                   n->pos, "want one child (have %d)", n->nchild);
+       /*
+        * 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 void
+post_UR(CHKARGS)
+{
+       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 void
 check_part(CHKARGS)
 {
 
 }
 
 static void
 check_part(CHKARGS)
 {
 

-       if (n->type == MAN_BODY && n->child == NULL)
-               mandoc_msg(MANDOCERR_BLK_EMPTY, man->parse,
-                   n->line, n->pos, man_macronames[n->tok]);
+       if (n->type == ROFFT_BODY && n->child == NULL)
+               mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos,
+                   "%s", roff_name[n->tok]);

 }
 
 static void
 }
 
 static void


@@ -262,23 +388,29 @@ check_par(CHKARGS)
 {
 
        switch (n->type) {
 {
 
        switch (n->type) {

-       case MAN_BLOCK:
-               if (0 == n->body->nchild)
-                       man_node_delete(man, n);
+       case ROFFT_BLOCK:
+               if (n->body->child == NULL)
+                       roff_node_delete(man, n);

                break;
                break;

-       case MAN_BODY:
-               if (0 == n->nchild)
-                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
-                           man->parse, n->line, n->pos,
-                           "%s empty", man_macronames[n->tok]);
+       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;
                break;

-       case MAN_HEAD:
-               if (n->nchild)
-                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                           man->parse, n->line, n->pos,
-                           "%s %s%s", man_macronames[n->tok],
-                           n->child->string,
-                           n->nchild > 1 ? " ..." : "");
+       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;
                break;
        default:
                break;


@@ -288,53 +420,82 @@ check_par(CHKARGS)
 static void
 post_IP(CHKARGS)
 {
 static void
 post_IP(CHKARGS)
 {

-

        switch (n->type) {
        switch (n->type) {

-       case MAN_BLOCK:
-               if (0 == n->head->nchild && 0 == n->body->nchild)
-                       man_node_delete(man, n);
+       case ROFFT_BLOCK:
+               if (n->head->child == NULL && n->body->child == NULL)
+                       roff_node_delete(man, n);

                break;
                break;

-       case MAN_BODY:
-               if (0 == n->parent->head->nchild && 0 == n->nchild)
-                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
-                           man->parse, n->line, n->pos,
-                           "%s empty", man_macronames[n->tok]);
+       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;
        }
 }
 
                break;
        default:
                break;
        }
 }
 

+/*
+ * 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 void
 post_TH(CHKARGS)
 {
 static void
 post_TH(CHKARGS)
 {

-       struct man_node *nb;
+       struct roff_node *nb;

        const char      *p;
 
        const char      *p;
 

-       check_le5(man, n);
-

        free(man->meta.title);
        free(man->meta.vol);
        free(man->meta.title);
        free(man->meta.vol);

-       free(man->meta.source);
+       free(man->meta.os);

        free(man->meta.msec);
        free(man->meta.date);
 
        man->meta.title = man->meta.vol = man->meta.date =
        free(man->meta.msec);
        free(man->meta.date);
 
        man->meta.title = man->meta.vol = man->meta.date =

-           man->meta.msec = man->meta.source = NULL;
+           man->meta.msec = man->meta.os = NULL;

 
        nb = n;
 
 
        nb = n;
 

-       /* ->TITLE<- MSEC DATE SOURCE VOL */
+       /* ->TITLE<- MSEC DATE OS VOL */

 
        n = n->child;
 
        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)) {
                        /* Only warn about this once... */
                        if (isalpha((unsigned char)*p) &&
                            ! isupper((unsigned char)*p)) {

-                               mandoc_vmsg(MANDOCERR_TITLE_CASE,
-                                   man->parse, n->line,
-                                   n->pos + (p - n->string),
+                               mandoc_msg(MANDOCERR_TITLE_CASE, n->line,
+                                   n->pos + (int)(p - n->string),

                                    "TH %s", n->string);
                                break;
                        }
                                    "TH %s", n->string);
                                break;
                        }


@@ -342,46 +503,49 @@ post_TH(CHKARGS)
                man->meta.title = mandoc_strdup(n->string);
        } else {
                man->meta.title = mandoc_strdup("");
                man->meta.title = mandoc_strdup(n->string);
        } else {
                man->meta.title = mandoc_strdup("");

-               mandoc_msg(MANDOCERR_TH_NOTITLE, man->parse,
-                   nb->line, nb->pos, "TH");
+               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;
                n = n->next;

-       if (n && n->string)
+       if (n != NULL && n->string != NULL) {

                man->meta.msec = mandoc_strdup(n->string);
                man->meta.msec = mandoc_strdup(n->string);

-       else {
+               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("");
                man->meta.msec = mandoc_strdup("");

-               mandoc_vmsg(MANDOCERR_MSEC_MISSING, man->parse,
+               mandoc_msg(MANDOCERR_MSEC_MISSING,

                    nb->line, nb->pos, "TH %s", man->meta.title);
        }
 
                    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;
                n = n->next;

-       if (n && n->string && '\0' != n->string[0]) {
-               man->meta.date = man->quick ?
-                   mandoc_strdup(n->string) :
-                   mandoc_normdate(man->parse, n->string,
-                       n->line, n->pos);
-       } else {
+       if (man->quick && n != NULL)

                man->meta.date = mandoc_strdup("");
                man->meta.date = mandoc_strdup("");

-               mandoc_msg(MANDOCERR_DATE_MISSING, man->parse,
-                   n ? n->line : nb->line,
-                   n ? n->pos : nb->pos, "TH");
-       }
+       else
+               man->meta.date = mandoc_normdate(n, nb);

 
 

-       /* TITLE MSEC DATE ->SOURCE<- VOL */
+       /* TITLE MSEC DATE ->OS<- VOL */

 
        if (n && (n = n->next))
 
        if (n && (n = n->next))

-               man->meta.source = mandoc_strdup(n->string);
-       else if (man->defos != NULL)
-               man->meta.source = mandoc_strdup(man->defos);
+               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))
        /* If missing, use the default VOL name for MSEC. */
 
        if (n && (n = n->next))


@@ -390,37 +554,15 @@ post_TH(CHKARGS)
            (NULL != (p = mandoc_a2msec(man->meta.msec))))
                man->meta.vol = mandoc_strdup(p);
 
            (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.
         */
        /*
         * Remove the `TH' node after we've processed it for our
         * meta-data.
         */

-       man_node_delete(man, man->last);
-}
-
-static void
-post_nf(CHKARGS)
-{
-
-       check_eq0(man, n);
-
-       if (MAN_LITERAL & man->flags)
-               mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
-                   n->line, n->pos, "nf");
-
-       man->flags |= MAN_LITERAL;
-}
-
-static void
-post_fi(CHKARGS)
-{
-
-       check_eq0(man, n);
-
-       if ( ! (MAN_LITERAL & man->flags))
-               mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
-                   n->line, n->pos, "fi");
-
-       man->flags &= ~MAN_LITERAL;
+       roff_node_delete(man, man->last);

 }
 
 static void
 }
 
 static void


@@ -438,7 +580,7 @@ post_UC(CHKARGS)
 
        n = n->child;
 
 
        n = n->child;
 

-       if (NULL == n || MAN_TEXT != n->type)
+       if (n == NULL || n->type != ROFFT_TEXT)

                p = bsd_versions[0];
        else {
                s = n->string;
                p = bsd_versions[0];
        else {
                s = n->string;


@@ -456,8 +598,8 @@ post_UC(CHKARGS)
                        p = bsd_versions[0];
        }
 
                        p = bsd_versions[0];
        }
 

-       free(man->meta.source);
-       man->meta.source = mandoc_strdup(p);
+       free(man->meta.os);
+       man->meta.os = mandoc_strdup(p);

 }
 
 static void
 }
 
 static void


@@ -470,12 +612,12 @@ post_AT(CHKARGS)
            "System V Release 2",
        };
 
            "System V Release 2",
        };
 

+       struct roff_node *nn;

        const char      *p, *s;
        const char      *p, *s;

-       struct man_node *nn;

 
        n = n->child;
 
 
        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;
                p = unix_versions[0];
        else {
                s = n->string;


@@ -485,7 +627,9 @@ post_AT(CHKARGS)
                        p = unix_versions[1];
                else if (0 == strcmp(s, "5")) {
                        nn = n->next;
                        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];
                                p = unix_versions[3];
                        else
                                p = unix_versions[2];


@@ -493,38 +637,22 @@ post_AT(CHKARGS)
                        p = unix_versions[0];
        }
 
                        p = unix_versions[0];
        }
 

-       free(man->meta.source);
-       man->meta.source = mandoc_strdup(p);
+       free(man->meta.os);
+       man->meta.os = mandoc_strdup(p);

 }
 
 static void
 }
 
 static void

-post_vs(CHKARGS)
+post_in(CHKARGS)

 {
 {

+       char    *s;

 
 

-       if (n->tok == MAN_br)
-               check_eq0(man, n);
-       else
-               check_le1(man, n);
-
-       if (NULL != n->prev)
+       if (n->parent->tok != MAN_TP ||
+           n->parent->type != ROFFT_HEAD ||
+           n->child == NULL ||
+           *n->child->string == '+' ||
+           *n->child->string == '-')

                return;
                return;

-
-       switch (n->parent->tok) {
-       case MAN_SH:
-               /* FALLTHROUGH */
-       case MAN_SS:
-               mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
-                   "%s after %s", man_macronames[n->tok],
-                   man_macronames[n->parent->tok]);
-               /* FALLTHROUGH */
-       case MAN_MAX:
-               /*
-                * Don't warn about this because it occurs in pod2man
-                * and would cause considerable (unfixable) warnage.
-                */
-               man_node_delete(man, n);
-               break;
-       default:
-               break;
-       }
+       mandoc_asprintf(&s, "+%s", n->child->string);
+       free(n->child->string);
+       n->child->string = s;

 }
 }