Explicit block closure macros clobber next-line block head scope,

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index b35d7e079a90e4f5b631c04114d62f594b697407..048db26f9a2b2da479da5cc7a8b16b8dc124dc88 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,6 +1,8 @@
-/*     $Id: man.c,v 1.84 2010/07/22 23:03:15 kristaps Exp $ */
+/*     $Id: man.c,v 1.145 2014/11/28 06:27:05 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org>

  *
  * 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,9 +16,7 @@
  * 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"
 #include "config.h"

-#endif

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


@@ -27,55 +27,54 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

+#include "man.h"

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

+#include "mandoc_aux.h"

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

-const  char *const __man_macronames[MAN_MAX] = {                
+const  char *const __man_macronames[MAN_MAX] = {

        "br",           "TH",           "SH",           "SS",
        "br",           "TH",           "SH",           "SS",

-       "TP",           "LP",           "PP",           "P",
+       "TP",           "LP",           "PP",           "P",

        "IP",           "HP",           "SM",           "SB",
        "BI",           "IB",           "BR",           "RB",
        "R",            "B",            "I",            "IR",
        "IP",           "HP",           "SM",           "SB",
        "BI",           "IB",           "BR",           "RB",
        "R",            "B",            "I",            "IR",

-       "RI",           "na",           "i",            "sp",
-       "nf",           "fi",           "r",            "RE",
-       "RS",           "DT",           "UC",           "PD",
-       "Sp",           "Vb",           "Ve",           "AT",
-       "in"
+       "RI",           "na",           "sp",           "nf",
+       "fi",           "RE",           "RS",           "DT",
+       "UC",           "PD",           "AT",           "in",
+       "ft",           "OP",           "EX",           "EE",
+       "UR",           "UE",           "ll"

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

-static struct man_node *man_node_alloc(int, int, 
+static struct man_node *man_node_alloc(struct man *, int, int,

                                enum man_type, enum mant);
                                enum man_type, enum mant);

-static int              man_node_append(struct man *, 
-                               struct man_node *);
+static void             man_node_append(struct man *, struct man_node *);

 static void             man_node_free(struct man_node *);
 static void             man_node_free(struct man_node *);

-static void             man_node_unlink(struct man *, 
+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 *);
                                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 int              macrowarn(struct man *, int, const char *, int);
+static void             man_descope(struct man *, int, int);

 
 
 const struct man_node *
 
 
 const struct man_node *

-man_node(const struct man *m)
+man_node(const struct man *man)

 {
 
 {
 

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

 }
 
 }
 

-

 const struct man_meta *
 const struct man_meta *

-man_meta(const struct man *m)
+man_meta(const struct man *man)

 {
 
 {
 

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

 }
 
 }
 

-

 void
 man_reset(struct man *man)
 {
 void
 man_reset(struct man *man)
 {


@@ -84,7 +83,6 @@ man_reset(struct man *man)
        man_alloc1(man);
 }
 
        man_alloc1(man);
 }
 

-

 void
 man_free(struct man *man)
 {
 void
 man_free(struct man *man)
 {


@@ -93,100 +91,84 @@ man_free(struct man *man)
        free(man);
 }
 
        free(man);
 }
 

-

 struct man *
 struct man *

-man_alloc(struct regset *regs, void *data, 
-               int pflags, mandocmsg msg)
+man_alloc(struct roff *roff, struct mparse *parse, int quick)

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

-       p->data = data;
-       p->pflags = pflags;
-       p->msg = msg;
-       p->regs = regs;
+       p->parse = parse;
+       p->quick = quick;
+       p->roff = roff;

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

-

 int
 int

-man_endparse(struct man *m)
+man_endparse(struct man *man)

 {
 
 {
 

-       if (MAN_HALT & m->flags)
-               return(0);
-       else if (man_macroend(m))
-               return(1);
-       m->flags |= MAN_HALT;
-       return(0);
+       man_macroend(man);
+       return(1);

 }
 
 }
 

-

 int
 int

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

 {
 
 {
 

-       if (MAN_HALT & m->flags)
-               return(0);
+       if (man->last->type != MAN_EQN || ln > man->last->line)
+               man->flags |= MAN_NEWLINE;

 
 

-       return(('.' == buf[offs] || '\'' == buf[offs]) ? 
-                       man_pmacro(m, ln, buf, offs) : 
-                       man_ptext(m, ln, buf, offs));
+       return (roff_getcontrol(man->roff, buf, &offs) ?
+           man_pmacro(man, ln, buf, offs) :
+           man_ptext(man, ln, buf, offs));

 }
 
 }
 

-

 static void
 man_free1(struct man *man)
 {
 
        if (man->first)
                man_node_delete(man, man->first);
 static void
 man_free1(struct man *man)
 {
 
        if (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.rawdate)
-               free(man->meta.rawdate);
-       if (man->meta.vol)
-               free(man->meta.vol);
-       if (man->meta.msec)
-               free(man->meta.msec);
+       free(man->meta.title);
+       free(man->meta.source);
+       free(man->meta.date);
+       free(man->meta.vol);
+       free(man->meta.msec);

 }
 
 }
 

-

 static void
 static void

-man_alloc1(struct man *m)
+man_alloc1(struct man *man)

 {
 
 {
 

-       memset(&m->meta, 0, sizeof(struct man_meta));
-       m->flags = 0;
-       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;
+       memset(&man->meta, 0, sizeof(struct man_meta));
+       man->flags = 0;
+       man->last = mandoc_calloc(1, sizeof(struct man_node));
+       man->first = man->last;
+       man->last->type = MAN_ROOT;
+       man->last->tok = MAN_MAX;
+       man->next = MAN_NEXT_CHILD;

 }
 
 
 }
 
 

-static int
+static void

 man_node_append(struct man *man, struct man_node *p)
 {
 
        assert(man->last);
        assert(man->first);
 man_node_append(struct man *man, struct man_node *p)
 {
 
        assert(man->last);
        assert(man->first);

-       assert(MAN_ROOT != p->type);
+       assert(p->type != MAN_ROOT);

 
        switch (man->next) {
 
        switch (man->next) {

-       case (MAN_NEXT_SIBLING):
+       case MAN_NEXT_SIBLING:

                man->last->next = p;
                p->prev = man->last;
                p->parent = man->last->parent;
                break;
                man->last->next = p;
                p->prev = man->last;
                p->parent = man->last->parent;
                break;

-       case (MAN_NEXT_CHILD):
+       case MAN_NEXT_CHILD:

                man->last->child = p;
                p->parent = man->last;
                break;
                man->last->child = p;
                p->parent = man->last;
                break;


@@ -194,20 +176,21 @@ man_node_append(struct man *man, struct man_node *p)
                abort();
                /* NOTREACHED */
        }
                abort();
                /* NOTREACHED */
        }

-       
+

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

-       if ( ! man_valid_pre(man, p))
-               return(0);
-

        switch (p->type) {
        switch (p->type) {

-       case (MAN_HEAD):
-               assert(MAN_BLOCK == p->parent->type);
+       case MAN_BLOCK:
+               if (p->tok == MAN_SH || p->tok == MAN_SS)
+                       man->flags &= ~MAN_LITERAL;
+               break;
+       case MAN_HEAD:
+               assert(p->parent->type == MAN_BLOCK);

                p->parent->head = p;
                break;
                p->parent->head = p;
                break;

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

                p->parent->body = p;
                break;
        default:
                p->parent->body = p;
                break;
        default:


@@ -217,22 +200,19 @@ man_node_append(struct man *man, struct man_node *p)
        man->last = p;
 
        switch (p->type) {
        man->last = p;
 
        switch (p->type) {

-       case (MAN_TEXT):
-               if ( ! man_valid_post(man))
-                       return(0);
-               if ( ! man_action_post(man))
-                       return(0);
+       case MAN_TBL:
+               /* FALLTHROUGH */
+       case MAN_TEXT:
+               man_valid_post(man);

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

-
-       return(1);

 }
 
 }
 

-

 static struct man_node *
 static struct man_node *

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

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


@@ -241,84 +221,78 @@ man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
        p->pos = pos;
        p->type = type;
        p->tok = tok;
        p->pos = pos;
        p->type = type;
        p->tok = tok;

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

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

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

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

-       p = man_node_alloc(line, pos, MAN_ELEM, tok);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
+       p = man_node_alloc(man, line, pos, MAN_ELEM, tok);
+       man_node_append(man, p);
+       man->next = MAN_NEXT_CHILD;

 }
 
 }
 

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

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

-       p = man_node_alloc(line, pos, MAN_HEAD, tok);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
+       p = man_node_alloc(man, line, pos, MAN_HEAD, tok);
+       man_node_append(man, p);
+       man->next = MAN_NEXT_CHILD;

 }
 
 }
 

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

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

-       p = man_node_alloc(line, pos, MAN_BODY, tok);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
+       p = man_node_alloc(man, line, pos, MAN_BODY, tok);
+       man_node_append(man, p);
+       man->next = MAN_NEXT_CHILD;

 }
 
 }
 

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

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

-       p = man_node_alloc(line, pos, MAN_BLOCK, tok);
-       if ( ! man_node_append(m, p))
-               return(0);
-       m->next = MAN_NEXT_CHILD;
-       return(1);
+       p = man_node_alloc(man, line, pos, MAN_BLOCK, tok);
+       man_node_append(man, p);
+       man->next = MAN_NEXT_CHILD;

 }
 
 }
 

-
-int
-man_word_alloc(struct man *m, int line, int pos, const char *word)
+void
+man_word_alloc(struct man *man, int line, int pos, const char *word)

 {
        struct man_node *n;
 {
        struct man_node *n;

-       size_t           sv, len;
-
-       len = strlen(word);
-
-       n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX);
-       n->string = mandoc_malloc(len + 1);
-       sv = strlcpy(n->string, word, len + 1);
-
-       /* Prohibit truncation. */
-       assert(sv < len + 1);
-
-       if ( ! man_node_append(m, n))
-               return(0);

 
 

-       m->next = MAN_NEXT_SIBLING;
-       return(1);
+       n = man_node_alloc(man, line, pos, MAN_TEXT, MAN_MAX);
+       n->string = roff_strdup(man->roff, word);
+       man_node_append(man, n);
+       man->next = MAN_NEXT_SIBLING;

 }
 
 }
 

+void
+man_word_append(struct man *man, const char *word)
+{
+       struct man_node *n;
+       char            *addstr, *newstr;
+
+       n = man->last;
+       addstr = roff_strdup(man->roff, word);
+       mandoc_asprintf(&newstr, "%s %s", n->string, addstr);
+       free(addstr);
+       free(n->string);
+       n->string = newstr;
+       man->next = MAN_NEXT_SIBLING;
+}

 
 /*
  * Free all of the resources held by a node.  This does NOT unlink a
 
 /*
  * Free all of the resources held by a node.  This does NOT unlink a


@@ -328,59 +302,101 @@ static void
 man_node_free(struct man_node *p)
 {
 
 man_node_free(struct man_node *p)
 {
 

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

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

-

 void
 void

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

 {
 
        while (p->child)
 {
 
        while (p->child)

-               man_node_delete(m, p->child);
+               man_node_delete(man, p->child);

 
 

-       man_node_unlink(m, p);
+       man_node_unlink(man, p);

        man_node_free(p);
 }
 
        man_node_free(p);
 }
 

+void
+man_addeqn(struct man *man, const struct eqn *ep)
+{
+       struct man_node *n;

 
 

-static int
-man_ptext(struct man *m, int line, char *buf, int offs)
+       n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
+       n->eqn = ep;
+       if (ep->ln > man->last->line)
+               n->flags |= MAN_LINE;
+       man_node_append(man, n);
+       man->next = MAN_NEXT_SIBLING;
+       man_descope(man, ep->ln, ep->pos);
+}
+
+void
+man_addspan(struct man *man, const struct tbl_span *sp)

 {
 {

-       int              i;
+       struct man_node *n;
+
+       n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
+       n->span = sp;
+       man_node_append(man, n);
+       man->next = MAN_NEXT_SIBLING;
+       man_descope(man, sp->line, 0);
+}
+
+static void
+man_descope(struct man *man, 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
+        * out the block scope (also if applicable).
+        */

 
 

-       /* Ignore bogus comments. */
+       if (man->flags & MAN_ELINE) {
+               man->flags &= ~MAN_ELINE;
+               man_unscope(man, man->last->parent);
+       }
+       if ( ! (man->flags & MAN_BLINE))
+               return;
+       man->flags &= ~MAN_BLINE;
+       man_unscope(man, man->last->parent);
+       man_body_alloc(man, line, offs, man->last->tok);
+}

 
 

-       if ('\\' == buf[offs] && 
-                       '.' == buf[offs + 1] && 
-                       '"' == buf[offs + 2])
-               return(man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));
+static int
+man_ptext(struct man *man, int line, char *buf, int offs)
+{
+       int              i;

 
        /* Literal free-form text whitespace is preserved. */
 
 
        /* Literal free-form text whitespace is preserved. */
 

-       if (MAN_LITERAL & m->flags) {
-               if ( ! man_word_alloc(m, line, offs, buf + offs))
-                       return(0);
-               goto descope;
+       if (man->flags & MAN_LITERAL) {
+               man_word_alloc(man, line, offs, buf + offs);
+               man_descope(man, line, offs);
+               return(1);

        }
 
        }
 

-       /* Pump blank lines directly into the backend. */
-
-       for (i = offs; ' ' == buf[i]; i++)
+       for (i = offs; buf[i] == ' '; i++)

                /* Skip leading whitespace. */ ;
 
                /* Skip leading whitespace. */ ;
 

-       if ('\0' == buf[i]) {
+       /*
+        * Blank lines are ignored right after headings
+        * but add a single vertical space elsewhere.
+        */
+
+       if (buf[i] == '\0') {

                /* Allocate a blank entry. */
                /* Allocate a blank entry. */

-               if ( ! man_word_alloc(m, line, offs, ""))
-                       return(0);
-               goto descope;
+               if (man->last->tok != MAN_SH &&
+                   man->last->tok != MAN_SS) {
+                       man_elem_alloc(man, line, offs, MAN_sp);
+                       man->next = MAN_NEXT_SIBLING;
+               }
+               return(1);

        }
 
        }
 

-       /* 
+       /*

         * Warn if the last un-escaped character is whitespace. Then
         * Warn if the last un-escaped character is whitespace. Then

-        * strip away the remaining spaces (tabs stay!).   
+        * strip away the remaining spaces (tabs stay!).

         */
 
        i = (int)strlen(buf);
         */
 
        i = (int)strlen(buf);


@@ -388,8 +404,8 @@ man_ptext(struct man *m, int line, char *buf, int offs)
 
        if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
                if (i > 1 && '\\' != buf[i - 2])
 
        if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
                if (i > 1 && '\\' != buf[i - 2])

-                       if ( ! man_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE))
-                               return(0);
+                       mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+                           line, i - 1, NULL);

 
                for (--i; i && ' ' == buf[i]; i--)
                        /* Spin back to non-space. */ ;
 
                for (--i; i && ' ' == buf[i]; i--)
                        /* Spin back to non-space. */ ;


@@ -399,9 +415,7 @@ man_ptext(struct man *m, int line, char *buf, int offs)
 
                buf[i] = '\0';
        }
 
                buf[i] = '\0';
        }

-
-       if ( ! man_word_alloc(m, line, offs, buf + offs))
-               return(0);
+       man_word_alloc(man, line, offs, buf + offs);

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


@@ -410,240 +424,170 @@ man_ptext(struct man *m, int line, char *buf, int offs)
         */
 
        assert(i);
         */
 
        assert(i);

-       if (mandoc_eos(buf, (size_t)i, 0))
-               m->last->flags |= MAN_EOS;
-
-descope:
-       /*
-        * Co-ordinate what happens with having a next-line scope open:
-        * first close out the element scope (if applicable), then close
-        * out the block scope (also if applicable).
-        */
+       if (mandoc_eos(buf, (size_t)i))
+               man->last->flags |= MAN_EOS;

 
 

-       if (MAN_ELINE & m->flags) {
-               m->flags &= ~MAN_ELINE;
-               if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))
-                       return(0);
-       }
-
-       if ( ! (MAN_BLINE & m->flags))
-               return(1);
-       m->flags &= ~MAN_BLINE;
-
-       if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))
-               return(0);
-       return(man_body_alloc(m, line, offs, m->last->tok));
+       man_descope(man, line, offs);
+       return(1);

 }
 
 }
 

-

 static int
 static int

-macrowarn(struct man *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = man_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s",
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       return(MAN_IGN_MACRO & m->pflags ? rc : 0);
-}
-
-
-int
-man_pmacro(struct man *m, int ln, char *buf, int offs)
+man_pmacro(struct man *man, int ln, char *buf, int offs)

 {
 {

-       int              i, j, ppos;
+       struct man_node *n;
+       const char      *cp;

        enum mant        tok;
        enum mant        tok;

+       int              i, ppos;
+       int              bline;

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

-       struct man_node *n;
-
-       /* Comments and empties are quickly ignored. */
-
-       offs++;
-
-       if ('\0' == buf[offs])
-               return(1);

 
 

-       i = offs;
+       ppos = offs;

 
        /*
 
        /*

-        * Skip whitespace between the control character and initial
-        * text.  "Whitespace" is both spaces and tabs.
+        * Copy the first word into a nil-terminated buffer.
+        * Stop when a space, tab, escape, or eoln is encountered.

         */
 
         */
 

-       if (' ' == buf[i] || '\t' == buf[i]) {
-               i++;
-               while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))
-                       i++;
-               if ('\0' == buf[i])
-                       goto out;
-       }
-
-       ppos = i;
-
-       /* Copy the first word into a nil-terminated buffer. */
+       i = 0;
+       while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)
+               mac[i++] = buf[offs++];

 
 

-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
+       mac[i] = '\0';

 
 

-               /* Check for invalid characters. */
+       tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;

 
 

-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! man_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
+       if (tok == MAN_MAX) {
+               mandoc_msg(MANDOCERR_MACRO, man->parse,
+                   ln, ppos, buf + ppos - 1);
+               return(1);

        }
 
        }
 

-       mac[j] = '\0';
+       /* Skip a leading escape sequence or tab. */

 
 

-       if (j == 4 || j < 1) {
-               if ( ! macrowarn(m, ln, mac, ppos))
-                       goto err;
-               return(1);
-       }
-       
-       if (MAN_MAX == (tok = man_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, ppos))
-                       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 ( ! man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
-                       goto err;
+       if (buf[offs] == '\0' && buf[offs - 1] == ' ')
+               mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+                   ln, offs - 1, NULL);

 
 

-       /* 
-        * Remove prior ELINE macro, as it's being clobbering by a new
+       /*
+        * 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.
         */
 
         * macro.  Note that NSCOPED macros do not close out ELINE
         * macros---they don't print text---so we let those slip by.
         */
 

-       if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
-                       m->flags & MAN_ELINE) {
-               assert(MAN_TEXT != m->last->type);
-
-               /*
-                * This occurs in the following construction:
-                *   .B
-                *   .br
-                *   .B
-                *   .br
-                *   I hate man macros.
-                * Flat-out disallow this madness.
-                */
-               if (MAN_NSCOPED & man_macros[m->last->tok].flags) {
-                       man_pmsg(m, ln, ppos, MANDOCERR_SYNTLINESCOPE);
-                       return(0);
-               }
+       if ( ! (man_macros[tok].flags & MAN_NSCOPED) &&
+                       man->flags & MAN_ELINE) {
+               n = man->last;
+               assert(MAN_TEXT != n->type);

 
 

-               n = m->last;
+               /* Remove repeated NSCOPED macros causing ELINE. */

 
 

-               assert(n);
-               assert(NULL == n->child);
-               assert(0 == n->nchild);
+               if (man_macros[n->tok].flags & MAN_NSCOPED)
+                       n = n->parent;

 
 

-               if ( ! man_nmsg(m, n, MANDOCERR_LINESCOPE))
-                       return(0);
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
+                   n->pos, "%s breaks %s", man_macronames[tok],
+                   man_macronames[n->tok]);

 
 

-               man_node_delete(m, n);
-               m->flags &= ~MAN_ELINE;
+               man_node_delete(man, n);
+               man->flags &= ~MAN_ELINE;

        }
 
        /*
        }
 
        /*

-        * 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.
+        * Remove prior BLINE macro that is being clobbered.

         */
         */

+       if ((man->flags & MAN_BLINE) &&
+           (man_macros[tok].flags & MAN_BSCOPE)) {
+               n = man->last;

 
 

-       if (MAN_BLINE & m->flags)
-               m->flags |= MAN_BPLINE;
-
-       /* Call to handler... */
-
-       assert(man_macros[tok].fp);
-       if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))
-               goto err;
+               /* Might be a text node like 8 in
+                * .TP 8
+                * .SH foo
+                */
+               if (n->type == MAN_TEXT)
+                       n = n->parent;

 
 

-out:
-       /* 
-        * We weren't in a block-line scope when entering the
-        * above-parsed macro, so return.
-        */
+               /* Remove element that didn't end BLINE, if any. */
+               if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))
+                       n = n->parent;

 
 

-       if ( ! (MAN_BPLINE & m->flags)) {
-               m->flags &= ~MAN_ILINE; 
-               return(1);
-       }
-       m->flags &= ~MAN_BPLINE;
+               assert(n->type == MAN_HEAD);
+               n = n->parent;
+               assert(n->type == MAN_BLOCK);
+               assert(man_macros[n->tok].flags & MAN_SCOPED);

 
 

-       /*
-        * If we're in a block scope, then allow this macro to slip by
-        * without closing scope around it.
-        */
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,
+                   n->pos, "%s breaks %s", man_macronames[tok],
+                   man_macronames[n->tok]);

 
 

-       if (MAN_ILINE & m->flags) {
-               m->flags &= ~MAN_ILINE;
-               return(1);
+               man_node_delete(man, n);
+               man->flags &= ~MAN_BLINE;

        }
 
        }
 

-       /* 
-        * If we've opened a new next-line element scope, then return
-        * now, as the next line will close out the block scope.
-        */
+       /* Remember whether we are in next-line scope for a block head. */

 
 

-       if (MAN_ELINE & m->flags)
-               return(1);
+       bline = man->flags & MAN_BLINE;

 
 

-       /* Close out the block scope opened in the prior line.  */
+       /* Call to handler... */

 
 

-       assert(MAN_BLINE & m->flags);
-       m->flags &= ~MAN_BLINE;
+       assert(man_macros[tok].fp);
+       (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf);

 
 

-       if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))
-               return(0);
-       return(man_body_alloc(m, ln, offs, m->last->tok));
+       /* In quick mode (for mandocdb), abort after the NAME section. */

 
 

-err:   /* Error out. */
+       if (man->quick && tok == MAN_SH) {
+               n = man->last;
+               if (n->type == MAN_BODY &&
+                   strcmp(n->prev->child->string, "NAME"))
+                       return(2);
+       }

 
 

-       m->flags |= MAN_HALT;
-       return(0);
-}
+       /*
+        * If we are in a next-line scope for a block head,
+        * close it out now and switch to the body,
+        * unless the next-line scope is allowed to continue.
+        */

 
 

+       if ( ! bline || man->flags & MAN_ELINE ||
+           man_macros[tok].flags & MAN_NSCOPED)
+               return(1);

 
 

-int
-man_vmsg(struct man *man, enum mandocerr t, 
-               int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
+       assert(man->flags & MAN_BLINE);
+       man->flags &= ~MAN_BLINE;

 
 

-       va_start(ap, fmt);
-       vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-       return((*man->msg)(t, man->data, ln, pos, buf));
+       man_unscope(man, man->last->parent);
+       man_body_alloc(man, ln, ppos, man->last->tok);
+       return(1);

 }
 
 }
 

-

 /*
 /*

- * Unlink a node from its context.  If "m" is provided, the last parse
+ * Unlink a node from its context.  If "man" is provided, the last parse

  * point will also be adjusted accordingly.
  */
 static void
  * point will also be adjusted accordingly.
  */
 static void

-man_node_unlink(struct man *m, struct man_node *n)
+man_node_unlink(struct man *man, struct man_node *n)

 {
 
        /* Adjust siblings. */
 {
 
        /* Adjust siblings. */


@@ -663,18 +607,72 @@ man_node_unlink(struct man *m, struct man_node *n)
 
        /* Adjust parse point, if applicable. */
 
 
        /* Adjust parse point, if applicable. */
 

-       if (m && m->last == n) {
+       if (man && man->last == n) {

                /*XXX: this can occur when bailing from validation. */
                /*assert(NULL == n->next);*/
                if (n->prev) {
                /*XXX: this can occur when bailing from validation. */
                /*assert(NULL == n->next);*/
                if (n->prev) {

-                       m->last = n->prev;
-                       m->next = MAN_NEXT_SIBLING;
+                       man->last = n->prev;
+                       man->next = MAN_NEXT_SIBLING;

                } else {
                } else {

-                       m->last = n->parent;
-                       m->next = MAN_NEXT_CHILD;
+                       man->last = n->parent;
+                       man->next = MAN_NEXT_CHILD;

                }
        }
 
                }
        }
 

-       if (m && m->first == n)
-               m->first = NULL;
+       if (man && man->first == n)
+               man->first = NULL;
+}
+
+const struct mparse *
+man_mparse(const struct man *man)
+{
+
+       assert(man && man->parse);
+       return(man->parse);
+}
+
+void
+man_deroff(char **dest, const struct man_node *n)
+{
+       char    *cp;
+       size_t   sz;
+
+       if (n->type != MAN_TEXT) {
+               for (n = n->child; n; n = n->next)
+                       man_deroff(dest, n);
+               return;
+       }
+
+       /* Skip leading whitespace and escape sequences. */
+
+       cp = n->string;
+       while ('\0' != *cp) {
+               if ('\\' == *cp) {
+                       cp++;
+                       mandoc_escape((const char **)&cp, NULL, NULL);
+               } else if (isspace((unsigned char)*cp))
+                       cp++;
+               else
+                       break;
+       }
+
+       /* Skip trailing whitespace. */
+
+       for (sz = strlen(cp); sz; sz--)
+               if (0 == isspace((unsigned char)cp[sz-1]))
+                       break;
+
+       /* Skip empty strings. */
+
+       if (0 == sz)
+               return;
+
+       if (NULL == *dest) {
+               *dest = mandoc_strndup(cp, sz);
+               return;
+       }
+
+       mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+       free(*dest);
+       *dest = cp;

 }
 }