store the operating system name obtained from uname(3) in the adequate

[mandoc.git] / mdoc_validate.c

diff --git a/mdoc_validate.c b/mdoc_validate.c
index d455523e4785c27d79569e38ee5c24d6816fc668..a92d407773dd2166c73a2aeb01303c32c0aae6f2 100644 (file)
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_validate.c,v 1.358 2018/04/11 17:11:13 schwarze Exp $ */
+/* $Id: mdoc_validate.c,v 1.390 2021/10/04 14:19:14 schwarze Exp $ */

 /*
 /*

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

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

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

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


@@ -15,6 +15,8 @@
  * 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.
  * 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 mdoc(7) syntax trees used by mandoc(1).

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


@@ -39,6 +41,7 @@
 #include "libmandoc.h"
 #include "roff_int.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
 #include "roff_int.h"
 #include "libmdoc.h"

+#include "tag.h"

 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 
 
 /* FIXME: .Bl -diag can't have non-text children in HEAD. */
 


@@ -64,6 +67,7 @@ static        size_t          macro2len(enum roff_tok);
 static void     rewrite_macro2len(struct roff_man *, char **);
 static int      similar(const char *, const char *);
 
 static void     rewrite_macro2len(struct roff_man *, char **);
 static int      similar(const char *, const char *);
 

+static void     post_abort(POST_ARGS) __attribute__((__noreturn__));

 static void     post_an(POST_ARGS);
 static void     post_an_norm(POST_ARGS);
 static void     post_at(POST_ARGS);
 static void     post_an(POST_ARGS);
 static void     post_an_norm(POST_ARGS);
 static void     post_at(POST_ARGS);


@@ -81,16 +85,18 @@ static      void     post_dd(POST_ARGS);
 static void     post_delim(POST_ARGS);
 static void     post_delim_nb(POST_ARGS);
 static void     post_dt(POST_ARGS);
 static void     post_delim(POST_ARGS);
 static void     post_delim_nb(POST_ARGS);
 static void     post_dt(POST_ARGS);

+static void     post_em(POST_ARGS);

 static void     post_en(POST_ARGS);
 static void     post_en(POST_ARGS);

+static void     post_er(POST_ARGS);

 static void     post_es(POST_ARGS);
 static void     post_eoln(POST_ARGS);
 static void     post_ex(POST_ARGS);
 static void     post_fa(POST_ARGS);
 static void     post_es(POST_ARGS);
 static void     post_eoln(POST_ARGS);
 static void     post_ex(POST_ARGS);
 static void     post_fa(POST_ARGS);

+static void     post_fl(POST_ARGS);

 static void     post_fn(POST_ARGS);
 static void     post_fname(POST_ARGS);
 static void     post_fo(POST_ARGS);
 static void     post_hyph(POST_ARGS);
 static void     post_fn(POST_ARGS);
 static void     post_fname(POST_ARGS);
 static void     post_fo(POST_ARGS);
 static void     post_hyph(POST_ARGS);

-static void     post_ignpar(POST_ARGS);

 static void     post_it(POST_ARGS);
 static void     post_lb(POST_ARGS);
 static void     post_nd(POST_ARGS);
 static void     post_it(POST_ARGS);
 static void     post_lb(POST_ARGS);
 static void     post_nd(POST_ARGS);


@@ -103,6 +109,7 @@ static      void     post_prevpar(POST_ARGS);
 static void     post_root(POST_ARGS);
 static void     post_rs(POST_ARGS);
 static void     post_rv(POST_ARGS);
 static void     post_root(POST_ARGS);
 static void     post_rs(POST_ARGS);
 static void     post_rv(POST_ARGS);

+static void     post_section(POST_ARGS);

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


@@ -112,16 +119,18 @@ static    void     post_sm(POST_ARGS);
 static void     post_st(POST_ARGS);
 static void     post_std(POST_ARGS);
 static void     post_sx(POST_ARGS);
 static void     post_st(POST_ARGS);
 static void     post_std(POST_ARGS);
 static void     post_sx(POST_ARGS);

+static void     post_tag(POST_ARGS);
+static void     post_tg(POST_ARGS);

 static void     post_useless(POST_ARGS);
 static void     post_xr(POST_ARGS);
 static void     post_xx(POST_ARGS);
 
 static void     post_useless(POST_ARGS);
 static void     post_xr(POST_ARGS);
 static void     post_xx(POST_ARGS);
 

-static const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = {
+static const v_post mdoc_valids[MDOC_MAX - MDOC_Dd] = {

        post_dd,        /* Dd */
        post_dt,        /* Dt */
        post_os,        /* Os */
        post_sh,        /* Sh */
        post_dd,        /* Dd */
        post_dt,        /* Dt */
        post_os,        /* Os */
        post_sh,        /* Sh */

-       post_ignpar,    /* Ss */
+       post_section,   /* Ss */

        post_par,       /* Pp */
        post_display,   /* D1 */
        post_display,   /* Dl */
        post_par,       /* Pp */
        post_display,   /* D1 */
        post_display,   /* Dl */


@@ -135,27 +144,27 @@ static    const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = {
        NULL,           /* Ap */
        post_defaults,  /* Ar */
        NULL,           /* Cd */
        NULL,           /* Ap */
        post_defaults,  /* Ar */
        NULL,           /* Cd */

-       post_delim_nb,  /* Cm */
-       post_delim_nb,  /* Dv */
-       post_delim_nb,  /* Er */
-       post_delim_nb,  /* Ev */
+       post_tag,       /* Cm */
+       post_tag,       /* Dv */
+       post_er,        /* Er */
+       post_tag,       /* Ev */

        post_ex,        /* Ex */
        post_fa,        /* Fa */
        NULL,           /* Fd */
        post_ex,        /* Ex */
        post_fa,        /* Fa */
        NULL,           /* Fd */

-       post_delim_nb,  /* Fl */
+       post_fl,        /* Fl */

        post_fn,        /* Fn */
        post_delim_nb,  /* Ft */
        post_fn,        /* Fn */
        post_delim_nb,  /* Ft */

-       post_delim_nb,  /* Ic */
+       post_tag,       /* Ic */

        post_delim_nb,  /* In */
        post_delim_nb,  /* In */

-       post_defaults,  /* Li */
+       post_tag,       /* Li */

        post_nd,        /* Nd */
        post_nm,        /* Nm */
        post_delim_nb,  /* Op */
        post_nd,        /* Nd */
        post_nm,        /* Nm */
        post_delim_nb,  /* Op */

-       post_obsolete,  /* Ot */
+       post_abort,     /* Ot */

        post_defaults,  /* Pa */
        post_rv,        /* Rv */
        post_st,        /* St */
        post_defaults,  /* Pa */
        post_rv,        /* Rv */
        post_st,        /* St */

-       post_delim_nb,  /* Va */
+       post_tag,       /* Va */

        post_delim_nb,  /* Vt */
        post_xr,        /* Xr */
        NULL,           /* %A */
        post_delim_nb,  /* Vt */
        post_xr,        /* Xr */
        NULL,           /* %A */


@@ -185,11 +194,11 @@ static    const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = {
        NULL,           /* Dq */
        NULL,           /* Ec */
        NULL,           /* Ef */
        NULL,           /* Dq */
        NULL,           /* Ec */
        NULL,           /* Ef */

-       post_delim_nb,  /* Em */
+       post_em,        /* Em */

        NULL,           /* Eo */
        post_xx,        /* Fx */
        NULL,           /* Eo */
        post_xx,        /* Fx */

-       post_delim_nb,  /* Ms */
-       NULL,           /* No */
+       post_tag,       /* Ms */
+       post_tag,       /* No */

        post_ns,        /* Ns */
        post_xx,        /* Nx */
        post_xx,        /* Ox */
        post_ns,        /* Ns */
        post_xx,        /* Nx */
        post_xx,        /* Ox */


@@ -208,7 +217,7 @@ static      const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = {
        post_delim_nb,  /* Sq */
        post_sm,        /* Sm */
        post_sx,        /* Sx */
        post_delim_nb,  /* Sq */
        post_sm,        /* Sm */
        post_sx,        /* Sx */

-       post_delim_nb,  /* Sy */
+       post_em,        /* Sy */

        post_useless,   /* Tn */
        post_xx,        /* Ux */
        NULL,           /* Xc */
        post_useless,   /* Tn */
        post_xx,        /* Ux */
        NULL,           /* Xc */


@@ -224,7 +233,7 @@ static      const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = {
        post_obsolete,  /* Fr */
        post_eoln,      /* Ud */
        post_lb,        /* Lb */
        post_obsolete,  /* Fr */
        post_eoln,      /* Ud */
        post_lb,        /* Lb */

-       post_par,       /* Lp */
+       post_abort,     /* Lp */

        post_delim_nb,  /* Lk */
        post_defaults,  /* Mt */
        post_delim_nb,  /* Brq */
        post_delim_nb,  /* Lk */
        post_defaults,  /* Mt */
        post_delim_nb,  /* Brq */


@@ -237,8 +246,8 @@ static      const v_post __mdoc_valids[MDOC_MAX - MDOC_Dd] = {
        NULL,           /* %Q */
        NULL,           /* %U */
        NULL,           /* Ta */
        NULL,           /* %Q */
        NULL,           /* %U */
        NULL,           /* Ta */

+       post_tg,        /* Tg */

 };
 };

-static const v_post *const mdoc_valids = __mdoc_valids - MDOC_Dd;

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


@@ -285,23 +294,51 @@ static    const char * const secnames[SEC__MAX] = {
        NULL
 };
 
        NULL
 };
 

+static int       fn_prio = TAG_STRONG;
+

 
 

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

 void
 void

-mdoc_node_validate(struct roff_man *mdoc)
+mdoc_validate(struct roff_man *mdoc)

 {
        struct roff_node *n, *np;
        const v_post *p;
 
 {
        struct roff_node *n, *np;
        const v_post *p;
 

+       /*
+        * Translate obsolete macros to modern macros first
+        * such that later code does not need to look
+        * for the obsolete versions.
+        */
+

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

+       switch (n->tok) {
+       case MDOC_Lp:
+               n->tok = MDOC_Pp;
+               break;
+       case MDOC_Ot:
+               post_obsolete(mdoc);
+               n->tok = MDOC_Ft;
+               break;
+       default:
+               break;
+       }
+
+       /*
+        * Iterate over all children, recursing into each one
+        * in turn, depth-first.
+        */
+

        mdoc->last = mdoc->last->child;
        while (mdoc->last != NULL) {
        mdoc->last = mdoc->last->child;
        while (mdoc->last != NULL) {

-               mdoc_node_validate(mdoc);
+               mdoc_validate(mdoc);

                if (mdoc->last == n)
                        mdoc->last = mdoc->last->child;
                else
                        mdoc->last = mdoc->last->next;
        }
 
                if (mdoc->last == n)
                        mdoc->last = mdoc->last->child;
                else
                        mdoc->last = mdoc->last->next;
        }
 

+       /* Finally validate the macro itself. */
+

        mdoc->last = n;
        mdoc->next = ROFF_NEXT_SIBLING;
        switch (n->type) {
        mdoc->last = n;
        mdoc->next = ROFF_NEXT_SIBLING;
        switch (n->type) {


@@ -310,9 +347,7 @@ mdoc_node_validate(struct roff_man *mdoc)
                if (n->sec != SEC_SYNOPSIS ||
                    (np->tok != MDOC_Cd && np->tok != MDOC_Fd))
                        check_text(mdoc, n->line, n->pos, n->string);
                if (n->sec != SEC_SYNOPSIS ||
                    (np->tok != MDOC_Cd && np->tok != MDOC_Fd))
                        check_text(mdoc, n->line, n->pos, n->string);

-               if (np->tok != MDOC_Ql && np->tok != MDOC_Dl &&
-                   (np->tok != MDOC_Bd ||
-                    (mdoc->flags & MDOC_LITERAL) == 0) &&
+               if ((n->flags & NODE_NOFILL) == 0 &&

                    (np->tok != MDOC_It || np->type != ROFFT_HEAD ||
                     np->parent->parent->norm->Bl.type != LIST_diag))
                        check_text_em(mdoc, n->line, n->pos, n->string);
                    (np->tok != MDOC_It || np->type != ROFFT_HEAD ||
                     np->parent->parent->norm->Bl.type != LIST_diag))
                        check_text_em(mdoc, n->line, n->pos, n->string);


@@ -344,20 +379,12 @@ mdoc_node_validate(struct roff_man *mdoc)
                /* Call the macro's postprocessor. */
 
                if (n->tok < ROFF_MAX) {
                /* Call the macro's postprocessor. */
 
                if (n->tok < ROFF_MAX) {

-                       switch(n->tok) {
-                       case ROFF_br:
-                       case ROFF_sp:
-                               post_par(mdoc);
-                               break;
-                       default:
-                               roff_validate(mdoc);
-                               break;
-                       }
+                       roff_validate(mdoc);

                        break;
                }
 
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
                        break;
                }
 
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);

-               p = mdoc_valids + n->tok;
+               p = mdoc_valids + (n->tok - MDOC_Dd);

                if (*p)
                        (*p)(mdoc);
                if (mdoc->last == n)
                if (*p)
                        (*p)(mdoc);
                if (mdoc->last == n)


@@ -393,12 +420,11 @@ check_text(struct roff_man *mdoc, int ln, int pos, char *p)
 {
        char            *cp;
 
 {
        char            *cp;
 

-       if (MDOC_LITERAL & mdoc->flags)
+       if (mdoc->last->flags & NODE_NOFILL)

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

-               mandoc_msg(MANDOCERR_FI_TAB, mdoc->parse,
-                   ln, pos + (int)(p - cp), NULL);
+               mandoc_msg(MANDOCERR_FI_TAB, ln, pos + (int)(p - cp), NULL);

 }
 
 static void
 }
 
 static void


@@ -437,16 +463,15 @@ check_text_em(struct roff_man *mdoc, int ln, int pos, char *p)
                     isalpha((unsigned char)cp[-3]) :
                     np != NULL &&
                     np->type == ROFFT_TEXT &&
                     isalpha((unsigned char)cp[-3]) :
                     np != NULL &&
                     np->type == ROFFT_TEXT &&

-                    np->string != '\0' &&
+                    *np->string != '\0' &&

                     isalpha((unsigned char)np->string[
                       strlen(np->string) - 1])) ||
                     isalpha((unsigned char)np->string[
                       strlen(np->string) - 1])) ||

-                   (cp[2] != '\0' ?
+                   (cp[1] != '\0' && cp[2] != '\0' ?

                     isalpha((unsigned char)cp[2]) :
                     nn != NULL &&
                     nn->type == ROFFT_TEXT &&
                     isalpha((unsigned char)cp[2]) :
                     nn != NULL &&
                     nn->type == ROFFT_TEXT &&

-                    nn->string != '\0' &&

                     isalpha((unsigned char)*nn->string))) {
                     isalpha((unsigned char)*nn->string))) {

-                       mandoc_msg(MANDOCERR_DASHDASH, mdoc->parse,
+                       mandoc_msg(MANDOCERR_DASHDASH,

                            ln, pos + (int)(cp - p) - 1, NULL);
                        break;
                }
                            ln, pos + (int)(cp - p) - 1, NULL);
                        break;
                }


@@ -462,17 +487,13 @@ check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p)
                return;
 
        if ((cp = strstr(p, "OpenBSD")) != NULL)
                return;
 
        if ((cp = strstr(p, "OpenBSD")) != NULL)

-               mandoc_msg(MANDOCERR_BX, mdoc->parse,
-                   ln, pos + (cp - p), "Ox");
+               mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Ox");

        if ((cp = strstr(p, "NetBSD")) != NULL)
        if ((cp = strstr(p, "NetBSD")) != NULL)

-               mandoc_msg(MANDOCERR_BX, mdoc->parse,
-                   ln, pos + (cp - p), "Nx");
+               mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Nx");

        if ((cp = strstr(p, "FreeBSD")) != NULL)
        if ((cp = strstr(p, "FreeBSD")) != NULL)

-               mandoc_msg(MANDOCERR_BX, mdoc->parse,
-                   ln, pos + (cp - p), "Fx");
+               mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Fx");

        if ((cp = strstr(p, "DragonFly")) != NULL)
        if ((cp = strstr(p, "DragonFly")) != NULL)

-               mandoc_msg(MANDOCERR_BX, mdoc->parse,
-                   ln, pos + (cp - p), "Dx");
+               mandoc_msg(MANDOCERR_BX, ln, pos + (int)(cp - p), "Dx");

 
        cp = p;
        while ((cp = strstr(cp + 1, "()")) != NULL) {
 
        cp = p;
        while ((cp = strstr(cp + 1, "()")) != NULL) {


@@ -481,13 +502,18 @@ check_toptext(struct roff_man *mdoc, int ln, int pos, const char *p)
                                break;
                if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) {
                        cpr++;
                                break;
                if ((cpr < p || *cpr == ' ') && cpr + 1 < cp) {
                        cpr++;

-                       mandoc_vmsg(MANDOCERR_FUNC, mdoc->parse,
-                           ln, pos + (cpr - p),
+                       mandoc_msg(MANDOCERR_FUNC, ln, pos + (int)(cpr - p),

                            "%.*s()", (int)(cp - cpr), cpr);
                }
        }
 }
 
                            "%.*s()", (int)(cp - cpr), cpr);
                }
        }
 }
 

+static void
+post_abort(POST_ARGS)
+{
+       abort();
+}
+

 static void
 post_delim(POST_ARGS)
 {
 static void
 post_delim(POST_ARGS)
 {


@@ -510,9 +536,8 @@ post_delim(POST_ARGS)
            tok == MDOC_Ss || tok == MDOC_Fo))
                return;
 
            tok == MDOC_Ss || tok == MDOC_Fo))
                return;
 

-       mandoc_vmsg(MANDOCERR_DELIM, mdoc->parse,
-           nch->line, nch->pos + (lc - nch->string),
-           "%s%s %s", roff_name[tok],
+       mandoc_msg(MANDOCERR_DELIM, nch->line,
+           nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok],

            nch == mdoc->last->child ? "" : " ...", nch->string);
 }
 
            nch == mdoc->last->child ? "" : " ...", nch->string);
 }
 


@@ -604,9 +629,8 @@ post_delim_nb(POST_ARGS)
                }
        }
 
                }
        }
 

-       mandoc_vmsg(MANDOCERR_DELIM_NB, mdoc->parse,
-           nch->line, nch->pos + (lc - nch->string),
-           "%s%s %s", roff_name[tok],
+       mandoc_msg(MANDOCERR_DELIM_NB, nch->line,
+           nch->pos + (int)(lc - nch->string), "%s%s %s", roff_name[tok],

            nch == mdoc->last->child ? "" : " ...", nch->string);
 }
 
            nch == mdoc->last->child ? "" : " ...", nch->string);
 }
 


@@ -672,39 +696,34 @@ post_bl_norm(POST_ARGS)
                case MDOC_Compact:
                        if (n->norm->Bl.comp)
                                mandoc_msg(MANDOCERR_ARG_REP,
                case MDOC_Compact:
                        if (n->norm->Bl.comp)
                                mandoc_msg(MANDOCERR_ARG_REP,

-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bl -compact");
+                                   argv->line, argv->pos, "Bl -compact");

                        n->norm->Bl.comp = 1;
                        break;
                case MDOC_Width:
                        wa = argv;
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,
                        n->norm->Bl.comp = 1;
                        break;
                case MDOC_Width:
                        wa = argv;
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,

-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bl -width");
+                                   argv->line, argv->pos, "Bl -width");

                                n->norm->Bl.width = "0n";
                                break;
                        }
                        if (NULL != n->norm->Bl.width)
                                n->norm->Bl.width = "0n";
                                break;
                        }
                        if (NULL != n->norm->Bl.width)

-                               mandoc_vmsg(MANDOCERR_ARG_REP,
-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bl -width %s",
-                                   argv->value[0]);
+                               mandoc_msg(MANDOCERR_ARG_REP,
+                                   argv->line, argv->pos,
+                                   "Bl -width %s", argv->value[0]);

                        rewrite_macro2len(mdoc, argv->value);
                        n->norm->Bl.width = argv->value[0];
                        break;
                case MDOC_Offset:
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,
                        rewrite_macro2len(mdoc, argv->value);
                        n->norm->Bl.width = argv->value[0];
                        break;
                case MDOC_Offset:
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,

-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bl -offset");
+                                   argv->line, argv->pos, "Bl -offset");

                                break;
                        }
                        if (NULL != n->norm->Bl.offs)
                                break;
                        }
                        if (NULL != n->norm->Bl.offs)

-                               mandoc_vmsg(MANDOCERR_ARG_REP,
-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bl -offset %s",
-                                   argv->value[0]);
+                               mandoc_msg(MANDOCERR_ARG_REP,
+                                   argv->line, argv->pos,
+                                   "Bl -offset %s", argv->value[0]);

                        rewrite_macro2len(mdoc, argv->value);
                        n->norm->Bl.offs = argv->value[0];
                        break;
                        rewrite_macro2len(mdoc, argv->value);
                        n->norm->Bl.offs = argv->value[0];
                        break;


@@ -718,8 +737,7 @@ post_bl_norm(POST_ARGS)
                /* Check: multiple list types. */
 
                if (LIST__NONE != n->norm->Bl.type) {
                /* Check: multiple list types. */
 
                if (LIST__NONE != n->norm->Bl.type) {

-                       mandoc_vmsg(MANDOCERR_BL_REP,
-                           mdoc->parse, n->line, n->pos,
+                       mandoc_msg(MANDOCERR_BL_REP, n->line, n->pos,

                            "Bl -%s", mdoc_argnames[argv->arg]);
                        continue;
                }
                            "Bl -%s", mdoc_argnames[argv->arg]);
                        continue;
                }


@@ -729,8 +747,8 @@ post_bl_norm(POST_ARGS)
                if (n->norm->Bl.width ||
                    n->norm->Bl.offs ||
                    n->norm->Bl.comp)
                if (n->norm->Bl.width ||
                    n->norm->Bl.offs ||
                    n->norm->Bl.comp)

-                       mandoc_vmsg(MANDOCERR_BL_LATETYPE,
-                           mdoc->parse, n->line, n->pos, "Bl -%s",
+                       mandoc_msg(MANDOCERR_BL_LATETYPE,
+                           n->line, n->pos, "Bl -%s",

                            mdoc_argnames[n->args->argv[0].arg]);
 
                n->norm->Bl.type = lt;
                            mdoc_argnames[n->args->argv[0].arg]);
 
                n->norm->Bl.type = lt;


@@ -743,8 +761,7 @@ post_bl_norm(POST_ARGS)
        /* Allow lists to default to LIST_item. */
 
        if (LIST__NONE == n->norm->Bl.type) {
        /* Allow lists to default to LIST_item. */
 
        if (LIST__NONE == n->norm->Bl.type) {

-               mandoc_msg(MANDOCERR_BL_NOTYPE, mdoc->parse,
-                   n->line, n->pos, "Bl");
+               mandoc_msg(MANDOCERR_BL_NOTYPE, n->line, n->pos, "Bl");

                n->norm->Bl.type = LIST_item;
                mdoclt = MDOC_Item;
        }
                n->norm->Bl.type = LIST_item;
                mdoclt = MDOC_Item;
        }


@@ -759,7 +776,7 @@ post_bl_norm(POST_ARGS)
        switch (n->norm->Bl.type) {
        case LIST_tag:
                if (n->norm->Bl.width == NULL)
        switch (n->norm->Bl.type) {
        case LIST_tag:
                if (n->norm->Bl.width == NULL)

-                       mandoc_msg(MANDOCERR_BL_NOWIDTH, mdoc->parse,
+                       mandoc_msg(MANDOCERR_BL_NOWIDTH,

                            n->line, n->pos, "Bl -tag");
                break;
        case LIST_column:
                            n->line, n->pos, "Bl -tag");
                break;
        case LIST_column:


@@ -768,9 +785,8 @@ post_bl_norm(POST_ARGS)
        case LIST_inset:
        case LIST_item:
                if (n->norm->Bl.width != NULL)
        case LIST_inset:
        case LIST_item:
                if (n->norm->Bl.width != NULL)

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

                n->norm->Bl.width = NULL;
                break;
        case LIST_bullet:
                n->norm->Bl.width = NULL;
                break;
        case LIST_bullet:


@@ -818,29 +834,25 @@ post_bd(POST_ARGS)
                        dt = DISP_literal;
                        break;
                case MDOC_File:
                        dt = DISP_literal;
                        break;
                case MDOC_File:

-                       mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,
-                           n->line, n->pos, NULL);
+                       mandoc_msg(MANDOCERR_BD_FILE, n->line, n->pos, NULL);

                        break;
                case MDOC_Offset:
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,
                        break;
                case MDOC_Offset:
                        if (0 == argv->sz) {
                                mandoc_msg(MANDOCERR_ARG_EMPTY,

-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bd -offset");
+                                   argv->line, argv->pos, "Bd -offset");

                                break;
                        }
                        if (NULL != n->norm->Bd.offs)
                                break;
                        }
                        if (NULL != n->norm->Bd.offs)

-                               mandoc_vmsg(MANDOCERR_ARG_REP,
-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bd -offset %s",
-                                   argv->value[0]);
+                               mandoc_msg(MANDOCERR_ARG_REP,
+                                   argv->line, argv->pos,
+                                   "Bd -offset %s", argv->value[0]);

                        rewrite_macro2len(mdoc, argv->value);
                        n->norm->Bd.offs = argv->value[0];
                        break;
                case MDOC_Compact:
                        if (n->norm->Bd.comp)
                                mandoc_msg(MANDOCERR_ARG_REP,
                        rewrite_macro2len(mdoc, argv->value);
                        n->norm->Bd.offs = argv->value[0];
                        break;
                case MDOC_Compact:
                        if (n->norm->Bd.comp)
                                mandoc_msg(MANDOCERR_ARG_REP,

-                                   mdoc->parse, argv->line,
-                                   argv->pos, "Bd -compact");
+                                   argv->line, argv->pos, "Bd -compact");

                        n->norm->Bd.comp = 1;
                        break;
                default:
                        n->norm->Bd.comp = 1;
                        break;
                default:


@@ -852,14 +864,12 @@ post_bd(POST_ARGS)
                if (DISP__NONE == n->norm->Bd.type)
                        n->norm->Bd.type = dt;
                else
                if (DISP__NONE == n->norm->Bd.type)
                        n->norm->Bd.type = dt;
                else

-                       mandoc_vmsg(MANDOCERR_BD_REP,
-                           mdoc->parse, n->line, n->pos,
+                       mandoc_msg(MANDOCERR_BD_REP, n->line, n->pos,

                            "Bd -%s", mdoc_argnames[argv->arg]);
        }
 
        if (DISP__NONE == n->norm->Bd.type) {
                            "Bd -%s", mdoc_argnames[argv->arg]);
        }
 
        if (DISP__NONE == n->norm->Bd.type) {

-               mandoc_msg(MANDOCERR_BD_NOTYPE, mdoc->parse,
-                   n->line, n->pos, "Bd");
+               mandoc_msg(MANDOCERR_BD_NOTYPE, n->line, n->pos, "Bd");

                n->norm->Bd.type = DISP_ragged;
        }
 }
                n->norm->Bd.type = DISP_ragged;
        }
 }


@@ -881,8 +891,7 @@ post_an_norm(POST_ARGS)
 
        for (i = 1; i < n->args->argc; i++) {
                argv = n->args->argv + i;
 
        for (i = 1; i < n->args->argc; i++) {
                argv = n->args->argv + i;

-               mandoc_vmsg(MANDOCERR_AN_REP,
-                   mdoc->parse, argv->line, argv->pos,
+               mandoc_msg(MANDOCERR_AN_REP, argv->line, argv->pos,

                    "An -%s", mdoc_argnames[argv->arg]);
        }
 
                    "An -%s", mdoc_argnames[argv->arg]);
        }
 


@@ -903,7 +912,7 @@ post_eoln(POST_ARGS)
        post_useless(mdoc);
        n = mdoc->last;
        if (n->child != NULL)
        post_useless(mdoc);
        n = mdoc->last;
        if (n->child != NULL)

-               mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse, n->line,
+               mandoc_msg(MANDOCERR_ARG_SKIP, n->line,

                    n->pos, "%s %s", roff_name[n->tok], n->child->string);
 
        while (n->child != NULL)
                    n->pos, "%s %s", roff_name[n->tok], n->child->string);
 
        while (n->child != NULL)


@@ -925,7 +934,7 @@ build_list(struct roff_man *mdoc, int tok)
        for (ic = 1;; ic++) {
                roff_elem_alloc(mdoc, n->line, n->pos, tok);
                mdoc->last->flags |= NODE_NOSRC;
        for (ic = 1;; ic++) {
                roff_elem_alloc(mdoc, n->line, n->pos, tok);
                mdoc->last->flags |= NODE_NOSRC;

-               mdoc_node_relink(mdoc, n);
+               roff_node_relink(mdoc, n);

                n = mdoc->last = mdoc->last->parent;
                mdoc->next = ROFF_NEXT_SIBLING;
                if (n->next == NULL)
                n = mdoc->last = mdoc->last->parent;
                mdoc->next = ROFF_NEXT_SIBLING;
                if (n->next == NULL)


@@ -966,8 +975,7 @@ post_ex(POST_ARGS)
                mdoc->next = ROFF_NEXT_SIBLING;
                ic = 1;
        } else {
                mdoc->next = ROFF_NEXT_SIBLING;
                ic = 1;
        } else {

-               mandoc_msg(MANDOCERR_EX_NONAME, mdoc->parse,
-                   n->line, n->pos, "Ex");
+               mandoc_msg(MANDOCERR_EX_NONAME, n->line, n->pos, "Ex");

                ic = 0;
        }
 
                ic = 0;
        }
 


@@ -1000,7 +1008,7 @@ post_lb(POST_ARGS)
                return;
        }
 
                return;
        }
 

-       mandoc_vmsg(MANDOCERR_LB_BAD, mdoc->parse, n->child->line,
+       mandoc_msg(MANDOCERR_LB_BAD, n->child->line,

            n->child->pos, "Lb %s", n->child->string);
 
        roff_word_alloc(mdoc, n->line, n->pos, "library");
            n->child->pos, "Lb %s", n->child->string);
 
        roff_word_alloc(mdoc, n->line, n->pos, "library");


@@ -1064,8 +1072,8 @@ post_std(POST_ARGS)
                if (n->args->argv[0].arg == MDOC_Std)
                        return;
 
                if (n->args->argv[0].arg == MDOC_Std)
                        return;
 

-       mandoc_msg(MANDOCERR_ARG_STD, mdoc->parse,
-           n->line, n->pos, roff_name[n->tok]);
+       mandoc_msg(MANDOCERR_ARG_STD, n->line, n->pos,
+           "%s", roff_name[n->tok]);

 }
 
 static void
 }
 
 static void


@@ -1079,7 +1087,7 @@ post_st(POST_ARGS)
        assert(nch->type == ROFFT_TEXT);
 
        if ((p = mdoc_a2st(nch->string)) == NULL) {
        assert(nch->type == ROFFT_TEXT);
 
        if ((p = mdoc_a2st(nch->string)) == NULL) {

-               mandoc_vmsg(MANDOCERR_ST_BAD, mdoc->parse,
+               mandoc_msg(MANDOCERR_ST_BAD,

                    nch->line, nch->pos, "St %s", nch->string);
                roff_node_delete(mdoc, n);
                return;
                    nch->line, nch->pos, "St %s", nch->string);
                roff_node_delete(mdoc, n);
                return;


@@ -1092,6 +1100,125 @@ post_st(POST_ARGS)
        mdoc->last= n;
 }
 
        mdoc->last= n;
 }
 

+static void
+post_tg(POST_ARGS)
+{
+       struct roff_node *n;    /* The .Tg node. */
+       struct roff_node *nch;  /* The first child of the .Tg node. */
+       struct roff_node *nn;   /* The next node after the .Tg node. */
+       struct roff_node *np;   /* The parent of the next node. */
+       struct roff_node *nt;   /* The TEXT node containing the tag. */
+       size_t            len;  /* The number of bytes in the tag. */
+
+       /* Find the next node. */
+       n = mdoc->last;
+       for (nn = n; nn != NULL; nn = nn->parent) {
+               if (nn->next != NULL) {
+                       nn = nn->next;
+                       break;
+               }
+       }
+
+       /* Find the tag. */
+       nt = nch = n->child;
+       if (nch == NULL && nn != NULL && nn->child != NULL &&
+           nn->child->type == ROFFT_TEXT)
+               nt = nn->child;
+
+       /* Validate the tag. */
+       if (nt == NULL || *nt->string == '\0')
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, n->line, n->pos, "Tg");
+       if (nt == NULL) {
+               roff_node_delete(mdoc, n);
+               return;
+       }
+       len = strcspn(nt->string, " \t\\");
+       if (nt->string[len] != '\0')
+               mandoc_msg(MANDOCERR_TG_SPC, nt->line,
+                   nt->pos + len, "Tg %s", nt->string);
+
+       /* Keep only the first argument. */
+       if (nch != NULL && nch->next != NULL) {
+               mandoc_msg(MANDOCERR_ARG_EXCESS, nch->next->line,
+                   nch->next->pos, "Tg ... %s", nch->next->string);
+               while (nch->next != NULL)
+                       roff_node_delete(mdoc, nch->next);
+       }
+
+       /* Drop the macro if the first argument is invalid. */
+       if (len == 0 || nt->string[len] != '\0') {
+               roff_node_delete(mdoc, n);
+               return;
+       }
+
+       /* By default, tag the .Tg node itself. */
+       if (nn == NULL || nn->flags & NODE_ID)
+               nn = n;
+
+       /* Explicit tagging of specific macros. */
+       switch (nn->tok) {
+       case MDOC_Sh:
+       case MDOC_Ss:
+       case MDOC_Fo:
+               nn = nn->head->child == NULL ? n : nn->head;
+               break;
+       case MDOC_It:
+               np = nn->parent;
+               while (np->tok != MDOC_Bl)
+                       np = np->parent;
+               switch (np->norm->Bl.type) {
+               case LIST_column:
+                       break;
+               case LIST_diag:
+               case LIST_hang:
+               case LIST_inset:
+               case LIST_ohang:
+               case LIST_tag:
+                       nn = nn->head;
+                       break;
+               case LIST_bullet:
+               case LIST_dash:
+               case LIST_enum:
+               case LIST_hyphen:
+               case LIST_item:
+                       nn = nn->body->child == NULL ? n : nn->body;
+                       break;
+               default:
+                       abort();
+               }
+               break;
+       case MDOC_Bd:
+       case MDOC_Bl:
+       case MDOC_D1:
+       case MDOC_Dl:
+               nn = nn->body->child == NULL ? n : nn->body;
+               break;
+       case MDOC_Pp:
+               break;
+       case MDOC_Cm:
+       case MDOC_Dv:
+       case MDOC_Em:
+       case MDOC_Er:
+       case MDOC_Ev:
+       case MDOC_Fl:
+       case MDOC_Fn:
+       case MDOC_Ic:
+       case MDOC_Li:
+       case MDOC_Ms:
+       case MDOC_No:
+       case MDOC_Sy:
+               if (nn->child == NULL)
+                       nn = n;
+               break;
+       default:
+               nn = n;
+               break;
+       }
+       tag_put(nt->string, TAG_MANUAL, nn);
+       if (nn != n)
+               n->flags |= NODE_NOPRT;
+}
+

 static void
 post_obsolete(POST_ARGS)
 {
 static void
 post_obsolete(POST_ARGS)
 {


@@ -1099,8 +1226,8 @@ post_obsolete(POST_ARGS)
 
        n = mdoc->last;
        if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)
 
        n = mdoc->last;
        if (n->type == ROFFT_ELEM || n->type == ROFFT_BLOCK)

-               mandoc_msg(MANDOCERR_MACRO_OBS, mdoc->parse,
-                   n->line, n->pos, roff_name[n->tok]);
+               mandoc_msg(MANDOCERR_MACRO_OBS, n->line, n->pos,
+                   "%s", roff_name[n->tok]);

 }
 
 static void
 }
 
 static void


@@ -1109,8 +1236,8 @@ post_useless(POST_ARGS)
        struct roff_node *n;
 
        n = mdoc->last;
        struct roff_node *n;
 
        n = mdoc->last;

-       mandoc_msg(MANDOCERR_MACRO_USELESS, mdoc->parse,
-           n->line, n->pos, roff_name[n->tok]);
+       mandoc_msg(MANDOCERR_MACRO_USELESS, n->line, n->pos,
+           "%s", roff_name[n->tok]);

 }
 
 /*
 }
 
 /*


@@ -1139,14 +1266,14 @@ post_bf(POST_ARGS)
        nch = np->child;
        if (np->parent->args == NULL) {
                if (nch == NULL) {
        nch = np->child;
        if (np->parent->args == NULL) {
                if (nch == NULL) {

-                       mandoc_msg(MANDOCERR_BF_NOFONT, mdoc->parse,
+                       mandoc_msg(MANDOCERR_BF_NOFONT,

                            np->line, np->pos, "Bf");
                        return;
                }
                nch = nch->next;
        }
        if (nch != NULL)
                            np->line, np->pos, "Bf");
                        return;
                }
                nch = nch->next;
        }
        if (nch != NULL)

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

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


@@ -1177,30 +1304,39 @@ post_bf(POST_ARGS)
        else if ( ! strcmp(np->child->string, "Sy"))
                np->norm->Bf.font = FONT_Sy;
        else
        else if ( ! strcmp(np->child->string, "Sy"))
                np->norm->Bf.font = FONT_Sy;
        else

-               mandoc_vmsg(MANDOCERR_BF_BADFONT, mdoc->parse,
-                   np->child->line, np->child->pos,
-                   "Bf %s", np->child->string);
+               mandoc_msg(MANDOCERR_BF_BADFONT, np->child->line,
+                   np->child->pos, "Bf %s", np->child->string);

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

-       const struct roff_node  *n;
+       struct roff_node        *n, *nch;

        const char              *cp;
        size_t                   pos;
 
        const char              *cp;
        size_t                   pos;
 

-       n = mdoc->last->child;
-       pos = strcspn(n->string, "()");
-       cp = n->string + pos;
-       if ( ! (cp[0] == '\0' || (cp[0] == '(' && cp[1] == '*')))
-               mandoc_msg(MANDOCERR_FN_PAREN, mdoc->parse,
-                   n->line, n->pos + pos, n->string);
+       n = mdoc->last;
+       nch = n->child;
+       cp = nch->string;
+       if (*cp == '(') {
+               if (cp[strlen(cp + 1)] == ')')
+                       return;
+               pos = 0;
+       } else {
+               pos = strcspn(cp, "()");
+               if (cp[pos] == '\0') {
+                       if (n->sec == SEC_DESCRIPTION ||
+                           n->sec == SEC_CUSTOM)
+                               tag_put(NULL, fn_prio++, n);
+                       return;
+               }
+       }
+       mandoc_msg(MANDOCERR_FN_PAREN, nch->line, nch->pos + pos, "%s", cp);

 }
 
 static void
 post_fn(POST_ARGS)
 {
 }
 
 static void
 post_fn(POST_ARGS)
 {

-

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


@@ -1216,12 +1352,11 @@ post_fo(POST_ARGS)
                return;
 
        if (n->child == NULL) {
                return;
 
        if (n->child == NULL) {

-               mandoc_msg(MANDOCERR_FO_NOHEAD, mdoc->parse,
-                   n->line, n->pos, "Fo");
+               mandoc_msg(MANDOCERR_FO_NOHEAD, n->line, n->pos, "Fo");

                return;
        }
        if (n->child != n->last) {
                return;
        }
        if (n->child != n->last) {

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

                    n->child->next->line, n->child->next->pos,
                    "Fo ... %s", n->child->next->string);
                while (n->child != n->last)
                    n->child->next->line, n->child->next->pos,
                    "Fo ... %s", n->child->next->string);
                while (n->child != n->last)


@@ -1245,9 +1380,8 @@ post_fa(POST_ARGS)
                                break;
                        if (*cp != ',')
                                continue;
                                break;
                        if (*cp != ',')
                                continue;

-                       mandoc_msg(MANDOCERR_FA_COMMA, mdoc->parse,
-                           n->line, n->pos + (cp - n->string),
-                           n->string);
+                       mandoc_msg(MANDOCERR_FA_COMMA, n->line,
+                           n->pos + (int)(cp - n->string), "%s", n->string);

                        break;
                }
        }
                        break;
                }
        }


@@ -1265,18 +1399,15 @@ post_nm(POST_ARGS)
            n->child->type == ROFFT_TEXT && mdoc->meta.msec != NULL)
                mandoc_xr_add(mdoc->meta.msec, n->child->string, -1, -1);
 
            n->child->type == ROFFT_TEXT && mdoc->meta.msec != NULL)
                mandoc_xr_add(mdoc->meta.msec, n->child->string, -1, -1);
 

-       if (n->last != NULL &&
-           (n->last->tok == MDOC_Pp ||
-            n->last->tok == MDOC_Lp))
-               mdoc_node_relink(mdoc, n->last);
+       if (n->last != NULL && n->last->tok == MDOC_Pp)
+               roff_node_relink(mdoc, n->last);

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

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

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


@@ -1310,12 +1441,10 @@ post_nd(POST_ARGS)
                return;
 
        if (n->sec != SEC_NAME)
                return;
 
        if (n->sec != SEC_NAME)

-               mandoc_msg(MANDOCERR_ND_LATE, mdoc->parse,
-                   n->line, n->pos, "Nd");
+               mandoc_msg(MANDOCERR_ND_LATE, n->line, n->pos, "Nd");

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

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

        else
                post_delim(mdoc);
 
        else
                post_delim(mdoc);
 


@@ -1335,8 +1464,8 @@ post_display(POST_ARGS)
                            n->body->parent->args == NULL)
                                roff_node_delete(mdoc, n);
                } else if (n->child == NULL)
                            n->body->parent->args == NULL)
                                roff_node_delete(mdoc, n);
                } else if (n->child == NULL)

-                       mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
-                           n->line, n->pos, roff_name[n->tok]);
+                       mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos,
+                           "%s", roff_name[n->tok]);

                else if (n->tok == MDOC_D1)
                        post_hyph(mdoc);
                break;
                else if (n->tok == MDOC_D1)
                        post_hyph(mdoc);
                break;


@@ -1344,10 +1473,10 @@ post_display(POST_ARGS)
                if (n->tok == MDOC_Bd) {
                        if (n->args == NULL) {
                                mandoc_msg(MANDOCERR_BD_NOARG,
                if (n->tok == MDOC_Bd) {
                        if (n->args == NULL) {
                                mandoc_msg(MANDOCERR_BD_NOARG,

-                                   mdoc->parse, n->line, n->pos, "Bd");
+                                   n->line, n->pos, "Bd");

                                mdoc->next = ROFF_NEXT_SIBLING;
                                while (n->body->child != NULL)
                                mdoc->next = ROFF_NEXT_SIBLING;
                                while (n->body->child != NULL)

-                                       mdoc_node_relink(mdoc,
+                                       roff_node_relink(mdoc,

                                            n->body->child);
                                roff_node_delete(mdoc, n);
                                break;
                                            n->body->child);
                                roff_node_delete(mdoc, n);
                                break;


@@ -1357,9 +1486,8 @@ post_display(POST_ARGS)
                }
                for (np = n->parent; np != NULL; np = np->parent) {
                        if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) {
                }
                for (np = n->parent; np != NULL; np = np->parent) {
                        if (np->type == ROFFT_BLOCK && np->tok == MDOC_Bd) {

-                               mandoc_vmsg(MANDOCERR_BD_NEST,
-                                   mdoc->parse, n->line, n->pos,
-                                   "%s in Bd", roff_name[n->tok]);
+                               mandoc_msg(MANDOCERR_BD_NEST, n->line,
+                                   n->pos, "%s in Bd", roff_name[n->tok]);

                                break;
                        }
                }
                                break;
                        }
                }


@@ -1372,38 +1500,29 @@ post_display(POST_ARGS)
 static void
 post_defaults(POST_ARGS)
 {
 static void
 post_defaults(POST_ARGS)
 {

-       struct roff_node *nn;
+       struct roff_node *n;

 
 

-       if (mdoc->last->child != NULL) {
+       n = mdoc->last;
+       if (n->child != NULL) {

                post_delim_nb(mdoc);
                return;
        }
                post_delim_nb(mdoc);
                return;
        }

-
-       /*
-        * The `Ar' defaults to "file ..." if no value is provided as an
-        * argument; the `Mt' and `Pa' macros use "~"; the `Li' just
-        * gets an empty string.
-        */
-
-       nn = mdoc->last;
-       switch (nn->tok) {
+       mdoc->next = ROFF_NEXT_CHILD;
+       switch (n->tok) {

        case MDOC_Ar:
        case MDOC_Ar:

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

                mdoc->last->flags |= NODE_NOSRC;
                mdoc->last->flags |= NODE_NOSRC;

+               roff_word_alloc(mdoc, n->line, n->pos, "...");

                break;
        case MDOC_Pa:
        case MDOC_Mt:
                break;
        case MDOC_Pa:
        case MDOC_Mt:

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

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

-       mdoc->last = nn;
+       mdoc->last->flags |= NODE_NOSRC;
+       mdoc->last = n;

 }
 
 static void
 }
 
 static void


@@ -1423,7 +1542,7 @@ post_at(POST_ARGS)
 
        att = NULL;
        if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL))
 
        att = NULL;
        if (nch != NULL && ((att = mdoc_a2att(nch->string)) == NULL))

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

                    nch->line, nch->pos, "At %s", nch->string);
 
        mdoc->next = ROFF_NEXT_CHILD;
                    nch->line, nch->pos, "At %s", nch->string);
 
        mdoc->next = ROFF_NEXT_CHILD;


@@ -1447,32 +1566,91 @@ post_an(POST_ARGS)
        nch = np->child;
        if (np->norm->An.auth == AUTH__NONE) {
                if (nch == NULL)
        nch = np->child;
        if (np->norm->An.auth == AUTH__NONE) {
                if (nch == NULL)

-                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY,

                            np->line, np->pos, "An");
                else
                        post_delim_nb(mdoc);
        } else if (nch != NULL)
                            np->line, np->pos, "An");
                else
                        post_delim_nb(mdoc);
        } else if (nch != NULL)

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

                    nch->line, nch->pos, "An ... %s", nch->string);
 }
 
 static void
                    nch->line, nch->pos, "An ... %s", nch->string);
 }
 
 static void

-post_en(POST_ARGS)
+post_em(POST_ARGS)

 {
 {

+       post_tag(mdoc);
+       tag_put(NULL, TAG_FALLBACK, mdoc->last);
+}

 
 

+static void
+post_en(POST_ARGS)
+{

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

-post_es(POST_ARGS)
+post_er(POST_ARGS)

 {
 {

+       struct roff_node *n;

 
 

+       n = mdoc->last;
+       if (n->sec == SEC_ERRORS &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Bq &&
+             n->parent->parent->parent->tok == MDOC_It)))
+               tag_put(NULL, TAG_STRONG, n);
+       post_delim_nb(mdoc);
+}
+
+static void
+post_tag(POST_ARGS)
+{
+       struct roff_node *n;
+
+       n = mdoc->last;
+       if ((n->prev == NULL ||
+            (n->prev->type == ROFFT_TEXT &&
+             strcmp(n->prev->string, "|") == 0)) &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Xo &&
+             n->parent->parent->prev == NULL &&
+             n->parent->parent->parent->tok == MDOC_It)))
+               tag_put(NULL, TAG_STRONG, n);
+       post_delim_nb(mdoc);
+}
+
+static void
+post_es(POST_ARGS)
+{

        post_obsolete(mdoc);
        mdoc->last_es = mdoc->last;
 }
 
        post_obsolete(mdoc);
        mdoc->last_es = mdoc->last;
 }
 

+static void
+post_fl(POST_ARGS)
+{
+       struct roff_node        *n;
+       char                    *cp;
+
+       /*
+        * Transform ".Fl Fl long" to ".Fl \-long",
+        * resulting for example in better HTML output.
+        */
+
+       n = mdoc->last;
+       if (n->prev != NULL && n->prev->tok == MDOC_Fl &&
+           n->prev->child == NULL && n->child != NULL &&
+           (n->flags & NODE_LINE) == 0) {
+               mandoc_asprintf(&cp, "\\-%s", n->child->string);
+               free(n->child->string);
+               n->child->string = cp;
+               roff_node_delete(mdoc, n->prev);
+       }
+       post_tag(mdoc);
+}
+

 static void
 post_xx(POST_ARGS)
 {
 static void
 post_xx(POST_ARGS)
 {


@@ -1548,9 +1726,8 @@ post_it(POST_ARGS)
        case LIST_inset:
        case LIST_diag:
                if (nit->head->child == NULL)
        case LIST_inset:
        case LIST_diag:
                if (nit->head->child == NULL)

-                       mandoc_vmsg(MANDOCERR_IT_NOHEAD,
-                           mdoc->parse, nit->line, nit->pos,
-                           "Bl -%s It",
+                       mandoc_msg(MANDOCERR_IT_NOHEAD,
+                           nit->line, nit->pos, "Bl -%s It",

                            mdoc_argnames[nbl->args->argv[0].arg]);
                break;
        case LIST_bullet:
                            mdoc_argnames[nbl->args->argv[0].arg]);
                break;
        case LIST_bullet:


@@ -1558,17 +1735,16 @@ post_it(POST_ARGS)
        case LIST_enum:
        case LIST_hyphen:
                if (nit->body == NULL || nit->body->child == NULL)
        case LIST_enum:
        case LIST_hyphen:
                if (nit->body == NULL || nit->body->child == NULL)

-                       mandoc_vmsg(MANDOCERR_IT_NOBODY,
-                           mdoc->parse, nit->line, nit->pos,
-                           "Bl -%s It",
+                       mandoc_msg(MANDOCERR_IT_NOBODY,
+                           nit->line, nit->pos, "Bl -%s It",

                            mdoc_argnames[nbl->args->argv[0].arg]);
                /* FALLTHROUGH */
        case LIST_item:
                if ((nch = nit->head->child) != NULL)
                            mdoc_argnames[nbl->args->argv[0].arg]);
                /* FALLTHROUGH */
        case LIST_item:
                if ((nch = nit->head->child) != NULL)

-                       mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
+                       mandoc_msg(MANDOCERR_ARG_SKIP,

                            nit->line, nit->pos, "It %s",
                            nit->line, nit->pos, "It %s",

-                           nch->string == NULL ? roff_name[nch->tok] :
-                           nch->string);
+                           nch->type == ROFFT_TEXT ? nch->string :
+                           roff_name[nch->tok]);

                break;
        case LIST_column:
                cols = (int)nbl->norm->Bl.ncols;
                break;
        case LIST_column:
                cols = (int)nbl->norm->Bl.ncols;


@@ -1577,7 +1753,7 @@ post_it(POST_ARGS)
 
                if (nit->head->next->child == NULL &&
                    nit->head->next->next == NULL) {
 
                if (nit->head->next->child == NULL &&
                    nit->head->next->next == NULL) {

-                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY,

                            nit->line, nit->pos, "It");
                        roff_node_delete(mdoc, nit);
                        break;
                            nit->line, nit->pos, "It");
                        roff_node_delete(mdoc, nit);
                        break;


@@ -1588,16 +1764,15 @@ post_it(POST_ARGS)
                        if (nch->type != ROFFT_BODY)
                                continue;
                        if (i++ && nch->flags & NODE_LINE)
                        if (nch->type != ROFFT_BODY)
                                continue;
                        if (i++ && nch->flags & NODE_LINE)

-                               mandoc_msg(MANDOCERR_TA_LINE, mdoc->parse,
+                               mandoc_msg(MANDOCERR_TA_LINE,

                                    nch->line, nch->pos, "Ta");
                }
                if (i < cols || i > cols + 1)
                                    nch->line, nch->pos, "Ta");
                }
                if (i < cols || i > cols + 1)

-                       mandoc_vmsg(MANDOCERR_BL_COL,
-                           mdoc->parse, nit->line, nit->pos,
+                       mandoc_msg(MANDOCERR_BL_COL, nit->line, nit->pos,

                            "%d columns, %d cells", cols, i);
                else if (nit->head->next->child != NULL &&
                            "%d columns, %d cells", cols, i);
                else if (nit->head->next->child != NULL &&

-                   nit->head->next->child->line > nit->line)
-                       mandoc_msg(MANDOCERR_IT_NOARG, mdoc->parse,
+                   nit->head->next->child->flags & NODE_LINE)
+                       mandoc_msg(MANDOCERR_IT_NOARG,

                            nit->line, nit->pos, "Bl -column It");
                break;
        default:
                            nit->line, nit->pos, "Bl -column It");
                break;
        default:


@@ -1620,7 +1795,6 @@ post_bl_block(POST_ARGS)
                while (nc != NULL) {
                        switch (nc->tok) {
                        case MDOC_Pp:
                while (nc != NULL) {
                        switch (nc->tok) {
                        case MDOC_Pp:

-                       case MDOC_Lp:

                        case ROFF_br:
                                break;
                        default:
                        case ROFF_br:
                                break;
                        default:


@@ -1628,14 +1802,13 @@ post_bl_block(POST_ARGS)
                                continue;
                        }
                        if (ni->next == NULL) {
                                continue;
                        }
                        if (ni->next == NULL) {

-                               mandoc_msg(MANDOCERR_PAR_MOVE,
-                                   mdoc->parse, nc->line, nc->pos,
-                                   roff_name[nc->tok]);
-                               mdoc_node_relink(mdoc, nc);
+                               mandoc_msg(MANDOCERR_PAR_MOVE, nc->line,
+                                   nc->pos, "%s", roff_name[nc->tok]);
+                               roff_node_relink(mdoc, nc);

                        } else if (n->norm->Bl.comp == 0 &&
                            n->norm->Bl.type != LIST_column) {
                        } else if (n->norm->Bl.comp == 0 &&
                            n->norm->Bl.type != LIST_column) {

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

                                    "%s before It", roff_name[nc->tok]);
                                roff_node_delete(mdoc, nc);
                        } else
                                    "%s before It", roff_name[nc->tok]);
                                roff_node_delete(mdoc, nc);
                        } else


@@ -1681,7 +1854,7 @@ post_bl_head(POST_ARGS)
        if (nh->norm->Bl.type != LIST_column) {
                if ((nch = nh->child) == NULL)
                        return;
        if (nh->norm->Bl.type != LIST_column) {
                if ((nch = nh->child) == NULL)
                        return;

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

                    nch->line, nch->pos, "Bl ... %s", nch->string);
                while (nch != NULL) {
                        roff_node_delete(mdoc, nch);
                    nch->line, nch->pos, "Bl ... %s", nch->string);
                while (nch != NULL) {
                        roff_node_delete(mdoc, nch);


@@ -1734,8 +1907,7 @@ post_bl_head(POST_ARGS)
 static void
 post_bl(POST_ARGS)
 {
 static void
 post_bl(POST_ARGS)
 {

-       struct roff_node        *nparent, *nprev; /* of the Bl block */
-       struct roff_node        *nblock, *nbody;  /* of the Bl */
+       struct roff_node        *nbody;           /* of the Bl */

        struct roff_node        *nchild, *nnext;  /* of the Bl body */
        const char              *prev_Er;
        int                      order;
        struct roff_node        *nchild, *nnext;  /* of the Bl body */
        const char              *prev_Er;
        int                      order;


@@ -1756,88 +1928,73 @@ post_bl(POST_ARGS)
        if (nbody->end != ENDBODY_NOT)
                return;
 
        if (nbody->end != ENDBODY_NOT)
                return;
 

-       nchild = nbody->child;
-       if (nchild == NULL) {
-               mandoc_msg(MANDOCERR_BLK_EMPTY, mdoc->parse,
-                   nbody->line, nbody->pos, "Bl");
-               return;
+       /*
+        * Up to the first item, move nodes before the list,
+        * but leave transparent nodes where they are
+        * if they precede an item.
+        * The next non-transparent node is kept in nchild.
+        * It only needs to be updated after a non-transparent
+        * node was moved out, and at the very beginning
+        * when no node at all was moved yet.
+        */
+
+       nchild = mdoc->last;
+       for (;;) {
+               if (nchild == mdoc->last)
+                       nchild = roff_node_child(nbody);
+               if (nchild == NULL) {
+                       mdoc->last = nbody;
+                       mandoc_msg(MANDOCERR_BLK_EMPTY,
+                           nbody->line, nbody->pos, "Bl");
+                       return;
+               }
+               if (nchild->tok == MDOC_It) {
+                       mdoc->last = nbody;
+                       break;
+               }
+               mandoc_msg(MANDOCERR_BL_MOVE, nbody->child->line,
+                   nbody->child->pos, "%s", roff_name[nbody->child->tok]);
+               if (nbody->parent->prev == NULL) {
+                       mdoc->last = nbody->parent->parent;
+                       mdoc->next = ROFF_NEXT_CHILD;
+               } else {
+                       mdoc->last = nbody->parent->prev;
+                       mdoc->next = ROFF_NEXT_SIBLING;
+               }
+               roff_node_relink(mdoc, nbody->child);

        }
        }

+
+       /*
+        * We have reached the first item,
+        * so moving nodes out is no longer possible.
+        * But in .Bl -column, the first rows may be implicit,
+        * that is, they may not start with .It macros.
+        * Such rows may be followed by nodes generated on the
+        * roff level, for example .TS.
+        * Wrap such roff nodes into an implicit row.
+        */
+

        while (nchild != NULL) {
        while (nchild != NULL) {

-               nnext = nchild->next;
-               if (nchild->tok == MDOC_It ||
-                   (nchild->tok == MDOC_Sm &&
-                    nnext != NULL && nnext->tok == MDOC_It)) {
-                       nchild = nnext;
+               if (nchild->tok == MDOC_It) {
+                       nchild = roff_node_next(nchild);

                        continue;
                }
                        continue;
                }

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

                        mdoc->next = ROFF_NEXT_SIBLING;
                        mdoc->next = ROFF_NEXT_SIBLING;

-                       roff_body_alloc(mdoc, nchild->line,
-                           nchild->pos, MDOC_It);
-                       while (nchild->tok != MDOC_It) {
-                               mdoc_node_relink(mdoc, nchild);
-                               if ((nchild = nnext) == NULL)
-                                       break;
-                               nnext = nchild->next;
-                               mdoc->next = ROFF_NEXT_SIBLING;
-                       }
-                       mdoc->last = nbody;
-                       continue;

                }
                }

-
-               mandoc_msg(MANDOCERR_BL_MOVE, mdoc->parse,
-                   nchild->line, nchild->pos, roff_name[nchild->tok]);
-
-               /*
-                * Move the node out of the Bl block.
-                * First, collect all required node pointers.
-                */
-
-               nblock  = nbody->parent;
-               nprev   = nblock->prev;
-               nparent = nblock->parent;
-
-               /*
-                * Unlink this child.
-                */
-
-               nbody->child = nnext;
-               if (nnext == NULL)
-                       nbody->last  = NULL;
-               else
-                       nnext->prev = NULL;
-
-               /*
-                * Relink this child.
-                */
-
-               nchild->parent = nparent;
-               nchild->prev   = nprev;
-               nchild->next   = nblock;
-
-               nblock->prev = nchild;
-               if (nprev == NULL)
-                       nparent->child = nchild;
-               else
-                       nprev->next = nchild;
-
-               nchild = nnext;
+               mdoc->last = nbody;

        }
 
        if (mdoc->meta.os_e != MANDOC_OS_NETBSD)
        }
 
        if (mdoc->meta.os_e != MANDOC_OS_NETBSD)


@@ -1857,13 +2014,13 @@ post_bl(POST_ARGS)
                if (prev_Er != NULL) {
                        order = strcmp(prev_Er, nnext->string);
                        if (order > 0)
                if (prev_Er != NULL) {
                        order = strcmp(prev_Er, nnext->string);
                        if (order > 0)

-                               mandoc_vmsg(MANDOCERR_ER_ORDER,
-                                   mdoc->parse, nnext->line, nnext->pos,
+                               mandoc_msg(MANDOCERR_ER_ORDER,
+                                   nnext->line, nnext->pos,

                                    "Er %s %s (NetBSD)",
                                    prev_Er, nnext->string);
                        else if (order == 0)
                                    "Er %s %s (NetBSD)",
                                    prev_Er, nnext->string);
                        else if (order == 0)

-                               mandoc_vmsg(MANDOCERR_ER_REP,
-                                   mdoc->parse, nnext->line, nnext->pos,
+                               mandoc_msg(MANDOCERR_ER_REP,
+                                   nnext->line, nnext->pos,

                                    "Er %s (NetBSD)", prev_Er);
                }
                prev_Er = nnext->string;
                                    "Er %s (NetBSD)", prev_Er);
                }
                prev_Er = nnext->string;


@@ -1878,8 +2035,7 @@ post_bk(POST_ARGS)
        n = mdoc->last;
 
        if (n->type == ROFFT_BLOCK && n->body->child == NULL) {
        n = mdoc->last;
 
        if (n->type == ROFFT_BLOCK && n->body->child == NULL) {

-               mandoc_msg(MANDOCERR_BLK_EMPTY,
-                   mdoc->parse, n->line, n->pos, "Bk");
+               mandoc_msg(MANDOCERR_BLK_EMPTY, n->line, n->pos, "Bk");

                roff_node_delete(mdoc, n);
        }
 }
                roff_node_delete(mdoc, n);
        }
 }


@@ -1907,49 +2063,24 @@ post_sm(POST_ARGS)
                return;
        }
 
                return;
        }
 

-       mandoc_vmsg(MANDOCERR_SM_BAD,
-           mdoc->parse, nch->line, nch->pos,
+       mandoc_msg(MANDOCERR_SM_BAD, nch->line, nch->pos,

            "%s %s", roff_name[mdoc->last->tok], nch->string);
            "%s %s", roff_name[mdoc->last->tok], nch->string);

-       mdoc_node_relink(mdoc, nch);
+       roff_node_relink(mdoc, nch);

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

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

        struct roff_node *n;
        struct roff_node *n;

-       const char **arch;

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

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

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

-               mandoc_msg(MANDOCERR_DT_NOTITLE,
-                   mdoc->parse, 0, 0, "EOF");
+               mandoc_msg(MANDOCERR_DT_NOTITLE, 0, 0, "EOF");

                mdoc->meta.title = mandoc_strdup("UNTITLED");
        }
 
                mdoc->meta.title = mandoc_strdup("UNTITLED");
        }
 


@@ -1957,49 +2088,43 @@ post_root(POST_ARGS)
                mdoc->meta.vol = mandoc_strdup("LOCAL");
 
        if (mdoc->meta.os == NULL) {
                mdoc->meta.vol = mandoc_strdup("LOCAL");
 
        if (mdoc->meta.os == NULL) {

-               mandoc_msg(MANDOCERR_OS_MISSING,
-                   mdoc->parse, 0, 0, NULL);
+               mandoc_msg(MANDOCERR_OS_MISSING, 0, 0, NULL);

                mdoc->meta.os = mandoc_strdup("");
        } else if (mdoc->meta.os_e &&
            (mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0)
                mdoc->meta.os = mandoc_strdup("");
        } else if (mdoc->meta.os_e &&
            (mdoc->meta.rcsids & (1 << mdoc->meta.os_e)) == 0)

-               mandoc_msg(MANDOCERR_RCS_MISSING, mdoc->parse, 0, 0,
+               mandoc_msg(MANDOCERR_RCS_MISSING, 0, 0,

                    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
                    "(OpenBSD)" : "(NetBSD)");
 
        if (mdoc->meta.arch != NULL &&
                    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
                    "(OpenBSD)" : "(NetBSD)");
 
        if (mdoc->meta.arch != NULL &&

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

        }
 
        /* Check that we begin with a proper `Sh'. */
 
        }
 
        /* Check that we begin with a proper `Sh'. */
 

-       n = mdoc->first->child;
+       n = mdoc->meta.first->child;

        while (n != NULL &&
            (n->type == ROFFT_COMMENT ||
             (n->tok >= MDOC_Dd &&
        while (n != NULL &&
            (n->type == ROFFT_COMMENT ||
             (n->tok >= MDOC_Dd &&

-             mdoc_macros[n->tok].flags & MDOC_PROLOGUE)))
+             mdoc_macro(n->tok)->flags & MDOC_PROLOGUE)))

                n = n->next;
 
        if (n == NULL)
                n = n->next;
 
        if (n == NULL)

-               mandoc_msg(MANDOCERR_DOC_EMPTY, mdoc->parse, 0, 0, NULL);
+               mandoc_msg(MANDOCERR_DOC_EMPTY, 0, 0, NULL);

        else if (n->tok != MDOC_Sh)
        else if (n->tok != MDOC_Sh)

-               mandoc_msg(MANDOCERR_SEC_BEFORE, mdoc->parse,
-                   n->line, n->pos, roff_name[n->tok]);
+               mandoc_msg(MANDOCERR_SEC_BEFORE, n->line, n->pos,
+                   "%s", roff_name[n->tok]);

 }
 
 static void
 }
 
 static void


@@ -2014,8 +2139,7 @@ post_rs(POST_ARGS)
                return;
 
        if (np->child == NULL) {
                return;
 
        if (np->child == NULL) {

-               mandoc_msg(MANDOCERR_RS_EMPTY, mdoc->parse,
-                   np->line, np->pos, "Rs");
+               mandoc_msg(MANDOCERR_RS_EMPTY, np->line, np->pos, "Rs");

                return;
        }
 
                return;
        }
 


@@ -2033,8 +2157,8 @@ post_rs(POST_ARGS)
                                break;
 
                if (i == RSORD_MAX) {
                                break;
 
                if (i == RSORD_MAX) {

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

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


@@ -2098,10 +2222,11 @@ post_rs(POST_ARGS)
 static void
 post_hyph(POST_ARGS)
 {
 static void
 post_hyph(POST_ARGS)
 {

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

        char                    *cp;
 
        char                    *cp;
 

-       for (nch = mdoc->last->child; nch != NULL; nch = nch->next) {
+       n = mdoc->last;
+       for (nch = n->child; nch != NULL; nch = nch->next) {

                if (nch->type != ROFFT_TEXT)
                        continue;
                cp = nch->string;
                if (nch->type != ROFFT_TEXT)
                        continue;
                cp = nch->string;


@@ -2110,8 +2235,11 @@ post_hyph(POST_ARGS)
                while (*(++cp) != '\0')
                        if (*cp == '-' &&
                            isalpha((unsigned char)cp[-1]) &&
                while (*(++cp) != '\0')
                        if (*cp == '-' &&
                            isalpha((unsigned char)cp[-1]) &&

-                           isalpha((unsigned char)cp[1]))
+                           isalpha((unsigned char)cp[1])) {
+                               if (n->tag == NULL && n->flags & NODE_ID)
+                                       n->tag = mandoc_strdup(nch->string);

                                *cp = ASCII_HYPH;
                                *cp = ASCII_HYPH;

+                       }

        }
 }
 
        }
 }
 


@@ -2123,8 +2251,7 @@ post_ns(POST_ARGS)
        n = mdoc->last;
        if (n->flags & NODE_LINE ||
            (n->next != NULL && n->next->flags & NODE_DELIMC))
        n = mdoc->last;
        if (n->flags & NODE_LINE ||
            (n->next != NULL && n->next->flags & NODE_DELIMC))

-               mandoc_msg(MANDOCERR_NS_SKIP, mdoc->parse,
-                   n->line, n->pos, NULL);
+               mandoc_msg(MANDOCERR_NS_SKIP, n->line, n->pos, NULL);

 }
 
 static void
 }
 
 static void


@@ -2137,8 +2264,7 @@ post_sx(POST_ARGS)
 static void
 post_sh(POST_ARGS)
 {
 static void
 post_sh(POST_ARGS)
 {

-
-       post_ignpar(mdoc);
+       post_section(mdoc);

 
        switch (mdoc->last->type) {
        case ROFFT_HEAD:
 
        switch (mdoc->last->type) {
        case ROFFT_HEAD:


@@ -2176,8 +2302,8 @@ post_sh_name(POST_ARGS)
                switch (n->tok) {
                case MDOC_Nm:
                        if (hasnm && n->child != NULL)
                switch (n->tok) {
                case MDOC_Nm:
                        if (hasnm && n->child != NULL)

-                               mandoc_vmsg(MANDOCERR_NAMESEC_PUNCT,
-                                   mdoc->parse, n->line, n->pos,
+                               mandoc_msg(MANDOCERR_NAMESEC_PUNCT,
+                                   n->line, n->pos,

                                    "Nm %s", n->child->string);
                        hasnm = 1;
                        continue;
                                    "Nm %s", n->child->string);
                        hasnm = 1;
                        continue;


@@ -2185,7 +2311,7 @@ post_sh_name(POST_ARGS)
                        hasnd = 1;
                        if (n->next != NULL)
                                mandoc_msg(MANDOCERR_NAMESEC_ND,
                        hasnd = 1;
                        if (n->next != NULL)
                                mandoc_msg(MANDOCERR_NAMESEC_ND,

-                                   mdoc->parse, n->line, n->pos, NULL);
+                                   n->line, n->pos, NULL);

                        break;
                case TOKEN_NONE:
                        if (n->type == ROFFT_TEXT &&
                        break;
                case TOKEN_NONE:
                        if (n->type == ROFFT_TEXT &&


@@ -2196,18 +2322,18 @@ post_sh_name(POST_ARGS)
                        }
                        /* FALLTHROUGH */
                default:
                        }
                        /* FALLTHROUGH */
                default:

-                       mandoc_msg(MANDOCERR_NAMESEC_BAD, mdoc->parse,
-                           n->line, n->pos, roff_name[n->tok]);
+                       mandoc_msg(MANDOCERR_NAMESEC_BAD,
+                           n->line, n->pos, "%s", roff_name[n->tok]);

                        continue;
                }
                break;
        }
 
        if ( ! hasnm)
                        continue;
                }
                break;
        }
 
        if ( ! hasnm)

-               mandoc_msg(MANDOCERR_NAMESEC_NONM, mdoc->parse,
+               mandoc_msg(MANDOCERR_NAMESEC_NONM,

                    mdoc->last->line, mdoc->last->pos, NULL);
        if ( ! hasnd)
                    mdoc->last->line, mdoc->last->pos, NULL);
        if ( ! hasnd)

-               mandoc_msg(MANDOCERR_NAMESEC_NOND, mdoc->parse,
+               mandoc_msg(MANDOCERR_NAMESEC_NOND,

                    mdoc->last->line, mdoc->last->pos, NULL);
 }
 
                    mdoc->last->line, mdoc->last->pos, NULL);
 }
 


@@ -2233,21 +2359,18 @@ post_sh_see_also(POST_ARGS)
                sec = n->child->next->string;
                if (lastsec != NULL) {
                        if (lastpunct[0] != ',' || lastpunct[1] != '\0')
                sec = n->child->next->string;
                if (lastsec != NULL) {
                        if (lastpunct[0] != ',' || lastpunct[1] != '\0')

-                               mandoc_vmsg(MANDOCERR_XR_PUNCT,
-                                   mdoc->parse, n->line, n->pos,
-                                   "%s before %s(%s)", lastpunct,
-                                   name, sec);
+                               mandoc_msg(MANDOCERR_XR_PUNCT, n->line,
+                                   n->pos, "%s before %s(%s)",
+                                   lastpunct, name, sec);

                        cmp = strcmp(lastsec, sec);
                        if (cmp > 0)
                        cmp = strcmp(lastsec, sec);
                        if (cmp > 0)

-                               mandoc_vmsg(MANDOCERR_XR_ORDER,
-                                   mdoc->parse, n->line, n->pos,
-                                   "%s(%s) after %s(%s)", name,
-                                   sec, lastname, lastsec);
+                               mandoc_msg(MANDOCERR_XR_ORDER, n->line,
+                                   n->pos, "%s(%s) after %s(%s)",
+                                   name, sec, lastname, lastsec);

                        else if (cmp == 0 &&
                            strcasecmp(lastname, name) > 0)
                        else if (cmp == 0 &&
                            strcasecmp(lastname, name) > 0)

-                               mandoc_vmsg(MANDOCERR_XR_ORDER,
-                                   mdoc->parse, n->line, n->pos,
-                                   "%s after %s", name, lastname);
+                               mandoc_msg(MANDOCERR_XR_ORDER, n->line,
+                                   n->pos, "%s after %s", name, lastname);

                }
                lastname = name;
                lastsec = sec;
                }
                lastname = name;
                lastsec = sec;


@@ -2268,8 +2391,8 @@ post_sh_see_also(POST_ARGS)
                                return;
                lastpunct = n->string;
                if (n->next == NULL || n->next->tok == MDOC_Rs)
                                return;
                lastpunct = n->string;
                if (n->next == NULL || n->next->tok == MDOC_Rs)

-                       mandoc_vmsg(MANDOCERR_XR_PUNCT, mdoc->parse,
-                           n->line, n->pos, "%s after %s(%s)",
+                       mandoc_msg(MANDOCERR_XR_PUNCT, n->line,
+                           n->pos, "%s after %s(%s)",

                            lastpunct, lastname, lastsec);
                n = n->next;
        }
                            lastpunct, lastname, lastsec);
                n = n->next;
        }


@@ -2290,7 +2413,7 @@ post_sh_authors(POST_ARGS)
 {
 
        if ( ! child_an(mdoc->last))
 {
 
        if ( ! child_an(mdoc->last))

-               mandoc_msg(MANDOCERR_AN_MISSING, mdoc->parse,
+               mandoc_msg(MANDOCERR_AN_MISSING,

                    mdoc->last->line, mdoc->last->pos, NULL);
 }
 
                    mdoc->last->line, mdoc->last->pos, NULL);
 }
 


@@ -2356,7 +2479,7 @@ post_sh_head(POST_ARGS)
        /* The NAME should be first. */
 
        if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)
        /* The NAME should be first. */
 
        if (sec != SEC_NAME && mdoc->lastnamed == SEC_NONE)

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

                    mdoc->last->line, mdoc->last->pos, "Sh %s",
                    sec != SEC_CUSTOM ? secnames[sec] :
                    (nch = mdoc->last->child) == NULL ? "" :
                    mdoc->last->line, mdoc->last->pos, "Sh %s",
                    sec != SEC_CUSTOM ? secnames[sec] :
                    (nch = mdoc->last->child) == NULL ? "" :


@@ -2372,6 +2495,8 @@ post_sh_head(POST_ARGS)
                roff_setreg(mdoc->roff, "nS", 0, '=');
                mdoc->flags &= ~MDOC_SYNOPSIS;
        }
                roff_setreg(mdoc->roff, "nS", 0, '=');
                mdoc->flags &= ~MDOC_SYNOPSIS;
        }

+       if (sec == SEC_DESCRIPTION)
+               fn_prio = TAG_STRONG;

 
        /* Mark our last section. */
 
 
        /* Mark our last section. */
 


@@ -2393,9 +2518,8 @@ post_sh_head(POST_ARGS)
                        }
                }
                if (goodsec != NULL)
                        }
                }
                if (goodsec != NULL)

-                       mandoc_vmsg(MANDOCERR_SEC_TYPO, mdoc->parse,
-                           nch->line, nch->pos, "Sh %s instead of %s",
-                           nch->string, goodsec);
+                       mandoc_msg(MANDOCERR_SEC_TYPO, nch->line, nch->pos,
+                           "Sh %s instead of %s", nch->string, goodsec);

                return;
        }
 
                return;
        }
 


@@ -2405,14 +2529,12 @@ post_sh_head(POST_ARGS)
         */
 
        if (sec == mdoc->lastnamed)
         */
 
        if (sec == mdoc->lastnamed)

-               mandoc_vmsg(MANDOCERR_SEC_REP, mdoc->parse,
-                   mdoc->last->line, mdoc->last->pos,
-                   "Sh %s", secnames[sec]);
+               mandoc_msg(MANDOCERR_SEC_REP, mdoc->last->line,
+                   mdoc->last->pos, "Sh %s", secnames[sec]);

 
        if (sec < mdoc->lastnamed)
 
        if (sec < mdoc->lastnamed)

-               mandoc_vmsg(MANDOCERR_SEC_ORDER, mdoc->parse,
-                   mdoc->last->line, mdoc->last->pos,
-                   "Sh %s", secnames[sec]);
+               mandoc_msg(MANDOCERR_SEC_ORDER, mdoc->last->line,
+                   mdoc->last->pos, "Sh %s", secnames[sec]);

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


@@ -2444,7 +2566,7 @@ post_sh_head(POST_ARGS)
                        break;
                if (NULL == goodsec)
                        goodsec = "9";
                        break;
                if (NULL == goodsec)
                        goodsec = "9";

-               mandoc_vmsg(MANDOCERR_SEC_MSEC, mdoc->parse,
+               mandoc_msg(MANDOCERR_SEC_MSEC,

                    mdoc->last->line, mdoc->last->pos,
                    "Sh %s for %s only", secnames[sec], goodsec);
                break;
                    mdoc->last->line, mdoc->last->pos,
                    "Sh %s for %s only", secnames[sec], goodsec);
                break;


@@ -2461,13 +2583,13 @@ post_xr(POST_ARGS)
        n = mdoc->last;
        nch = n->child;
        if (nch->next == NULL) {
        n = mdoc->last;
        nch = n->child;
        if (nch->next == NULL) {

-               mandoc_vmsg(MANDOCERR_XR_NOSEC, mdoc->parse,
+               mandoc_msg(MANDOCERR_XR_NOSEC,

                    n->line, n->pos, "Xr %s", nch->string);
        } else {
                assert(nch->next == n->last);
                if(mandoc_xr_add(nch->next->string, nch->string,
                    nch->line, nch->pos))
                    n->line, n->pos, "Xr %s", nch->string);
        } else {
                assert(nch->next == n->last);
                if(mandoc_xr_add(nch->next->string, nch->string,
                    nch->line, nch->pos))

-                       mandoc_vmsg(MANDOCERR_XR_SELF, mdoc->parse,
+                       mandoc_msg(MANDOCERR_XR_SELF,

                            nch->line, nch->pos, "Xr %s %s",
                            nch->string, nch->next->string);
        }
                            nch->line, nch->pos, "Xr %s %s",
                            nch->string, nch->next->string);
        }


@@ -2475,15 +2597,31 @@ post_xr(POST_ARGS)
 }
 
 static void
 }
 
 static void

-post_ignpar(POST_ARGS)
+post_section(POST_ARGS)

 {
 {

-       struct roff_node *np;
+       struct roff_node *n, *nch;
+       char             *cp, *tag;

 
 

-       switch (mdoc->last->type) {
+       n = mdoc->last;
+       switch (n->type) {

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

+               tag = NULL;
+               deroff(&tag, n);
+               if (tag != NULL) {
+                       for (cp = tag; *cp != '\0'; cp++)
+                               if (*cp == ' ')
+                                       *cp = '_';
+                       if ((nch = n->child) != NULL &&
+                           nch->type == ROFFT_TEXT &&
+                           strcmp(nch->string, tag) == 0)
+                               tag_put(NULL, TAG_STRONG, n);
+                       else
+                               tag_put(tag, TAG_FALLBACK, n);
+                       free(tag);
+               }

                post_delim(mdoc);
                post_hyph(mdoc);
                return;
                post_delim(mdoc);
                post_hyph(mdoc);
                return;


@@ -2492,45 +2630,40 @@ post_ignpar(POST_ARGS)
        default:
                return;
        }
        default:
                return;
        }

-
-       if ((np = mdoc->last->child) != NULL)
-               if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) {
-                       mandoc_vmsg(MANDOCERR_PAR_SKIP,
-                           mdoc->parse, np->line, np->pos,
-                           "%s after %s", roff_name[np->tok],
-                           roff_name[mdoc->last->tok]);
-                       roff_node_delete(mdoc, np);
-               }
-
-       if ((np = mdoc->last->last) != NULL)
-               if (np->tok == MDOC_Pp || np->tok == MDOC_Lp) {
-                       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
-                           np->line, np->pos, "%s at the end of %s",
-                           roff_name[np->tok],
-                           roff_name[mdoc->last->tok]);
-                       roff_node_delete(mdoc, np);
-               }
+       if ((nch = n->child) != NULL &&
+           (nch->tok == MDOC_Pp || nch->tok == ROFF_br ||
+            nch->tok == ROFF_sp)) {
+               mandoc_msg(MANDOCERR_PAR_SKIP, nch->line, nch->pos,
+                   "%s after %s", roff_name[nch->tok],
+                   roff_name[n->tok]);
+               roff_node_delete(mdoc, nch);
+       }
+       if ((nch = n->last) != NULL &&
+           (nch->tok == MDOC_Pp || nch->tok == ROFF_br)) {
+               mandoc_msg(MANDOCERR_PAR_SKIP, nch->line, nch->pos,
+                   "%s at the end of %s", roff_name[nch->tok],
+                   roff_name[n->tok]);
+               roff_node_delete(mdoc, nch);
+       }

 }
 
 static void
 post_prevpar(POST_ARGS)
 {
 }
 
 static void
 post_prevpar(POST_ARGS)
 {

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

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

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

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

+       if ((np = roff_node_prev(n)) == NULL)
+               return;

 
        /*
 
        /*

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

         */
 
         */
 

-       if (n->prev->tok != MDOC_Pp &&
-           n->prev->tok != MDOC_Lp &&
-           n->prev->tok != ROFF_br)
+       if (np->tok != MDOC_Pp && np->tok != ROFF_br)

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


@@ -2539,10 +2672,9 @@ post_prevpar(POST_ARGS)
        if (n->tok == MDOC_It && n->parent->norm->Bl.comp)
                return;
 
        if (n->tok == MDOC_It && n->parent->norm->Bl.comp)
                return;
 

-       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
-           n->prev->line, n->prev->pos, "%s before %s",
-           roff_name[n->prev->tok], roff_name[n->tok]);
-       roff_node_delete(mdoc, n->prev);
+       mandoc_msg(MANDOCERR_PAR_SKIP, np->line, np->pos,
+           "%s before %s", roff_name[np->tok], roff_name[n->tok]);
+       roff_node_delete(mdoc, np);

 }
 
 static void
 }
 
 static void


@@ -2550,73 +2682,39 @@ post_par(POST_ARGS)
 {
        struct roff_node *np;
 
 {
        struct roff_node *np;
 

-       np = mdoc->last;
-       if (np->tok != ROFF_br && np->tok != ROFF_sp)
-               post_prevpar(mdoc);
-
-       if (np->tok == ROFF_sp) {
-               if (np->child != NULL && np->child->next != NULL)
-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
-                           np->child->next->line, np->child->next->pos,
-                           "sp ... %s", np->child->next->string);
-       } else if (np->child != NULL)
-               mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                   mdoc->parse, np->line, np->pos, "%s %s",
-                   roff_name[np->tok], np->child->string);
-
-       if ((np = mdoc->last->prev) == NULL) {
-               np = mdoc->last->parent;
-               if (np->tok != MDOC_Sh && np->tok != MDOC_Ss)
-                       return;
-       } else if (np->tok != MDOC_Pp && np->tok != MDOC_Lp &&
-           (mdoc->last->tok != ROFF_br ||
-            (np->tok != ROFF_sp && np->tok != ROFF_br)))
-               return;
+       fn_prio = TAG_STRONG;
+       post_prevpar(mdoc);

 
 

-       mandoc_vmsg(MANDOCERR_PAR_SKIP, mdoc->parse,
-           mdoc->last->line, mdoc->last->pos, "%s after %s",
-           roff_name[mdoc->last->tok], roff_name[np->tok]);
-       roff_node_delete(mdoc, mdoc->last);
+       np = mdoc->last;
+       if (np->child != NULL)
+               mandoc_msg(MANDOCERR_ARG_SKIP, np->line, np->pos,
+                   "%s %s", roff_name[np->tok], np->child->string);

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

-       char             *datestr;

 
        n = mdoc->last;
        n->flags |= NODE_NOPRT;
 
        if (mdoc->meta.date != NULL) {
 
        n = mdoc->last;
        n->flags |= NODE_NOPRT;
 
        if (mdoc->meta.date != NULL) {

-               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
-                   n->line, n->pos, "Dd");
+               mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dd");

                free(mdoc->meta.date);
        } else if (mdoc->flags & MDOC_PBODY)
                free(mdoc->meta.date);
        } else if (mdoc->flags & MDOC_PBODY)

-               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
-                   n->line, n->pos, "Dd");
+               mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Dd");

        else if (mdoc->meta.title != NULL)
        else if (mdoc->meta.title != NULL)

-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+               mandoc_msg(MANDOCERR_PROLOG_ORDER,

                    n->line, n->pos, "Dd after Dt");
        else if (mdoc->meta.os != NULL)
                    n->line, n->pos, "Dd after Dt");
        else if (mdoc->meta.os != NULL)

-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+               mandoc_msg(MANDOCERR_PROLOG_ORDER,

                    n->line, n->pos, "Dd after Os");
 
                    n->line, n->pos, "Dd after Os");
 

-       if (n->child == NULL || n->child->string[0] == '\0') {
-               mdoc->meta.date = mdoc->quick ? mandoc_strdup("") :
-                   mandoc_normdate(mdoc, NULL, n->line, n->pos);
-               return;
-       }
-
-       datestr = NULL;
-       deroff(&datestr, n);
-       if (mdoc->quick)
-               mdoc->meta.date = datestr;
-       else {
-               mdoc->meta.date = mandoc_normdate(mdoc,
-                   datestr, n->line, n->pos);
-               free(datestr);
-       }
+       if (mdoc->quick && n != NULL)
+               mdoc->meta.date = mandoc_strdup("");
+       else
+               mdoc->meta.date = mandoc_normdate(n->child, n);

 }
 
 static void
 }
 
 static void


@@ -2630,16 +2728,14 @@ post_dt(POST_ARGS)
        n->flags |= NODE_NOPRT;
 
        if (mdoc->flags & MDOC_PBODY) {
        n->flags |= NODE_NOPRT;
 
        if (mdoc->flags & MDOC_PBODY) {

-               mandoc_msg(MANDOCERR_DT_LATE, mdoc->parse,
-                   n->line, n->pos, "Dt");
+               mandoc_msg(MANDOCERR_DT_LATE, n->line, n->pos, "Dt");

                return;
        }
 
        if (mdoc->meta.title != NULL)
                return;
        }
 
        if (mdoc->meta.title != NULL)

-               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
-                   n->line, n->pos, "Dt");
+               mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Dt");

        else if (mdoc->meta.os != NULL)
        else if (mdoc->meta.os != NULL)

-               mandoc_msg(MANDOCERR_PROLOG_ORDER, mdoc->parse,
+               mandoc_msg(MANDOCERR_PROLOG_ORDER,

                    n->line, n->pos, "Dt after Os");
 
        free(mdoc->meta.title);
                    n->line, n->pos, "Dt after Os");
 
        free(mdoc->meta.title);


@@ -2656,8 +2752,7 @@ post_dt(POST_ARGS)
 
        nn = n->child;
        if (nn == NULL || *nn->string == '\0') {
 
        nn = n->child;
        if (nn == NULL || *nn->string == '\0') {

-               mandoc_msg(MANDOCERR_DT_NOTITLE,
-                   mdoc->parse, n->line, n->pos, "Dt");
+               mandoc_msg(MANDOCERR_DT_NOTITLE, n->line, n->pos, "Dt");

                mdoc->meta.title = mandoc_strdup("UNTITLED");
        } else {
                mdoc->meta.title = mandoc_strdup(nn->string);
                mdoc->meta.title = mandoc_strdup("UNTITLED");
        } else {
                mdoc->meta.title = mandoc_strdup(nn->string);


@@ -2666,9 +2761,8 @@ post_dt(POST_ARGS)
 
                for (p = nn->string; *p != '\0'; p++)
                        if (islower((unsigned char)*p)) {
 
                for (p = nn->string; *p != '\0'; p++)
                        if (islower((unsigned char)*p)) {

-                               mandoc_vmsg(MANDOCERR_TITLE_CASE,
-                                   mdoc->parse, nn->line,
-                                   nn->pos + (p - nn->string),
+                               mandoc_msg(MANDOCERR_TITLE_CASE, nn->line,
+                                   nn->pos + (int)(p - nn->string),

                                    "Dt %s", nn->string);
                                break;
                        }
                                    "Dt %s", nn->string);
                                break;
                        }


@@ -2680,8 +2774,7 @@ post_dt(POST_ARGS)
                nn = nn->next;
 
        if (nn == NULL) {
                nn = nn->next;
 
        if (nn == NULL) {

-               mandoc_vmsg(MANDOCERR_MSEC_MISSING,
-                   mdoc->parse, n->line, n->pos,
+               mandoc_msg(MANDOCERR_MSEC_MISSING, n->line, n->pos,

                    "Dt %s", mdoc->meta.title);
                mdoc->meta.vol = mandoc_strdup("LOCAL");
                return;  /* msec and arch remain NULL. */
                    "Dt %s", mdoc->meta.title);
                mdoc->meta.vol = mandoc_strdup("LOCAL");
                return;  /* msec and arch remain NULL. */


@@ -2693,11 +2786,17 @@ post_dt(POST_ARGS)
 
        cp = mandoc_a2msec(nn->string);
        if (cp == NULL) {
 
        cp = mandoc_a2msec(nn->string);
        if (cp == NULL) {

-               mandoc_vmsg(MANDOCERR_MSEC_BAD, mdoc->parse,
+               mandoc_msg(MANDOCERR_MSEC_BAD,

                    nn->line, nn->pos, "Dt ... %s", nn->string);
                mdoc->meta.vol = mandoc_strdup(nn->string);
                    nn->line, nn->pos, "Dt ... %s", nn->string);
                mdoc->meta.vol = mandoc_strdup(nn->string);

-       } else
+       } else {

                mdoc->meta.vol = mandoc_strdup(cp);
                mdoc->meta.vol = mandoc_strdup(cp);

+               if (mdoc->filesec != '\0' &&
+                   mdoc->filesec != *nn->string &&
+                   *nn->string >= '1' && *nn->string <= '9')
+                       mandoc_msg(MANDOCERR_MSEC_FILE, nn->line, nn->pos,
+                           "*.%c vs Dt ... %c", mdoc->filesec, *nn->string);
+       }

 
        /* Optional third argument: architecture. */
 
 
        /* Optional third argument: architecture. */
 


@@ -2711,7 +2810,7 @@ post_dt(POST_ARGS)
        /* Ignore fourth and later arguments. */
 
        if ((nn = nn->next) != NULL)
        /* Ignore fourth and later arguments. */
 
        if ((nn = nn->next) != NULL)

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, mdoc->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

                    nn->line, nn->pos, "Dt ... %s", nn->string);
 }
 
                    nn->line, nn->pos, "Dt ... %s", nn->string);
 }
 


@@ -2732,8 +2831,8 @@ post_bx(POST_ARGS)
                    !strcmp(nch->string, "Free") ? "Fx" :
                    !strcmp(nch->string, "DragonFly") ? "Dx" : NULL;
                if (macro != NULL)
                    !strcmp(nch->string, "Free") ? "Fx" :
                    !strcmp(nch->string, "DragonFly") ? "Dx" : NULL;
                if (macro != NULL)

-                       mandoc_msg(MANDOCERR_BX, mdoc->parse,
-                           n->line, n->pos, macro);
+                       mandoc_msg(MANDOCERR_BX,
+                           n->line, n->pos, "%s", macro);

                mdoc->last = nch;
                nch = nch->next;
                mdoc->next = ROFF_NEXT_SIBLING;
                mdoc->last = nch;
                nch = nch->next;
                mdoc->next = ROFF_NEXT_SIBLING;


@@ -2773,7 +2872,6 @@ post_os(POST_ARGS)
 {
 #ifndef OSNAME
        struct utsname    utsname;
 {
 #ifndef OSNAME
        struct utsname    utsname;

-       static char      *defbuf;

 #endif
        struct roff_node *n;
 
 #endif
        struct roff_node *n;
 


@@ -2781,11 +2879,9 @@ post_os(POST_ARGS)
        n->flags |= NODE_NOPRT;
 
        if (mdoc->meta.os != NULL)
        n->flags |= NODE_NOPRT;
 
        if (mdoc->meta.os != NULL)

-               mandoc_msg(MANDOCERR_PROLOG_REP, mdoc->parse,
-                   n->line, n->pos, "Os");
+               mandoc_msg(MANDOCERR_PROLOG_REP, n->line, n->pos, "Os");

        else if (mdoc->flags & MDOC_PBODY)
        else if (mdoc->flags & MDOC_PBODY)

-               mandoc_msg(MANDOCERR_PROLOG_LATE, mdoc->parse,
-                   n->line, n->pos, "Os");
+               mandoc_msg(MANDOCERR_PROLOG_LATE, n->line, n->pos, "Os");

 
        post_delim(mdoc);
 
 
        post_delim(mdoc);
 


@@ -2812,16 +2908,15 @@ post_os(POST_ARGS)
 #ifdef OSNAME
        mdoc->meta.os = mandoc_strdup(OSNAME);
 #else /*!OSNAME */
 #ifdef OSNAME
        mdoc->meta.os = mandoc_strdup(OSNAME);
 #else /*!OSNAME */

-       if (defbuf == NULL) {
+       if (mdoc->os_r == NULL) {

                if (uname(&utsname) == -1) {
                if (uname(&utsname) == -1) {

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

                } else
                } else

-                       mandoc_asprintf(&defbuf, "%s %s",
+                       mandoc_asprintf(&mdoc->os_r, "%s %s",

                            utsname.sysname, utsname.release);
        }
                            utsname.sysname, utsname.release);
        }

-       mdoc->meta.os = mandoc_strdup(defbuf);
+       mdoc->meta.os = mandoc_strdup(mdoc->os_r);

 #endif /*!OSNAME*/
 
 out:
 #endif /*!OSNAME*/
 
 out:


@@ -2839,8 +2934,7 @@ out:
         */
 
        if (n->child != NULL)
         */
 
        if (n->child != NULL)

-               mandoc_vmsg(MANDOCERR_OS_ARG, mdoc->parse,
-                   n->child->line, n->child->pos,
+               mandoc_msg(MANDOCERR_OS_ARG, n->child->line, n->child->pos,

                    "Os %s (%s)", n->child->string,
                    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
                    "OpenBSD" : "NetBSD");
                    "Os %s (%s)", n->child->string,
                    mdoc->meta.os_e == MANDOC_OS_OPENBSD ?
                    "OpenBSD" : "NetBSD");


@@ -2852,14 +2946,12 @@ out:
                return;
        if (strncmp(n->string, "$" "Mdocdate", 9)) {
                if (mdoc->meta.os_e == MANDOC_OS_OPENBSD)
                return;
        if (strncmp(n->string, "$" "Mdocdate", 9)) {
                if (mdoc->meta.os_e == MANDOC_OS_OPENBSD)

-                       mandoc_vmsg(MANDOCERR_MDOCDATE_MISSING,
-                           mdoc->parse, n->line, n->pos,
-                           "Dd %s (OpenBSD)", n->string);
+                       mandoc_msg(MANDOCERR_MDOCDATE_MISSING, n->line,
+                           n->pos, "Dd %s (OpenBSD)", n->string);

        } else {
                if (mdoc->meta.os_e == MANDOC_OS_NETBSD)
        } else {
                if (mdoc->meta.os_e == MANDOC_OS_NETBSD)

-                       mandoc_vmsg(MANDOCERR_MDOCDATE,
-                           mdoc->parse, n->line, n->pos,
-                           "Dd %s (NetBSD)", n->string);
+                       mandoc_msg(MANDOCERR_MDOCDATE, n->line,
+                           n->pos, "Dd %s (NetBSD)", n->string);

        }
 }
 
        }
 }