Cleanup, no functional change:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index e521e27ba4a4a91fd64819bc31a7385a739ea813..9c170e6e4c947e8cc1f709a4a5f2844c012ea9b4 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,22 +1,21 @@
-/*     $Id: mdoc.c,v 1.134 2010/05/16 00:04:46 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.270 2018/12/04 02:53:51 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2012-2018 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>
 


@@ -28,255 +27,29 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

-#include "libmdoc.h"
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "mdoc.h"

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

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

 
 

-const  char *const __mdoc_merrnames[MERRMAX] = {                
-       "trailing whitespace", /* ETAILWS */
-       "unexpected quoted parameter", /* EQUOTPARM */
-       "unterminated quoted parameter", /* EQUOTTERM */
-       "argument parameter suggested", /* EARGVAL */
-       "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 font mode", /* EFONT */
-       "invalid date syntax", /* EBADDATE */
-       "invalid number format", /* ENUMFMT */
-       "superfluous width argument", /* ENOWIDTH */
-       "system: utsname error", /* EUTSNAME */
-       "obsolete macro", /* EOBS */
-       "end-of-line scope violation", /* EIMPBRK */
-       "empty macro ignored", /* EIGNE */
-       "unclosed explicit scope", /* EOPEN */
-       "unterminated quoted phrase", /* EQUOTPHR */
-       "closure macro without prior context", /* ENOCTX */
-       "no description found for library", /* ELIB */
-       "bad child for parent context", /* EBADCHILD */
-       "list arguments preceding type", /* ENOTYPE */
-       "deprecated comment style", /* EBADCOMMENT */
-};
-
-const  char *const __mdoc_macronames[MDOC_MAX] = {              
-       "Ap",           "Dd",           "Dt",           "Os",
-       "Sh",           "Ss",           "Pp",           "D1",
-       "Dl",           "Bd",           "Ed",           "Bl",
-       "El",           "It",           "Ad",           "An",
-       "Ar",           "Cd",           "Cm",           "Dv",
-       "Er",           "Ev",           "Ex",           "Fa",
-       "Fd",           "Fl",           "Fn",           "Ft",
-       "Ic",           "In",           "Li",           "Nd",
-       "Nm",           "Op",           "Ot",           "Pa",
-       "Rv",           "St",           "Va",           "Vt",
-       /* LINTED */
-       "Xr",           "%A",           "%B",           "%D",
-       /* LINTED */
-       "%I",           "%J",           "%N",           "%O",
-       /* LINTED */
-       "%P",           "%R",           "%T",           "%V",
-       "Ac",           "Ao",           "Aq",           "At",
-       "Bc",           "Bf",           "Bo",           "Bq",
-       "Bsx",          "Bx",           "Db",           "Dc",
-       "Do",           "Dq",           "Ec",           "Ef",
-       "Em",           "Eo",           "Fx",           "Ms",
-       "No",           "Ns",           "Nx",           "Ox",
-       "Pc",           "Pf",           "Po",           "Pq",
-       "Qc",           "Ql",           "Qo",           "Qq",
-       "Re",           "Rs",           "Sc",           "So",
-       "Sq",           "Sm",           "Sx",           "Sy",
-       "Tn",           "Ux",           "Xc",           "Xo",
-       "Fo",           "Fc",           "Oo",           "Oc",
-       "Bk",           "Ek",           "Bt",           "Hf",
-       "Fr",           "Ud",           "Lb",           "Lp",
-       "Lk",           "Mt",           "Brq",          "Bro",
-       /* LINTED */
-       "Brc",          "%C",           "Es",           "En",
-       /* LINTED */
-       "Dx",           "%Q",           "br",           "sp",
-       /* LINTED */
-       "%U"
-       };
-
-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_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 *);
-static int               mdoc_pmacro(struct mdoc *, int, char *);
-static int               macrowarn(struct mdoc *, int, const char *);
-
-
-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(void *data, int pflags, const struct mdoc_cb *cb)
-{
-       struct mdoc     *p;
-
-       p = mandoc_calloc(1, sizeof(struct mdoc));
-
-       if (cb)
-               memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
-
-       p->data = data;
-       p->pflags = pflags;
-
-       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);

 
 
 /*
 
 
 /*


@@ -284,418 +57,213 @@ 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)
+mdoc_parseln(struct roff_man *mdoc, int ln, char *buf, int offs)

 {
 
 {
 

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

 
 

-       m->flags |= MDOC_NEWLINE;
-       return(('.' == *buf || '\'' == *buf) ? 
-                       mdoc_pmacro(m, ln, buf) :
-                       mdoc_ptext(m, ln, buf));
-}
-
-
-int
-mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
-               const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       if (NULL == mdoc->cb.mdoc_err)
-               return(0);
-
-       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
-mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       if (NULL == mdoc->cb.mdoc_warn)
-               return(0);
-
-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-
-       return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, buf));
+       /*
+        * Let the roff nS register switch SYNOPSIS mode early,
+        * such that the parser knows at all times
+        * whether this mode is on or off.
+        * Note that this mode is also switched by the Sh macro.
+        */
+       if (roff_getreg(mdoc->roff, "nS"))
+               mdoc->flags |= MDOC_SYNOPSIS;
+       else
+               mdoc->flags &= ~MDOC_SYNOPSIS;
+
+       return roff_getcontrol(mdoc->roff, buf, &offs) ?
+           mdoc_pmacro(mdoc, ln, buf, offs) :
+           mdoc_ptext(mdoc, ln, buf, offs);

 }
 
 }
 

-
-int
-mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type)
+void
+mdoc_tail_alloc(struct roff_man *mdoc, int line, int pos, enum roff_tok tok)

 {
 {

-       const char      *p;
+       struct roff_node *p;

 
 

-       p = __mdoc_merrnames[(int)type];
-       assert(p);
-
-       if (iserr)
-               return(mdoc_verr(m, line, pos, p));
-
-       return(mdoc_vwarn(m, line, pos, p));
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_TAIL, tok);
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_CHILD;

 }
 
 }
 

-
-int
-mdoc_macro(struct mdoc *m, enum mdoct tok, 
-               int ln, int pp, int *pos, char *buf)
+struct roff_node *
+mdoc_endbody_alloc(struct roff_man *mdoc, int line, int pos,
+    enum roff_tok tok, struct roff_node *body)

 {
 {

-       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_perr(m, ln, pp, EPROLBODY));
-
-       /* If we're in the prologue, deny "body" macros.  */
-
-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
-                       ! (MDOC_PBODY & m->flags)) {
-               if ( ! mdoc_pwarn(m, ln, pp, EBODYPROL))
-                       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, ln, pp, pos, buf));
+       struct roff_node *p;
+
+       body->flags |= NODE_ENDED;
+       body->parent->flags |= NODE_ENDED;
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_BODY, tok);
+       p->body = body;
+       p->norm = body->norm;
+       p->end = ENDBODY_SPACE;
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_SIBLING;
+       return p;

 }
 
 }
 

-
-static int
-node_append(struct mdoc *mdoc, struct mdoc_node *p)
+struct roff_node *
+mdoc_block_alloc(struct roff_man *mdoc, int line, int pos,
+    enum roff_tok tok, struct mdoc_arg *args)

 {
 {

+       struct roff_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):
-               assert(MDOC_BLOCK == p->parent->type);
-               p->parent->body = p;
-               break;
-       default:
-               break;
-       }
-
-       mdoc->last = p;
+       p = roff_node_alloc(mdoc, line, pos, ROFFT_BLOCK, tok);
+       p->args = args;
+       if (p->args)
+               (args->refcnt)++;

 
 

-       switch (p->type) {
-       case (MDOC_TEXT):
-               if ( ! mdoc_valid_post(mdoc))
-                       return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
+       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;
        }
                break;
        default:
                break;
        }

-
-       return(1);
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_CHILD;
+       return p;

 }
 
 }
 

-
-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;
-       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)
-{
-       struct mdoc_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);
-}
-
-
-int
-mdoc_block_alloc(struct mdoc *m, int line, int pos, 
-               enum mdoct tok, struct mdoc_arg *args)
-{
-       struct mdoc_node *p;
-
-       p = node_alloc(m, line, pos, tok, MDOC_BLOCK);
-       p->args = args;
-       if (p->args)
-               (args->refcnt)++;
-       if ( ! node_append(m, p))
-               return(0);
-       m->next = MDOC_NEXT_CHILD;
-       return(1);
-}
-
-
-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,
+     enum roff_tok 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);
-}

 
 

-
-void
-mdoc_node_free(struct mdoc_node *p)
-{
-
-       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;
-               }
-       }
-
-       if (m && m->first == n)
-               m->first = NULL;
-}
-
-
-void
-mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)
-{
-
-       while (p->child) {
-               assert(p->nchild);
-               mdoc_node_delete(m, p->child);
+       switch (tok) {
+       case MDOC_An:
+               p->norm = mandoc_calloc(1, sizeof(union mdoc_data));
+               break;
+       default:
+               break;

        }
        }

-       assert(0 == p->nchild);
-
-       mdoc_node_unlink(m, p);
-       mdoc_node_free(p);
+       roff_node_append(mdoc, p);
+       mdoc->next = ROFF_NEXT_CHILD;

 }
 
 }
 

-

 /*
  * 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)
+mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs)

 {
 {

-       int              i;
-
-       /* Ignore bogus comments. */
+       struct roff_node *n;
+       const char       *cp, *sp;
+       char             *c, *ws, *end;

 
 

-       if ('\\' == buf[0] && '.' == buf[1] && '\"' == buf[2])
-               return(mdoc_pwarn(m, line, 0, EBADCOMMENT));
+       n = mdoc->last;

 
 

-       /* No text before an initial macro. */
-
-       if (SEC_NONE == m->lastnamed)
-               return(mdoc_perr(m, line, 0, ETEXTPROL));
-
-       /* Literal just gets pulled in as-is. */
-       
-       if (MDOC_LITERAL & m->flags)
-               return(mdoc_word_alloc(m, line, 0, buf));
-
-       /* Check for a blank line, which may also consist of spaces. */
-
-       for (i = 0; ' ' == buf[i]; i++)
-               /* Skip to first non-space. */ ;
-
-       if ('\0' == buf[i]) {
-               if ( ! mdoc_pwarn(m, line, 0, ENOBLANK))
-                       return(0);
-
-               /*
-                * Insert a `Pp' 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.
-                */
-               if ( ! mdoc_elem_alloc(m, line, 0, MDOC_Pp, NULL))
-                       return(0);
+       /*
+        * If a column list contains plain text, assume an implicit item
+        * macro.  This can happen one or more times at the beginning
+        * of such a list, intermixed with non-It mdoc macros and with
+        * nodes generated on the roff level, for example by tbl.
+        */

 
 

-               m->next = MDOC_NEXT_SIBLING;
-               return(1);
+       if ((n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+            n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) ||
+           (n->parent != NULL && n->parent->tok == MDOC_Bl &&
+            n->parent->norm->Bl.type == LIST_column)) {
+               mdoc->flags |= MDOC_FREECOL;
+               (*mdoc_macro(MDOC_It)->fp)(mdoc, MDOC_It,
+                   line, offs, &offs, buf);
+               return 1;

        }
 
        }
 

-       /* 
-        * Warn if the last un-escaped character is whitespace. Then
-        * strip away the remaining spaces (tabs stay!).   
+       /*
+        * Search for the beginning of unescaped trailing whitespace (ws)
+        * and for the first character not to be output (end).

         */
 
         */
 

-       i = (int)strlen(buf);
-       assert(i);
-
-       if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
-               if (i > 1 && '\\' != buf[i - 2])
-                       if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
-                               return(0);
+       /* FIXME: replace with strcspn(). */
+       ws = NULL;
+       for (c = end = buf + offs; *c; c++) {
+               switch (*c) {
+               case ' ':
+                       if (NULL == ws)
+                               ws = c;
+                       continue;
+               case '\t':
+                       /*
+                        * Always warn about trailing tabs,
+                        * even outside literal context,
+                        * where they should be put on the next line.
+                        */
+                       if (NULL == ws)
+                               ws = c;
+                       /*
+                        * Strip trailing tabs in literal context only;
+                        * outside, they affect the next line.
+                        */
+                       if (MDOC_LITERAL & mdoc->flags)
+                               continue;
+                       break;
+               case '\\':
+                       /* Skip the escaped character, too, if any. */
+                       if (c[1])
+                               c++;
+                       /* FALLTHROUGH */
+               default:
+                       ws = NULL;
+                       break;
+               }
+               end = c + 1;
+       }
+       *end = '\0';

 
 

-               for (--i; i && ' ' == buf[i]; i--)
-                       /* Spin back to non-space. */ ;
+       if (ws)
+               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                   line, (int)(ws-buf), NULL);

 
 

-               /* Jump ahead of escaped whitespace. */
-               i += '\\' == buf[i] ? 2 : 1;
+       /*
+        * Blank lines are allowed in no-fill mode
+        * and cancel preceding \c,
+        * but add a single vertical space elsewhere.
+        */

 
 

-               buf[i] = '\0';
+       if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) {
+               switch (mdoc->last->type) {
+               case ROFFT_TEXT:
+                       sp = mdoc->last->string;
+                       cp = end = strchr(sp, '\0') - 2;
+                       if (cp < sp || cp[0] != '\\' || cp[1] != 'c')
+                               break;
+                       while (cp > sp && cp[-1] == '\\')
+                               cp--;
+                       if ((end - cp) % 2)
+                               break;
+                       *end = '\0';
+                       return 1;
+               default:
+                       break;
+               }
+               mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse,
+                   line, (int)(c - buf), NULL);
+               roff_elem_alloc(mdoc, line, offs, ROFF_sp);
+               mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+               mdoc->next = ROFF_NEXT_SIBLING;
+               return 1;

        }
 
        }
 

-       /* Allocate the whole word. */
+       roff_word_alloc(mdoc, line, offs, buf+offs);

 
 

-       if ( ! mdoc_word_alloc(m, line, 0, buf))
-               return(0);
+       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


@@ -703,114 +271,174 @@ mdoc_ptext(struct mdoc *m, int line, char *buf)
         * sentence.  The front-end will know how to interpret this.
         */
 
         * sentence.  The front-end will know how to interpret this.
         */
 

-       /* FIXME: chain of close delims. */
-
-       assert(i);
+       assert(buf < end);

 
 

-       if (mandoc_eos(buf, (size_t)i))
-               m->last->flags |= MDOC_EOS;
-
-       return(1);
-}
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+               mdoc->last->flags |= NODE_EOS;

 
 

+       for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) {
+               if (c - buf < offs + 2)
+                       continue;
+               if (end - c < 3)
+                       break;
+               if (c[1] != ' ' ||
+                   isalnum((unsigned char)c[-2]) == 0 ||
+                   isalnum((unsigned char)c[-1]) == 0 ||
+                   (c[-2] == 'n' && c[-1] == 'c') ||
+                   (c[-2] == 'v' && c[-1] == 's'))
+                       continue;
+               c += 2;
+               if (*c == ' ')
+                       c++;
+               if (*c == ' ')
+                       c++;
+               if (isupper((unsigned char)(*c)))
+                       mandoc_msg(MANDOCERR_EOS, mdoc->parse,
+                           line, (int)(c - buf), NULL);
+       }

 
 

-static int
-macrowarn(struct mdoc *m, int ln, const char *buf)
-{
-       if ( ! (MDOC_IGN_MACRO & m->pflags))
-               return(mdoc_verr(m, ln, 0, "unknown macro: %s%s", 
-                               buf, strlen(buf) > 3 ? "..." : ""));
-       return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s",
-                               buf, strlen(buf) > 3 ? "..." : ""));
+       return 1;

 }
 
 }
 

-

 /*
  * 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.
  */

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

 {
 {

-       enum mdoct      tok;
-       int             i, j, sv;
-       char            mac[5];
+       struct roff_node *n;
+       const char       *cp;
+       size_t            sz;
+       enum roff_tok     tok;
+       int               sv;
+
+       /* Determine the line macro. */
+
+       sv = offs;
+       tok = TOKEN_NONE;
+       for (sz = 0; sz < 4 && strchr(" \t\\", buf[offs]) == NULL; sz++)
+               offs++;
+       if (sz == 2 || sz == 3)
+               tok = roffhash_find(mdoc->mdocmac, buf + sv, sz);
+       if (tok == TOKEN_NONE) {
+               mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
+                   ln, sv, buf + sv - 1);
+               return 1;
+       }

 
 

-       /* Empty lines are ignored. */
+       /* Skip a leading escape sequence or tab. */

 
 

-       if ('\0' == buf[1])
-               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;
+       }

 
 

-       i = 1;
+       /* Jump to the next non-whitespace word. */

 
 

-       /* Accept whitespace after the initial control char. */
+       while (buf[offs] == ' ')
+               offs++;

 
 

-       if (' ' == buf[i]) {
-               i++;
-               while (buf[i] && ' ' == buf[i])
-                       i++;
-               if ('\0' == buf[i])
-                       return(1);
-       }
+       /*
+        * Trailing whitespace.  Note that tabs are allowed to be passed
+        * into the parser as "text", so we only warn about spaces here.
+        */

 
 

-       sv = i;
+       if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+               mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse,
+                   ln, offs - 1, NULL);

 
 

-       /* Copy the first word into a nil-terminated buffer. */
+       /*
+        * If an initial macro or a list invocation, divert directly
+        * into macro processing.
+        */

 
 

-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
+       n = mdoc->last;
+       if (n == NULL || tok == MDOC_It || tok == MDOC_El) {
+               (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);
+               return 1;
+       }

 
 

-               /* Check for invalid characters. */
+       /*
+        * If a column list contains a non-It macro, assume an implicit
+        * item macro.  This can happen one or more times at the
+        * beginning of such a list, intermixed with text lines and
+        * with nodes generated on the roff level, for example by tbl.
+        */

 
 

-               if (isgraph((u_char)buf[i]))
-                       continue;
-               return(mdoc_perr(m, ln, i, EPRINT));
+       if ((n->tok == MDOC_Bl && n->type == ROFFT_BODY &&
+            n->end == ENDBODY_NOT && n->norm->Bl.type == LIST_column) ||
+           (n->parent != NULL && n->parent->tok == MDOC_Bl &&
+            n->parent->norm->Bl.type == LIST_column)) {
+               mdoc->flags |= MDOC_FREECOL;
+               (*mdoc_macro(MDOC_It)->fp)(mdoc, MDOC_It, ln, sv, &sv, buf);
+               return 1;

        }
 
        }
 

-       mac[j] = 0;
-
-       if (j == 4 || j < 2) {
-               if ( ! macrowarn(m, ln, mac))
-                       goto err;
-               return(1);
-       } 
-       
-       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac))
-                       goto err;
-               return(1);
-       }
+       /* Normal processing of a macro. */

 
 

-       /* The macro is sane.  Jump to the next word. */
+       (*mdoc_macro(tok)->fp)(mdoc, tok, ln, sv, &offs, buf);

 
 

-       while (buf[i] && ' ' == buf[i])
-               i++;
+       /* In quick mode (for mandocdb), abort after the NAME section. */

 
 

-       /* 
-        * Trailing whitespace.  Note that tabs are allowed to be passed
-        * into the parser as "text", so we only warn about spaces here.
-        */
+       if (mdoc->quick && MDOC_Sh == tok &&
+           SEC_NAME != mdoc->last->sec)
+               return 2;

 
 

-       if ('\0' == buf[i] && ' ' == buf[i - 1])
-               if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS))
-                       goto err;
+       return 1;
+}

 
 

-       /* 
-        * Begin recursive parse sequence.  Since we're at the start of
-        * the line, we don't need to do callable/parseable checks.
-        */
-       if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
-               goto err;
+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;
+               }

 
 

-       return(1);
+       if ('\\' != p[0])
+               return DELIM_NONE;

 
 

-err:   /* Error out. */
+       if (0 == strcmp(p + 1, "."))
+               return DELIM_CLOSE;
+       if (0 == strcmp(p + 1, "fR|\\fP"))
+               return DELIM_MIDDLE;

 
 

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

 }
 
 }
 

+void
+mdoc_validate(struct roff_man *mdoc)
+{

 
 

+       mdoc->last = mdoc->first;
+       mdoc_node_validate(mdoc);
+       mdoc_state_reset(mdoc);
+}