Fixed undocumented `-diag' where NULL list item bodies aren't followed by a vspace.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 9c25faafb4c889b2ef6c75a0832452aae761531e..67cf61f0702b3f77ed3b78beaa2b7f3456345abb 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,48 +1,87 @@
-/* $Id: mdoc.c,v 1.62 2009/03/12 02:57:36 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.95 2009/07/20 14:09:38 kristaps Exp $ */

 /*
 /*

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

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
 #include <assert.h>
 #include <ctype.h>
  */
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>

 #include <stdarg.h>
 #include <stdarg.h>

-#include <stdlib.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 
 #include <string.h>
 

-#include "private.h"
-
-/*
- * Main caller in the libmdoc library.  This begins the parsing routine,
- * handles allocation of data, and so forth.  Most of the "work" is done
- * in macro.c and validate.c.
- */
-
-static struct mdoc_node *mdoc_node_alloc(const struct mdoc *);
-static int               mdoc_node_append(struct mdoc *, 
-                               struct mdoc_node *);
-
-static int               parsetext(struct mdoc *, int, char *);
-static int               parsemacro(struct mdoc *, int, char *);
-static int               macrowarn(struct mdoc *, int, const char *);
-
+#include "libmdoc.h"
+
+const  char *const __mdoc_merrnames[MERRMAX] = {                
+       "trailing whitespace", /* ETAILWS */
+       "unexpected quoted parameter", /* EQUOTPARM */
+       "unterminated quoted parameter", /* EQUOTTERM */
+       "system: malloc error", /* EMALLOC */
+       "argument parameter suggested", /* EARGVAL */
+       "macro not callable", /* ENOCALL */
+       "macro disallowed in prologue", /* EBODYPROL */
+       "macro disallowed in body", /* EPROLBODY */
+       "text disallowed in prologue", /* ETEXTPROL */
+       "blank line disallowed", /* ENOBLANK */
+       "text parameter too long", /* ETOOLONG */
+       "invalid escape sequence", /* EESCAPE */
+       "invalid character", /* EPRINT */
+       "document has no body", /* ENODAT */
+       "document has no prologue", /* ENOPROLOGUE */
+       "expected line arguments", /* ELINE */
+       "invalid AT&T argument", /* EATT */
+       "default name not yet set", /* ENAME */
+       "missing list type", /* ELISTTYPE */
+       "missing display type", /* EDISPTYPE */
+       "too many display types", /* EMULTIDISP */
+       "too many list types", /* EMULTILIST */
+       "NAME section must be first", /* ESECNAME */
+       "badly-formed NAME section", /* ENAMESECINC */
+       "argument repeated", /* EARGREP */
+       "expected boolean parameter", /* EBOOL */
+       "inconsistent column syntax", /* ECOLMIS */
+       "nested display invalid", /* ENESTDISP */
+       "width argument missing", /* EMISSWIDTH */
+       "invalid section for this manual section", /* EWRONGMSEC */
+       "section out of conventional order", /* ESECOOO */
+       "section repeated", /* ESECREP */
+       "invalid standard argument", /* EBADSTAND */
+       "multi-line arguments discouraged", /* ENOMULTILINE */
+       "multi-line arguments suggested", /* EMULTILINE */
+       "line arguments discouraged", /* ENOLINE */
+       "prologue macro out of conventional order", /* EPROLOOO */
+       "prologue macro repeated", /* EPROLREP */
+       "invalid manual section", /* EBADMSEC */
+       "invalid section", /* EBADSEC */
+       "invalid font mode", /* EFONT */
+       "invalid date syntax", /* EBADDATE */
+       "invalid number format", /* ENUMFMT */
+       "superfluous width argument", /* ENOWIDTH */
+       "system: utsname error", /* EUTSNAME */
+       "obsolete macro", /* EOBS */
+       "macro-like parameter", /* EMACPARM */
+       "end-of-line scope violation", /* EIMPBRK */
+       "empty macro ignored", /* EIGNE */
+       "unclosed explicit scope", /* EOPEN */
+       "unterminated quoted phrase", /* EQUOTPHR */
+       "closure macro without prior context", /* ENOCTX */
+       "invalid whitespace after control character", /* ESPACE */
+       "no description found for library" /* ELIB */
+};

 
 const  char *const __mdoc_macronames[MDOC_MAX] = {              
 
 const  char *const __mdoc_macronames[MDOC_MAX] = {              

-       "\\\"",         "Dd",           "Dt",           "Os",
+       "Ap",           "Dd",           "Dt",           "Os",

        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
        "El",           "It",           "Ad",           "An",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
        "El",           "It",           "Ad",           "An",


@@ -71,9 +110,12 @@ const       char *const __mdoc_macronames[MDOC_MAX] = {
        "Tn",           "Ux",           "Xc",           "Xo",
        "Fo",           "Fc",           "Oo",           "Oc",
        "Bk",           "Ek",           "Bt",           "Hf",
        "Tn",           "Ux",           "Xc",           "Xo",
        "Fo",           "Fc",           "Oo",           "Oc",
        "Bk",           "Ek",           "Bt",           "Hf",

-       "Fr",           "Ud",           "Lb",           "Ap",
-       "Lp",           "Lk",           "Mt",           "Brq",
-       "Bro",          "Brc"
+       "Fr",           "Ud",           "Lb",           "Lp",
+       "Lk",           "Mt",           "Brq",          "Bro",
+       /* LINTED */
+       "Brc",          "\%C",          "Es",           "En",
+       /* LINTED */
+       "Dx",           "\%Q",          "br",           "sp"

        };
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            
        };
 
 const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            


@@ -85,37 +127,54 @@ const      char *const __mdoc_argnames[MDOC_ARG_MAX] = {
        "ohang",                "inset",                "column",        
        "width",                "compact",              "std",   
        "filled",               "words",                "emphasis",
        "ohang",                "inset",                "column",        
        "width",                "compact",              "std",   
        "filled",               "words",                "emphasis",

-       "symbolic"
+       "symbolic",             "nested"

        };
 
 const  char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
        };
 
 const  char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 

+static void              mdoc_free1(struct mdoc *);
+static int               mdoc_alloc1(struct mdoc *);
+static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
+                               int, enum mdoc_type);
+static int               node_append(struct mdoc *, 
+                               struct mdoc_node *);
+static int               parsetext(struct mdoc *, int, char *);
+static int               parsemacro(struct mdoc *, int, char *);
+static int               macrowarn(struct mdoc *, int, const char *);
+static int               pstring(struct mdoc *, int, int, 
+                               const char *, size_t);
+
+#ifdef __linux__
+extern size_t            strlcpy(char *, const char *, size_t);
+#endif
+

 
 const struct mdoc_node *
 
 const struct mdoc_node *

-mdoc_node(const struct mdoc *mdoc)
+mdoc_node(const struct mdoc *m)

 {
 
 {
 

-       return(mdoc->first);
+       return(MDOC_HALT & m->flags ? NULL : m->first);

 }
 
 
 const struct mdoc_meta *
 }
 
 
 const struct mdoc_meta *

-mdoc_meta(const struct mdoc *mdoc)
+mdoc_meta(const struct mdoc *m)

 {
 
 {
 

-       return(&mdoc->meta);
+       return(MDOC_HALT & m->flags ? NULL : &m->meta);

 }
 
 
 }
 
 

-void
-mdoc_free(struct mdoc *mdoc)
+/*
+ * Frees volatile resources (parse tree, meta-data, fields).
+ */
+static void
+mdoc_free1(struct mdoc *mdoc)

 {
 
        if (mdoc->first)
                mdoc_node_freelist(mdoc->first);
 {
 
        if (mdoc->first)
                mdoc_node_freelist(mdoc->first);

-       if (mdoc->htab)
-               mdoc_tokhash_free(mdoc->htab);

        if (mdoc->meta.title)
                free(mdoc->meta.title);
        if (mdoc->meta.os)
        if (mdoc->meta.title)
                free(mdoc->meta.title);
        if (mdoc->meta.os)


@@ -126,61 +185,112 @@ mdoc_free(struct mdoc *mdoc)
                free(mdoc->meta.arch);
        if (mdoc->meta.vol)
                free(mdoc->meta.vol);
                free(mdoc->meta.arch);
        if (mdoc->meta.vol)
                free(mdoc->meta.vol);

+}
+
+
+/*
+ * Allocate all volatile resources (parse tree, meta-data, fields).
+ */
+static int
+mdoc_alloc1(struct mdoc *mdoc)
+{
+
+       bzero(&mdoc->meta, sizeof(struct mdoc_meta));
+       mdoc->flags = 0;
+       mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
+       mdoc->last = calloc(1, sizeof(struct mdoc_node));
+       if (NULL == mdoc->last)
+               return(0);
+
+       mdoc->first = mdoc->last;
+       mdoc->last->type = MDOC_ROOT;
+       mdoc->next = MDOC_NEXT_CHILD;
+       return(1);
+}
+
+
+/*
+ * Free up volatile resources (see mdoc_free1()) then re-initialises the
+ * data with mdoc_alloc1().  After invocation, parse data has been reset
+ * and the parser is ready for re-invocation on a new tree; however,
+ * cross-parse non-volatile data is kept intact.
+ */
+int
+mdoc_reset(struct mdoc *mdoc)
+{
+
+       mdoc_free1(mdoc);
+       return(mdoc_alloc1(mdoc));
+}
+

 
 

+/*
+ * Completely free up all volatile and non-volatile parse resources.
+ * After invocation, the pointer is no longer usable.
+ */
+void
+mdoc_free(struct mdoc *mdoc)
+{
+
+       mdoc_free1(mdoc);
+       if (mdoc->htab)
+               mdoc_hash_free(mdoc->htab);

        free(mdoc);
 }
 
 
        free(mdoc);
 }
 
 

+/*
+ * Allocate volatile and non-volatile parse resources.  
+ */

 struct mdoc *
 mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
 {
        struct mdoc     *p;
 
 struct mdoc *
 mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
 {
        struct mdoc     *p;
 

-       p = xcalloc(1, sizeof(struct mdoc));
-
-       p->data = data;
+       if (NULL == (p = calloc(1, sizeof(struct mdoc))))
+               return(NULL);

        if (cb)
                (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 
        if (cb)
                (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
 

-       p->last = xcalloc(1, sizeof(struct mdoc_node));
-       p->last->type = MDOC_ROOT;
-       p->first = p->last;
+       p->data = data;

        p->pflags = pflags;
        p->pflags = pflags;

-       p->next = MDOC_NEXT_CHILD;
-       p->htab = mdoc_tokhash_alloc();

 
 

-       return(p);
+       if (NULL == (p->htab = mdoc_hash_alloc())) {
+               free(p);
+               return(NULL);
+       } else if (mdoc_alloc1(p))
+               return(p);
+
+       free(p);
+       return(NULL);

 }
 
 
 }
 
 

+/*
+ * Climb back up the parse tree, validating open scopes.  Mostly calls
+ * through to macro_end() in macro.c.
+ */

 int
 int

-mdoc_endparse(struct mdoc *mdoc)
+mdoc_endparse(struct mdoc *m)

 {
 
 {
 

-       if (MDOC_HALT & mdoc->flags)
+       if (MDOC_HALT & m->flags)

                return(0);
                return(0);

-       if (NULL == mdoc->first)
+       else if (mdoc_macroend(m))

                return(1);
                return(1);

-
-       assert(mdoc->last);
-       if ( ! macro_end(mdoc)) {
-               mdoc->flags |= MDOC_HALT;
-               return(0);
-       }
-       return(1);
+       m->flags |= MDOC_HALT;
+       return(0);

 }
 
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
 }
 
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to

- * the macro or text parser.
+ * the macro (parsemacro()) or text parser (parsetext()).

  */
 int
 mdoc_parseln(struct mdoc *m, int ln, char *buf)
 {
 
  */
 int
 mdoc_parseln(struct mdoc *m, int ln, char *buf)
 {
 

-       /* If in error-mode, then we parse no more. */
-

        if (MDOC_HALT & m->flags)
                return(0);
 
        if (MDOC_HALT & m->flags)
                return(0);
 


@@ -189,22 +299,6 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf)
 }
 
 
 }
 
 

-void
-mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
-{
-       char              buf[256];
-       va_list           ap;
-
-       if (NULL == mdoc->cb.mdoc_msg)
-               return;
-
-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-       (*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf);
-}
-
-

 int
 mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
                const char *fmt, ...)
 int
 mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
                const char *fmt, ...)


@@ -218,13 +312,13 @@ mdoc_verr(struct mdoc *mdoc, int ln, int pos,
        va_start(ap, fmt);
        (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
        va_end(ap);
        va_start(ap, fmt);
        (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
        va_end(ap);

+

        return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
 }
 
 
 int
        return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
 }
 
 
 int

-mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, 
-               enum mdoc_warn type, const char *fmt, ...)
+mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)

 {
        char             buf[256];
        va_list          ap;
 {
        char             buf[256];
        va_list          ap;


@@ -235,7 +329,23 @@ mdoc_vwarn(struct mdoc *mdoc, int ln, int pos,
        va_start(ap, fmt);
        (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
        va_end(ap);
        va_start(ap, fmt);
        (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
        va_end(ap);

-       return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));
+
+       return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, buf));
+}
+
+
+int
+mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type)
+{
+       const char      *p;
+
+       p = __mdoc_merrnames[(int)type];
+       assert(p);
+
+       if (iserr)
+               return(mdoc_verr(m, line, pos, p));
+
+       return(mdoc_vwarn(m, line, pos, p));

 }
 
 
 }
 
 


@@ -244,27 +354,22 @@ mdoc_macro(struct mdoc *m, int tok,
                int ln, int pp, int *pos, char *buf)
 {
 
                int ln, int pp, int *pos, char *buf)
 {
 

-       /* FIXME - these should happen during validation. */
-

        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 

-                       SEC_PROLOGUE != m->lastnamed)
-               return(mdoc_perr(m, ln, pp, 
-                               "disallowed in document body"));
-
+                       MDOC_PBODY & m->flags)
+               return(mdoc_perr(m, ln, pp, EPROLBODY));

        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 

-                       SEC_PROLOGUE == m->lastnamed)
-               return(mdoc_perr(m, ln, pp, 
-                               "disallowed in prologue"));
+                       ! (MDOC_PBODY & m->flags))
+               return(mdoc_perr(m, ln, pp, EBODYPROL));

 
        if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
 
        if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))

-               return(mdoc_perr(m, ln, pp, "not callable"));
+               return(mdoc_perr(m, ln, pp, ENOCALL));

 
        return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
 
 
 static int
 
        return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
 
 
 static int

-mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
+node_append(struct mdoc *mdoc, struct mdoc_node *p)

 {
 
        assert(mdoc->last);
 {
 
        assert(mdoc->last);


@@ -286,8 +391,12 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
                /* NOTREACHED */
        }
 
                /* NOTREACHED */
        }
 

+       p->parent->nchild++;
+

        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);

+       if ( ! mdoc_action_pre(mdoc, p))
+               return(0);

 
        switch (p->type) {
        case (MDOC_HEAD):
 
        switch (p->type) {
        case (MDOC_HEAD):


@@ -307,148 +416,145 @@ mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
        }
 
        mdoc->last = p;
        }
 
        mdoc->last = p;

+
+       switch (p->type) {
+       case (MDOC_TEXT):
+               if ( ! mdoc_valid_post(mdoc))
+                       return(0);
+               if ( ! mdoc_action_post(mdoc))
+                       return(0);
+               break;
+       default:
+               break;
+       }
+

        return(1);
 }
 
 
 static struct mdoc_node *
        return(1);
 }
 
 
 static struct mdoc_node *

-mdoc_node_alloc(const struct mdoc *mdoc)
+node_alloc(struct mdoc *m, int line, 
+               int pos, int tok, enum mdoc_type type)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = xcalloc(1, sizeof(struct mdoc_node));
-       p->sec = mdoc->lastsec;
+       if (NULL == (p = calloc(1, sizeof(struct mdoc_node)))) {
+               (void)mdoc_nerr(m, m->last, EMALLOC);
+               return(NULL);
+       }
+
+       p->sec = m->lastsec;
+       p->line = line;
+       p->pos = pos;
+       p->tok = tok;
+       if (MDOC_TEXT != (p->type = type))
+               assert(p->tok >= 0);

 
        return(p);
 }
 
 
 int
 
        return(p);
 }
 
 
 int

-mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+mdoc_tail_alloc(struct mdoc *m, int line, int pos, int tok)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       assert(mdoc->first);
-       assert(mdoc->last);
-
-       p = mdoc_node_alloc(mdoc);
-
-       p->line = line;
-       p->pos = pos;
-       p->type = MDOC_TAIL;
-       p->tok = tok;
-
-       return(mdoc_node_append(mdoc, p));
+       p = node_alloc(m, line, pos, tok, MDOC_TAIL);
+       if (NULL == p)
+               return(0);
+       return(node_append(m, p));

 }
 
 
 int
 }
 
 
 int

-mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+mdoc_head_alloc(struct mdoc *m, int line, int pos, int tok)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       assert(mdoc->first);
-       assert(mdoc->last);
-
-       p = mdoc_node_alloc(mdoc);
-
-       p->line = line;
-       p->pos = pos;
-       p->type = MDOC_HEAD;
-       p->tok = tok;
+       assert(m->first);
+       assert(m->last);

 
 

-       return(mdoc_node_append(mdoc, p));
+       p = node_alloc(m, line, pos, tok, MDOC_HEAD);
+       if (NULL == p)
+               return(0);
+       return(node_append(m, p));

 }
 
 
 int
 }
 
 
 int

-mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+mdoc_body_alloc(struct mdoc *m, int line, int pos, int tok)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       assert(mdoc->first);
-       assert(mdoc->last);
-
-       p = mdoc_node_alloc(mdoc);
-
-       p->line = line;
-       p->pos = pos;
-       p->type = MDOC_BODY;
-       p->tok = tok;
-
-       return(mdoc_node_append(mdoc, p));
+       p = node_alloc(m, line, pos, tok, MDOC_BODY);
+       if (NULL == p)
+               return(0);
+       return(node_append(m, p));

 }
 
 
 int
 }
 
 
 int

-mdoc_root_alloc(struct mdoc *mdoc)
+mdoc_block_alloc(struct mdoc *m, int line, int pos, 
+               int tok, struct mdoc_arg *args)

 {
        struct mdoc_node *p;
 
 {
        struct mdoc_node *p;
 

-       p = mdoc_node_alloc(mdoc);
-
-       p->type = MDOC_ROOT;
-
-       return(mdoc_node_append(mdoc, p));
+       p = node_alloc(m, line, pos, tok, MDOC_BLOCK);
+       if (NULL == p)
+               return(0);
+       p->args = args;
+       if (p->args)
+               (args->refcnt)++;
+       return(node_append(m, p));

 }
 
 
 int
 }
 
 
 int

-mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, 
+mdoc_elem_alloc(struct mdoc *m, int line, int pos, 

                int tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
 
                int tok, struct mdoc_arg *args)
 {
        struct mdoc_node *p;
 

-       p = mdoc_node_alloc(mdoc);
-
-       p->pos = pos;
-       p->line = line;
-       p->type = MDOC_BLOCK;
-       p->tok = tok;
+       p = node_alloc(m, line, pos, tok, MDOC_ELEM);
+       if (NULL == p)
+               return(0);

        p->args = args;
        p->args = args;

-
-       if (args)
+       if (p->args)

                (args->refcnt)++;
                (args->refcnt)++;

-
-       return(mdoc_node_append(mdoc, p));
+       return(node_append(m, p));

 }
 
 
 }
 
 

-int
-mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, 
-               int tok, struct mdoc_arg *args)
+static int
+pstring(struct mdoc *m, int line, int pos, const char *p, size_t len)

 {
 {

-       struct mdoc_node *p;
+       struct mdoc_node *n;
+       size_t            sv;

 
 

-       p = mdoc_node_alloc(mdoc);
+       n = node_alloc(m, line, pos, -1, MDOC_TEXT);
+       if (NULL == n)
+               return(mdoc_nerr(m, m->last, EMALLOC));

 
 

-       p->line = line;
-       p->pos = pos;
-       p->type = MDOC_ELEM;
-       p->tok = tok;
-       p->args = args;
+       n->string = malloc(len + 1);
+       if (NULL == n->string) {
+               free(n);
+               return(mdoc_nerr(m, m->last, EMALLOC));
+       }

 
 

-       if (args)
-               (args->refcnt)++;
+       sv = strlcpy(n->string, p, len + 1);

 
 

-       return(mdoc_node_append(mdoc, p));
+       /* Prohibit truncation. */
+       assert(sv < len + 1);
+
+       return(node_append(m, n));

 }
 
 
 int
 }
 
 
 int

-mdoc_word_alloc(struct mdoc *mdoc, 
-               int line, int pos, const char *word)
+mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)

 {
 {

-       struct mdoc_node *p;

 
 

-       p = mdoc_node_alloc(mdoc);
-
-       p->line = line;
-       p->pos = pos;
-       p->type = MDOC_TEXT;
-       p->string = xstrdup(word);
-
-       return(mdoc_node_append(mdoc, p));
+       return(pstring(m, line, pos, p, strlen(p)));

 }
 
 
 }
 
 


@@ -456,6 +562,8 @@ void
 mdoc_node_free(struct mdoc_node *p)
 {
 
 mdoc_node_free(struct mdoc_node *p)
 {
 

+       if (p->parent)
+               p->parent->nchild--;

        if (p->string)
                free(p->string);
        if (p->args)
        if (p->string)
                free(p->string);
        if (p->args)


@@ -473,6 +581,7 @@ mdoc_node_freelist(struct mdoc_node *p)
        if (p->next)
                mdoc_node_freelist(p->next);
 
        if (p->next)
                mdoc_node_freelist(p->next);
 

+       assert(0 == p->nchild);

        mdoc_node_free(p);
 }
 
        mdoc_node_free(p);
 }
 


@@ -482,34 +591,80 @@ mdoc_node_freelist(struct mdoc_node *p)
  * control character.
  */
 static int
  * control character.
  */
 static int

-parsetext(struct mdoc *mdoc, int line, char *buf)
+parsetext(struct mdoc *m, int line, char *buf)

 {
 {

+       int              i, j;
+
+       if (SEC_NONE == m->lastnamed)
+               return(mdoc_perr(m, line, 0, ETEXTPROL));
+       
+       /*
+        * If in literal mode, then pass the buffer directly to the
+        * back-end, as it should be preserved as a single term.
+        */
+
+       if (MDOC_LITERAL & m->flags) {
+               if ( ! mdoc_word_alloc(m, line, 0, buf))
+                       return(0);
+               m->next = MDOC_NEXT_SIBLING;
+               return(1);
+       }
+
+       /* Disallow blank/white-space lines in non-literal mode. */
+
+       for (i = 0; ' ' == buf[i]; i++)
+               /* Skip leading whitespace. */ ;
+       if (0 == buf[i])
+               return(mdoc_perr(m, line, 0, ENOBLANK));
+
+       /*
+        * Break apart a free-form line into tokens.  Spaces are
+        * stripped out of the input.
+        */
+
+       for (j = i; buf[i]; i++) {
+               if (' ' != buf[i])
+                       continue;

 
 

-       if (SEC_PROLOGUE == mdoc->lastnamed)
-               return(mdoc_perr(mdoc, line, 0,
-                       "text disallowed in prologue"));
+               /* Escaped whitespace. */
+               if (i && ' ' == buf[i] && '\\' == buf[i - 1])
+                       continue;

 
 

-       if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
+               buf[i++] = 0;
+               if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+                       return(0);
+               m->next = MDOC_NEXT_SIBLING;
+
+               for ( ; ' ' == buf[i]; i++)
+                       /* Skip trailing whitespace. */ ;
+
+               j = i;
+               if (0 == buf[i])
+                       break;
+       }
+
+       if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))

                return(0);
 
                return(0);
 

-       mdoc->next = MDOC_NEXT_SIBLING;
+       m->next = MDOC_NEXT_SIBLING;

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

+
+

 static int
 macrowarn(struct mdoc *m, int ln, const char *buf)
 {
        if ( ! (MDOC_IGN_MACRO & m->pflags))
 static int
 macrowarn(struct mdoc *m, int ln, const char *buf)
 {
        if ( ! (MDOC_IGN_MACRO & m->pflags))

-               return(mdoc_perr(m, ln, 1, "unknown macro: %s%s", 
+               return(mdoc_verr(m, ln, 1, 
+                               "unknown macro: %s%s", 

                                buf, strlen(buf) > 3 ? "..." : ""));
                                buf, strlen(buf) > 3 ? "..." : ""));

-       return(mdoc_pwarn(m, ln, 1, WARN_SYNTAX,
-                               "unknown macro: %s%s",
+       return(mdoc_vwarn(m, ln, 1, "unknown macro: %s%s",

                                buf, strlen(buf) > 3 ? "..." : ""));
 }
 
 
                                buf, strlen(buf) > 3 ? "..." : ""));
 }
 
 

-

 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.


@@ -520,18 +675,26 @@ parsemacro(struct mdoc *m, int ln, char *buf)
        int               i, c;
        char              mac[5];
 
        int               i, c;
        char              mac[5];
 

-       /* Comments are quickly ignored. */
+       /* Empty lines are ignored. */

 
 

-       if (buf[1] && '\\' == buf[1])
-               if (buf[2] && '\"' == buf[2])
+       if (0 == buf[1])
+               return(1);
+
+       if (' ' == buf[1]) {
+               i = 2;
+               while (buf[i] && ' ' == buf[i])
+                       i++;
+               if (0 == buf[i])

                        return(1);
                        return(1);

+               return(mdoc_perr(m, ln, 1, ESPACE));
+       }

 
        /* Copy the first word into a nil-terminated buffer. */
 
        for (i = 1; i < 5; i++) {
                if (0 == (mac[i - 1] = buf[i]))
                        break;
 
        /* Copy the first word into a nil-terminated buffer. */
 
        for (i = 1; i < 5; i++) {
                if (0 == (mac[i - 1] = buf[i]))
                        break;

-               else if (isspace((unsigned char)buf[i]))
+               else if (' ' == buf[i])

                        break;
        }
 
                        break;
        }
 


@@ -543,7 +706,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
                return(1);
        } 
        
                return(1);
        } 
        

-       if (MDOC_MAX == (c = mdoc_tokhash_find(m->htab, mac))) {
+       if (MDOC_MAX == (c = mdoc_hash_find(m->htab, mac))) {

                if ( ! macrowarn(m, ln, mac))
                        goto err;
                return(1);
                if ( ! macrowarn(m, ln, mac))
                        goto err;
                return(1);


@@ -551,7 +714,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 
        /* The macro is sane.  Jump to the next word. */
 
 
        /* The macro is sane.  Jump to the next word. */
 

-       while (buf[i] && isspace((unsigned char)buf[i]))
+       while (buf[i] && ' ' == buf[i])

                i++;
 
        /* Begin recursive parse sequence. */
                i++;
 
        /* Begin recursive parse sequence. */