Reject the escape sequences \[uD800] to \[uDFFF] in the parser.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 37b223e5e29a7a5fa7eff6f7cfc06d99587392e4..a6509722082dd1ccf8b44b006275be5f31ac4f30 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,23 +1,21 @@
-/*     $Id: mdoc.c,v 1.157 2010/07/04 22:04:04 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.254 2015/10/12 00:08:15 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

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

-#endif

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


@@ -29,12 +27,16 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

+#include "mandoc_aux.h"

 #include "mandoc.h"
 #include "mandoc.h"

-#include "regs.h"
-#include "libmdoc.h"
+#include "roff.h"
+#include "mdoc.h"

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

+#include "roff_int.h"
+#include "libmdoc.h"

 
 

-const  char *const __mdoc_macronames[MDOC_MAX] = {              
+const  char *const __mdoc_macronames[MDOC_MAX + 1] = {
+       "text",

        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
        "Dl",           "Bd",           "Ed",           "Bl",


@@ -45,11 +47,8 @@ const        char *const __mdoc_macronames[MDOC_MAX] = {
        "Ic",           "In",           "Li",           "Nd",
        "Nm",           "Op",           "Ot",           "Pa",
        "Rv",           "St",           "Va",           "Vt",
        "Ic",           "In",           "Li",           "Nd",
        "Nm",           "Op",           "Ot",           "Pa",
        "Rv",           "St",           "Va",           "Vt",

-       /* LINTED */

        "Xr",           "%A",           "%B",           "%D",
        "Xr",           "%A",           "%B",           "%D",

-       /* LINTED */

        "%I",           "%J",           "%N",           "%O",
        "%I",           "%J",           "%N",           "%O",

-       /* LINTED */

        "%P",           "%R",           "%T",           "%V",
        "Ac",           "Ao",           "Aq",           "At",
        "Bc",           "Bf",           "Bo",           "Bq",
        "%P",           "%R",           "%T",           "%V",
        "Ac",           "Ao",           "Aq",           "At",
        "Bc",           "Bf",           "Bo",           "Bq",


@@ -66,166 +65,28 @@ const      char *const __mdoc_macronames[MDOC_MAX] = {
        "Bk",           "Ek",           "Bt",           "Hf",
        "Fr",           "Ud",           "Lb",           "Lp",
        "Lk",           "Mt",           "Brq",          "Bro",
        "Bk",           "Ek",           "Bt",           "Hf",
        "Fr",           "Ud",           "Lb",           "Lp",
        "Lk",           "Mt",           "Brq",          "Bro",

-       /* LINTED */

        "Brc",          "%C",           "Es",           "En",
        "Brc",          "%C",           "Es",           "En",

-       /* LINTED */

        "Dx",           "%Q",           "br",           "sp",
        "Dx",           "%Q",           "br",           "sp",

-       /* LINTED */
-       "%U",           "Ta"
-       };
+       "%U",           "Ta",           "ll",
+};

 
 

-const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {            
+const  char *const __mdoc_argnames[MDOC_ARG_MAX] = {

        "split",                "nosplit",              "ragged",
        "split",                "nosplit",              "ragged",

-       "unfilled",             "literal",              "file",          
-       "offset",               "bullet",               "dash",          
-       "hyphen",               "item",                 "enum",          
-       "tag",                  "diag",                 "hang",          
-       "ohang",                "inset",                "column",        
-       "width",                "compact",              "std",   
+       "unfilled",             "literal",              "file",
+       "offset",               "bullet",               "dash",
+       "hyphen",               "item",                 "enum",
+       "tag",                  "diag",                 "hang",
+       "ohang",                "inset",                "column",
+       "width",                "compact",              "std",

        "filled",               "words",                "emphasis",
        "symbolic",             "nested",               "centered"
        };
 
        "filled",               "words",                "emphasis",
        "symbolic",             "nested",               "centered"
        };
 

-const  char * const *mdoc_macronames = __mdoc_macronames;
+const  char * const *mdoc_macronames = __mdoc_macronames + 1;

 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 const  char * const *mdoc_argnames = __mdoc_argnames;
 

-static void              mdoc_node_free(struct mdoc_node *);
-static void              mdoc_node_unlink(struct mdoc *, 
-                               struct mdoc_node *);
-static void              mdoc_free1(struct mdoc *);
-static void              mdoc_alloc1(struct mdoc *);
-static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
-                               enum mdoct, enum mdoc_type);
-static int               node_append(struct mdoc *, 
-                               struct mdoc_node *);
-static int               mdoc_ptext(struct mdoc *, int, char *, int);
-static int               mdoc_pmacro(struct mdoc *, int, char *, int);
-static int               macrowarn(struct mdoc *, int, 
-                               const char *, int);
-
-
-const struct mdoc_node *
-mdoc_node(const struct mdoc *m)
-{
-
-       return(MDOC_HALT & m->flags ? NULL : m->first);
-}
-
-
-const struct mdoc_meta *
-mdoc_meta(const struct mdoc *m)
-{
-
-       return(MDOC_HALT & m->flags ? NULL : &m->meta);
-}
-
-
-/*
- * Frees volatile resources (parse tree, meta-data, fields).
- */
-static void
-mdoc_free1(struct mdoc *mdoc)
-{
-
-       if (mdoc->first)
-               mdoc_node_delete(mdoc, mdoc->first);
-       if (mdoc->meta.title)
-               free(mdoc->meta.title);
-       if (mdoc->meta.os)
-               free(mdoc->meta.os);
-       if (mdoc->meta.name)
-               free(mdoc->meta.name);
-       if (mdoc->meta.arch)
-               free(mdoc->meta.arch);
-       if (mdoc->meta.vol)
-               free(mdoc->meta.vol);
-       if (mdoc->meta.msec)
-               free(mdoc->meta.msec);
-}
-
-
-/*
- * Allocate all volatile resources (parse tree, meta-data, fields).
- */
-static void
-mdoc_alloc1(struct mdoc *mdoc)
-{
-
-       memset(&mdoc->meta, 0, sizeof(struct mdoc_meta));
-       mdoc->flags = 0;
-       mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
-       mdoc->last = mandoc_calloc(1, sizeof(struct mdoc_node));
-       mdoc->first = mdoc->last;
-       mdoc->last->type = MDOC_ROOT;
-       mdoc->next = MDOC_NEXT_CHILD;
-}
-
-
-/*
- * 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.
- */
-void
-mdoc_reset(struct mdoc *mdoc)
-{
-
-       mdoc_free1(mdoc);
-       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);
-       free(mdoc);
-}
-
-
-/*
- * Allocate volatile and non-volatile parse resources.  
- */
-struct mdoc *
-mdoc_alloc(struct regset *regs, void *data, 
-               int pflags, mandocmsg msg)
-{
-       struct mdoc     *p;
-
-       p = mandoc_calloc(1, sizeof(struct mdoc));
-
-       p->msg = msg;
-       p->data = data;
-       p->pflags = pflags;
-       p->regs = regs;
-
-       mdoc_hash_init();
-       mdoc_alloc1(p);
-       return(p);
-}
-
-
-/*
- * Climb back up the parse tree, validating open scopes.  Mostly calls
- * through to macro_end() in macro.c.
- */
-int
-mdoc_endparse(struct mdoc *m)
-{
-
-       if (MDOC_HALT & m->flags)
-               return(0);
-       else if (mdoc_macroend(m))
-               return(1);
-       m->flags |= MDOC_HALT;
-       return(0);
-}
+static int               mdoc_ptext(struct roff_man *, int, char *, int);
+static int               mdoc_pmacro(struct roff_man *, int, char *, int);

 
 
 /*
 
 
 /*


@@ -233,13 +94,11 @@ mdoc_endparse(struct mdoc *m)
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
  */
 int
  * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).
  */
 int

-mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs)

 {
 
 {
 

-       if (MDOC_HALT & m->flags)
-               return(0);
-
-       m->flags |= MDOC_NEWLINE;
+       if (mdoc->last->type != ROFFT_EQN || ln > mdoc->last->line)
+               mdoc->flags |= MDOC_NEWLINE;

 
        /*
         * Let the roff nS register switch SYNOPSIS mode early,
 
        /*
         * Let the roff nS register switch SYNOPSIS mode early,


@@ -247,399 +106,162 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
         * whether this mode is on or off.
         * Note that this mode is also switched by the Sh macro.
         */
         * whether this mode is on or off.
         * Note that this mode is also switched by the Sh macro.
         */

-       if (m->regs->regs[(int)REG_nS].set) {
-               if (m->regs->regs[(int)REG_nS].v.u)
-                       m->flags |= MDOC_SYNOPSIS;
-               else
-                       m->flags &= ~MDOC_SYNOPSIS;
-       }
-
-       return(('.' == buf[offs] || '\'' == buf[offs]) ? 
-                       mdoc_pmacro(m, ln, buf, offs) :
-                       mdoc_ptext(m, ln, buf, offs));
-}
-
-
-int
-mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, 
-               int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       va_start(ap, fmt);
-       vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
+       if (roff_getreg(mdoc->roff, "nS"))
+               mdoc->flags |= MDOC_SYNOPSIS;
+       else
+               mdoc->flags &= ~MDOC_SYNOPSIS;

 
 

-       return((*mdoc->msg)(t, mdoc->data, ln, pos, buf));
+       return roff_getcontrol(mdoc->roff, buf, &offs) ?
+           mdoc_pmacro(mdoc, ln, buf, offs) :
+           mdoc_ptext(mdoc, ln, buf, offs);

 }
 
 }
 

-
-int
+void

 mdoc_macro(MACRO_PROT_ARGS)
 {
 mdoc_macro(MACRO_PROT_ARGS)
 {

-       assert(tok < MDOC_MAX);
-
-       /* If we're in the body, deny prologue calls. */
-
-       if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
-                       MDOC_PBODY & m->flags)
-               return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));
-
-       /* If we're in the prologue, deny "body" macros.  */
-
-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
-                       ! (MDOC_PBODY & m->flags)) {
-               if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
-                       return(0);
-               if (NULL == m->meta.title)
-                       m->meta.title = mandoc_strdup("UNKNOWN");
-               if (NULL == m->meta.vol)
-                       m->meta.vol = mandoc_strdup("LOCAL");
-               if (NULL == m->meta.os)
-                       m->meta.os = mandoc_strdup("LOCAL");
-               if (0 == m->meta.date)
-                       m->meta.date = time(NULL);
-               m->flags |= MDOC_PBODY;
-       }
-
-       return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf));
-}
-
-
-static int
-node_append(struct mdoc *mdoc, struct mdoc_node *p)
-{
-
-       assert(mdoc->last);
-       assert(mdoc->first);
-       assert(MDOC_ROOT != p->type);
-
-       switch (mdoc->next) {
-       case (MDOC_NEXT_SIBLING):
-               mdoc->last->next = p;
-               p->prev = mdoc->last;
-               p->parent = mdoc->last->parent;
-               break;
-       case (MDOC_NEXT_CHILD):
-               mdoc->last->child = p;
-               p->parent = mdoc->last;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-
-       p->parent->nchild++;
-
-       if ( ! mdoc_valid_pre(mdoc, p))
-               return(0);
-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);
-
-       switch (p->type) {
-       case (MDOC_HEAD):
-               assert(MDOC_BLOCK == p->parent->type);
-               p->parent->head = p;
-               break;
-       case (MDOC_TAIL):
-               assert(MDOC_BLOCK == p->parent->type);
-               p->parent->tail = p;
-               break;
-       case (MDOC_BODY):
-               if (p->end)
-                       break;
-               assert(MDOC_BLOCK == p->parent->type);
-               p->parent->body = p;
-               break;
-       default:
-               break;
-       }
-
-       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;
+       assert(tok > TOKEN_NONE && tok < MDOC_MAX);
+
+       if (mdoc->flags & MDOC_PBODY) {
+               if (tok == MDOC_Dt) {
+                       mandoc_vmsg(MANDOCERR_DT_LATE,
+                           mdoc->parse, line, ppos,
+                           "Dt %s", buf + *pos);
+                       return;
+               }
+       } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
+               if (mdoc->meta.title == NULL) {
+                       mandoc_vmsg(MANDOCERR_DT_NOTITLE,
+                           mdoc->parse, line, ppos, "%s %s",
+                           mdoc_macronames[tok], buf + *pos);
+                       mdoc->meta.title = mandoc_strdup("UNTITLED");
+               }
+               if (NULL == mdoc->meta.vol)
+                       mdoc->meta.vol = mandoc_strdup("LOCAL");
+               mdoc->flags |= MDOC_PBODY;

        }
        }

-
-       return(1);
+       (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf);

 }
 
 }
 

-
-static struct mdoc_node *
-node_alloc(struct mdoc *m, int line, int pos, 
-               enum mdoct tok, enum mdoc_type type)
-{
-       struct mdoc_node *p;
-
-       p = mandoc_calloc(1, sizeof(struct mdoc_node));
-       p->sec = m->lastsec;
-       p->line = line;
-       p->pos = pos;
-       p->tok = tok;
-       p->type = type;
-
-       /* Flag analysis. */
-
-       if (MDOC_SYNOPSIS & m->flags)
-               p->flags |= MDOC_SYNPRETTY;
-       else
-               p->flags &= ~MDOC_SYNPRETTY;
-       if (MDOC_NEWLINE & m->flags)
-               p->flags |= MDOC_LINE;
-       m->flags &= ~MDOC_NEWLINE;
-
-       return(p);
-}
-
-
-int
-mdoc_tail_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
-{
-       struct mdoc_node *p;
-
-       p = node_alloc(m, line, pos, tok, MDOC_TAIL);
-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_CHILD;
-       return(1);
-}
-
-
-int
-mdoc_head_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
-{
-       struct mdoc_node *p;
-
-       assert(m->first);
-       assert(m->last);
-
-       p = node_alloc(m, line, pos, tok, MDOC_HEAD);
-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_CHILD;
-       return(1);
-}
-
-
-int
-mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
+void
+mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, int tok)

 {
 {

-       struct mdoc_node *p;
+       struct roff_node *p;

 
 

-       p = node_alloc(m, line, pos, tok, MDOC_BODY);
-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_CHILD;
-       return(1);
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_TAIL, tok);
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_CHILD;

 }
 
 }
 

-
-int
-mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok,
-               struct mdoc_node *body, enum mdoc_endbody end)
+struct roff_node *
+mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos, int tok,
+               struct roff_node *body, enum mdoc_endbody end)

 {
 {

-       struct mdoc_node *p;
+       struct roff_node *p;

 
 

-       p = node_alloc(m, line, pos, tok, MDOC_BODY);
-       p->pending = body;
+       body->flags |= MDOC_ENDED;
+       body->parent->flags |= MDOC_ENDED;
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok);
+       p->body = body;
+       p->norm = body->norm;

        p->end = end;
        p->end = end;

-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_SIBLING;
-       return(1);
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_SIBLING;
+       return p;

 }
 
 }
 

-
-int
-mdoc_block_alloc(struct mdoc *m, int line, int pos, 
-               enum mdoct tok, struct mdoc_arg *args)
+struct roff_node *
+mdoc_block_alloc(struct roff_man *mdoc, int line, int pos,
+       int tok, struct mdoc_arg *args)

 {
 {

-       struct mdoc_node *p;
+       struct roff_node *p;

 
 

-       p = node_alloc(m, line, pos, tok, MDOC_BLOCK);
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_BLOCK, tok);

        p->args = args;
        if (p->args)
                (args->refcnt)++;
        p->args = args;
        if (p->args)
                (args->refcnt)++;

-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_CHILD;
-       return(1);
-}

 
 

+       switch (tok) {
+       case MDOC_Bd:
+       case MDOC_Bf:
+       case MDOC_Bl:
+       case MDOC_En:
+       case MDOC_Rs:
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;
+       }
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_CHILD;
+       return p;
+}

 
 

-int
-mdoc_elem_alloc(struct mdoc *m, int line, int pos, 
-               enum mdoct tok, struct mdoc_arg *args)
+void
+mdoc_elem_alloc(struct roff_man *mdoc, int line, int pos,
+       int tok, struct mdoc_arg *args)

 {
 {

-       struct mdoc_node *p;
+       struct roff_node *p;

 
 

-       p = node_alloc(m, line, pos, tok, MDOC_ELEM);
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_ELEM, tok);

        p->args = args;
        if (p->args)
                (args->refcnt)++;
        p->args = args;
        if (p->args)
                (args->refcnt)++;

-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_CHILD;
-       return(1);
-}
-
-
-int
-mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
-{
-       struct mdoc_node *n;
-       size_t            sv, len;
-
-       len = strlen(p);
-
-       n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);
-       n->string = mandoc_malloc(len + 1);
-       sv = strlcpy(n->string, p, len + 1);
-
-       /* Prohibit truncation. */
-       assert(sv < len + 1);
-
-       if ( ! node_append(m, n))
-               return(0);
-
-       m->next = MDOC_NEXT_SIBLING;
-       return(1);
-}
-
-
-static void
-mdoc_node_free(struct mdoc_node *p)
-{
-
-       /*
-        * XXX: if these end up being problematic in terms of memory
-        * management and dereferencing freed blocks, then make them
-        * into reference-counted double-pointers.
-        */
-
-       if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
-               if (p->data.Bd)
-                       free(p->data.Bd);
-       if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
-               if (p->data.Bl)
-                       free(p->data.Bl);
-       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
-               if (p->data.Bf)
-                       free(p->data.Bf);
-
-       if (p->string)
-               free(p->string);
-       if (p->args)
-               mdoc_argv_free(p->args);
-       free(p);
-}
-
-
-static void
-mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
-{
-
-       /* Adjust siblings. */

 
 

-       if (n->prev)
-               n->prev->next = n->next;
-       if (n->next)
-               n->next->prev = n->prev;
-
-       /* Adjust parent. */
-
-       if (n->parent) {
-               n->parent->nchild--;
-               if (n->parent->child == n)
-                       n->parent->child = n->prev ? n->prev : n->next;
-       }
-
-       /* Adjust parse point, if applicable. */
-
-       if (m && m->last == n) {
-               if (n->prev) {
-                       m->last = n->prev;
-                       m->next = MDOC_NEXT_SIBLING;
-               } else {
-                       m->last = n->parent;
-                       m->next = MDOC_NEXT_CHILD;
-               }
+       switch (tok) {
+       case MDOC_An:
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;

        }
        }

-
-       if (m && m->first == n)
-               m->first = NULL;
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_CHILD;

 }
 
 }
 

-

 void
 void

-mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)
+mdoc_node_relink(struct roff_man *mdoc, struct roff_node *p)

 {
 
 {
 

-       while (p->child) {
-               assert(p->nchild);
-               mdoc_node_delete(m, p->child);
-       }
-       assert(0 == p->nchild);
-
-       mdoc_node_unlink(m, p);
-       mdoc_node_free(p);
+       roff_node_unlink(mdoc, p);
+       roff_node_append(mdoc, p);

 }
 
 }
 

-

 /*
  * Parse free-form text, that is, a line that does not begin with the
  * control character.
  */
 static int
 /*
  * Parse free-form text, that is, a line that does not begin with the
  * control character.
  */
 static int

-mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
+mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)

 {
 {

+       struct roff_node *n;

        char             *c, *ws, *end;
        char             *c, *ws, *end;

-       struct mdoc_node *n;

 
 

-       /* Ignore bogus comments. */
-
-       if ('\\' == buf[offs] && 
-                       '.' == buf[offs + 1] && 
-                       '"' == buf[offs + 2])
-               return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
-
-       /* No text before an initial macro. */
-
-       if (SEC_NONE == m->lastnamed)
-               return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));
-
-       assert(m->last);
-       n = m->last;
+       assert(mdoc->last);
+       n = mdoc->last;

 
        /*
         * Divert directly to list processing if we're encountering a
 
        /*
         * Divert directly to list processing if we're encountering a

-        * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry
-        * (a MDOC_BODY means it's already open, in which case we should
+        * columnar ROFFT_BLOCK with or without a prior ROFFT_BLOCK entry
+        * (a ROFFT_BODY means it's already open, in which case we should

         * process within its context in the normal way).
         */
 
         * process within its context in the normal way).
         */
 

-       if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl->type) {
+       if (n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+           n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) {

                /* `Bl' is open without any children. */
                /* `Bl' is open without any children. */

-               m->flags |= MDOC_FREECOL;
-               return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
+               mdoc->flags |= MDOC_FREECOL;
+               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+               return 1;

        }
 
        }
 

-       if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
-                       NULL != n->parent &&
-                       MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl->type) {
+       if (n->tok == MDOC_It && n->type == ROFFT_BLOCK &&
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {

                /* `Bl' has block-level `It' children. */
                /* `Bl' has block-level `It' children. */

-               m->flags |= MDOC_FREECOL;
-               return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
+               mdoc->flags |= MDOC_FREECOL;
+               mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf);
+               return 1;

        }
 
        /*
        }
 
        /*


@@ -651,11 +273,6 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        ws = NULL;
        for (c = end = buf + offs; *c; c++) {
                switch (*c) {
        ws = NULL;
        for (c = end = buf + offs; *c; c++) {
                switch (*c) {

-               case '-':
-                       if (mandoc_hyph(buf + offs, c))
-                               *c = ASCII_HYPH;
-                       ws = NULL;
-                       break;

                case ' ':
                        if (NULL == ws)
                                ws = c;
                case ' ':
                        if (NULL == ws)
                                ws = c;


@@ -672,7 +289,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */
                         * Strip trailing tabs in literal context only;
                         * outside, they affect the next line.
                         */

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

                                continue;
                        break;
                case '\\':
                                continue;
                        break;
                case '\\':


@@ -689,30 +306,28 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        *end = '\0';
 
        if (ws)
        *end = '\0';
 
        if (ws)

-               if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE))
-                       return(0);
+               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                   line, (int)(ws-buf), NULL);

 
 

-       if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) {
-               if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN))
-                       return(0);
+       if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
+               mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
+                   line, (int)(c - buf), NULL);

 
                /*
 
                /*

-                * Insert a `Pp' in the case of a blank line.  Technically,
+                * Insert a `sp' in the case of a blank line.  Technically,

                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */

-               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))
-                       return(0);
-
-               m->next = MDOC_NEXT_SIBLING;
-               return(1);
+               roff_elem_alloc(mdoc, line, offs, MDOC_sp);
+               mdoc->next = ROFF_NEXT_SIBLING;
+               mdoc_valid_post(mdoc);
+               return 1;

        }
 
        }
 

-       if ( ! mdoc_word_alloc(m, line, offs, buf+offs))
-               return(0);
+       roff_word_alloc(mdoc, line, offs, buf+offs);

 
 

-       if (MDOC_LITERAL & m->flags)
-               return(1);
+       if (mdoc->flags & MDOC_LITERAL)
+               return 1;

 
        /*
         * End-of-sentence check.  If the last character is an unescaped
 
        /*
         * End-of-sentence check.  If the last character is an unescaped


@@ -723,130 +338,96 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        assert(buf < end);
 
        if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
        assert(buf < end);
 
        if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))

-               m->last->flags |= MDOC_EOS;
-
-       return(1);
-}
-
-
-static int
-macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s", 
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       /* FIXME: logic should be in driver. */
-       /* FIXME: broken, will error out and not omit a message. */
-       return(MDOC_IGN_MACRO & m->pflags ? rc : 0);
+               mdoc->last->flags |= MDOC_EOS;
+       return 1;

 }
 
 }
 

-

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

-mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
+mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, int offs)

 {
 {

-       enum mdoct        tok;
-       int               i, j, sv;
+       struct roff_node *n;
+       const char       *cp;
+       int               tok;
+       int               i, sv;

        char              mac[5];
        char              mac[5];

-       struct mdoc_node *n;

 
 

-       /* Empty lines are ignored. */
+       sv = offs;

 
 

-       offs++;
+       /*
+        * Copy the first word into a nil-terminated buffer.
+        * Stop when a space, tab, escape, or eoln is encountered.
+        */

 
 

-       if ('\0' == buf[offs])
-               return(1);
+       i = 0;
+       while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)
+               mac[i++] = buf[offs++];

 
 

-       i = offs;
+       mac[i] = '\0';

 
 

-       /* Accept whitespace after the initial control char. */
+       tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE;

 
 

-       if (' ' == buf[i]) {
-               i++;
-               while (buf[i] && ' ' == buf[i])
-                       i++;
-               if ('\0' == buf[i])
-                       return(1);
+       if (tok == TOKEN_NONE) {
+               mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
+                   ln, sv, buf + sv - 1);
+               return 1;

        }
 
        }
 

-       sv = i;
-
-       /* Copy the first word into a nil-terminated buffer. */
-
-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
-
-               /* Check for invalid characters. */
-
-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
+       /* Skip a leading escape sequence or tab. */

 
 

-       mac[j] = '\0';
-
-       if (j == 4 || j < 2) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
-               return(1);
-       } 
-       
-       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
-               return(1);
+       switch (buf[offs]) {
+       case '\\':
+               cp = buf + offs + 1;
+               mandoc_escape(&cp, NULL, NULL);
+               offs = cp - buf;
+               break;
+       case '\t':
+               offs++;
+               break;
+       default:
+               break;

        }
 
        }
 

-       /* The macro is sane.  Jump to the next word. */
+       /* Jump to the next non-whitespace word. */

 
 

-       while (buf[i] && ' ' == buf[i])
-               i++;
+       while (buf[offs] && ' ' == buf[offs])
+               offs++;

 
 

-       /* 
+       /*

         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */
 
         * Trailing whitespace.  Note that tabs are allowed to be passed
         * into the parser as "text", so we only warn about spaces here.
         */
 

-       if ('\0' == buf[i] && ' ' == buf[i - 1])
-               if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-                       goto err;
+       if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                   ln, offs - 1, NULL);

 
        /*
         * If an initial macro or a list invocation, divert directly
         * into macro processing.
         */
 
 
        /*
         * If an initial macro or a list invocation, divert directly
         * into macro processing.
         */
 

-       if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) {
-               if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
-                       goto err;
-               return(1);
+       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
+               mdoc_macro(mdoc, tok, ln, sv, &offs, buf);
+               return 1;

        }
 
        }
 

-       n = m->last;
-       assert(m->last);
+       n = mdoc->last;
+       assert(mdoc->last);

 
        /*
         * If the first macro of a `Bl -column', open an `It' block
         * context around the parsed macro.
         */
 
 
        /*
         * If the first macro of a `Bl -column', open an `It' block
         * context around the parsed macro.
         */
 

-       if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl->type) {
-               m->flags |= MDOC_FREECOL;
-               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
-                       goto err;
-               return(1);
+       if (n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+           n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) {
+               mdoc->flags |= MDOC_FREECOL;
+               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return 1;

        }
 
        /*
        }
 
        /*


@@ -855,27 +436,62 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
         * then open an `It' block context around the parsed macro.
         */
 
         * then open an `It' block context around the parsed macro.
         */
 

-       if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
-                       NULL != n->parent &&
-                       MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl->type) {
-               m->flags |= MDOC_FREECOL;
-               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
-                       goto err;
-               return(1);
+       if (n->tok == MDOC_It && n->type == ROFFT_BLOCK &&
+           NULL != n->parent &&
+           MDOC_Bl == n->parent->tok &&
+           LIST_column == n->parent->norm->Bl.type) {
+               mdoc->flags |= MDOC_FREECOL;
+               mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return 1;

        }
 
        /* Normal processing of a macro. */
 
        }
 
        /* Normal processing of a macro. */
 

-       if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
-               goto err;
+       mdoc_macro(mdoc, tok, ln, sv, &offs, buf);

 
 

-       return(1);
+       /* In quick mode (for mandocdb), abort after the NAME section. */

 
 

-err:   /* Error out. */
+       if (mdoc->quick && MDOC_Sh == tok &&
+           SEC_NAME != mdoc->last->sec)
+               return 2;

 
 

-       m->flags |= MDOC_HALT;
-       return(0);
+       return 1;

 }
 
 }
 

+enum mdelim
+mdoc_isdelim(const char *p)
+{

 
 

+       if ('\0' == p[0])
+               return DELIM_NONE;
+
+       if ('\0' == p[1])
+               switch (p[0]) {
+               case '(':
+               case '[':
+                       return DELIM_OPEN;
+               case '|':
+                       return DELIM_MIDDLE;
+               case '.':
+               case ',':
+               case ';':
+               case ':':
+               case '?':
+               case '!':
+               case ')':
+               case ']':
+                       return DELIM_CLOSE;
+               default:
+                       return DELIM_NONE;
+               }
+
+       if ('\\' != p[0])
+               return DELIM_NONE;
+
+       if (0 == strcmp(p + 1, "."))
+               return DELIM_CLOSE;
+       if (0 == strcmp(p + 1, "fR|\\fP"))
+               return DELIM_MIDDLE;
+
+       return DELIM_NONE;
+}