1. Eliminate struct eqn, instead use the existing members

[mandoc.git] / man_validate.c

diff --git a/man_validate.c b/man_validate.c
index 647dbcca3ba075dba04180c17d0edfc31fd9ac71..12ba6e22e97b209b559826fc3e4e59e6368849c7 100644 (file)
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,23 +1,21 @@
-/*     $Id: man_validate.c,v 1.89 2014/03/23 11:25:26 schwarze Exp $ */
+/*     $OpenBSD$ */

 /*
  * 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>
+ * Copyright (c) 2010, 2012-2017 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.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -30,193 +28,156 @@
 #include <string.h>
 #include <time.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"

 
 

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

 
 

-typedef        int     (*v_check)(CHKARGS);
+typedef        void    (*v_check)(CHKARGS);

 
 

-struct man_valid {
-       v_check  *pres;
-       v_check  *posts;
-};
-
-static int       check_eq0(CHKARGS);
-static int       check_eq2(CHKARGS);
-static int       check_le1(CHKARGS);
-static int       check_ge2(CHKARGS);
-static int       check_le5(CHKARGS);
-static int       check_head1(CHKARGS);
-static int       check_par(CHKARGS);
-static int       check_part(CHKARGS);
-static int       check_root(CHKARGS);
+static void      check_par(CHKARGS);
+static void      check_part(CHKARGS);
+static void      check_root(CHKARGS);

 static void      check_text(CHKARGS);
 
 static void      check_text(CHKARGS);
 

-static int       post_AT(CHKARGS);
-static int       post_IP(CHKARGS);
-static int       post_vs(CHKARGS);
-static int       post_fi(CHKARGS);
-static int       post_ft(CHKARGS);
-static int       post_nf(CHKARGS);
-static int       post_sec(CHKARGS);
-static int       post_TH(CHKARGS);
-static int       post_UC(CHKARGS);
-static int       pre_sec(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_eq2[] = { check_eq2, NULL };
-static v_check   posts_fi[] = { check_eq0, post_fi, NULL };
-static v_check   posts_ft[] = { post_ft, NULL };
-static v_check   posts_ip[] = { post_IP, NULL };
-static v_check   posts_le1[] = { check_le1, 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[] = { post_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   posts_ur[] = { check_head1, check_part, NULL };
-static v_check   pres_sec[] = { pre_sec, NULL };
-
-static const struct man_valid man_valids[MAN_MAX] = {
-       { NULL, posts_br }, /* br */
-       { NULL, posts_th }, /* TH */
-       { pres_sec, posts_sec }, /* SH */
-       { pres_sec, posts_sec }, /* SS */
-       { NULL, NULL }, /* TP */
-       { NULL, posts_par }, /* LP */
-       { NULL, posts_par }, /* PP */
-       { NULL, posts_par }, /* P */
-       { NULL, posts_ip }, /* IP */
-       { NULL, 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 */
-       { NULL, posts_sp }, /* sp */
-       { NULL, posts_nf }, /* nf */
-       { NULL, posts_fi }, /* fi */
-       { NULL, NULL }, /* RE */
-       { NULL, posts_part }, /* RS */
-       { NULL, NULL }, /* DT */
-       { NULL, posts_uc }, /* UC */
-       { NULL, posts_le1 }, /* PD */
-       { NULL, posts_at }, /* AT */
-       { NULL, NULL }, /* in */
-       { NULL, posts_ft }, /* ft */
-       { NULL, posts_eq2 }, /* OP */
-       { NULL, posts_nf }, /* EX */
-       { NULL, posts_fi }, /* EE */
-       { NULL, posts_ur }, /* UR */
-       { NULL, NULL }, /* UE */
+static void      post_AT(CHKARGS);
+static void      post_IP(CHKARGS);
+static void      post_OP(CHKARGS);
+static void      post_TH(CHKARGS);
+static void      post_UC(CHKARGS);
+static void      post_UR(CHKARGS);
+static void      post_in(CHKARGS);
+static void      post_vs(CHKARGS);
+
+static const v_check __man_valids[MAN_MAX - MAN_TH] = {
+       post_TH,    /* TH */
+       NULL,       /* SH */
+       NULL,       /* SS */
+       NULL,       /* TP */
+       check_par,  /* LP */
+       check_par,  /* PP */
+       check_par,  /* 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,       /* nf */
+       NULL,       /* fi */
+       NULL,       /* RE */
+       check_part, /* RS */
+       NULL,       /* DT */
+       post_UC,    /* UC */
+       NULL,       /* PD */
+       post_AT,    /* AT */
+       post_in,    /* in */
+       post_OP,    /* OP */
+       NULL,       /* EX */
+       NULL,       /* EE */
+       post_UR,    /* UR */
+       NULL,       /* UE */
+       post_UR,    /* MT */
+       NULL,       /* ME */

 };
 };

+static const v_check *man_valids = __man_valids - MAN_TH;

 
 
 
 

-int
-man_valid_pre(struct man *man, struct man_node *n)
+void
+man_node_validate(struct roff_man *man)

 {
 {

-       v_check         *cp;
+       struct roff_node *n;
+       const v_check    *cp;
+
+       n = man->last;
+       man->last = man->last->child;
+       while (man->last != NULL) {
+               man_node_validate(man);
+               if (man->last == n)
+                       man->last = man->last->child;
+               else
+                       man->last = man->last->next;
+       }

 
 

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

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

-       case (MAN_TEXT):
-               /* FALLTHROUGH */
-       case (MAN_ROOT):
-               /* FALLTHROUGH */
-       case (MAN_EQN):
-               /* FALLTHROUGH */
-       case (MAN_TBL):
-               return(1);
-       default:
+       case ROFFT_TEXT:
+               check_text(man, n);
+               break;
+       case ROFFT_ROOT:
+               check_root(man, n);
+               break;
+       case ROFFT_EQN:
+       case ROFFT_TBL:

                break;
                break;

-       }
-
-       if (NULL == (cp = man_valids[n->tok].pres))
-               return(1);
-       for ( ; *cp; cp++)
-               if ( ! (*cp)(man, n)) 
-                       return(0);
-       return(1);
-}
-
-
-int
-man_valid_post(struct man *man)
-{
-       v_check         *cp;
-
-       if (MAN_VALID & man->last->flags)
-               return(1);
-       man->last->flags |= MAN_VALID;
-
-       switch (man->last->type) {
-       case (MAN_TEXT): 
-               check_text(man, man->last);
-               return(1);
-       case (MAN_ROOT):
-               return(check_root(man, man->last));
-       case (MAN_EQN):
-               /* FALLTHROUGH */
-       case (MAN_TBL):
-               return(1);

        default:
        default:

+               if (n->tok < ROFF_MAX) {
+                       switch (n->tok) {
+                       case ROFF_br:
+                       case ROFF_sp:
+                               post_vs(man, n);
+                               break;
+                       default:
+                               roff_validate(man);
+                               break;
+                       }
+                       break;
+               }
+               assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
+               cp = man_valids + n->tok;
+               if (*cp)
+                       (*cp)(man, n);
+               if (man->last == n)
+                       man_state(man, n);

                break;
        }
                break;
        }

-
-       if (NULL == (cp = man_valids[man->last->tok].posts))
-               return(1);
-       for ( ; *cp; cp++)
-               if ( ! (*cp)(man, man->last))
-                       return(0);
-
-       return(1);

 }
 
 }
 

-
-static int
-check_root(CHKARGS) 
+static void
+check_root(CHKARGS)

 {
 
 {
 

-       if (MAN_BLINE & man->flags)
-               man_nmsg(man, n, MANDOCERR_SCOPEEXIT);
-       else if (MAN_ELINE & man->flags)
-               man_nmsg(man, n, MANDOCERR_SCOPEEXIT);
+       assert((man->flags & (MAN_BLINE | MAN_ELINE)) == 0);

 
 

-       man->flags &= ~MAN_BLINE;
-       man->flags &= ~MAN_ELINE;
+       if (NULL == man->first->child)
+               mandoc_msg(MANDOCERR_DOC_EMPTY, man->parse,
+                   n->line, n->pos, NULL);
+       else
+               man->meta.hasbody = 1;

 
 

-       if (NULL == man->first->child) {
-               man_nmsg(man, n, MANDOCERR_NODOCBODY);
-               return(0);
-       } else if (NULL == man->meta.title) {
-               man_nmsg(man, n, MANDOCERR_NOTITLE);
+       if (NULL == man->meta.title) {
+               mandoc_msg(MANDOCERR_TH_NOTITLE, man->parse,
+                   n->line, n->pos, NULL);

 
                /*
                 * If a title hasn't been set, do so now (by
                 * implication, date and section also aren't set).
                 */
 
 
                /*
                 * If a title hasn't been set, do so now (by
                 * implication, date and section also aren't set).
                 */
 

-               man->meta.title = mandoc_strdup("unknown");
-               man->meta.msec = mandoc_strdup("1");
+               man->meta.title = mandoc_strdup("");
+               man->meta.msec = mandoc_strdup("");

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

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

        }
 
        }
 

-       return(1);
+       if (man->meta.os_e &&
+           (man->meta.rcsids & (1 << man->meta.os_e)) == 0)
+               mandoc_msg(MANDOCERR_RCS_MISSING, man->parse, 0, 0,
+                   man->meta.os_e == MANDOC_OS_OPENBSD ?
+                   "(OpenBSD)" : "(NetBSD)");

 }
 
 static void
 }
 
 static void


@@ -229,226 +190,170 @@ check_text(CHKARGS)
 
        cp = n->string;
        for (p = cp; NULL != (p = strchr(p, '\t')); p++)
 
        cp = n->string;
        for (p = cp; NULL != (p = strchr(p, '\t')); p++)

-               man_pmsg(man, n->line, (int)(p - cp), MANDOCERR_BADTAB);
-}
-
-#define        INEQ_DEFINE(x, ineq, name) \
-static int \
-check_##name(CHKARGS) \
-{ \
-       if (n->nchild ineq (x)) \
-               return(1); \
-       mandoc_vmsg(MANDOCERR_ARGCOUNT, man->parse, n->line, n->pos, \
-                       "line arguments %s %d (have %d)", \
-                       #ineq, (x), n->nchild); \
-       return(1); \
-}
-
-INEQ_DEFINE(0, ==, eq0)
-INEQ_DEFINE(2, ==, eq2)
-INEQ_DEFINE(1, <=, le1)
-INEQ_DEFINE(2, >=, ge2)
-INEQ_DEFINE(5, <=, le5)
-
-static int
-check_head1(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);
-
-       return(1);
+               mandoc_msg(MANDOCERR_FI_TAB, man->parse,
+                   n->line, n->pos + (p - cp), NULL);

 }
 
 }
 

-static int
-post_ft(CHKARGS)
+static void
+post_OP(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;
-       default:
-               break;
-       }

 
 

-       if (0 == ok) {
-               mandoc_vmsg
-                       (MANDOCERR_BADFONT, man->parse,
-                        n->line, n->pos, "%s", cp);
-               *cp = '\0';
+       if (n->child == NULL)
+               mandoc_msg(MANDOCERR_OP_EMPTY, man->parse,
+                   n->line, n->pos, "OP");
+       else if (n->child->next != NULL && n->child->next->next != NULL) {
+               n = n->child->next->next;
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
+                   n->line, n->pos, "OP ... %s", n->string);

        }
        }

-
-       if (1 < n->nchild)
-               mandoc_vmsg
-                       (MANDOCERR_ARGCOUNT, man->parse, n->line, 
-                        n->pos, "want one child (have %d)", 
-                        n->nchild);
-
-       return(1);

 }
 
 }
 

-static int
-pre_sec(CHKARGS)
-{
-
-       if (MAN_BLOCK == n->type)
-               man->flags &= ~MAN_LITERAL;
-       return(1);
-}
-
-static int
-post_sec(CHKARGS)
+static void
+post_UR(CHKARGS)

 {
 
 {
 

-       if ( ! (MAN_HEAD == n->type && 0 == n->nchild)) 
-               return(1);
-
-       man_nmsg(man, n, MANDOCERR_SYNTARGCOUNT);
-       return(0);
+       if (n->type == ROFFT_HEAD && n->child == NULL)
+               mandoc_vmsg(MANDOCERR_UR_NOHEAD, man->parse,
+                   n->line, n->pos, roff_name[n->tok]);
+       check_part(man, n);

 }
 
 }
 

-static int
+static void

 check_part(CHKARGS)
 {
 
 check_part(CHKARGS)
 {
 

-       if (MAN_BODY == n->type && 0 == n->nchild)
-               mandoc_msg(MANDOCERR_ARGCWARN, man->parse, n->line, 
-                               n->pos, "want children (have none)");
-
-       return(1);
+       if (n->type == ROFFT_BODY && n->child == NULL)
+               mandoc_msg(MANDOCERR_BLK_EMPTY, man->parse,
+                   n->line, n->pos, roff_name[n->tok]);

 }
 
 }
 

-
-static int
+static void

 check_par(CHKARGS)
 {
 
        switch (n->type) {
 check_par(CHKARGS)
 {
 
        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)
-                       man_nmsg(man, n, MANDOCERR_IGNPAR);
+       case ROFFT_BODY:
+               if (n->child == NULL)
+                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
+                           man->parse, n->line, n->pos,
+                           "%s empty", roff_name[n->tok]);

                break;
                break;

-       case (MAN_HEAD):
-               if (n->nchild)
-                       man_nmsg(man, n, MANDOCERR_ARGSLOST);
+       case ROFFT_HEAD:
+               if (n->child != NULL)
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                           man->parse, n->line, n->pos, "%s %s%s",
+                           roff_name[n->tok], n->child->string,
+                           n->child->next != NULL ? " ..." : "");

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

-
-       return(1);

 }
 
 }
 

-static int
+static void

 post_IP(CHKARGS)
 {
 
        switch (n->type) {
 post_IP(CHKARGS)
 {
 
        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)
-                       man_nmsg(man, n, MANDOCERR_IGNPAR);
+       case ROFFT_BODY:
+               if (n->parent->head->child == NULL && n->child == NULL)
+                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
+                           man->parse, n->line, n->pos,
+                           "%s empty", roff_name[n->tok]);

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

-       return(1);

 }
 
 }
 

-static int
+static void

 post_TH(CHKARGS)
 {
 post_TH(CHKARGS)
 {

+       struct roff_node *nb;

        const char      *p;
 
        free(man->meta.title);
        free(man->meta.vol);
        const char      *p;
 
        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;

 
 

-       /* ->TITLE<- MSEC DATE SOURCE VOL */
+       nb = n;
+
+       /* ->TITLE<- MSEC DATE OS VOL */

 
        n = n->child;
        if (n && n->string) {
                for (p = n->string; '\0' != *p; p++) {
                        /* Only warn about this once... */
 
        n = n->child;
        if (n && n->string) {
                for (p = n->string; '\0' != *p; p++) {
                        /* Only warn about this once... */

-                       if (isalpha((unsigned char)*p) && 
-                                       ! isupper((unsigned char)*p)) {
-                               man_nmsg(man, n, MANDOCERR_UPPERCASE);
+                       if (isalpha((unsigned char)*p) &&
+                           ! isupper((unsigned char)*p)) {
+                               mandoc_vmsg(MANDOCERR_TITLE_CASE,
+                                   man->parse, n->line,
+                                   n->pos + (p - n->string),
+                                   "TH %s", n->string);

                                break;
                        }
                }
                man->meta.title = mandoc_strdup(n->string);
                                break;
                        }
                }
                man->meta.title = mandoc_strdup(n->string);

-       } else
+       } else {

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

+               mandoc_msg(MANDOCERR_TH_NOTITLE, man->parse,
+                   nb->line, nb->pos, "TH");
+       }

 
 

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

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

-       else
+       else {

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

+               mandoc_vmsg(MANDOCERR_MSEC_MISSING, man->parse,
+                   nb->line, nb->pos, "TH %s", man->meta.title);
+       }

 
 

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

 
        if (n)
                n = n->next;
        if (n && n->string && '\0' != n->string[0]) {
                man->meta.date = man->quick ?
                    mandoc_strdup(n->string) :
 
        if (n)
                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
+                   mandoc_normdate(man, n->string, n->line, n->pos);
+       } else {

                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");
+       }

 
 

-       /* 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);
+               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))


@@ -457,37 +362,18 @@ 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_vmsg(MANDOCERR_ARG_EXCESS, man->parse,
+                   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);
-       return(1);
-}
-
-static int
-post_nf(CHKARGS)
-{
-
-       if (MAN_LITERAL & man->flags)
-               man_nmsg(man, n, MANDOCERR_SCOPEREP);
-
-       man->flags |= MAN_LITERAL;
-       return(1);
-}
-
-static int
-post_fi(CHKARGS)
-{
-
-       if ( ! (MAN_LITERAL & man->flags))
-               man_nmsg(man, n, MANDOCERR_WNOSCOPE);
-
-       man->flags &= ~MAN_LITERAL;
-       return(1);
+       roff_node_delete(man, man->last);

 }
 
 }
 

-static int
+static void

 post_UC(CHKARGS)
 {
        static const char * const bsd_versions[] = {
 post_UC(CHKARGS)
 {
        static const char * const bsd_versions[] = {


@@ -502,7 +388,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;


@@ -520,12 +406,11 @@ post_UC(CHKARGS)
                        p = bsd_versions[0];
        }
 
                        p = bsd_versions[0];
        }
 

-       free(man->meta.source);
-       man->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[] = {
 post_AT(CHKARGS)
 {
        static const char * const unix_versions[] = {


@@ -535,12 +420,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;


@@ -550,7 +435,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];


@@ -558,34 +445,51 @@ post_AT(CHKARGS)
                        p = unix_versions[0];
        }
 
                        p = unix_versions[0];
        }
 

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

 }
 
 }
 

-static int
+static void
+post_in(CHKARGS)
+{
+       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;
+}
+
+static void

 post_vs(CHKARGS)
 {
 
        if (NULL != n->prev)
 post_vs(CHKARGS)
 {
 
        if (NULL != n->prev)

-               return(1);
+               return;

 
        switch (n->parent->tok) {
 
        switch (n->parent->tok) {

-       case (MAN_SH):
+       case MAN_SH:
+       case MAN_SS:
+       case MAN_PP:
+       case MAN_LP:
+       case MAN_P:
+               mandoc_vmsg(MANDOCERR_PAR_SKIP, man->parse, n->line, n->pos,
+                   "%s after %s", roff_name[n->tok],
+                   roff_name[n->parent->tok]);

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MAN_SS):
-               man_nmsg(man, n, MANDOCERR_IGNPAR);
-               /* FALLTHROUGH */
-       case (MAN_MAX):
-               /* 
+       case TOKEN_NONE:
+               /*

                 * Don't warn about this because it occurs in pod2man
                 * and would cause considerable (unfixable) warnage.
                 */
                 * Don't warn about this because it occurs in pod2man
                 * and would cause considerable (unfixable) warnage.
                 */

-               man_node_delete(man, n);
+               roff_node_delete(man, n);

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

-
-       return(1);

 }
 }