The sh(1) "test" builtin on Solaris 10 doesn't have -e,

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index 7a41b1fbedd49c309649a41d4310416b8b925c6e..31c094e8d62c6fe7c2a8d42b6fe0bec269612aed 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,22 +1,22 @@
-/*     $Id: man.c,v 1.64 2010/05/08 10:25:27 kristaps Exp $ */
+/*     $Id: man.c,v 1.166 2015/10/22 21:54:23 schwarze Exp $ */

 /*
 /*

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


@@ -27,377 +27,100 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "libman.h"
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
+#include "man.h"

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

+#include "roff_int.h"
+#include "libman.h"

 
 

-const  char *const __man_merrnames[WERRMAX] = {                 
-       "invalid character", /* WNPRINT */
-       "invalid manual section", /* WMSEC */
-       "invalid date format", /* WDATE */
-       "scope of prior line violated", /* WLNSCOPE */
-       "over-zealous prior line scope violation", /* WLNSCOPE2 */
-       "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 */
-       "invalid nesting of roff declarations", /* WROFFNEST */
-       "scope in roff instructions broken", /* WROFFSCOPE */
-       "document title should be uppercase", /* WTITLECASE */
-       "deprecated comment style", /* WBADCOMMENT */
-};
-
-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",           "de",
-       "dei",          "am",           "ami",          "ig",
-       ".",
+       "RI",           "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, 
-                               enum man_type, enum mant);
-static int              man_node_append(struct man *, 
-                               struct man_node *);
-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 *);
-static int              man_pmacro(struct man *, int, char *);
-static void             man_free1(struct man *);
-static void             man_alloc1(struct man *);
-static int              macrowarn(struct man *, int, const char *);
-
-
-const struct man_node *
-man_node(const struct man *m)
-{
-
-       return(MAN_HALT & m->flags ? NULL : m->first);
-}
-
-
-const struct man_meta *
-man_meta(const struct man *m)
-{
-
-       return(MAN_HALT & m->flags ? NULL : &m->meta);
-}
-
-
-void
-man_reset(struct man *man)
-{
-
-       man_free1(man);
-       man_alloc1(man);
-}
-
-
-void
-man_free(struct man *man)
-{
-
-       man_free1(man);
-       free(man);
-}
-
-
-struct man *
-man_alloc(void *data, int pflags, const struct man_cb *cb)
-{
-       struct man      *p;
-
-       p = mandoc_calloc(1, sizeof(struct man));
-
-       if (cb)
-               memcpy(&p->cb, cb, sizeof(struct man_cb));
-
-       man_hash_init();
-       p->data = data;
-       p->pflags = pflags;
-
-       man_alloc1(p);
-       return(p);
-}
+static void             man_descope(struct roff_man *, int, int);
+static int              man_ptext(struct roff_man *, int, char *, int);
+static int              man_pmacro(struct roff_man *, int, char *, int);

 
 
 int
 
 
 int

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

 {
 
 {
 

-       if (MAN_HALT & m->flags)
-               return(0);
-       else if (man_macroend(m))
-               return(1);
-       m->flags |= MAN_HALT;
-       return(0);
-}
-
+       if (man->last->type != ROFFT_EQN || ln > man->last->line)
+               man->flags |= MAN_NEWLINE;

 
 

-int
-man_parseln(struct man *m, int ln, char *buf)
-{
-
-       return('.' == *buf || '\'' == *buf ? 
-                       man_pmacro(m, ln, buf) : 
-                       man_ptext(m, ln, buf));
+       return roff_getcontrol(man->roff, buf, &offs) ?
+           man_pmacro(man, ln, buf, offs) :
+           man_ptext(man, ln, buf, offs);

 }
 
 }
 

-

 static void
 static void

-man_free1(struct man *man)
+man_descope(struct roff_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).
+        */

 
 

-       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.vol)
-               free(man->meta.vol);
-}
-
-
-static void
-man_alloc1(struct man *m)
-{
-
-       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;
-}
-
-
-static int
-man_node_append(struct man *man, struct man_node *p)
-{
-
-       assert(man->last);
-       assert(man->first);
-       assert(MAN_ROOT != p->type);
-
-       switch (man->next) {
-       case (MAN_NEXT_SIBLING):
-               man->last->next = p;
-               p->prev = man->last;
-               p->parent = man->last->parent;
-               break;
-       case (MAN_NEXT_CHILD):
-               man->last->child = p;
-               p->parent = man->last;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-       
-       assert(p->parent);
-       p->parent->nchild++;
-
-       if ( ! man_valid_pre(man, p))
-               return(0);
-
-       switch (p->type) {
-       case (MAN_HEAD):
-               assert(MAN_BLOCK == p->parent->type);
-               p->parent->head = p;
-               break;
-       case (MAN_BODY):
-               assert(MAN_BLOCK == p->parent->type);
-               p->parent->body = p;
-               break;
-       default:
-               break;
-       }
-
-       man->last = p;
-
-       switch (p->type) {
-       case (MAN_TEXT):
-               if ( ! man_valid_post(man))
-                       return(0);
-               if ( ! man_action_post(man))
-                       return(0);
-               break;
-       default:
-               break;
+       if (man->flags & MAN_ELINE) {
+               man->flags &= ~MAN_ELINE;
+               man_unscope(man, man->last->parent);

        }
        }

-
-       return(1);
+       if ( ! (man->flags & MAN_BLINE))
+               return;
+       man->flags &= ~MAN_BLINE;
+       man_unscope(man, man->last->parent);
+       roff_body_alloc(man, line, offs, man->last->tok);

 }
 
 }
 

-
-static struct man_node *
-man_node_alloc(int line, int pos, enum man_type type, enum mant tok)
-{
-       struct man_node *p;
-
-       p = mandoc_calloc(1, sizeof(struct man_node));
-       p->line = line;
-       p->pos = pos;
-       p->type = type;
-       p->tok = tok;
-       return(p);
-}
-
-
-int
-man_elem_alloc(struct man *m, int line, int pos, enum mant tok)
-{
-       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);
-}
-
-
-int
-man_head_alloc(struct man *m, int line, int pos, enum mant tok)
-{
-       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);
-}
-
-
-int
-man_body_alloc(struct man *m, int line, int pos, enum mant tok)
-{
-       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);
-}
-
-
-int
-man_block_alloc(struct man *m, int line, int pos, enum mant tok)
-{
-       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);
-}
-
-
-int
-man_word_alloc(struct man *m, int line, int pos, const char *word)
-{
-       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);
-}
-
-
-/*
- * 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);
-       free(p);
-}
-
-
-void
-man_node_delete(struct man *m, struct man_node *p)
-{
-
-       while (p->child)
-               man_node_delete(m, p->child);
-
-       man_node_unlink(m, p);
-       man_node_free(p);
-}
-
-

 static int
 static int

-man_ptext(struct man *m, int line, char *buf)
+man_ptext(struct roff_man *man, int line, char *buf, int offs)

 {
        int              i;
 
 {
        int              i;
 

-       /* Ignore bogus comments. */
-
-       if ('\\' == buf[0] && '.' == buf[1] && '\"' == buf[2])
-               return(man_pwarn(m, line, 0, WBADCOMMENT));
-

        /* 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, 0, buf))
-                       return(0);
-               goto descope;
+       if (man->flags & MAN_LITERAL) {
+               roff_word_alloc(man, line, offs, buf + offs);
+               man_descope(man, line, offs);
+               return 1;

        }
 
        }
 

-       /* Pump blank lines directly into the backend. */
-
-       for (i = 0; ' ' == 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, 0, ""))
-                       return(0);
-               goto descope;
+               if (man->last->tok != MAN_SH &&
+                   man->last->tok != MAN_SS) {
+                       roff_elem_alloc(man, line, offs, MAN_sp);
+                       man->next = ROFF_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);


@@ -405,8 +128,8 @@ man_ptext(struct man *m, int line, char *buf)
 
        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_pwarn(m, line, i - 1, WTSPACE))
-                               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. */ ;


@@ -416,304 +139,231 @@ man_ptext(struct man *m, int line, char *buf)
 
                buf[i] = '\0';
        }
 
                buf[i] = '\0';
        }

+       roff_word_alloc(man, line, offs, buf + offs);

 
 

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

         */
 
         */
 

-       if (MAN_ELINE & m->flags) {
-               m->flags &= ~MAN_ELINE;
-               if ( ! man_unscope(m, m->last->parent, WERRMAX))
-                       return(0);
-       }
-
-       if ( ! (MAN_BLINE & m->flags))
-               return(1);
-       m->flags &= ~MAN_BLINE;
+       assert(i);
+       if (mandoc_eos(buf, (size_t)i))
+               man->last->flags |= MAN_EOS;

 
 

-       if ( ! man_unscope(m, m->last->parent, WERRMAX))
-               return(0);
-       return(man_body_alloc(m, line, 0, m->last->tok));
+       man_descope(man, line, offs);
+       return 1;

 }
 
 }
 

-

 static int
 static int

-macrowarn(struct man *m, int ln, const char *buf)
+man_pmacro(struct roff_man *man, int ln, 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
-man_pmacro(struct man *m, int ln, char *buf)
-{
-       int              i, j, ppos;
-       enum mant        tok;
+       struct roff_node *n;
+       const char      *cp;
+       int              tok;
+       int              i, ppos;
+       int              bline;

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

-       struct man_node *n;
-
-       /* Comments and empties are quickly ignored. */

 
 

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

 
 

-       /* Copy the first word into a nil-terminated buffer. */
+       mac[i] = '\0';

 
 

-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
+       tok = (i > 0 && i < 4) ? man_hash_find(mac) : TOKEN_NONE;

 
 

-               /* Check for invalid characters. */
-
-               if (isgraph((u_char)buf[i]))
-                       continue;
-               return(man_perr(m, ln, i, WNPRINT));
+       if (tok == TOKEN_NONE) {
+               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 ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_perr(m, ln, ppos, WMACROFORM);
-                       goto err;
-               } 
-               if ( ! man_pwarn(m, ln, ppos, WMACROFORM))
-                       goto err;
-               return(1);
-       }
-       
-       if (MAN_MAX == (tok = man_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac))
-                       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_pwarn(m, ln, i - 1, WTSPACE))
-                       goto err;
-
-       /* 
-        * Remove prior ELINE macro, as it's being clobbering 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.
-        * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded
-        * here because that would stipulate blocks as children of
-        * elements!
-        */
-
-       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)
-                       return(man_perr(m, ln, ppos, WLNSCOPE));
-
-               n = m->last;
-
-               assert(n);
-               assert(NULL == n->child);
-               assert(0 == n->nchild);
-
-               if ( ! man_nwarn(m, n, WLNSCOPE))
-                       return(0);
-
-               man_node_delete(m, n);
-               m->flags &= ~MAN_ELINE;
-       }
+       if (buf[offs] == '\0' && buf[offs - 1] == ' ')
+               mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
+                   ln, offs - 1, NULL);

 
        /*
 
        /*

-        * 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.
+        * Some macros break next-line scopes; otherwise, remember
+        * whether we are in next-line scope for a block head.

         */
 
         */
 

-       if (MAN_BLINE & m->flags)
-               m->flags |= MAN_BPLINE;
+       man_breakscope(man, tok);
+       bline = man->flags & MAN_BLINE;

 
        /* Call to handler... */
 
        assert(man_macros[tok].fp);
 
        /* Call to handler... */
 
        assert(man_macros[tok].fp);

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

 
 

-out:
-       /* 
-        * We weren't in a block-line scope when entering the
-        * above-parsed macro, so return.
-        */
+       /* In quick mode (for mandocdb), abort after the NAME section. */

 
 

-       if ( ! (MAN_BPLINE & m->flags)) {
-               m->flags &= ~MAN_ILINE; 
-               return(1);
+       if (man->quick && tok == MAN_SH) {
+               n = man->last;
+               if (n->type == ROFFT_BODY &&
+                   strcmp(n->prev->child->string, "NAME"))
+                       return 2;

        }
        }

-       m->flags &= ~MAN_BPLINE;

 
        /*
 
        /*

-        * If we're in a block scope, then allow this macro to slip by
-        * without closing scope around it.
+        * 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 (MAN_ILINE & m->flags) {
-               m->flags &= ~MAN_ILINE;
-               return(1);
-       }
+       if ( ! bline || man->flags & MAN_ELINE ||
+           man_macros[tok].flags & MAN_NSCOPED)
+               return 1;

 
 

-       /* 
-        * If we've opened a new next-line element scope, then return
-        * now, as the next line will close out the block scope.
-        */
+       assert(man->flags & MAN_BLINE);
+       man->flags &= ~MAN_BLINE;

 
 

-       if (MAN_ELINE & m->flags)
-               return(1);
+       man_unscope(man, man->last->parent);
+       roff_body_alloc(man, ln, ppos, man->last->tok);
+       return 1;
+}

 
 

-       /* Close out the block scope opened in the prior line.  */
+void
+man_breakscope(struct roff_man *man, int tok)
+{
+       struct roff_node *n;

 
 

-       assert(MAN_BLINE & m->flags);
-       m->flags &= ~MAN_BLINE;
+       /*
+        * An element next line scope is open,
+        * and the new macro is not allowed inside elements.
+        * Delete the element that is being broken.
+        */

 
 

-       if ( ! man_unscope(m, m->last->parent, WERRMAX))
-               return(0);
-       return(man_body_alloc(m, ln, 0, m->last->tok));
+       if (man->flags & MAN_ELINE && (tok == TOKEN_NONE ||
+           ! (man_macros[tok].flags & MAN_NSCOPED))) {
+               n = man->last;
+               assert(n->type != ROFFT_TEXT);
+               if (man_macros[n->tok].flags & MAN_NSCOPED)
+                       n = n->parent;

 
 

-err:   /* Error out. */
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
+                   n->line, n->pos, "%s breaks %s",
+                   tok == TOKEN_NONE ? "TS" : man_macronames[tok],
+                   man_macronames[n->tok]);

 
 

-       m->flags |= MAN_HALT;
-       return(0);
-}
+               roff_node_delete(man, n);
+               man->flags &= ~MAN_ELINE;
+       }

 
 

+       /*
+        * Weird special case:
+        * Switching fill mode closes section headers.
+        */

 
 

-int
-man_verr(struct man *man, int ln, int pos, const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
+       if (man->flags & MAN_BLINE &&
+           (tok == MAN_nf || tok == MAN_fi) &&
+           (man->last->tok == MAN_SH || man->last->tok == MAN_SS)) {
+               n = man->last;
+               man_unscope(man, n);
+               roff_body_alloc(man, n->line, n->pos, n->tok);
+               man->flags &= ~MAN_BLINE;
+       }

 
 

-       if (NULL == man->cb.man_err)
-               return(0);
+       /*
+        * A block header next line scope is open,
+        * and the new macro is not allowed inside block headers.
+        * Delete the block that is being broken.
+        */

 
 

-       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 (man->flags & MAN_BLINE && (tok == TOKEN_NONE ||
+           man_macros[tok].flags & MAN_BSCOPE)) {
+               n = man->last;
+               if (n->type == ROFFT_TEXT)
+                       n = n->parent;
+               if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))
+                       n = n->parent;
+
+               assert(n->type == ROFFT_HEAD);
+               n = n->parent;
+               assert(n->type == ROFFT_BLOCK);
+               assert(man_macros[n->tok].flags & MAN_SCOPED);
+
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse,
+                   n->line, n->pos, "%s breaks %s",
+                   tok == TOKEN_NONE ? "TS" : man_macronames[tok],
+                   man_macronames[n->tok]);
+
+               roff_node_delete(man, n);
+               man->flags &= ~MAN_BLINE;
+       }

 }
 
 }
 

-
-int
-man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...)
+const struct mparse *
+man_mparse(const struct roff_man *man)

 {
 {

-       char             buf[256];
-       va_list          ap;

 
 

-       if (NULL == man->cb.man_warn)
-               return(0);
-
-       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));
+       assert(man && man->parse);
+       return man->parse;

 }
 
 }
 

-
-int
-man_err(struct man *m, int line, int pos, int iserr, enum merr type)
+void
+man_state(struct roff_man *man, struct roff_node *n)

 {
 {

-       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));
+       switch(n->tok) {
+       case MAN_nf:
+       case MAN_EX:
+               if (man->flags & MAN_LITERAL && ! (n->flags & MAN_VALID))
+                       mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
+                           n->line, n->pos, "nf");
+               man->flags |= MAN_LITERAL;
+               break;
+       case MAN_fi:
+       case MAN_EE:
+               if ( ! (man->flags & MAN_LITERAL) &&
+                    ! (n->flags & MAN_VALID))
+                       mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
+                           n->line, n->pos, "fi");
+               man->flags &= ~MAN_LITERAL;
+               break;
+       default:
+               break;
+       }
+       man->last->flags |= MAN_VALID;

 }
 
 }
 

-
-/*
- * 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)
+void
+man_validate(struct roff_man *man)

 {
 
 {
 

-       /* 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) {
-               /*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;
+       man->last = man->first;
+       man_node_validate(man);
+       man->flags &= ~MAN_LITERAL;

 }
 }