Back out lorder, which doesn't seem necessary (?). I think this means all

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 1cc0811a6134d4e30b7a70d84a0665f581364745..61f2a5eb1ec672c34b561690e661c063dc40fd65 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,6 @@
-/*     $Id: man.c,v 1.45 2009/10/30 05:58:37 kristaps Exp $ */
+/*     $Id: man.c,v 1.114 2011/11/16 22:39:05 joerg Exp $ */

 /*
 /*

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

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


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

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

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

-#include <ctype.h>

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

+#include "man.h"
+#include "mandoc.h"

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

-const  char *const __man_merrnames[WERRMAX] = {                 
-       "invalid character", /* WNPRINT */
-       "invalid manual section", /* WMSEC */
-       "invalid date format", /* WDATE */
-       "scope of prior line violated", /* WLNSCOPE */
-       "trailing whitespace", /* WTSPACE */
-       "unterminated quoted parameter", /* WTQUOTE */
-       "document has no body", /* WNODATA */
-       "document has no title/section", /* WNOTITLE */
-       "invalid escape sequence", /* WESCAPE */
-       "invalid number format", /* WNUMFMT */
-       "expected block head arguments", /* WHEADARGS */
-       "expected block body arguments", /* WBODYARGS */
-       "expected empty block head", /* WNHEADARGS */
-       "ill-formed macro", /* WMACROFORM */
-       "scope open on exit", /* WEXITSCOPE */
-       "no scope context", /* WNOSCOPE */
-       "literal context already open", /* WOLITERAL */
-       "no literal context open" /* WNLITERAL */
-};
-

 const  char *const __man_macronames[MAN_MAX] = {                
        "br",           "TH",           "SH",           "SS",
        "TP",           "LP",           "PP",           "P",
        "IP",           "HP",           "SM",           "SB",
        "BI",           "IB",           "BR",           "RB",
        "R",            "B",            "I",            "IR",
 const  char *const __man_macronames[MAN_MAX] = {                
        "br",           "TH",           "SH",           "SS",
        "TP",           "LP",           "PP",           "P",
        "IP",           "HP",           "SM",           "SB",
        "BI",           "IB",           "BR",           "RB",
        "R",            "B",            "I",            "IR",

-       "RI",           "na",           "i",            "sp",
-       "nf",           "fi",           "r",            "RE",
-       "RS",           "DT",           "UC",           "PD"
+       "RI",           "na",           "sp",           "nf",
+       "fi",           "RE",           "RS",           "DT",
+       "UC",           "PD",           "AT",           "in",
+       "ft"

        };
 
 const  char * const *man_macronames = __man_macronames;
 
        };
 
 const  char * const *man_macronames = __man_macronames;
 

-static struct man_node *man_node_alloc(int, int, 
-                               enum man_type, int);
+static struct man_node *man_node_alloc(struct man *, int, int, 
+                               enum man_type, enum mant);

 static int              man_node_append(struct man *, 
                                struct man_node *);
 static int              man_node_append(struct man *, 
                                struct man_node *);

-static int              man_ptext(struct man *, int, char *);
-static int              man_pmacro(struct man *, int, char *);
+static void             man_node_free(struct man_node *);
+static void             man_node_unlink(struct man *, 
+                               struct man_node *);
+static int              man_ptext(struct man *, int, char *, int);
+static int              man_pmacro(struct man *, int, char *, int);

 static void             man_free1(struct man *);
 static void             man_alloc1(struct man *);
 static void             man_free1(struct man *);
 static void             man_alloc1(struct man *);

-static int              pstring(struct man *, int, int, 
-                               const char *, size_t);
-static int              macrowarn(struct man *, int, const char *);
-
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-#endif
+static int              man_descope(struct man *, int, int);

 
 
 const struct man_node *
 man_node(const struct man *m)
 {
 
 
 
 const struct man_node *
 man_node(const struct man *m)
 {
 

-       return(MAN_HALT & m->flags ? NULL : m->first);
+       assert( ! (MAN_HALT & m->flags));
+       return(m->first);

 }
 
 
 }
 
 


@@ -89,7 +72,8 @@ const struct man_meta *
 man_meta(const struct man *m)
 {
 
 man_meta(const struct man *m)
 {
 

-       return(MAN_HALT & m->flags ? NULL : &m->meta);
+       assert( ! (MAN_HALT & m->flags));
+       return(&m->meta);

 }
 
 
 }
 
 


@@ -112,18 +96,15 @@ man_free(struct man *man)
 
 
 struct man *
 
 
 struct man *

-man_alloc(void *data, int pflags, const struct man_cb *cb)
+man_alloc(struct roff *roff, struct mparse *parse)

 {
        struct man      *p;
 
        p = mandoc_calloc(1, sizeof(struct man));
 
 {
        struct man      *p;
 
        p = mandoc_calloc(1, sizeof(struct man));
 

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

        man_hash_init();
        man_hash_init();

-       p->data = data;
-       p->pflags = pflags;
+       p->parse = parse;
+       p->roff = roff;

 
        man_alloc1(p);
        return(p);
 
        man_alloc1(p);
        return(p);


@@ -134,9 +115,8 @@ int
 man_endparse(struct man *m)
 {
 
 man_endparse(struct man *m)
 {
 

-       if (MAN_HALT & m->flags)
-               return(0);
-       else if (man_macroend(m))
+       assert( ! (MAN_HALT & m->flags));
+       if (man_macroend(m))

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


@@ -144,12 +124,16 @@ man_endparse(struct man *m)
 
 
 int
 
 
 int

-man_parseln(struct man *m, int ln, char *buf)
+man_parseln(struct man *m, int ln, char *buf, int offs)

 {
 
 {
 

-       return('.' == *buf ? 
-                       man_pmacro(m, ln, buf) : 
-                       man_ptext(m, ln, buf));
+       m->flags |= MAN_NEWLINE;
+
+       assert( ! (MAN_HALT & m->flags));
+
+       return (mandoc_getcontrol(buf, &offs) ?
+                       man_pmacro(m, ln, buf, offs) : 
+                       man_ptext(m, ln, buf, offs));

 }
 
 
 }
 
 


@@ -158,13 +142,17 @@ man_free1(struct man *man)
 {
 
        if (man->first)
 {
 
        if (man->first)

-               man_node_freelist(man->first);
+               man_node_delete(man, man->first);

        if (man->meta.title)
                free(man->meta.title);
        if (man->meta.source)
                free(man->meta.source);
        if (man->meta.title)
                free(man->meta.title);
        if (man->meta.source)
                free(man->meta.source);

+       if (man->meta.date)
+               free(man->meta.date);

        if (man->meta.vol)
                free(man->meta.vol);
        if (man->meta.vol)
                free(man->meta.vol);

+       if (man->meta.msec)
+               free(man->meta.msec);

 }
 
 
 }
 
 


@@ -177,6 +165,7 @@ man_alloc1(struct man *m)
        m->last = mandoc_calloc(1, sizeof(struct man_node));
        m->first = m->last;
        m->last->type = MAN_ROOT;
        m->last = mandoc_calloc(1, sizeof(struct man_node));
        m->first = m->last;
        m->last->type = MAN_ROOT;

+       m->last->tok = MAN_MAX;

        m->next = MAN_NEXT_CHILD;
 }
 
        m->next = MAN_NEXT_CHILD;
 }
 


@@ -204,6 +193,7 @@ man_node_append(struct man *man, struct man_node *p)
                /* NOTREACHED */
        }
        
                /* NOTREACHED */
        }
        

+       assert(p->parent);

        p->parent->nchild++;
 
        if ( ! man_valid_pre(man, p))
        p->parent->nchild++;
 
        if ( ! man_valid_pre(man, p))


@@ -214,6 +204,10 @@ man_node_append(struct man *man, struct man_node *p)
                assert(MAN_BLOCK == p->parent->type);
                p->parent->head = p;
                break;
                assert(MAN_BLOCK == p->parent->type);
                p->parent->head = p;
                break;

+       case (MAN_TAIL):
+               assert(MAN_BLOCK == p->parent->type);
+               p->parent->tail = p;
+               break;

        case (MAN_BODY):
                assert(MAN_BLOCK == p->parent->type);
                p->parent->body = p;
        case (MAN_BODY):
                assert(MAN_BLOCK == p->parent->type);
                p->parent->body = p;


@@ -225,11 +219,11 @@ man_node_append(struct man *man, struct man_node *p)
        man->last = p;
 
        switch (p->type) {
        man->last = p;
 
        switch (p->type) {

+       case (MAN_TBL):
+               /* FALLTHROUGH */

        case (MAN_TEXT):
                if ( ! man_valid_post(man))
                        return(0);
        case (MAN_TEXT):
                if ( ! man_valid_post(man))
                        return(0);

-               if ( ! man_action_post(man))
-                       return(0);

                break;
        default:
                break;
                break;
        default:
                break;


@@ -240,7 +234,8 @@ man_node_append(struct man *man, struct man_node *p)
 
 
 static struct man_node *
 
 
 static struct man_node *

-man_node_alloc(int line, int pos, enum man_type type, int tok)
+man_node_alloc(struct man *m, int line, int pos, 
+               enum man_type type, enum mant tok)

 {
        struct man_node *p;
 
 {
        struct man_node *p;
 


@@ -249,16 +244,20 @@ man_node_alloc(int line, int pos, enum man_type type, int tok)
        p->pos = pos;
        p->type = type;
        p->tok = tok;
        p->pos = pos;
        p->type = type;
        p->tok = tok;

+
+       if (MAN_NEWLINE & m->flags)
+               p->flags |= MAN_LINE;
+       m->flags &= ~MAN_NEWLINE;

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

-man_elem_alloc(struct man *m, int line, int pos, int tok)
+man_elem_alloc(struct man *m, int line, int pos, enum mant tok)

 {
        struct man_node *p;
 
 {
        struct man_node *p;
 

-       p = man_node_alloc(line, pos, MAN_ELEM, tok);
+       p = man_node_alloc(m, line, pos, MAN_ELEM, tok);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -267,11 +266,11 @@ man_elem_alloc(struct man *m, int line, int pos, int tok)
 
 
 int
 
 
 int

-man_head_alloc(struct man *m, int line, int pos, int tok)
+man_tail_alloc(struct man *m, int line, int pos, enum mant tok)

 {
        struct man_node *p;
 
 {
        struct man_node *p;
 

-       p = man_node_alloc(line, pos, MAN_HEAD, tok);
+       p = man_node_alloc(m, line, pos, MAN_TAIL, tok);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -280,11 +279,11 @@ man_head_alloc(struct man *m, int line, int pos, int tok)
 
 
 int
 
 
 int

-man_body_alloc(struct man *m, int line, int pos, int tok)
+man_head_alloc(struct man *m, int line, int pos, enum mant tok)

 {
        struct man_node *p;
 
 {
        struct man_node *p;
 

-       p = man_node_alloc(line, pos, MAN_BODY, tok);
+       p = man_node_alloc(m, line, pos, MAN_HEAD, tok);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -293,11 +292,11 @@ man_body_alloc(struct man *m, int line, int pos, int tok)
 
 
 int
 
 
 int

-man_block_alloc(struct man *m, int line, int pos, int tok)
+man_body_alloc(struct man *m, int line, int pos, enum mant tok)

 {
        struct man_node *p;
 
 {
        struct man_node *p;
 

-       p = man_node_alloc(line, pos, MAN_BLOCK, tok);
+       p = man_node_alloc(m, line, pos, MAN_BODY, tok);

        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;
        if ( ! man_node_append(m, p))
                return(0);
        m->next = MAN_NEXT_CHILD;


@@ -305,110 +304,96 @@ man_block_alloc(struct man *m, int line, int pos, int tok)
 }
 
 
 }
 
 

-static int
-pstring(struct man *m, int line, int pos, 
-               const char *p, size_t len)
+int
+man_block_alloc(struct man *m, int line, int pos, enum mant tok)

 {
 {

-       struct man_node *n;
-       size_t           sv;
-
-       n = man_node_alloc(line, pos, MAN_TEXT, -1);
-       n->string = mandoc_malloc(len + 1);
-       sv = strlcpy(n->string, p, len + 1);
-
-       /* Prohibit truncation. */
-       assert(sv < len + 1);
+       struct man_node *p;

 
 

-       if ( ! man_node_append(m, n))
+       p = man_node_alloc(m, line, pos, MAN_BLOCK, tok);
+       if ( ! man_node_append(m, p))

                return(0);
                return(0);

-       m->next = MAN_NEXT_SIBLING;
+       m->next = MAN_NEXT_CHILD;

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

-

 int
 man_word_alloc(struct man *m, int line, int pos, const char *word)
 {
 int
 man_word_alloc(struct man *m, int line, int pos, const char *word)
 {

+       struct man_node *n;
+
+       n = man_node_alloc(m, line, pos, MAN_TEXT, MAN_MAX);
+       n->string = roff_strdup(m->roff, word);

 
 

-       return(pstring(m, line, pos, word, strlen(word)));
+       if ( ! man_node_append(m, n))
+               return(0);
+
+       m->next = MAN_NEXT_SIBLING;
+       return(1);

 }
 
 
 }
 
 

-void
+/*
+ * Free all of the resources held by a node.  This does NOT unlink a
+ * node from its context; for that, see man_node_unlink().
+ */
+static void

 man_node_free(struct man_node *p)
 {
 
        if (p->string)
                free(p->string);
 man_node_free(struct man_node *p)
 {
 
        if (p->string)
                free(p->string);

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

        free(p);
 }
 
 
 void
        free(p);
 }
 
 
 void

-man_node_freelist(struct man_node *p)
+man_node_delete(struct man *m, struct man_node *p)

 {
 {

-       struct man_node *n;

 
 

-       if (p->child)
-               man_node_freelist(p->child);
-       assert(0 == p->nchild);
-       n = p->next;
+       while (p->child)
+               man_node_delete(m, p->child);
+
+       man_node_unlink(m, p);

        man_node_free(p);
        man_node_free(p);

-       if (n)
-               man_node_freelist(n);

 }
 
 }
 

-
-static int
-man_ptext(struct man *m, int line, char *buf)
+int
+man_addeqn(struct man *m, const struct eqn *ep)

 {
 {

-       int              i, j;
-
-       /* Literal free-form text whitespace is preserved. */
+       struct man_node *n;

 
 

-       if (MAN_LITERAL & m->flags) {
-               if ( ! man_word_alloc(m, line, 0, buf))
-                       return(0);
-               goto descope;
-       }
+       assert( ! (MAN_HALT & m->flags));

 
 

-       /* First de-chunk and allocate words. */
+       n = man_node_alloc(m, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
+       n->eqn = ep;

 
 

-       for (i = 0; ' ' == buf[i]; i++)
-               /* Skip leading whitespace. */ ;
-       if (0 == buf[i]) {
-               if ( ! pstring(m, line, 0, &buf[i], 0))
-                       return(0);
-               goto descope;
-       }
-
-       for (j = i; buf[i]; i++) {
-               if (' ' != buf[i])
-                       continue;
+       if ( ! man_node_append(m, n))
+               return(0);

 
 

-               /* Escaped whitespace. */
-               if (i && ' ' == buf[i] && '\\' == buf[i - 1])
-                       continue;
+       m->next = MAN_NEXT_SIBLING;
+       return(man_descope(m, ep->ln, ep->pos));
+}

 
 

-               buf[i++] = 0;
-               if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
-                       return(0);
+int
+man_addspan(struct man *m, const struct tbl_span *sp)
+{
+       struct man_node *n;

 
 

-               for ( ; ' ' == buf[i]; i++)
-                       /* Skip trailing whitespace. */ ;
+       assert( ! (MAN_HALT & m->flags));

 
 

-               j = i;
-               if (0 == buf[i])
-                       break;
-       }
+       n = man_node_alloc(m, sp->line, 0, MAN_TBL, MAN_MAX);
+       n->span = sp;

 
 

-       if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+       if ( ! man_node_append(m, n))

                return(0);
 
                return(0);
 

-descope:
+       m->next = MAN_NEXT_SIBLING;
+       return(man_descope(m, sp->line, 0));
+}

 
 

+static int
+man_descope(struct man *m, int line, int offs)
+{

        /*
         * Co-ordinate what happens with having a next-line scope open:
         * first close out the element scope (if applicable), then close
        /*
         * Co-ordinate what happens with having a next-line scope open:
         * first close out the element scope (if applicable), then close


@@ -417,7 +402,7 @@ descope:
 
        if (MAN_ELINE & m->flags) {
                m->flags &= ~MAN_ELINE;
 
        if (MAN_ELINE & m->flags) {
                m->flags &= ~MAN_ELINE;

-               if ( ! man_unscope(m, m->last->parent))
+               if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))

                        return(0);
        }
 
                        return(0);
        }
 


@@ -425,124 +410,212 @@ descope:
                return(1);
        m->flags &= ~MAN_BLINE;
 
                return(1);
        m->flags &= ~MAN_BLINE;
 

-       if ( ! man_unscope(m, m->last->parent))
+       if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))

                return(0);
                return(0);

-       return(man_body_alloc(m, line, 0, m->last->tok));
+       return(man_body_alloc(m, line, offs, m->last->tok));

 }
 
 }
 

-

 static int
 static int

-macrowarn(struct man *m, int ln, const char *buf)
+man_ptext(struct man *m, int line, char *buf, int offs)

 {
 {

-       if ( ! (MAN_IGN_MACRO & m->pflags))
-               return(man_verr(m, ln, 0, 
-                               "unknown macro: %s%s", 
-                               buf, strlen(buf) > 3 ? "..." : ""));
-       return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
-                               buf, strlen(buf) > 3 ? "..." : ""));
-}
-
+       int              i;

 
 

-int
-man_pmacro(struct man *m, int ln, char *buf)
-{
-       int              i, j, c, ppos, fl;
-       char             mac[5];
-       struct man_node *n;
-
-       /* Comments and empties are quickly ignored. */
+       /* Literal free-form text whitespace is preserved. */

 
 

-       fl = m->flags;
+       if (MAN_LITERAL & m->flags) {
+               if ( ! man_word_alloc(m, line, offs, buf + offs))
+                       return(0);
+               return(man_descope(m, line, offs));
+       }

 
 

-       if (0 == buf[1])
-               goto out;
+       /* Pump blank lines directly into the backend. */

 
 

-       i = 1;
+       for (i = offs; ' ' == buf[i]; i++)
+               /* Skip leading whitespace. */ ;

 
 

-       if (' ' == buf[i]) {
-               i++;
-               while (buf[i] && ' ' == buf[i])
-                       i++;
-               if (0 == buf[i])
-                       goto out;
+       if ('\0' == buf[i]) {
+               /* Allocate a blank entry. */
+               if ( ! man_word_alloc(m, line, offs, ""))
+                       return(0);
+               return(man_descope(m, line, offs));

        }
 
        }
 

-       ppos = i;
+       /* 
+        * Warn if the last un-escaped character is whitespace. Then
+        * strip away the remaining spaces (tabs stay!).   
+        */
+
+       i = (int)strlen(buf);
+       assert(i);

 
 

-       /* Copy the first word into a nil-terminated buffer. */
+       if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+               if (i > 1 && '\\' != buf[i - 2])
+                       man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE);

 
 

-       for (j = 0; j < 4; j++, i++) {
-               if (0 == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
+               for (--i; i && ' ' == buf[i]; i--)
+                       /* Spin back to non-space. */ ;

 
 

-               /* Check for invalid characters. */
+               /* Jump ahead of escaped whitespace. */
+               i += '\\' == buf[i] ? 2 : 1;

 
 

-               if (isgraph((u_char)buf[i]))
-                       continue;
-               return(man_perr(m, ln, i, WNPRINT));
+               buf[i] = '\0';

        }
 
        }
 

-       mac[j] = 0;
+       if ( ! man_word_alloc(m, line, offs, buf + offs))
+               return(0);
+
+       /*
+        * End-of-sentence check.  If the last character is an unescaped
+        * EOS character, then flag the node as being the end of a
+        * sentence.  The front-end will know how to interpret this.
+        */
+
+       assert(i);
+       if (mandoc_eos(buf, (size_t)i, 0))
+               m->last->flags |= MAN_EOS;

 
 

-       if (j == 4 || j < 1) {
-               if ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_perr(m, ln, ppos, WMACROFORM);
-                       goto err;
-               } 
-               if ( ! man_pwarn(m, ln, ppos, WMACROFORM))
-                       goto err;
+       return(man_descope(m, line, offs));
+}
+
+static int
+man_pmacro(struct man *m, int ln, char *buf, int offs)
+{
+       int              i, ppos;
+       enum mant        tok;
+       char             mac[5];
+       struct man_node *n;
+
+       if ('"' == buf[offs]) {
+               man_pmsg(m, ln, offs, MANDOCERR_BADCOMMENT);

                return(1);
                return(1);

-       }
-       
-       if (MAN_MAX == (c = man_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac))
-                       goto err;
+       } else if ('\0' == buf[offs])
+               return(1);
+
+       ppos = offs;
+
+       /*
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */
+
+       i = 0;
+       while (i < 4 && '\0' != buf[offs] && 
+                       ' ' != buf[offs] && '\t' != buf[offs])
+               mac[i++] = buf[offs++];
+
+       mac[i] = '\0';
+
+       tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
+
+       if (MAN_MAX == tok) {
+               mandoc_vmsg(MANDOCERR_MACRO, m->parse, ln, 
+                               ppos, "%s", buf + ppos - 1);

                return(1);
        }
 
        /* The macro is sane.  Jump to the next word. */
 
                return(1);
        }
 
        /* The macro is sane.  Jump to the next word. */
 

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

 
 

-       /* Remove prior ELINE macro, if applicable. */
+       /* 
+        * 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[offs] && ' ' == buf[offs - 1])
+               man_pmsg(m, ln, offs - 1, MANDOCERR_EOLNSPACE);
+
+       /* 
+        * Remove prior ELINE macro, as it's being clobbered by a new
+        * macro.  Note that NSCOPED macros do not close out ELINE
+        * macros---they don't print text---so we let those slip by.
+        */

 
 

-       if (m->flags & MAN_ELINE) {
+       if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
+                       m->flags & MAN_ELINE) {

                n = m->last;
                n = m->last;

-               assert(NULL == n->child);
-               assert(0 == n->nchild);
-               if ( ! man_nwarn(m, n, WLNSCOPE))
-                       return(0);
+               assert(MAN_TEXT != n->type);

 
 

-               if (n->prev) {
-                       assert(n != n->parent->child);
-                       assert(n == n->prev->next);
-                       n->prev->next = NULL;
-                       m->last = n->prev;
-                       m->next = MAN_NEXT_SIBLING;
-               } else {
-                       assert(n == n->parent->child);
-                       n->parent->child = NULL;
-                       m->last = n->parent;
-                       m->next = MAN_NEXT_CHILD;
-               }
+               /* Remove repeated NSCOPED macros causing ELINE. */
+
+               if (MAN_NSCOPED & man_macros[n->tok].flags)
+                       n = n->parent;
+
+               mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, 
+                   n->pos, "%s breaks %s", man_macronames[tok],
+                   man_macronames[n->tok]);

 
 

-               man_node_free(n);
+               man_node_delete(m, n);

                m->flags &= ~MAN_ELINE;
        }
 
                m->flags &= ~MAN_ELINE;
        }
 

-       /* Begin recursive parse sequence. */
+       /*
+        * Remove prior BLINE macro that is being clobbered.
+        */
+       if ((m->flags & MAN_BLINE) &&
+           (MAN_BSCOPE & man_macros[tok].flags)) {
+               n = m->last;
+
+               /* Might be a text node like 8 in
+                * .TP 8
+                * .SH foo
+                */
+               if (MAN_TEXT == n->type)
+                       n = n->parent;
+
+               /* Remove element that didn't end BLINE, if any. */
+               if ( ! (MAN_BSCOPE & man_macros[n->tok].flags))
+                       n = n->parent;
+
+               assert(MAN_HEAD == n->type);
+               n = n->parent;
+               assert(MAN_BLOCK == n->type);
+               assert(MAN_SCOPED & man_macros[n->tok].flags);
+
+               mandoc_vmsg(MANDOCERR_LINESCOPE, m->parse, n->line, 
+                   n->pos, "%s breaks %s", man_macronames[tok],
+                   man_macronames[n->tok]);
+
+               man_node_delete(m, n);
+               m->flags &= ~MAN_BLINE;
+       }
+
+       /*
+        * Save the fact that we're in the next-line for a block.  In
+        * this way, embedded roff instructions can "remember" state
+        * when they exit.
+        */
+
+       if (MAN_BLINE & m->flags)
+               m->flags |= MAN_BPLINE;

 
 

-       assert(man_macros[c].fp);
+       /* Call to handler... */

 
 

-       if ( ! (*man_macros[c].fp)(m, c, ln, ppos, &i, buf))
+       assert(man_macros[tok].fp);
+       if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &offs, buf))

                goto err;
 
                goto err;
 

-out:
-       if ( ! (MAN_BLINE & fl))
+       /* 
+        * We weren't in a block-line scope when entering the
+        * above-parsed macro, so return.
+        */
+
+       if ( ! (MAN_BPLINE & m->flags)) {
+               m->flags &= ~MAN_ILINE; 

                return(1);
                return(1);

+       }
+       m->flags &= ~MAN_BPLINE;
+
+       /*
+        * If we're in a block scope, then allow this macro to slip by
+        * without closing scope around it.
+        */
+
+       if (MAN_ILINE & m->flags) {
+               m->flags &= ~MAN_ILINE;
+               return(1);
+       }

 
        /* 
         * If we've opened a new next-line element scope, then return
 
        /* 
         * If we've opened a new next-line element scope, then return


@@ -557,9 +630,9 @@ out:
        assert(MAN_BLINE & m->flags);
        m->flags &= ~MAN_BLINE;
 
        assert(MAN_BLINE & m->flags);
        m->flags &= ~MAN_BLINE;
 

-       if ( ! man_unscope(m, m->last->parent))
+       if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))

                return(0);
                return(0);

-       return(man_body_alloc(m, ln, 0, m->last->tok));
+       return(man_body_alloc(m, ln, ppos, m->last->tok));

 
 err:   /* Error out. */
 
 
 err:   /* Error out. */
 


@@ -567,49 +640,51 @@ err:      /* Error out. */
        return(0);
 }
 
        return(0);
 }
 

-
-int
-man_verr(struct man *man, int ln, int pos, const char *fmt, ...)
+/*
+ * Unlink a node from its context.  If "m" is provided, the last parse
+ * point will also be adjusted accordingly.
+ */
+static void
+man_node_unlink(struct man *m, struct man_node *n)

 {
 {

-       char             buf[256];
-       va_list          ap;

 
 

-       if (NULL == man->cb.man_err)
-               return(0);
+       /* Adjust siblings. */

 
 

-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-       return((*man->cb.man_err)(man->data, ln, pos, buf));
-}
+       if (n->prev)
+               n->prev->next = n->next;
+       if (n->next)
+               n->next->prev = n->prev;

 
 

+       /* Adjust parent. */

 
 

-int
-man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
+       if (n->parent) {
+               n->parent->nchild--;
+               if (n->parent->child == n)
+                       n->parent->child = n->prev ? n->prev : n->next;
+       }

 
 

-       if (NULL == man->cb.man_warn)
-               return(0);
+       /* Adjust parse point, if applicable. */

 
 

-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-       return((*man->cb.man_warn)(man->data, ln, pos, buf));
-}
+       if (m && m->last == n) {
+               /*XXX: this can occur when bailing from validation. */
+               /*assert(NULL == n->next);*/
+               if (n->prev) {
+                       m->last = n->prev;
+                       m->next = MAN_NEXT_SIBLING;
+               } else {
+                       m->last = n->parent;
+                       m->next = MAN_NEXT_CHILD;
+               }
+       }

 
 

+       if (m && m->first == n)
+               m->first = NULL;
+}

 
 

-int
-man_err(struct man *m, int line, int pos, int iserr, enum merr type)
+const struct mparse *
+man_mparse(const struct man *m)

 {
 {

-       const char       *p;
-       
-       p = __man_merrnames[(int)type];
-       assert(p);
-
-       if (iserr)
-               return(man_verr(m, line, pos, p));

 
 

-       return(man_vwarn(m, line, pos, p));
+       assert(m && m->parse);
+       return(m->parse);

 }
 }