Move `Sh' validation from mdoc_action.c. into mdoc_validate.c.

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index 72c0e085affc0f1aa4ab23686cff62b89cbe594a..566310d2214662e667f532fce29bdbb013ee608f 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_action.c,v 1.47 2009/10/30 18:50:11 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.81 2010/11/29 13:51:03 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,22 +14,31 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #ifndef        OSNAME
 #include <sys/utsname.h>
 #endif
 
 #include <assert.h>
 #ifndef        OSNAME
 #include <sys/utsname.h>
 #endif
 
 #include <assert.h>

-#include <errno.h>

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

+#include "mandoc.h"

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

+/* 
+ * FIXME: this file is deprecated.  All future "actions" should be
+ * pushed into mdoc_validate.c.
+ */
+

 #define        POST_ARGS struct mdoc *m, struct mdoc_node *n
 #define        POST_ARGS struct mdoc *m, struct mdoc_node *n

-#define        PRE_ARGS  struct mdoc *m, const struct mdoc_node *n
+#define        PRE_ARGS  struct mdoc *m, struct mdoc_node *n

 
 #define        NUMSIZ    32
 #define        DATESIZ   32
 
 #define        NUMSIZ    32
 #define        DATESIZ   32


@@ -41,13 +50,7 @@ struct       actions {
 
 static int       concat(struct mdoc *, char *,
                        const struct mdoc_node *, size_t);
 
 static int       concat(struct mdoc *, char *,
                        const struct mdoc_node *, size_t);

-static inline int order_rs(int);
-
-#ifdef __linux__
-extern size_t    strlcat(char *, const char *, size_t);
-#endif

 
 

-static int       post_ar(POST_ARGS);

 static int       post_at(POST_ARGS);
 static int       post_bl(POST_ARGS);
 static int       post_bl_head(POST_ARGS);
 static int       post_at(POST_ARGS);
 static int       post_bl(POST_ARGS);
 static int       post_bl_head(POST_ARGS);


@@ -61,34 +64,30 @@ static      int       post_nm(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_pa(POST_ARGS);
 static int       post_prol(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_pa(POST_ARGS);
 static int       post_prol(POST_ARGS);

-static int       post_rs(POST_ARGS);
-static int       post_sh(POST_ARGS);

 static int       post_st(POST_ARGS);
 static int       post_std(POST_ARGS);
 
 static int       pre_bd(PRE_ARGS);
 static int       post_st(POST_ARGS);
 static int       post_std(POST_ARGS);
 
 static int       pre_bd(PRE_ARGS);

-static int       pre_bl(PRE_ARGS);

 static int       pre_dl(PRE_ARGS);
 static int       pre_dl(PRE_ARGS);

-static int       pre_offset(PRE_ARGS);

 
 static const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ap */
        { NULL, post_dd }, /* Dd */ 
        { NULL, post_dt }, /* Dt */ 
        { NULL, post_os }, /* Os */ 
 
 static const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ap */
        { NULL, post_dd }, /* Dd */ 
        { NULL, post_dt }, /* Dt */ 
        { NULL, post_os }, /* Os */ 

-       { NULL, post_sh }, /* Sh */ 
+       { NULL, NULL }, /* Sh */ 

        { NULL, NULL }, /* Ss */ 
        { NULL, NULL }, /* Pp */ 
        { NULL, NULL }, /* D1 */
        { pre_dl, post_display }, /* Dl */
        { pre_bd, post_display }, /* Bd */ 
        { NULL, NULL }, /* Ed */
        { NULL, NULL }, /* Ss */ 
        { NULL, NULL }, /* Pp */ 
        { NULL, NULL }, /* D1 */
        { pre_dl, post_display }, /* Dl */
        { pre_bd, post_display }, /* Bd */ 
        { NULL, NULL }, /* Ed */

-       { pre_bl, post_bl }, /* Bl */ 
+       { NULL, post_bl }, /* Bl */ 

        { NULL, NULL }, /* El */
        { NULL, NULL }, /* It */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* An */
        { NULL, NULL }, /* El */
        { NULL, NULL }, /* It */
        { NULL, NULL }, /* Ad */ 
        { NULL, NULL }, /* An */

-       { NULL, post_ar }, /* Ar */
+       { NULL, NULL }, /* Ar */

        { NULL, NULL }, /* Cd */
        { NULL, NULL }, /* Cm */
        { NULL, NULL }, /* Dv */ 
        { NULL, NULL }, /* Cd */
        { NULL, NULL }, /* Cm */
        { NULL, NULL }, /* Dv */ 


@@ -157,7 +156,7 @@ static      const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Qo */
        { NULL, NULL }, /* Qq */
        { NULL, NULL }, /* Re */
        { NULL, NULL }, /* Qo */
        { NULL, NULL }, /* Qq */
        { NULL, NULL }, /* Re */

-       { NULL, post_rs }, /* Rs */
+       { NULL, NULL }, /* Rs */

        { NULL, NULL }, /* Sc */
        { NULL, NULL }, /* So */
        { NULL, NULL }, /* Sq */
        { NULL, NULL }, /* Sc */
        { NULL, NULL }, /* So */
        { NULL, NULL }, /* Sq */


@@ -193,11 +192,12 @@ static    const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* br */
        { NULL, NULL }, /* sp */
        { NULL, NULL }, /* %U */
        { NULL, NULL }, /* br */
        { NULL, NULL }, /* sp */
        { NULL, NULL }, /* %U */

+       { NULL, NULL }, /* Ta */

 };
 
 #define        RSORD_MAX 14
 
 };
 
 #define        RSORD_MAX 14
 

-static const int rsord[RSORD_MAX] = {
+static const enum mdoct rsord[RSORD_MAX] = {

        MDOC__A,
        MDOC__T,
        MDOC__B,
        MDOC__A,
        MDOC__T,
        MDOC__B,


@@ -216,7 +216,7 @@ static      const int rsord[RSORD_MAX] = {
 
 
 int
 
 
 int

-mdoc_action_pre(struct mdoc *m, const struct mdoc_node *n)
+mdoc_action_pre(struct mdoc *m, struct mdoc_node *n)

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


@@ -270,12 +270,21 @@ concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
        p[0] = '\0';
        for ( ; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
        p[0] = '\0';
        for ( ; n; n = n->next) {
                assert(MDOC_TEXT == n->type);

-               if (strlcat(p, n->string, sz) >= sz)
-                       return(mdoc_nerr(m, n, ETOOLONG));
+               /*
+                * XXX: yes, these can technically be resized, but it's
+                * highly unlikely that we're going to get here, so let
+                * it slip for now.
+                */
+               if (strlcat(p, n->string, sz) >= sz) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }

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

-               if (strlcat(p, " ", sz) >= sz)
-                       return(mdoc_nerr(m, n, ETOOLONG));
+               if (strlcat(p, " ", sz) >= sz) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }

        }
 
        return(1);
        }
 
        return(1);


@@ -289,14 +298,16 @@ concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)
 static int
 post_std(POST_ARGS)
 {
 static int
 post_std(POST_ARGS)
 {

-       struct mdoc_node        *nn;
+       struct mdoc_node *nn;

 
        if (n->child)
                return(1);
 
        if (n->child)
                return(1);

+       if (NULL == m->meta.name)
+               return(1);

        
        nn = n;
        m->next = MDOC_NEXT_CHILD;
        
        nn = n;
        m->next = MDOC_NEXT_CHILD;

-       assert(m->meta.name);
+

        if ( ! mdoc_word_alloc(m, n->line, n->pos, m->meta.name))
                return(0);
        m->last = nn;
        if ( ! mdoc_word_alloc(m, n->line, n->pos, m->meta.name))
                return(0);
        m->last = nn;


@@ -367,9 +378,10 @@ post_st(POST_ARGS)
 
        assert(MDOC_TEXT == n->child->type);
        p = mdoc_a2st(n->child->string);
 
        assert(MDOC_TEXT == n->child->type);
        p = mdoc_a2st(n->child->string);

-       assert(p);
-       free(n->child->string);
-       n->child->string = mandoc_strdup(p);
+       if (p != NULL) {
+               free(n->child->string);
+               n->child->string = mandoc_strdup(p);
+       }

        return(1);
 }
 
        return(1);
 }
 


@@ -382,15 +394,27 @@ post_st(POST_ARGS)
 static int
 post_at(POST_ARGS)
 {
 static int
 post_at(POST_ARGS)
 {

-       struct mdoc_node        *nn;
-       const char              *p;
+       struct mdoc_node *nn;
+       const char       *p, *q;
+       char             *buf;
+       size_t            sz;

 
        if (n->child) {
                assert(MDOC_TEXT == n->child->type);
                p = mdoc_a2att(n->child->string);
 
        if (n->child) {
                assert(MDOC_TEXT == n->child->type);
                p = mdoc_a2att(n->child->string);

-               assert(p);
-               free(n->child->string);
-               n->child->string = mandoc_strdup(p);
+               if (p) {
+                       free(n->child->string);
+                       n->child->string = mandoc_strdup(p);
+               } else {
+                       p = "AT&T UNIX ";
+                       q = n->child->string;
+                       sz = strlen(p) + strlen(q) + 1;
+                       buf = mandoc_malloc(sz);
+                       strlcpy(buf, p, sz);
+                       strlcat(buf, q, sz);
+                       free(n->child->string);
+                       n->child->string = buf;
+               }

                return(1);
        }
 
                return(1);
        }
 


@@ -403,51 +427,6 @@ post_at(POST_ARGS)
 }
 
 
 }
 
 

-/*
- * Mark the current section.  The ``named'' section (lastnamed) is set
- * whenever the current section isn't a custom section--we use this to
- * keep track of section ordering.  Also check that the section is
- * allowed within the document's manual section.
- */
-static int
-post_sh(POST_ARGS)
-{
-       enum mdoc_sec    sec;
-       char             buf[BUFSIZ];
-
-       if (MDOC_HEAD != n->type)
-               return(1);
-
-       if ( ! concat(m, buf, n->child, BUFSIZ))
-               return(0);
-       sec = mdoc_atosec(buf);
-       if (SEC_CUSTOM != sec)
-               m->lastnamed = sec;
-
-       /* Some sections only live in certain manual sections. */
-
-       switch ((m->lastsec = sec)) {
-       case (SEC_RETURN_VALUES):
-               /* FALLTHROUGH */
-       case (SEC_ERRORS):
-               switch (m->meta.msec) {
-               case (2):
-                       /* FALLTHROUGH */
-               case (3):
-                       /* FALLTHROUGH */
-               case (9):
-                       break;
-               default:
-                       return(mdoc_nwarn(m, n, EBADSEC));
-               }
-               break;
-       default:
-               break;
-       }
-       return(1);
-}
-
-

 /*
  * Parse out the contents of `Dt'.  See in-line documentation for how we
  * handle the various fields of this macro.
 /*
  * Parse out the contents of `Dt'.  See in-line documentation for how we
  * handle the various fields of this macro.


@@ -457,8 +436,6 @@ post_dt(POST_ARGS)
 {
        struct mdoc_node *nn;
        const char       *cp;
 {
        struct mdoc_node *nn;
        const char       *cp;

-       char             *ep;
-       long              lval;

 
        if (m->meta.title)
                free(m->meta.title);
 
        if (m->meta.title)
                free(m->meta.title);


@@ -468,16 +445,16 @@ post_dt(POST_ARGS)
                free(m->meta.arch);
 
        m->meta.title = m->meta.vol = m->meta.arch = NULL;
                free(m->meta.arch);
 
        m->meta.title = m->meta.vol = m->meta.arch = NULL;

-       m->meta.msec = 0;
-

        /* Handles: `.Dt' 
         *   --> title = unknown, volume = local, msec = 0, arch = NULL
         */
 
        if (NULL == (nn = n->child)) {
                /* XXX: make these macro values. */
        /* Handles: `.Dt' 
         *   --> title = unknown, volume = local, msec = 0, arch = NULL
         */
 
        if (NULL == (nn = n->child)) {
                /* XXX: make these macro values. */

-               m->meta.title = mandoc_strdup("unknown");
-               m->meta.vol = mandoc_strdup("local");
+               /* FIXME: warn about missing values. */
+               m->meta.title = mandoc_strdup("UNKNOWN");
+               m->meta.vol = mandoc_strdup("LOCAL");
+               m->meta.msec = mandoc_strdup("1");

                return(post_prol(m, n));
        }
 
                return(post_prol(m, n));
        }
 


@@ -485,11 +462,14 @@ post_dt(POST_ARGS)
         *   --> title = TITLE, volume = local, msec = 0, arch = NULL
         */
 
         *   --> title = TITLE, volume = local, msec = 0, arch = NULL
         */
 

-       m->meta.title = mandoc_strdup(nn->string);
+       m->meta.title = mandoc_strdup
+               ('\0' == nn->string[0] ? "UNKNOWN" : nn->string);

 
        if (NULL == (nn = nn->next)) {
 
        if (NULL == (nn = nn->next)) {

+               /* FIXME: warn about missing msec. */

                /* XXX: make this a macro value. */
                /* XXX: make this a macro value. */

-               m->meta.vol = mandoc_strdup("local");
+               m->meta.vol = mandoc_strdup("LOCAL");
+               m->meta.msec = mandoc_strdup("1");

                return(post_prol(m, n));
        }
 
                return(post_prol(m, n));
        }
 


@@ -502,14 +482,13 @@ post_dt(POST_ARGS)
 
        cp = mdoc_a2msec(nn->string);
        if (cp) {
 
        cp = mdoc_a2msec(nn->string);
        if (cp) {

-               /* FIXME: where is strtonum!? */

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

-               errno = 0;
-               lval = strtol(nn->string, &ep, 10);
-               if (nn->string[0] != '\0' && *ep == '\0')
-                       m->meta.msec = (int)lval;
-       } else 
+               m->meta.msec = mandoc_strdup(nn->string);
+       } else if (mdoc_nmsg(m, n, MANDOCERR_BADMSEC)) {

                m->meta.vol = mandoc_strdup(nn->string);
                m->meta.vol = mandoc_strdup(nn->string);

+               m->meta.msec = mandoc_strdup(nn->string);
+       } else
+               return(0);

 
        if (NULL == (nn = nn->next))
                return(post_prol(m, n));
 
        if (NULL == (nn = nn->next))
                return(post_prol(m, n));


@@ -526,6 +505,7 @@ post_dt(POST_ARGS)
                free(m->meta.vol);
                m->meta.vol = mandoc_strdup(cp);
        } else {
                free(m->meta.vol);
                m->meta.vol = mandoc_strdup(cp);
        } else {

+               /* FIXME: warn about bad arch. */

                cp = mdoc_a2arch(nn->string);
                if (NULL == cp) {
                        free(m->meta.vol);
                cp = mdoc_a2arch(nn->string);
                if (NULL == cp) {
                        free(m->meta.vol);


@@ -561,19 +541,32 @@ post_os(POST_ARGS)
        if ( ! concat(m, buf, n->child, BUFSIZ))
                return(0);
 
        if ( ! concat(m, buf, n->child, BUFSIZ))
                return(0);
 

+       /* XXX: yes, these can all be dynamically-adjusted buffers, but
+        * it's really not worth the extra hackery.
+        */
+

        if ('\0' == buf[0]) {
 #ifdef OSNAME
        if ('\0' == buf[0]) {
 #ifdef OSNAME

-               if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ)
-                       return(mdoc_nerr(m, n, EUTSNAME));
+               if (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }

 #else /*!OSNAME */
                if (-1 == uname(&utsname))
 #else /*!OSNAME */
                if (-1 == uname(&utsname))

-                       return(mdoc_nerr(m, n, EUTSNAME));
-               if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ)
-                       return(mdoc_nerr(m, n, ETOOLONG));
-               if (strlcat(buf, " ", 64) >= BUFSIZ)
-                       return(mdoc_nerr(m, n, ETOOLONG));
-               if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ)
-                       return(mdoc_nerr(m, n, ETOOLONG));
+                       return(mdoc_nmsg(m, n, MANDOCERR_UTSNAME));
+
+               if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }
+               if (strlcat(buf, " ", 64) >= BUFSIZ) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }
+               if (strlcat(buf, utsname.release, BUFSIZ) >= BUFSIZ) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }

 #endif /*!OSNAME*/
        }
 
 #endif /*!OSNAME*/
        }
 


@@ -592,30 +585,41 @@ static int
 post_bl_tagwidth(POST_ARGS)
 {
        struct mdoc_node *nn;
 post_bl_tagwidth(POST_ARGS)
 {
        struct mdoc_node *nn;

-       size_t            sz;
+       size_t            sz, ssz;

        int               i;
        char              buf[NUMSIZ];
 
        int               i;
        char              buf[NUMSIZ];
 

-       /* Defaults to ten ens. */
+       sz = 10;

 
 

-       sz = 10; /* XXX: make this a macro value. */
-       nn = n->body->child;
+       for (nn = n->body->child; nn; nn = nn->next) {
+               if (MDOC_It != nn->tok)
+                       continue;

 
 

-       if (nn) {

                assert(MDOC_BLOCK == nn->type);
                assert(MDOC_BLOCK == nn->type);

-               assert(MDOC_It == nn->tok);

                nn = nn->head->child;
                nn = nn->head->child;

-               if (MDOC_TEXT != nn->type) {
-                       sz = mdoc_macro2len(nn->tok);
-                       if (sz == 0) {
-                               if ( ! mdoc_nwarn(m, n, ENOWIDTH))
-                                       return(0);
-                               sz = 10;
-                       }
-               } else
+
+               if (nn == NULL) {
+                       /* No -width for .Bl and first .It is emtpy */
+                       if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG))
+                               return(0);
+                       break;
+               }
+
+               if (MDOC_TEXT == nn->type) {

                        sz = strlen(nn->string) + 1;
                        sz = strlen(nn->string) + 1;

+                       break;
+               }
+
+               if (0 != (ssz = mdoc_macro2len(nn->tok)))
+                       sz = ssz;
+               else if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG))
+                       return(0);
+
+               break;

        } 
 
        } 
 

+       /* Defaults to ten ens. */
+

        snprintf(buf, NUMSIZ, "%zun", sz);
 
        /*
        snprintf(buf, NUMSIZ, "%zun", sz);
 
        /*


@@ -623,19 +627,21 @@ post_bl_tagwidth(POST_ARGS)
         * We're guaranteed that a MDOC_Width doesn't already exist.
         */
 
         * We're guaranteed that a MDOC_Width doesn't already exist.
         */
 

-       nn = n;
-       assert(nn->args);
-       i = (int)(nn->args->argc)++;
-
-       nn->args->argv = mandoc_realloc(nn->args->argv, 
-                       nn->args->argc * sizeof(struct mdoc_argv));
-
-       nn->args->argv[i].arg = MDOC_Width;
-       nn->args->argv[i].line = n->line;
-       nn->args->argv[i].pos = n->pos;
-       nn->args->argv[i].sz = 1;
-       nn->args->argv[i].value = mandoc_malloc(sizeof(char *));
-       nn->args->argv[i].value[0] = mandoc_strdup(buf);
+       assert(n->args);
+       i = (int)(n->args->argc)++;
+
+       n->args->argv = mandoc_realloc(n->args->argv, 
+                       n->args->argc * sizeof(struct mdoc_argv));
+
+       n->args->argv[i].arg = MDOC_Width;
+       n->args->argv[i].line = n->line;
+       n->args->argv[i].pos = n->pos;
+       n->args->argv[i].sz = 1;
+       n->args->argv[i].value = mandoc_malloc(sizeof(char *));
+       n->args->argv[i].value[0] = mandoc_strdup(buf);
+
+       /* Set our width! */
+       n->data.Bl->width = n->args->argv[i].value[0];

        return(1);
 }
 
        return(1);
 }
 


@@ -649,39 +655,38 @@ static int
 post_bl_width(POST_ARGS)
 {
        size_t            width;
 post_bl_width(POST_ARGS)
 {
        size_t            width;

-       int               i, tok;
+       int               i;
+       enum mdoct        tok;

        char              buf[NUMSIZ];
        char              buf[NUMSIZ];

-       char             *p;
-
-       if (NULL == n->args)
-               return(1);
-
-       for (i = 0; i < (int)n->args->argc; i++)
-               if (MDOC_Width == n->args->argv[i].arg)
-                       break;
-
-       if (i == (int)n->args->argc)
-               return(1);
-       p = n->args->argv[i].value[0];

 
        /*
         * If the value to -width is a macro, then we re-write it to be
         * the macro's width as set in share/tmac/mdoc/doc-common.
         */
 
 
        /*
         * If the value to -width is a macro, then we re-write it to be
         * the macro's width as set in share/tmac/mdoc/doc-common.
         */
 

-       if (0 == strcmp(p, "Ds"))
-               /* XXX: make into a macro. */
+       if (0 == strcmp(n->data.Bl->width, "Ds"))

                width = 6;
                width = 6;

-       else if (MDOC_MAX == (tok = mdoc_hash_find(p)))
+       else if (MDOC_MAX == (tok = mdoc_hash_find(n->data.Bl->width)))

                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 

-               return(mdoc_nwarn(m, n, ENOWIDTH));
+               return(mdoc_nmsg(m, n, MANDOCERR_BADWIDTH));

 
        /* The value already exists: free and reallocate it. */
 
 
        /* The value already exists: free and reallocate it. */
 

+       assert(n->args);
+
+       for (i = 0; i < (int)n->args->argc; i++) 
+               if (MDOC_Width == n->args->argv[i].arg)
+                       break;
+
+       assert(i < (int)n->args->argc);
+

        snprintf(buf, NUMSIZ, "%zun", width);
        free(n->args->argv[i].value[0]);
        n->args->argv[i].value[0] = mandoc_strdup(buf);
        snprintf(buf, NUMSIZ, "%zun", width);
        free(n->args->argv[i].value[0]);
        n->args->argv[i].value[0] = mandoc_strdup(buf);

+
+       /* Set our width! */
+       n->data.Bl->width = n->args->argv[i].value[0];

        return(1);
 }
 
        return(1);
 }
 


@@ -697,7 +702,9 @@ post_bl_head(POST_ARGS)
        int                      i, c;
        struct mdoc_node        *np, *nn, *nnp;
 
        int                      i, c;
        struct mdoc_node        *np, *nn, *nnp;
 

-       if (NULL == n->child)
+       if (LIST_column != n->data.Bl->type)
+               return(1);
+       else if (NULL == n->child)

                return(1);
 
        np = n->parent;
                return(1);
 
        np = n->parent;


@@ -707,8 +714,7 @@ post_bl_head(POST_ARGS)
                if (MDOC_Column == np->args->argv[c].arg)
                        break;
 
                if (MDOC_Column == np->args->argv[c].arg)
                        break;
 

-       if (c == (int)np->args->argc)
-               return(1);
+       assert(c < (int)np->args->argc);

        assert(0 == np->args->argv[c].sz);
 
        /*
        assert(0 == np->args->argv[c].sz);
 
        /*


@@ -721,12 +727,15 @@ post_bl_head(POST_ARGS)
        np->args->argv[c].value = mandoc_malloc
                ((size_t)n->nchild * sizeof(char *));
 
        np->args->argv[c].value = mandoc_malloc
                ((size_t)n->nchild * sizeof(char *));
 

+       n->data.Bl->ncols = np->args->argv[c].sz;
+       n->data.Bl->cols = (const char **)np->args->argv[c].value;
+

        for (i = 0, nn = n->child; nn; i++) {
                np->args->argv[c].value[i] = nn->string;
                nn->string = NULL;
                nnp = nn;
                nn = nn->next;
        for (i = 0, nn = n->child; nn; i++) {
                np->args->argv[c].value[i] = nn->string;
                nn->string = NULL;
                nnp = nn;
                nn = nn->next;

-               mdoc_node_free(nnp);
+               mdoc_node_delete(NULL, nnp);

        }
 
        n->nchild = 0;
        }
 
        n->nchild = 0;


@@ -738,7 +747,6 @@ post_bl_head(POST_ARGS)
 static int
 post_bl(POST_ARGS)
 {
 static int
 post_bl(POST_ARGS)
 {

-       int               i, r, len;

 
        if (MDOC_HEAD == n->type)
                return(post_bl_head(m, n));
 
        if (MDOC_HEAD == n->type)
                return(post_bl_head(m, n));


@@ -753,22 +761,16 @@ post_bl(POST_ARGS)
         * rewritten into real lengths).
         */
 
         * rewritten into real lengths).
         */
 

-       len = (int)(n->args ? n->args->argc : 0);
-
-       for (r = i = 0; i < len; i++) {
-               if (MDOC_Tag == n->args->argv[i].arg)
-                       r |= 1 << 0;
-               if (MDOC_Width == n->args->argv[i].arg)
-                       r |= 1 << 1;
-       }
-
-       if (r & (1 << 0) && ! (r & (1 << 1))) {
+       if (LIST_tag == n->data.Bl->type && NULL == n->data.Bl->width) {

                if ( ! post_bl_tagwidth(m, n))
                        return(0);
                if ( ! post_bl_tagwidth(m, n))
                        return(0);

-       } else if (r & (1 << 1))
+       } else if (NULL != n->data.Bl->width) {

                if ( ! post_bl_width(m, n))
                        return(0);
                if ( ! post_bl_width(m, n))
                        return(0);

+       } else 
+               return(1);

 
 

+       assert(n->data.Bl->width);

        return(1);
 }
 
        return(1);
 }
 


@@ -787,7 +789,6 @@ post_pa(POST_ARGS)
        
        np = n;
        m->next = MDOC_NEXT_CHILD;
        
        np = n;
        m->next = MDOC_NEXT_CHILD;

-       /* XXX: make into macro value. */

        if ( ! mdoc_word_alloc(m, n->line, n->pos, "~"))
                return(0);
        m->last = np;
        if ( ! mdoc_word_alloc(m, n->line, n->pos, "~"))
                return(0);
        m->last = np;


@@ -796,44 +797,26 @@ post_pa(POST_ARGS)
 
 
 /*
 
 
 /*

- * The `Ar' macro defaults to two strings "file ..." if no value is
- * provided as an argument.
- */
-static int
-post_ar(POST_ARGS)
-{
-       struct mdoc_node *np;
-
-       if (n->child)
-               return(1);
-       
-       np = n;
-       m->next = MDOC_NEXT_CHILD;
-       /* XXX: make into macro values. */
-       if ( ! mdoc_word_alloc(m, n->line, n->pos, "file"))
-               return(0);
-       if ( ! mdoc_word_alloc(m, n->line, n->pos, "..."))
-               return(0);
-       m->last = np;
-       return(1);
-}
-
-
-/*
- * Parse the date field in `Dd', primarily through mdoc_atotime().
- * FIXME: push mdoc_atotime() into here.
+ * Parse the date field in `Dd'.

  */
 static int
 post_dd(POST_ARGS)
 {
        char            buf[DATESIZ];
 
  */
 static int
 post_dd(POST_ARGS)
 {
        char            buf[DATESIZ];
 

+       if (NULL == n->child) {
+               m->meta.date = time(NULL);
+               return(post_prol(m, n));
+       }
+

        if ( ! concat(m, buf, n->child, DATESIZ))
                return(0);
 
        if ( ! concat(m, buf, n->child, DATESIZ))
                return(0);
 

-       m->meta.date = mdoc_atotime(buf);
+       m->meta.date = mandoc_a2time
+               (MTIME_MDOCDATE | MTIME_CANONICAL, buf);
+

        if (0 == m->meta.date) {
        if (0 == m->meta.date) {

-               if ( ! mdoc_nwarn(m, n, EBADDATE))
+               if ( ! mdoc_nmsg(m, n, MANDOCERR_BADDATE))

                        return(0);
                m->meta.date = time(NULL);
        }
                        return(0);
                m->meta.date = time(NULL);
        }


@@ -850,29 +833,10 @@ post_dd(POST_ARGS)
 static int
 post_prol(POST_ARGS)
 {
 static int
 post_prol(POST_ARGS)
 {

-       struct mdoc_node *np;
-
-       if (n->parent->child == n)
-               n->parent->child = n->prev;
-       if (n->prev)
-               n->prev->next = NULL;
-
-       np = n;
-       assert(NULL == n->next);
-
-       if (n->prev) {
-               m->last = n->prev;
-               m->next = MDOC_NEXT_SIBLING;
-       } else {
-               m->last = n->parent;
-               m->next = MDOC_NEXT_CHILD;
-       }
-
-       mdoc_node_freelist(np);

 
 

+       mdoc_node_delete(m, n);

        if (m->meta.title && m->meta.date && m->meta.os)
                m->flags |= MDOC_PBODY;
        if (m->meta.title && m->meta.date && m->meta.os)
                m->flags |= MDOC_PBODY;

-

        return(1);
 }
 
        return(1);
 }
 


@@ -890,60 +854,18 @@ pre_dl(PRE_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-pre_offset(PRE_ARGS)
-{
-       int              i;
-
-       /* 
-        * Make sure that an empty offset produces an 8n length space as
-        * stipulated by mdoc.samples. 
-        */
-
-       assert(n->args);
-       for (i = 0; i < (int)n->args->argc; i++) {
-               if (MDOC_Offset != n->args->argv[i].arg) 
-                       continue;
-               if (n->args->argv[i].sz)
-                       break;
-               assert(1 == n->args->refcnt);
-               /* If no value set, length of <string>. */
-               n->args->argv[i].sz++;
-               n->args->argv[i].value = mandoc_malloc(sizeof(char *));
-               n->args->argv[i].value[0] = mandoc_strdup("8n");
-               break;
-       }
-
-       return(1);
-}
-
-
-static int
-pre_bl(PRE_ARGS)
-{
-
-       return(MDOC_BLOCK == n->type ? pre_offset(m, n) : 1);
-}
-
-

 static int
 pre_bd(PRE_ARGS)
 {
 static int
 pre_bd(PRE_ARGS)
 {

-       int              i;

 
 

-       if (MDOC_BLOCK == n->type)
-               return(pre_offset(m, n));

        if (MDOC_BODY != n->type)
                return(1);
 
        if (MDOC_BODY != n->type)
                return(1);
 

-       /* Enter literal context if `Bd -literal' or `-unfilled'. */
-
-       for (n = n->parent, i = 0; i < (int)n->args->argc; i++)
-               if (MDOC_Literal == n->args->argv[i].arg)
-                       m->flags |= MDOC_LITERAL;
-               else if (MDOC_Unfilled == n->args->argv[i].arg)
-                       m->flags |= MDOC_LITERAL;
+       assert(n->data.Bd);
+       if (DISP_literal == n->data.Bd->type)
+               m->flags |= MDOC_LITERAL;
+       if (DISP_unfilled == n->data.Bd->type)
+               m->flags |= MDOC_LITERAL;

 
        return(1);
 }
 
        return(1);
 }


@@ -957,67 +879,3 @@ post_display(POST_ARGS)
                m->flags &= ~MDOC_LITERAL;
        return(1);
 }
                m->flags &= ~MDOC_LITERAL;
        return(1);
 }

-
-
-static inline int
-order_rs(int t)
-{
-       int             i;
-
-       for (i = 0; i < RSORD_MAX; i++)
-               if (rsord[i] == t)
-                       return(i);
-
-       abort();
-       /* NOTREACHED */
-}
-
-
-/* ARGSUSED */
-static int
-post_rs(POST_ARGS)
-{
-       struct mdoc_node        *nn, *next, *prev;
-       int                      o;
-
-       if (MDOC_BLOCK != n->type)
-               return(1);
-
-       assert(n->body->child);
-       for (next = NULL, nn = n->body->child->next; nn; nn = next) {
-               o = order_rs(nn->tok);
-
-               /* Remove `nn' from the chain. */
-               next = nn->next;
-               if (next)
-                       next->prev = nn->prev;
-
-               prev = nn->prev;
-               if (prev)
-                       prev->next = nn->next;
-
-               nn->prev = nn->next = NULL;
-
-               /* 
-                * Scan back until we reach a node that's ordered before
-                * us, then set ourselves as being the next. 
-                */
-               for ( ; prev; prev = prev->prev)
-                       if (order_rs(prev->tok) <= o)
-                               break;
-
-               nn->prev = prev;
-               if (prev) {
-                       if (prev->next)
-                               prev->next->prev = nn;
-                       nn->next = prev->next;
-                       prev->next = nn;
-                       continue;
-               } 
-
-               n->body->child->prev = nn;
-               nn->next = n->body->child;
-               n->body->child = nn;
-       }
-       return(1);
-}