Cache all of `Bd's resolved arguments into mdoc_bd, which is stashed in

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index 844e1bf646ed9a08d235fd18f2d2e36afbafee1d..e103eb980068d028f121a5f7033e2c99acbdbbf7 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.41 2009/09/25 13:03:25 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.67 2010/06/12 11:21:44 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -14,32 +14,38 @@
  * 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>
 #include <sys/utsname.h>

+#endif

 
 #include <assert.h>
 
 #include <assert.h>

-#include <errno.h>

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

+#include <time.h>

 
 

+#include "mandoc.h"

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

+#include "libmandoc.h"

 
 #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

 
 struct actions {
        int     (*pre)(PRE_ARGS);
        int     (*post)(POST_ARGS);
 };
 
 
 struct actions {
        int     (*pre)(PRE_ARGS);
        int     (*post)(POST_ARGS);
 };
 

-static int       concat(struct mdoc *, 
-                       const struct mdoc_node *, 
-                       char *, size_t);
-static inline int order_rs(int);
-
-#ifdef __linux__
-extern size_t    strlcat(char *, const char *, size_t);
-#endif
+static int       concat(struct mdoc *, char *,
+                       const struct mdoc_node *, size_t);
+static inline int order_rs(enum mdoct);

 
 static int       post_ar(POST_ARGS);
 static int       post_at(POST_ARGS);
 
 static int       post_ar(POST_ARGS);
 static int       post_at(POST_ARGS);


@@ -51,14 +57,15 @@ static      int       post_dd(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_lb(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_lb(POST_ARGS);

+static int       post_li(POST_ARGS);

 static int       post_nm(POST_ARGS);
 static int       post_os(POST_ARGS);
 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_rs(POST_ARGS);
 static int       post_sh(POST_ARGS);
 static int       post_st(POST_ARGS);
 static int       post_std(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       post_tilde(POST_ARGS);

 
 static int       pre_bd(PRE_ARGS);
 static int       pre_bl(PRE_ARGS);
 
 static int       pre_bd(PRE_ARGS);
 static int       pre_bl(PRE_ARGS);


@@ -96,12 +103,12 @@ static     const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ft */ 
        { NULL, NULL }, /* Ic */ 
        { NULL, NULL }, /* In */ 
        { NULL, NULL }, /* Ft */ 
        { NULL, NULL }, /* Ic */ 
        { NULL, NULL }, /* In */ 

-       { NULL, NULL }, /* Li */
+       { NULL, post_li }, /* Li */

        { NULL, NULL }, /* Nd */ 
        { NULL, post_nm }, /* Nm */ 
        { NULL, NULL }, /* Op */
        { NULL, NULL }, /* Ot */
        { NULL, NULL }, /* Nd */ 
        { NULL, post_nm }, /* Nm */ 
        { NULL, NULL }, /* Op */
        { NULL, NULL }, /* Ot */

-       { NULL, post_tilde }, /* Pa */
+       { NULL, post_pa }, /* Pa */

        { NULL, post_std }, /* Rv */
        { NULL, post_st }, /* St */
        { NULL, NULL }, /* Va */
        { NULL, post_std }, /* Rv */
        { NULL, post_st }, /* St */
        { NULL, NULL }, /* Va */


@@ -174,7 +181,7 @@ static      const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ud */
        { NULL, post_lb }, /* Lb */
        { NULL, NULL }, /* Lp */
        { NULL, NULL }, /* Ud */
        { NULL, post_lb }, /* Lb */
        { NULL, NULL }, /* Lp */

-       { NULL, post_tilde }, /* Lk */
+       { NULL, NULL }, /* Lk */

        { NULL, NULL }, /* Mt */
        { NULL, NULL }, /* Brq */
        { NULL, NULL }, /* Bro */
        { NULL, NULL }, /* Mt */
        { NULL, NULL }, /* Brq */
        { NULL, NULL }, /* Bro */


@@ -186,11 +193,13 @@ static    const struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* %Q */
        { NULL, NULL }, /* br */
        { NULL, NULL }, /* sp */
        { NULL, NULL }, /* %Q */
        { NULL, NULL }, /* br */
        { NULL, NULL }, /* sp */

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

 };
 
 };
 

-#define        RSORD_MAX 13
+#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,


@@ -203,12 +212,13 @@ static    const int rsord[RSORD_MAX] = {
        MDOC__Q,
        MDOC__D,
        MDOC__O,
        MDOC__Q,
        MDOC__D,
        MDOC__O,

-       MDOC__C
+       MDOC__C,
+       MDOC__U

 };
 
 
 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) {


@@ -249,62 +259,88 @@ mdoc_action_post(struct mdoc *m)
 }
 
 
 }
 
 

+/*
+ * Concatenate sibling nodes together.  All siblings must be of type
+ * MDOC_TEXT or an assertion is raised.  Concatenation is separated by a
+ * single whitespace.
+ */

 static int
 static int

-concat(struct mdoc *m, const struct mdoc_node *n, 
-               char *buf, size_t sz)
+concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz)

 {
 
 {
 

+       assert(sz);
+       p[0] = '\0';

        for ( ; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
        for ( ; n; n = n->next) {
                assert(MDOC_TEXT == n->type);

-               if (strlcat(buf, 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(buf, " ", 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);
 }
 
 

+/*
+ * Macros accepting `-std' as an argument have the name of the current
+ * document (`Nm') filled in as the argument if it's not provided.
+ */

 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;

-

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

+/*
+ * The `Nm' macro's first use sets the name of the document.  See also
+ * post_std(), etc.
+ */

 static int
 post_nm(POST_ARGS)
 {
 static int
 post_nm(POST_ARGS)
 {

-       char             buf[64];
+       char             buf[BUFSIZ];

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

-
-       buf[0] = 0;
-       if ( ! concat(m, n->child, buf, sizeof(buf)))
+       if ( ! concat(m, buf, n->child, BUFSIZ))

                return(0);
                return(0);

-       if (NULL == (m->meta.name = strdup(buf)))
-               return(mdoc_nerr(m, n, EMALLOC));
-
+       m->meta.name = mandoc_strdup(buf);

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

+/*
+ * Look up the value of `Lb' for matching predefined strings.  If it has
+ * one, then substitute the current value for the formatted value.  Note
+ * that the lookup may fail (we can provide arbitrary strings).
+ */
+/* ARGSUSED */

 static int
 post_lb(POST_ARGS)
 {
 static int
 post_lb(POST_ARGS)
 {


@@ -314,28 +350,29 @@ post_lb(POST_ARGS)
 
        assert(MDOC_TEXT == n->child->type);
        p = mdoc_a2lib(n->child->string);
 
        assert(MDOC_TEXT == n->child->type);
        p = mdoc_a2lib(n->child->string);

-       if (NULL == p) {
-               sz = strlen(n->child->string) +
-                       2 + strlen("\\(lqlibrary\\(rq");
-               buf = malloc(sz);
-               if (NULL == buf)
-                       return(mdoc_nerr(m, n, EMALLOC));
-               (void)snprintf(buf, sz, "library \\(lq%s\\(rq", 
-                               n->child->string);
+
+       if (p) {

                free(n->child->string);
                free(n->child->string);

-               n->child->string = buf;
+               n->child->string = mandoc_strdup(p);

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

+       sz = strlen(n->child->string) +
+               2 + strlen("\\(lqlibrary\\(rq");
+       buf = mandoc_malloc(sz);
+       snprintf(buf, sz, "library \\(lq%s\\(rq", n->child->string);

        free(n->child->string);
        free(n->child->string);

-       n->child->string = strdup(p);
-       if (NULL == n->child->string)
-               return(mdoc_nerr(m, n, EMALLOC));
-
+       n->child->string = buf;

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

+/*
+ * Substitute the value of `St' for the corresponding formatted string.
+ * We're guaranteed that this exists (it's been verified during the
+ * validation phase).
+ */
+/* ARGSUSED */

 static int
 post_st(POST_ARGS)
 {
 static int
 post_st(POST_ARGS)
 {


@@ -343,80 +380,94 @@ 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 = strdup(p);
-       if (NULL == n->child->string)
-               return(mdoc_nerr(m, n, EMALLOC));
-
+       if (p != NULL) {
+               free(n->child->string);
+               n->child->string = mandoc_strdup(p);
+       }

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

+/*
+ * Look up the standard string in a table.  We know that it exists from
+ * the validation phase, so assert on failure.  If a standard key wasn't
+ * supplied, supply the default ``AT&T UNIX''.
+ */

 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 = strdup(p);
-               if (NULL == n->child->string)
-                       return(mdoc_nerr(m, n, EMALLOC));
+               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);
        }
 
        nn = n;
        m->next = MDOC_NEXT_CHILD;
                return(1);
        }
 
        nn = n;
        m->next = MDOC_NEXT_CHILD;

-

        if ( ! mdoc_word_alloc(m, nn->line, nn->pos, "AT&T UNIX"))
                return(0);
        m->last = nn;
        if ( ! mdoc_word_alloc(m, nn->line, nn->pos, "AT&T UNIX"))
                return(0);
        m->last = nn;

-

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

+/*
+ * 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;
 static int
 post_sh(POST_ARGS)
 {
        enum mdoc_sec    sec;

-       char             buf[64];
-
-       /*
-        * We keep track of the current section /and/ the "named"
-        * section, which is one of the conventional ones, in order to
-        * check ordering.
-        */
+       char             buf[BUFSIZ];

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

-       buf[0] = 0;
-       if ( ! concat(m, n->child, buf, sizeof(buf)))
+       if ( ! concat(m, buf, n->child, BUFSIZ))

                return(0);
                return(0);

-       if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
+       sec = mdoc_str2sec(buf);
+       /*
+        * The first section should always make us move into a non-new
+        * state.
+        */
+       if (SEC_NONE == m->lastnamed || SEC_CUSTOM != sec)

                m->lastnamed = 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->lastsec = sec)) {
        case (SEC_RETURN_VALUES):
                /* FALLTHROUGH */
        case (SEC_ERRORS):

-               switch (m->meta.msec) {
-               case (2):
-                       /* FALLTHROUGH */
-               case (3):
-                       /* FALLTHROUGH */
-               case (9):
+               assert(m->meta.msec);
+               if (*m->meta.msec == '2')

                        break;
                        break;

-               default:
-                       return(mdoc_nwarn(m, n, EBADSEC));
-               }
-               break;
+               if (*m->meta.msec == '3')
+                       break;
+               if (*m->meta.msec == '9')
+                       break;
+               return(mdoc_nmsg(m, n, MANDOCERR_SECMSEC));

        default:
                break;
        }
        default:
                break;
        }


@@ -424,13 +475,15 @@ post_sh(POST_ARGS)
 }
 
 
 }
 
 

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

 static int
 post_dt(POST_ARGS)
 {
        struct mdoc_node *nn;
        const char       *cp;
 static int
 post_dt(POST_ARGS)
 {
        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);


@@ -440,17 +493,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)) {
        /* Handles: `.Dt' 
         *   --> title = unknown, volume = local, msec = 0, arch = NULL
         */
 
        if (NULL == (nn = n->child)) {

-               if (NULL == (m->meta.title = strdup("unknown")))
-                       return(mdoc_nerr(m, n, EMALLOC));
-               if (NULL == (m->meta.vol = strdup("local")))
-                       return(mdoc_nerr(m, n, EMALLOC));
+               /* XXX: make these macro values. */
+               /* 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));
        }
 


@@ -458,12 +510,14 @@ post_dt(POST_ARGS)
         *   --> title = TITLE, volume = local, msec = 0, arch = NULL
         */
 
         *   --> title = TITLE, volume = local, msec = 0, arch = NULL
         */
 

-       if (NULL == (m->meta.title = strdup(nn->string)))
-               return(mdoc_nerr(m, n, EMALLOC));
+       m->meta.title = mandoc_strdup
+               ('\0' == nn->string[0] ? "UNKNOWN" : nn->string);

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

-               if (NULL == (m->meta.vol = strdup("local")))
-                       return(mdoc_nerr(m, n, EMALLOC));
+               /* FIXME: warn about missing msec. */
+               /* XXX: make this a macro value. */
+               m->meta.vol = mandoc_strdup("LOCAL");
+               m->meta.msec = mandoc_strdup("1");

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


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

-               if (NULL == (m->meta.vol = strdup(cp)))
-                       return(mdoc_nerr(m, n, EMALLOC));
-               errno = 0;
-               lval = strtol(nn->string, &ep, 10);
-               if (nn->string[0] != '\0' && *ep == '\0')
-                       m->meta.msec = (int)lval;
-       } else if (NULL == (m->meta.vol = strdup(nn->string)))
-               return(mdoc_nerr(m, n, EMALLOC));
+               m->meta.vol = mandoc_strdup(cp);
+               m->meta.msec = mandoc_strdup(nn->string);
+       } else if (mdoc_nmsg(m, n, MANDOCERR_BADMSEC)) {
+               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));


@@ -498,91 +551,116 @@ post_dt(POST_ARGS)
        cp = mdoc_a2vol(nn->string);
        if (cp) {
                free(m->meta.vol);
        cp = mdoc_a2vol(nn->string);
        if (cp) {
                free(m->meta.vol);

-               if (NULL == (m->meta.vol = strdup(cp)))
-                       return(mdoc_nerr(m, n, EMALLOC));
+               m->meta.vol = mandoc_strdup(cp);

        } else {
        } 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);

-                       if (NULL == (m->meta.vol = strdup(nn->string)))
-                               return(mdoc_nerr(m, n, EMALLOC));
-               } else if (NULL == (m->meta.arch = strdup(cp)))
-                       return(mdoc_nerr(m, n, EMALLOC));
+                       m->meta.vol = mandoc_strdup(nn->string);
+               } else 
+                       m->meta.arch = mandoc_strdup(cp);

        }       
 
        /* Ignore any subsequent parameters... */
        }       
 
        /* Ignore any subsequent parameters... */

+       /* FIXME: warn about subsequent parameters. */

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

+/*
+ * Set the operating system by way of the `Os' macro.  Note that if an
+ * argument isn't provided and -DOSNAME="\"foo\"" is provided during
+ * compilation, this value will be used instead of filling in "sysname
+ * release" from uname().
+ */

 static int
 post_os(POST_ARGS)
 {
 static int
 post_os(POST_ARGS)
 {

-       char              buf[64];
+       char              buf[BUFSIZ];
+#ifndef OSNAME

        struct utsname    utsname;
        struct utsname    utsname;

+#endif

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

-       buf[0] = 0;
-       if ( ! concat(m, n->child, buf, sizeof(buf)))
+       if ( ! concat(m, buf, n->child, BUFSIZ))

                return(0);
 
                return(0);
 

-       if (0 == buf[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 (strlcat(buf, OSNAME, BUFSIZ) >= BUFSIZ) {
+                       mdoc_nmsg(m, n, MANDOCERR_MEM);
+                       return(0);
+               }
+#else /*!OSNAME */

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

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

 
 

-       if (NULL == (m->meta.os = strdup(buf)))
-               return(mdoc_nerr(m, n, EMALLOC));
+               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*/
+       }

 
 

+       m->meta.os = mandoc_strdup(buf);

        return(post_prol(m, n));
 }
 
 
 /*
  * Calculate the -width for a `Bl -tag' list if it hasn't been provided.
        return(post_prol(m, n));
 }
 
 
 /*
  * Calculate the -width for a `Bl -tag' list if it hasn't been provided.

- * Uses the first head macro.
+ * Uses the first head macro.  NOTE AGAIN: this is ONLY if the -width
+ * argument has NOT been provided.  See post_bl_width() for converting
+ * the -width string.

  */
 static int
 post_bl_tagwidth(POST_ARGS)
 {
  */
 static int
 post_bl_tagwidth(POST_ARGS)
 {

-       struct mdoc_node  *nn;
-       int                sz;
-       char               buf[32];
+       struct mdoc_node *nn;
+       size_t            sz;
+       int               i;
+       char              buf[NUMSIZ];

 
 

-       /*
-        * Use the text width, if a text node, or the default macro
-        * width if a macro.
-        */
+       /* Defaults to ten ens. */

 
 

-       nn = n->body->child;
-       if (nn) {
-               assert(MDOC_BLOCK == nn->type);
-               assert(MDOC_It == nn->tok);
-               nn = nn->head->child;
-       }
+       sz = 10; /* XXX: make this a macro value. */

 
 

-       sz = 10; /* Default size. */
+       for (nn = n->body->child; nn; nn = nn->next) {
+               if (MDOC_It == nn->tok)
+                       break;
+       }

 
        if (nn) {
 
        if (nn) {

+               assert(MDOC_BLOCK == nn->type);
+               nn = nn->head->child;

                if (MDOC_TEXT != nn->type) {
                if (MDOC_TEXT != nn->type) {

-                       if (0 == (sz = (int)mdoc_macro2len(nn->tok)))
-                               if ( ! mdoc_nwarn(m, n, ENOWIDTH))
+                       sz = mdoc_macro2len(nn->tok);
+                       if (sz == 0) {
+                               if ( ! mdoc_nmsg(m, n, MANDOCERR_NOWIDTHARG))

                                        return(0);
                                        return(0);

+                               sz = 10;
+                       }

                } else
                } else

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

        } 
 
        } 
 

-       if (-1 == snprintf(buf, sizeof(buf), "%dn", sz))
-               return(mdoc_nerr(m, n, ENUMFMT));
+       snprintf(buf, NUMSIZ, "%zun", sz);

 
        /*
         * We have to dynamically add this to the macro's argument list.
 
        /*
         * We have to dynamically add this to the macro's argument list.


@@ -591,35 +669,33 @@ post_bl_tagwidth(POST_ARGS)
 
        nn = n;
        assert(nn->args);
 
        nn = n;
        assert(nn->args);

-       sz = (int)(nn->args->argc)++;
+       i = (int)(nn->args->argc)++;

 
 

-       nn->args->argv = realloc(nn->args->argv, 
+       nn->args->argv = mandoc_realloc(nn->args->argv, 

                        nn->args->argc * sizeof(struct mdoc_argv));
 
                        nn->args->argc * sizeof(struct mdoc_argv));
 

-       if (NULL == nn->args->argv)
-               return(mdoc_nerr(m, n, EMALLOC));
-
-       nn->args->argv[sz].arg = MDOC_Width;
-       nn->args->argv[sz].line = n->line;
-       nn->args->argv[sz].pos = n->pos;
-       nn->args->argv[sz].sz = 1;
-       nn->args->argv[sz].value = calloc(1, sizeof(char *));
-
-       if (NULL == nn->args->argv[sz].value)
-               return(mdoc_nerr(m, n, EMALLOC));
-       if (NULL == (nn->args->argv[sz].value[0] = strdup(buf)))
-               return(mdoc_nerr(m, n, EMALLOC));
-
+       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);

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

+/*
+ * Calculate the real width of a list from the -width string, which may
+ * contain a macro (with a known default width), a literal string, or a
+ * scaling width.
+ */

 static int
 post_bl_width(POST_ARGS)
 {
        size_t            width;
 static int
 post_bl_width(POST_ARGS)
 {
        size_t            width;

-       int               i, tok;
-       char              buf[32];
+       int               i;
+       enum mdoct        tok;
+       char              buf[NUMSIZ];

        char             *p;
 
        if (NULL == n->args)
        char             *p;
 
        if (NULL == n->args)


@@ -643,22 +719,21 @@ post_bl_width(POST_ARGS)
        else if (MDOC_MAX == (tok = mdoc_hash_find(p)))
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 
        else if (MDOC_MAX == (tok = mdoc_hash_find(p)))
                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. */
 

-       if (-1 == snprintf(buf, sizeof(buf), "%zun", width))
-               return(mdoc_nerr(m, n, ENUMFMT));
-
+       snprintf(buf, NUMSIZ, "%zun", width);

        free(n->args->argv[i].value[0]);
        free(n->args->argv[i].value[0]);

-       n->args->argv[i].value[0] = strdup(buf);
-       if (NULL == n->args->argv[i].value[0])
-               return(mdoc_nerr(m, n, EMALLOC));
-
+       n->args->argv[i].value[0] = mandoc_strdup(buf);

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

+/*
+ * Do processing for -column lists, which can have two distinct styles
+ * of invocation.  Merge this two styles into a consistent form.
+ */

 /* ARGSUSED */
 static int
 post_bl_head(POST_ARGS)
 /* ARGSUSED */
 static int
 post_bl_head(POST_ARGS)


@@ -676,11 +751,8 @@ post_bl_head(POST_ARGS)
                if (MDOC_Column == np->args->argv[c].arg)
                        break;
 
                if (MDOC_Column == np->args->argv[c].arg)
                        break;
 

-       /* Only process -column. */
-

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

-       

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


@@ -690,7 +762,7 @@ post_bl_head(POST_ARGS)
         */
 
        np->args->argv[c].sz = (size_t)n->nchild;
         */
 
        np->args->argv[c].sz = (size_t)n->nchild;

-       np->args->argv[c].value = malloc
+       np->args->argv[c].value = mandoc_malloc

                ((size_t)n->nchild * sizeof(char *));
 
        for (i = 0, nn = n->child; nn; i++) {
                ((size_t)n->nchild * sizeof(char *));
 
        for (i = 0, nn = n->child; nn; i++) {


@@ -698,12 +770,11 @@ post_bl_head(POST_ARGS)
                nn->string = NULL;
                nnp = nn;
                nn = nn->next;
                nn->string = NULL;
                nnp = nn;
                nn = nn->next;

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

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

-

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


@@ -746,8 +817,12 @@ post_bl(POST_ARGS)
 }
 
 
 }
 
 

+/*
+ * The `Pa' macro defaults to a tilde if no value is provided as an
+ * argument.
+ */

 static int
 static int

-post_tilde(POST_ARGS)
+post_pa(POST_ARGS)

 {
        struct mdoc_node *np;
 
 {
        struct mdoc_node *np;
 


@@ -756,16 +831,39 @@ post_tilde(POST_ARGS)
        
        np = n;
        m->next = MDOC_NEXT_CHILD;
        
        np = n;
        m->next = MDOC_NEXT_CHILD;

-
-       /* XXX: not documented for `Lk'. */
+       /* 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;

+       return(1);
+}
+

 
 

+/*
+ * Empty `Li' macros get an empty string to make front-ends add an extra
+ * space.
+ */
+static int
+post_li(POST_ARGS)
+{
+       struct mdoc_node *np;
+
+       if (n->child)
+               return(1);
+       
+       np = n;
+       m->next = MDOC_NEXT_CHILD;
+       if ( ! mdoc_word_alloc(m, n->line, n->pos, ""))
+               return(0);
+       m->last = np;

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

+/*
+ * The `Ar' macro defaults to two strings "file ..." if no value is
+ * provided as an argument.
+ */

 static int
 post_ar(POST_ARGS)
 {
 static int
 post_ar(POST_ARGS)
 {


@@ -776,27 +874,32 @@ post_ar(POST_ARGS)
        
        np = n;
        m->next = MDOC_NEXT_CHILD;
        
        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;
        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);
 }
 
 
        return(1);
 }
 
 

+/*
+ * Parse the date field in `Dd'.
+ */

 static int
 post_dd(POST_ARGS)
 {
 static int
 post_dd(POST_ARGS)
 {

-       char              buf[64];
+       char            buf[DATESIZ];

 
 

-       buf[0] = 0;
-       if ( ! concat(m, n->child, buf, sizeof(buf)))
+       if ( ! concat(m, buf, n->child, DATESIZ))

                return(0);
 
                return(0);
 

-       if (0 == (m->meta.date = mdoc_atotime(buf))) {
-               if ( ! mdoc_nwarn(m, n, EBADDATE))
+       m->meta.date = mandoc_a2time
+               (MTIME_MDOCDATE | MTIME_CANONICAL, buf);
+
+       if (0 == m->meta.date) {
+               if ( ! mdoc_nmsg(m, n, MANDOCERR_BADDATE))

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


@@ -805,38 +908,25 @@ post_dd(POST_ARGS)
 }
 
 
 }
 
 

+/*
+ * Remove prologue macros from the document after they're processed.
+ * The final document uses mdoc_meta for these values and discards the
+ * originals.
+ */

 static int
 post_prol(POST_ARGS)
 {
 static int
 post_prol(POST_ARGS)
 {

-       struct mdoc_node *np;
-
-       /* Remove prologue macros from AST.  */
-
-       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);
 }
 
 

+/*
+ * Trigger a literal context.
+ */

 static int
 pre_dl(PRE_ARGS)
 {
 static int
 pre_dl(PRE_ARGS)
 {


@@ -847,6 +937,7 @@ pre_dl(PRE_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

 static int
 pre_offset(PRE_ARGS)
 {
 static int
 pre_offset(PRE_ARGS)
 {


@@ -857,22 +948,16 @@ pre_offset(PRE_ARGS)
         * stipulated by mdoc.samples. 
         */
 
         * stipulated by mdoc.samples. 
         */
 

-       assert(n->args);
-       for (i = 0; i < (int)n->args->argc; i++) {
+       for (i = 0; n->args && 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>. */
                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].value = 
-               calloc(1, sizeof(char *));
-               if (NULL == n->args->argv[i].value)
-                       return(mdoc_nerr(m, n, EMALLOC));

                n->args->argv[i].sz++;
                n->args->argv[i].sz++;

-               n->args->argv[i].value[0] = strdup("8n");
-               if (NULL == n->args->argv[i].value[0])
-                       return(mdoc_nerr(m, n, EMALLOC));
+               n->args->argv[i].value = mandoc_malloc(sizeof(char *));
+               n->args->argv[i].value[0] = mandoc_strdup("8n");

                break;
        }
 
                break;
        }
 


@@ -884,27 +969,23 @@ static int
 pre_bl(PRE_ARGS)
 {
 
 pre_bl(PRE_ARGS)
 {
 

-       return(MDOC_BLOCK == n->type ? pre_offset(m, n) : 1);
+       if (MDOC_BLOCK == n->type)
+               return(pre_offset(m, n));
+       return(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;
+       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);
 }


@@ -921,11 +1002,11 @@ post_display(POST_ARGS)
 
 
 static inline int
 
 
 static inline int

-order_rs(int t)
+order_rs(enum mdoct t)

 {
        int             i;
 
 {
        int             i;
 

-       for (i = 0; i < RSORD_MAX; i++)
+       for (i = 0; i < (int)RSORD_MAX; i++)

                if (rsord[i] == t)
                        return(i);
 
                if (rsord[i] == t)
                        return(i);