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

[mandoc.git] / man.c

diff --git a/man.c b/man.c
index a2c99fe87213f203dbbd3d9bc743d128be9b247d..048db26f9a2b2da479da5cc7a8b16b8dc124dc88 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/*     $Id: man.c,v 1.132 2014/07/07 19:18:15 schwarze Exp $ */
+/*     $Id: man.c,v 1.145 2014/11/28 06:27:05 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -16,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>
 


@@ -52,8 +50,7 @@ const char * const *man_macronames = __man_macronames;
 
 static struct man_node *man_node_alloc(struct man *, int, int,
                                enum man_type, enum mant);
 
 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 void             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 void             man_node_free(struct man_node *);
 static void             man_node_unlink(struct man *,
                                struct man_node *);


@@ -61,14 +58,13 @@ 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              man_pmacro(struct man *, int, char *, int);
 static void             man_free1(struct man *);
 static void             man_alloc1(struct man *);

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

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

-       assert( ! (MAN_HALT & man->flags));

        return(man->first);
 }
 
        return(man->first);
 }
 


@@ -76,7 +72,6 @@ const struct man_meta *
 man_meta(const struct man *man)
 {
 
 man_meta(const struct man *man)
 {
 

-       assert( ! (MAN_HALT & man->flags));

        return(&man->meta);
 }
 
        return(&man->meta);
 }
 


@@ -116,20 +111,16 @@ int
 man_endparse(struct man *man)
 {
 
 man_endparse(struct man *man)
 {
 

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

 }
 
 int
 man_parseln(struct man *man, int ln, char *buf, int offs)
 {
 
 }
 
 int
 man_parseln(struct man *man, int ln, char *buf, int offs)
 {
 

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

 
        return (roff_getcontrol(man->roff, buf, &offs) ?
            man_pmacro(man, ln, buf, offs) :
 
        return (roff_getcontrol(man->roff, buf, &offs) ?
            man_pmacro(man, ln, buf, offs) :


@@ -142,16 +133,11 @@ man_free1(struct man *man)
 
        if (man->first)
                man_node_delete(man, man->first);
 
        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.date)
-               free(man->meta.date);
-       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


@@ -168,13 +154,13 @@ man_alloc1(struct man *man)
 }
 
 
 }
 
 

-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) {
        case MAN_NEXT_SIBLING:
 
        switch (man->next) {
        case MAN_NEXT_SIBLING:


@@ -194,20 +180,17 @@ man_node_append(struct man *man, struct man_node *p)
        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_BLOCK:
+               if (p->tok == MAN_SH || p->tok == MAN_SS)
+                       man->flags &= ~MAN_LITERAL;
+               break;

        case MAN_HEAD:
        case MAN_HEAD:

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

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

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

        case MAN_BODY:
        case MAN_BODY:

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

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


@@ -220,14 +203,11 @@ man_node_append(struct man *man, struct man_node *p)
        case MAN_TBL:
                /* FALLTHROUGH */
        case MAN_TEXT:
        case MAN_TBL:
                /* FALLTHROUGH */
        case MAN_TEXT:

-               if ( ! man_valid_post(man))
-                       return(0);
+               man_valid_post(man);

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

-
-       return(1);

 }
 
 static struct man_node *
 }
 
 static struct man_node *


@@ -242,85 +222,76 @@ man_node_alloc(struct man *man, int line, int pos,
        p->type = type;
        p->tok = tok;
 
        p->type = type;
        p->tok = tok;
 

-       if (MAN_NEWLINE & man->flags)
+       if (man->flags & MAN_NEWLINE)

                p->flags |= MAN_LINE;
        man->flags &= ~MAN_NEWLINE;
        return(p);
 }
 
                p->flags |= MAN_LINE;
        man->flags &= ~MAN_NEWLINE;
        return(p);
 }
 

-int
+void

 man_elem_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_ELEM, tok);
 man_elem_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_ELEM, tok);

-       if ( ! man_node_append(man, p))
-               return(0);
+       man_node_append(man, p);

        man->next = MAN_NEXT_CHILD;
        man->next = MAN_NEXT_CHILD;

-       return(1);

 }
 
 }
 

-int
-man_tail_alloc(struct man *man, int line, int pos, enum mant tok)
-{
-       struct man_node *p;
-
-       p = man_node_alloc(man, line, pos, MAN_TAIL, tok);
-       if ( ! man_node_append(man, p))
-               return(0);
-       man->next = MAN_NEXT_CHILD;
-       return(1);
-}
-
-int
+void

 man_head_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_HEAD, tok);
 man_head_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_HEAD, tok);

-       if ( ! man_node_append(man, p))
-               return(0);
+       man_node_append(man, p);

        man->next = MAN_NEXT_CHILD;
        man->next = MAN_NEXT_CHILD;

-       return(1);

 }
 
 }
 

-int
+void

 man_body_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_BODY, tok);
 man_body_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_BODY, tok);

-       if ( ! man_node_append(man, p))
-               return(0);
+       man_node_append(man, p);

        man->next = MAN_NEXT_CHILD;
        man->next = MAN_NEXT_CHILD;

-       return(1);

 }
 
 }
 

-int
+void

 man_block_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_BLOCK, tok);
 man_block_alloc(struct man *man, int line, int pos, enum mant tok)
 {
        struct man_node *p;
 
        p = man_node_alloc(man, line, pos, MAN_BLOCK, tok);

-       if ( ! man_node_append(man, p))
-               return(0);
+       man_node_append(man, p);

        man->next = MAN_NEXT_CHILD;
        man->next = MAN_NEXT_CHILD;

-       return(1);

 }
 
 }
 

-int
+void

 man_word_alloc(struct man *man, int line, int pos, const char *word)
 {
        struct man_node *n;
 
        n = man_node_alloc(man, line, pos, MAN_TEXT, MAN_MAX);
        n->string = roff_strdup(man->roff, word);
 man_word_alloc(struct man *man, int line, int pos, const char *word)
 {
        struct man_node *n;
 
        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;
+}

 
 

-       if ( ! man_node_append(man, n))
-               return(0);
-
+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;
        man->next = MAN_NEXT_SIBLING;

-       return(1);

 }
 
 /*
 }
 
 /*


@@ -331,8 +302,7 @@ 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);
 }
 


@@ -347,41 +317,33 @@ man_node_delete(struct man *man, struct man_node *p)
        man_node_free(p);
 }
 
        man_node_free(p);
 }
 

-int
+void

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

-       assert( ! (MAN_HALT & man->flags));
-

        n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
        n->eqn = ep;
        n = man_node_alloc(man, ep->ln, ep->pos, MAN_EQN, MAN_MAX);
        n->eqn = ep;

-
-       if ( ! man_node_append(man, n))
-               return(0);
-
+       if (ep->ln > man->last->line)
+               n->flags |= MAN_LINE;
+       man_node_append(man, n);

        man->next = MAN_NEXT_SIBLING;
        man->next = MAN_NEXT_SIBLING;

-       return(man_descope(man, ep->ln, ep->pos));
+       man_descope(man, ep->ln, ep->pos);

 }
 
 }
 

-int
+void

 man_addspan(struct man *man, const struct tbl_span *sp)
 {
        struct man_node *n;
 
 man_addspan(struct man *man, const struct tbl_span *sp)
 {
        struct man_node *n;
 

-       assert( ! (MAN_HALT & man->flags));
-

        n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
        n->span = sp;
        n = man_node_alloc(man, sp->line, 0, MAN_TBL, MAN_MAX);
        n->span = sp;

-
-       if ( ! man_node_append(man, n))
-               return(0);
-
+       man_node_append(man, n);

        man->next = MAN_NEXT_SIBLING;
        man->next = MAN_NEXT_SIBLING;

-       return(man_descope(man, sp->line, 0));
+       man_descope(man, sp->line, 0);

 }
 
 }
 

-static int
+static void

 man_descope(struct man *man, int line, int offs)
 {
        /*
 man_descope(struct man *man, int line, int offs)
 {
        /*


@@ -390,19 +352,15 @@ man_descope(struct man *man, int line, int offs)
         * out the block scope (also if applicable).
         */
 
         * out the block scope (also if applicable).
         */
 

-       if (MAN_ELINE & man->flags) {
+       if (man->flags & MAN_ELINE) {

                man->flags &= ~MAN_ELINE;
                man->flags &= ~MAN_ELINE;

-               if ( ! man_unscope(man, man->last->parent))
-                       return(0);
+               man_unscope(man, man->last->parent);

        }
        }

-
-       if ( ! (MAN_BLINE & man->flags))
-               return(1);
+       if ( ! (man->flags & MAN_BLINE))
+               return;

        man->flags &= ~MAN_BLINE;
        man->flags &= ~MAN_BLINE;

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

 }
 
 static int
 }
 
 static int


@@ -412,13 +370,13 @@ man_ptext(struct man *man, int line, char *buf, int offs)
 
        /* Literal free-form text whitespace is preserved. */
 
 
        /* Literal free-form text whitespace is preserved. */
 

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

        }
 
        }
 

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

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


@@ -426,12 +384,11 @@ man_ptext(struct man *man, int line, char *buf, int offs)
         * but add a single vertical space elsewhere.
         */
 
         * but add a single vertical space elsewhere.
         */
 

-       if ('\0' == buf[i]) {
+       if (buf[i] == '\0') {

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

-               if (MAN_SH != man->last->tok &&
-                   MAN_SS != man->last->tok) {
-                       if ( ! man_elem_alloc(man, line, offs, MAN_sp))
-                               return(0);
+               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);
                        man->next = MAN_NEXT_SIBLING;
                }
                return(1);


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

-
-       if ( ! man_word_alloc(man, 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


@@ -472,49 +427,59 @@ man_ptext(struct man *man, int line, char *buf, int offs)
        if (mandoc_eos(buf, (size_t)i))
                man->last->flags |= MAN_EOS;
 
        if (mandoc_eos(buf, (size_t)i))
                man->last->flags |= MAN_EOS;
 

-       return(man_descope(man, line, offs));
+       man_descope(man, line, offs);
+       return(1);

 }
 
 static int
 man_pmacro(struct man *man, int ln, char *buf, int offs)
 {
 }
 
 static int
 man_pmacro(struct man *man, int ln, char *buf, int offs)
 {

-       int              i, 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;
-
-       if ('"' == buf[offs]) {
-               mandoc_msg(MANDOCERR_COMMENT_BAD, man->parse,
-                   ln, offs, NULL);
-               return(1);
-       } else if ('\0' == buf[offs])
-               return(1);

 
        ppos = offs;
 
        /*
         * Copy the first word into a nil-terminated buffer.
 
        ppos = offs;
 
        /*
         * Copy the first word into a nil-terminated buffer.

-        * Stop copying when a tab, space, or eoln is encountered.
+        * Stop when a space, tab, escape, or eoln is encountered.

         */
 
        i = 0;
         */
 
        i = 0;

-       while (i < 4 && '\0' != buf[offs] && ' ' != buf[offs] &&
-           '\t' != buf[offs])
+       while (i < 4 && strchr(" \t\\", buf[offs]) == NULL)

                mac[i++] = buf[offs++];
 
        mac[i] = '\0';
 
        tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
 
                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, man->parse, ln, ppos,
-                   "%s", buf + ppos - 1);
+       if (tok == MAN_MAX) {
+               mandoc_msg(MANDOCERR_MACRO, man->parse,
+                   ln, ppos, buf + ppos - 1);

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

-       /* The macro is sane.  Jump to the next word. */
+       /* Skip a leading escape sequence or tab. */
+
+       switch (buf[offs]) {
+       case '\\':
+               cp = buf + offs + 1;
+               mandoc_escape(&cp, NULL, NULL);
+               offs = cp - buf;
+               break;
+       case '\t':
+               offs++;
+               break;
+       default:
+               break;
+       }
+
+       /* Jump to the next non-whitespace word. */

 
 

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

                offs++;
 
        /*
                offs++;
 
        /*


@@ -522,7 +487,7 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
         * into the parser as "text", so we only warn about spaces here.
         */
 
         * into the parser as "text", so we only warn about spaces here.
         */
 

-       if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+       if (buf[offs] == '\0' && buf[offs - 1] == ' ')

                mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
                    ln, offs - 1, NULL);
 
                mandoc_msg(MANDOCERR_SPACE_EOL, man->parse,
                    ln, offs - 1, NULL);
 


@@ -532,17 +497,17 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
         * macros---they don't print text---so we let those slip by.
         */
 
         * macros---they don't print text---so we let those slip by.
         */
 

-       if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&
+       if ( ! (man_macros[tok].flags & MAN_NSCOPED) &&

                        man->flags & MAN_ELINE) {
                n = man->last;
                assert(MAN_TEXT != n->type);
 
                /* Remove repeated NSCOPED macros causing ELINE. */
 
                        man->flags & MAN_ELINE) {
                n = man->last;
                assert(MAN_TEXT != n->type);
 
                /* Remove repeated NSCOPED macros causing ELINE. */
 

-               if (MAN_NSCOPED & man_macros[n->tok].flags)
+               if (man_macros[n->tok].flags & MAN_NSCOPED)

                        n = n->parent;
 
                        n = n->parent;
 

-               mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line,
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,

                    n->pos, "%s breaks %s", man_macronames[tok],
                    man_macronames[n->tok]);
 
                    n->pos, "%s breaks %s", man_macronames[tok],
                    man_macronames[n->tok]);
 


@@ -554,26 +519,26 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
         * Remove prior BLINE macro that is being clobbered.
         */
        if ((man->flags & MAN_BLINE) &&
         * Remove prior BLINE macro that is being clobbered.
         */
        if ((man->flags & MAN_BLINE) &&

-           (MAN_BSCOPE & man_macros[tok].flags)) {
+           (man_macros[tok].flags & MAN_BSCOPE)) {

                n = man->last;
 
                /* Might be a text node like 8 in
                 * .TP 8
                 * .SH foo
                 */
                n = man->last;
 
                /* Might be a text node like 8 in
                 * .TP 8
                 * .SH foo
                 */

-               if (MAN_TEXT == n->type)
+               if (n->type == MAN_TEXT)

                        n = n->parent;
 
                /* Remove element that didn't end BLINE, if any. */
                        n = n->parent;
 
                /* Remove element that didn't end BLINE, if any. */

-               if ( ! (MAN_BSCOPE & man_macros[n->tok].flags))
+               if ( ! (man_macros[n->tok].flags & MAN_BSCOPE))

                        n = n->parent;
 
                        n = n->parent;
 

-               assert(MAN_HEAD == n->type);
+               assert(n->type == MAN_HEAD);

                n = n->parent;
                n = n->parent;

-               assert(MAN_BLOCK == n->type);
-               assert(MAN_SCOPED & man_macros[n->tok].flags);
+               assert(n->type == MAN_BLOCK);
+               assert(man_macros[n->tok].flags & MAN_SCOPED);

 
 

-               mandoc_vmsg(MANDOCERR_LINESCOPE, man->parse, n->line,
+               mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, n->line,

                    n->pos, "%s breaks %s", man_macronames[tok],
                    man_macronames[n->tok]);
 
                    n->pos, "%s breaks %s", man_macronames[tok],
                    man_macronames[n->tok]);
 


@@ -581,72 +546,40 @@ man_pmacro(struct man *man, int ln, char *buf, int offs)
                man->flags &= ~MAN_BLINE;
        }
 
                man->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.
-        */
+       /* Remember whether we are in next-line scope for a block head. */

 
 

-       if (MAN_BLINE & man->flags)
-               man->flags |= MAN_BPLINE;
+       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)(man, tok, ln, ppos, &offs, buf))
-               goto err;
+       (*man_macros[tok].fp)(man, tok, ln, ppos, &offs, buf);

 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 

-       if (man->quick && MAN_SH == tok) {
+       if (man->quick && tok == MAN_SH) {

                n = man->last;
                n = man->last;

-               if (MAN_BODY == n->type &&
+               if (n->type == MAN_BODY &&

                    strcmp(n->prev->child->string, "NAME"))
                        return(2);
        }
 
        /*
                    strcmp(n->prev->child->string, "NAME"))
                        return(2);
        }
 
        /*

-        * We weren't in a block-line scope when entering the
-        * above-parsed macro, so return.
+        * 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_BPLINE & man->flags)) {
-               man->flags &= ~MAN_ILINE;
+       if ( ! bline || man->flags & MAN_ELINE ||
+           man_macros[tok].flags & MAN_NSCOPED)

                return(1);
                return(1);

-       }
-       man->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 & man->flags) {
-               man->flags &= ~MAN_ILINE;
-               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.
-        */
-
-       if (MAN_ELINE & man->flags)
-               return(1);
-
-       /* Close out the block scope opened in the prior line.  */
-
-       assert(MAN_BLINE & man->flags);
+       assert(man->flags & MAN_BLINE);

        man->flags &= ~MAN_BLINE;
 
        man->flags &= ~MAN_BLINE;
 

-       if ( ! man_unscope(man, man->last->parent))
-               return(0);
-       return(man_body_alloc(man, ln, ppos, man->last->tok));
-
-err:   /* Error out. */
-
-       man->flags |= MAN_HALT;
-       return(0);
+       man_unscope(man, man->last->parent);
+       man_body_alloc(man, ln, ppos, man->last->tok);
+       return(1);

 }
 
 /*
 }
 
 /*


@@ -704,7 +637,7 @@ man_deroff(char **dest, const struct man_node *n)
        char    *cp;
        size_t   sz;
 
        char    *cp;
        size_t   sz;
 

-       if (MAN_TEXT != n->type) {
+       if (n->type != MAN_TEXT) {

                for (n = n->child; n; n = n->next)
                        man_deroff(dest, n);
                return;
                for (n = n->child; n; n = n->next)
                        man_deroff(dest, n);
                return;