Modernize an example showing antiquated syntax,

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 09c111d1db7f05ba3be68b1c1b755c128ae87f1f..0946ee6eb5788ab17ec0ed63bbc5b86750b5d40a 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,23 +1,23 @@
-/*     $Id: mdoc_macro.c,v 1.129 2014/01/21 10:26:53 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.223 2017/05/05 15:17:32 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>


@@ -26,51 +26,41 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

-#include "mdoc.h"

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

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

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

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

 
 

-enum   rew {   /* see rew_dohalt() */
-       REWIND_NONE,
-       REWIND_THIS,
-       REWIND_MORE,
-       REWIND_FORCE,
-       REWIND_LATER,
-       REWIND_ERROR
-};
-
-static int             blk_full(MACRO_PROT_ARGS);
-static int             blk_exp_close(MACRO_PROT_ARGS);
-static int             blk_part_exp(MACRO_PROT_ARGS);
-static int             blk_part_imp(MACRO_PROT_ARGS);
-static int             ctx_synopsis(MACRO_PROT_ARGS);
-static int             in_line_eoln(MACRO_PROT_ARGS);
-static int             in_line_argn(MACRO_PROT_ARGS);
-static int             in_line(MACRO_PROT_ARGS);
-static int             obsolete(MACRO_PROT_ARGS);
-static int             phrase_ta(MACRO_PROT_ARGS);
-
-static int             dword(struct mdoc *, int, int, const char *,
-                                enum mdelim, int);
-static int             append_delims(struct mdoc *, 
+static void            blk_full(MACRO_PROT_ARGS);
+static void            blk_exp_close(MACRO_PROT_ARGS);
+static void            blk_part_exp(MACRO_PROT_ARGS);
+static void            blk_part_imp(MACRO_PROT_ARGS);
+static void            ctx_synopsis(MACRO_PROT_ARGS);
+static void            in_line_eoln(MACRO_PROT_ARGS);
+static void            in_line_argn(MACRO_PROT_ARGS);
+static void            in_line(MACRO_PROT_ARGS);
+static void            phrase_ta(MACRO_PROT_ARGS);
+
+static void            append_delims(struct roff_man *, int, int *, char *);
+static void            dword(struct roff_man *, int, int, const char *,
+                               enum mdelim, int);
+static int             find_pending(struct roff_man *, enum roff_tok,
+                               int, int, struct roff_node *);
+static int             lookup(struct roff_man *, int, int, int, const char *);
+static int             macro_or_word(MACRO_PROT_ARGS, int);
+static void            break_intermediate(struct roff_node *,
+                               struct roff_node *);
+static int             parse_rest(struct roff_man *, enum roff_tok,

                                int, int *, char *);
                                int, int *, char *);

-static enum mdoct      lookup(enum mdoct, const char *);
-static enum mdoct      lookup_raw(const char *);
-static int             make_pending(struct mdoc_node *, enum mdoct,
-                               struct mdoc *, int, int);
-static int             phrase(struct mdoc *, int, int, char *);
-static enum mdoct      rew_alt(enum mdoct);
-static enum rew        rew_dohalt(enum mdoct, enum mdoc_type, 
-                               const struct mdoc_node *);
-static int             rew_elem(struct mdoc *, enum mdoct);
-static int             rew_last(struct mdoc *, 
-                               const struct mdoc_node *);
-static int             rew_sub(enum mdoc_type, struct mdoc *, 
-                               enum mdoct, int, int);
-
-const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */
+static enum roff_tok   rew_alt(enum roff_tok);
+static void            rew_elem(struct roff_man *, enum roff_tok);
+static void            rew_last(struct roff_man *, const struct roff_node *);
+static void            rew_pending(struct roff_man *,
+                               const struct roff_node *);
+
+const  struct mdoc_macro __mdoc_macros[MDOC_MAX - MDOC_Dd] = {

        { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */


@@ -86,6 +76,7 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* It */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* An */

+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Cd */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */


@@ -104,7 +95,7 @@ const        struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_full, MDOC_JOIN }, /* Nd */
        { ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
        { blk_full, MDOC_JOIN }, /* Nd */
        { ctx_synopsis, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */

-       { obsolete, 0 }, /* Ot */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ot */

        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
        { in_line_eoln, 0 }, /* Rv */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
        { in_line_eoln, 0 }, /* Rv */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */


@@ -148,8 +139,7 @@ const       struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */

-       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED |
-                       MDOC_IGNDELIM | MDOC_JOIN }, /* No */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* No */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED |
                        MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED |
                        MDOC_IGNDELIM | MDOC_JOIN }, /* Ns */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */


@@ -173,7 +163,7 @@ const       struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
                        MDOC_EXPLICIT | MDOC_JOIN }, /* So */
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */
        { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED |
                        MDOC_EXPLICIT | MDOC_JOIN }, /* So */
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sq */

-       { in_line_eoln, 0 }, /* Sm */
+       { in_line_argn, 0 }, /* Sm */

        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sx */
        { in_line, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Sy */
        { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */


@@ -191,7 +181,7 @@ const       struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */
        { in_line_eoln, 0 }, /* Bt */
        { in_line_eoln, 0 }, /* Hf */
        { blk_exp_close, MDOC_EXPLICIT | MDOC_JOIN }, /* Ek */
        { in_line_eoln, 0 }, /* Bt */
        { in_line_eoln, 0 }, /* Hf */

-       { obsolete, 0 }, /* Fr */
+       { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fr */

        { in_line_eoln, 0 }, /* Ud */
        { in_line, 0 }, /* Lb */
        { in_line_eoln, 0 }, /* Lp */
        { in_line_eoln, 0 }, /* Ud */
        { in_line, 0 }, /* Lb */
        { in_line_eoln, 0 }, /* Lp */


@@ -203,17 +193,14 @@ const     struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
                         MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */
        { in_line_eoln, MDOC_JOIN }, /* %C */
        { blk_exp_close, MDOC_CALLABLE | MDOC_PARSED |
                         MDOC_EXPLICIT | MDOC_JOIN }, /* Brc */
        { in_line_eoln, MDOC_JOIN }, /* %C */

-       { obsolete, 0 }, /* Es */
-       { obsolete, 0 }, /* En */
+       { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Es */
+       { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */

        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
        { in_line_eoln, MDOC_JOIN }, /* %Q */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
        { in_line_eoln, MDOC_JOIN }, /* %Q */

-       { in_line_eoln, 0 }, /* br */
-       { in_line_eoln, 0 }, /* sp */

        { in_line_eoln, 0 }, /* %U */
        { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */
 };
        { in_line_eoln, 0 }, /* %U */
        { phrase_ta, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ta */
 };

-
-const  struct mdoc_macro * const mdoc_macros = __mdoc_macros;
+const  struct mdoc_macro *const mdoc_macros = __mdoc_macros - MDOC_Dd;

 
 
 /*
 
 
 /*


@@ -221,455 +208,276 @@ const   struct mdoc_macro * const mdoc_macros = __mdoc_macros;
  * closing out open [implicit] scopes.  Obviously, open explicit scopes
  * are errors.
  */
  * closing out open [implicit] scopes.  Obviously, open explicit scopes
  * are errors.
  */

-int
-mdoc_macroend(struct mdoc *mdoc)
+void
+mdoc_endparse(struct roff_man *mdoc)

 {
 {

-       struct mdoc_node *n;
+       struct roff_node *n;

 
        /* Scan for open explicit scopes. */
 
 
        /* Scan for open explicit scopes. */
 

-       n = MDOC_VALID & mdoc->last->flags ?
-                       mdoc->last->parent : mdoc->last;
+       n = mdoc->last->flags & NODE_VALID ?
+           mdoc->last->parent : mdoc->last;

 
        for ( ; n; n = n->parent)
 
        for ( ; n; n = n->parent)

-               if (MDOC_BLOCK == n->type &&
-                   MDOC_EXPLICIT & mdoc_macros[n->tok].flags)
-                       mdoc_nmsg(mdoc, n, MANDOCERR_SCOPEEXIT);
+               if (n->type == ROFFT_BLOCK &&
+                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT)
+                       mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,
+                           n->line, n->pos, roff_name[n->tok]);

 
        /* Rewind to the first. */
 
 
        /* Rewind to the first. */
 

-       return(rew_last(mdoc, mdoc->first));
+       rew_last(mdoc, mdoc->first);
+       mdoc_state_reset(mdoc);

 }
 
 }
 

-

 /*
 /*

- * Look up a macro from within a subsequent context.
+ * Look up the macro at *p called by "from",
+ * or as a line macro if from == TOKEN_NONE.

  */
  */

-static enum mdoct
-lookup(enum mdoct from, const char *p)
+static int
+lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)

 {
 {

+       enum roff_tok    res;

 
 

-       if ( ! (MDOC_PARSED & mdoc_macros[from].flags))
-               return(MDOC_MAX);
-       return(lookup_raw(p));
+       if (mdoc->flags & MDOC_PHRASEQF) {
+               mdoc->flags &= ~MDOC_PHRASEQF;
+               return TOKEN_NONE;
+       }
+       if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) {
+               res = roffhash_find(mdoc->mdocmac, p, 0);
+               if (res != TOKEN_NONE) {
+                       if (mdoc_macros[res].flags & MDOC_CALLABLE)
+                               return res;
+                       mandoc_msg(MANDOCERR_MACRO_CALL,
+                           mdoc->parse, line, ppos, p);
+               }
+       }
+       return TOKEN_NONE;

 }
 
 }
 

-

 /*
 /*

- * Lookup a macro following the initial line macro.
+ * Rewind up to and including a specific node.

  */
  */

-static enum mdoct
-lookup_raw(const char *p)
-{
-       enum mdoct       res;
-
-       if (MDOC_MAX == (res = mdoc_hash_find(p)))
-               return(MDOC_MAX);
-       if (MDOC_CALLABLE & mdoc_macros[res].flags)
-               return(res);
-       return(MDOC_MAX);
-}
-
-
-static int
-rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
+static void
+rew_last(struct roff_man *mdoc, const struct roff_node *to)

 {
 {

-       struct mdoc_node *n, *np;

 
 

-       assert(to);
-       mdoc->next = MDOC_NEXT_SIBLING;
+       if (to->flags & NODE_VALID)
+               return;

 
 

-       /* LINTED */

        while (mdoc->last != to) {
        while (mdoc->last != to) {

-               /*
-                * Save the parent here, because we may delete the
-                * mdoc->last node in the post-validation phase and reset
-                * it to mdoc->last->parent, causing a step in the closing
-                * out to be lost.
-                */
-               np = mdoc->last->parent;
-               if ( ! mdoc_valid_post(mdoc))
-                       return(0);
-               n = mdoc->last;
-               mdoc->last = np;
-               assert(mdoc->last);
-               mdoc->last->last = n;
+               mdoc_state(mdoc, mdoc->last);
+               mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+               mdoc->last = mdoc->last->parent;

        }
        }

-
-       return(mdoc_valid_post(mdoc));
+       mdoc_state(mdoc, mdoc->last);
+       mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+       mdoc->next = ROFF_NEXT_SIBLING;

 }
 
 }
 

-

 /*
 /*

- * For a block closing macro, return the corresponding opening one.
- * Otherwise, return the macro itself.
+ * Rewind up to a specific block, including all blocks that broke it.

  */
  */

-static enum mdoct
-rew_alt(enum mdoct tok)
+static void
+rew_pending(struct roff_man *mdoc, const struct roff_node *n)

 {
 {

-       switch (tok) {
-       case (MDOC_Ac):
-               return(MDOC_Ao);
-       case (MDOC_Bc):
-               return(MDOC_Bo);
-       case (MDOC_Brc):
-               return(MDOC_Bro);
-       case (MDOC_Dc):
-               return(MDOC_Do);
-       case (MDOC_Ec):
-               return(MDOC_Eo);
-       case (MDOC_Ed):
-               return(MDOC_Bd);
-       case (MDOC_Ef):
-               return(MDOC_Bf);
-       case (MDOC_Ek):
-               return(MDOC_Bk);
-       case (MDOC_El):
-               return(MDOC_Bl);
-       case (MDOC_Fc):
-               return(MDOC_Fo);
-       case (MDOC_Oc):
-               return(MDOC_Oo);
-       case (MDOC_Pc):
-               return(MDOC_Po);
-       case (MDOC_Qc):
-               return(MDOC_Qo);
-       case (MDOC_Re):
-               return(MDOC_Rs);
-       case (MDOC_Sc):
-               return(MDOC_So);
-       case (MDOC_Xc):
-               return(MDOC_Xo);
-       default:
-               return(tok);
+
+       for (;;) {
+               rew_last(mdoc, n);
+
+               if (mdoc->last == n) {
+                       switch (n->type) {
+                       case ROFFT_HEAD:
+                               roff_body_alloc(mdoc, n->line, n->pos,
+                                   n->tok);
+                               break;
+                       case ROFFT_BLOCK:
+                               break;
+                       default:
+                               return;
+                       }
+                       if ( ! (n->flags & NODE_BROKEN))
+                               return;
+               } else
+                       n = mdoc->last;
+
+               for (;;) {
+                       if ((n = n->parent) == NULL)
+                               return;
+
+                       if (n->type == ROFFT_BLOCK ||
+                           n->type == ROFFT_HEAD) {
+                               if (n->flags & NODE_ENDED)
+                                       break;
+                               else
+                                       return;
+                       }
+               }

        }
        }

-       /* NOTREACHED */

 }
 
 }
 

-

 /*
 /*

- * Rewinding to tok, how do we have to handle *p?
- * REWIND_NONE: *p would delimit tok, but no tok scope is open
- *   inside *p, so there is no need to rewind anything at all.
- * REWIND_THIS: *p matches tok, so rewind *p and nothing else.
- * REWIND_MORE: *p is implicit, rewind it and keep searching for tok.
- * REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.
- * REWIND_LATER: *p is explicit and still open, postpone rewinding.
- * REWIND_ERROR: No tok block is open at all.
+ * For a block closing macro, return the corresponding opening one.
+ * Otherwise, return the macro itself.

  */
  */

-static enum rew
-rew_dohalt(enum mdoct tok, enum mdoc_type type, 
-               const struct mdoc_node *p)
+static enum roff_tok
+rew_alt(enum roff_tok tok)

 {
 {

-
-       /*
-        * No matching token, no delimiting block, no broken block.
-        * This can happen when full implicit macros are called for
-        * the first time but try to rewind their previous
-        * instance anyway.
-        */
-       if (MDOC_ROOT == p->type)
-               return(MDOC_BLOCK == type &&
-                   MDOC_EXPLICIT & mdoc_macros[tok].flags ?
-                   REWIND_ERROR : REWIND_NONE);
-
-       /*
-        * When starting to rewind, skip plain text 
-        * and nodes that have already been rewound.
-        */
-       if (MDOC_TEXT == p->type || MDOC_VALID & p->flags)
-               return(REWIND_MORE);
-
-       /*
-        * The easiest case:  Found a matching token.
-        * This applies to both blocks and elements.
-        */
-       tok = rew_alt(tok);
-       if (tok == p->tok)
-               return(p->end ? REWIND_NONE :
-                   type == p->type ? REWIND_THIS : REWIND_MORE);
-
-       /*
-        * While elements do require rewinding for themselves,
-        * they never affect rewinding of other nodes.
-        */
-       if (MDOC_ELEM == p->type)
-               return(REWIND_MORE);
-
-       /*
-        * Blocks delimited by our target token get REWIND_MORE.
-        * Blocks delimiting our target token get REWIND_NONE. 
-        */

        switch (tok) {
        switch (tok) {

-       case (MDOC_Bl):
-               if (MDOC_It == p->tok)
-                       return(REWIND_MORE);
-               break;
-       case (MDOC_It):
-               if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
-                       return(REWIND_NONE);
-               break;
-       /*
-        * XXX Badly nested block handling still fails badly
-        * when one block is breaking two blocks of the same type.
-        * This is an incomplete and extremely ugly workaround,
-        * required to let the OpenBSD tree build.
-        */
-       case (MDOC_Oo):
-               if (MDOC_Op == p->tok)
-                       return(REWIND_MORE);
-               break;
-       case (MDOC_Nm):
-               return(REWIND_NONE);
-       case (MDOC_Nd):
-               /* FALLTHROUGH */
-       case (MDOC_Ss):
-               if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
-                       return(REWIND_NONE);
-               /* FALLTHROUGH */
-       case (MDOC_Sh):
-               if (MDOC_Nd == p->tok || MDOC_Ss == p->tok ||
-                   MDOC_Sh == p->tok)
-                       return(REWIND_MORE);
-               break;
+       case MDOC_Ac:
+               return MDOC_Ao;
+       case MDOC_Bc:
+               return MDOC_Bo;
+       case MDOC_Brc:
+               return MDOC_Bro;
+       case MDOC_Dc:
+               return MDOC_Do;
+       case MDOC_Ec:
+               return MDOC_Eo;
+       case MDOC_Ed:
+               return MDOC_Bd;
+       case MDOC_Ef:
+               return MDOC_Bf;
+       case MDOC_Ek:
+               return MDOC_Bk;
+       case MDOC_El:
+               return MDOC_Bl;
+       case MDOC_Fc:
+               return MDOC_Fo;
+       case MDOC_Oc:
+               return MDOC_Oo;
+       case MDOC_Pc:
+               return MDOC_Po;
+       case MDOC_Qc:
+               return MDOC_Qo;
+       case MDOC_Re:
+               return MDOC_Rs;
+       case MDOC_Sc:
+               return MDOC_So;
+       case MDOC_Xc:
+               return MDOC_Xo;

        default:
        default:

-               break;
+               return tok;

        }
        }

-
-       /*
-        * Default block rewinding rules.
-        * In particular, always skip block end markers,
-        * and let all blocks rewind Nm children.
-        */
-       if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok ||
-           (MDOC_BLOCK == p->type &&
-           ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)))
-               return(REWIND_MORE);
-
-       /*
-        * By default, closing out full blocks
-        * forces closing of broken explicit blocks,
-        * while closing out partial blocks
-        * allows delayed rewinding by default.
-        */
-       return (&blk_full == mdoc_macros[tok].fp ?
-           REWIND_FORCE : REWIND_LATER);

 }
 
 }
 

-
-static int
-rew_elem(struct mdoc *mdoc, enum mdoct tok)
+static void
+rew_elem(struct roff_man *mdoc, enum roff_tok tok)

 {
 {

-       struct mdoc_node *n;
+       struct roff_node *n;

 
        n = mdoc->last;
 
        n = mdoc->last;

-       if (MDOC_ELEM != n->type)
+       if (n->type != ROFFT_ELEM)

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

-       assert(MDOC_ELEM == n->type);
+       assert(n->type == ROFFT_ELEM);

        assert(tok == n->tok);
        assert(tok == n->tok);

-
-       return(rew_last(mdoc, n));
+       rew_last(mdoc, n);

 }
 
 }
 

-
-/*
- * We are trying to close a block identified by tok,
- * but the child block *broken is still open.
- * Thus, postpone closing the tok block
- * until the rew_sub call closing *broken.
- */
-static int
-make_pending(struct mdoc_node *broken, enum mdoct tok,
-               struct mdoc *mdoc, int line, int ppos)
+static void
+break_intermediate(struct roff_node *n, struct roff_node *breaker)

 {
 {

-       struct mdoc_node *breaker;
-
-       /*
-        * Iterate backwards, searching for the block matching tok,
-        * that is, the block breaking the *broken block.
-        */
-       for (breaker = broken->parent; breaker; breaker = breaker->parent) {
-
-               /*
-                * If the *broken block had already been broken before
-                * and we encounter its breaker, make the tok block
-                * pending on the inner breaker.
-                * Graphically, "[A breaker=[B broken=[C->B B] tok=A] C]"
-                * becomes "[A broken=[B [C->B B] tok=A] C]"
-                * and finally "[A [B->A [C->B B] A] C]".
-                */
-               if (breaker == broken->pending) {
-                       broken = breaker;
-                       continue;
-               }
-
-               if (REWIND_THIS != rew_dohalt(tok, MDOC_BLOCK, breaker))
-                       continue;
-               if (MDOC_BODY == broken->type)
-                       broken = broken->parent;
-
-               /*
-                * Found the breaker.
-                * If another, outer breaker is already pending on
-                * the *broken block, we must not clobber the link
-                * to the outer breaker, but make it pending on the
-                * new, now inner breaker.
-                * Graphically, "[A breaker=[B broken=[C->A A] tok=B] C]"
-                * becomes "[A breaker=[B->A broken=[C A] tok=B] C]"
-                * and finally "[A [B->A [C->B A] B] C]".
-                */
-               if (broken->pending) {
-                       struct mdoc_node *taker;
-
-                       /*
-                        * If the breaker had also been broken before,
-                        * it cannot take on the outer breaker itself,
-                        * but must hand it on to its own breakers.
-                        * Graphically, this is the following situation:
-                        * "[A [B breaker=[C->B B] broken=[D->A A] tok=C] D]"
-                        * "[A taker=[B->A breaker=[C->B B] [D->C A] C] D]"
-                        */
-                       taker = breaker;
-                       while (taker->pending)
-                               taker = taker->pending;
-                       taker->pending = broken->pending;
-               }
-               broken->pending = breaker;
-               mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos,
-                               "%s breaks %s", mdoc_macronames[tok],
-                               mdoc_macronames[broken->tok]);
-               return(1);
+       if (n != breaker &&
+           n->type != ROFFT_BLOCK && n->type != ROFFT_HEAD &&
+           (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
+               n = n->parent;
+       while (n != breaker) {
+               if ( ! (n->flags & NODE_VALID))
+                       n->flags |= NODE_BROKEN;
+               n = n->parent;

        }
        }

-
-       /*
-        * Found no matching block for tok.
-        * Are you trying to close a block that is not open?
-        */
-       return(0);

 }
 
 }
 

-
+/*
+ * If there is an open sub-block of the target requiring
+ * explicit close-out, postpone closing out the target until
+ * the rew_pending() call closing out the sub-block.
+ */

 static int
 static int

-rew_sub(enum mdoc_type t, struct mdoc *mdoc, 
-               enum mdoct tok, int line, int ppos)
+find_pending(struct roff_man *mdoc, enum roff_tok tok, int line, int ppos,
+       struct roff_node *target)

 {
 {

-       struct mdoc_node *n;
+       struct roff_node        *n;
+       int                      irc;

 
 

-       n = mdoc->last;
-       while (n) {
-               switch (rew_dohalt(tok, t, n)) {
-               case (REWIND_NONE):
-                       return(1);
-               case (REWIND_THIS):
-                       n->lastline = line -
-                           (MDOC_NEWLINE & mdoc->flags &&
-                            ! (MDOC_EXPLICIT & mdoc_macros[tok].flags));
-                       break;
-               case (REWIND_FORCE):
-                       mandoc_vmsg(MANDOCERR_SCOPEBROKEN, mdoc->parse, 
-                                       line, ppos, "%s breaks %s", 
-                                       mdoc_macronames[tok],
-                                       mdoc_macronames[n->tok]);
-                       /* FALLTHROUGH */
-               case (REWIND_MORE):
-                       n->lastline = line -
-                           (MDOC_NEWLINE & mdoc->flags ? 1 : 0);
-                       n = n->parent;
+       if (target->flags & NODE_VALID)
+               return 0;
+
+       irc = 0;
+       for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
+               if (n->flags & NODE_ENDED)

                        continue;
                        continue;

-               case (REWIND_LATER):
-                       if (make_pending(n, tok, mdoc, line, ppos) ||
-                           MDOC_BLOCK != t)
-                               return(1);
-                       /* FALLTHROUGH */
-               case (REWIND_ERROR):
-                       mdoc_pmsg(mdoc, line, ppos, MANDOCERR_NOSCOPE);
-                       return(1);
+               if (n->type == ROFFT_BLOCK &&
+                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                       irc = 1;
+                       break_intermediate(mdoc->last, target);
+                       if (target->type == ROFFT_HEAD)
+                               target->flags |= NODE_ENDED;
+                       else if ( ! (target->flags & NODE_ENDED)) {
+                               mandoc_vmsg(MANDOCERR_BLK_NEST,
+                                   mdoc->parse, line, ppos,
+                                   "%s breaks %s", roff_name[tok],
+                                   roff_name[n->tok]);
+                               mdoc_endbody_alloc(mdoc, line, ppos,
+                                   tok, target);
+                       }

                }
                }

-               break;
-       }
-
-       assert(n);
-       if ( ! rew_last(mdoc, n))
-               return(0);
-
-       /*
-        * The current block extends an enclosing block.
-        * Now that the current block ends, close the enclosing block, too.
-        */
-       while (NULL != (n = n->pending)) {
-               if ( ! rew_last(mdoc, n))
-                       return(0);
-               if (MDOC_HEAD == n->type &&
-                   ! mdoc_body_alloc(mdoc, n->line, n->pos, n->tok))
-                       return(0);

        }
        }

-
-       return(1);
+       return irc;

 }
 
 /*
  * Allocate a word and check whether it's punctuation or not.
  * Punctuation consists of those tokens found in mdoc_isdelim().
  */
 }
 
 /*
  * Allocate a word and check whether it's punctuation or not.
  * Punctuation consists of those tokens found in mdoc_isdelim().
  */

-static int
-dword(struct mdoc *mdoc, int line, int col, const char *p,
+static void
+dword(struct roff_man *mdoc, int line, int col, const char *p,

                enum mdelim d, int may_append)
 {
                enum mdelim d, int may_append)
 {

-       
-       if (DELIM_MAX == d)
+
+       if (d == DELIM_MAX)

                d = mdoc_isdelim(p);
 
        if (may_append &&
                d = mdoc_isdelim(p);
 
        if (may_append &&

-           ! ((MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF) & mdoc->flags) &&
-           DELIM_NONE == d && MDOC_TEXT == mdoc->last->type &&
-           DELIM_NONE == mdoc_isdelim(mdoc->last->string)) {
-               mdoc_word_append(mdoc, p);
-               return(1);
+           ! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) &&
+           d == DELIM_NONE && mdoc->last->type == ROFFT_TEXT &&
+           mdoc_isdelim(mdoc->last->string) == DELIM_NONE) {
+               roff_word_append(mdoc, p);
+               return;

        }
 
        }
 

-       if ( ! mdoc_word_alloc(mdoc, line, col, p))
-               return(0);
-
-       if (DELIM_OPEN == d)
-               mdoc->last->flags |= MDOC_DELIMO;
+       roff_word_alloc(mdoc, line, col, p);

 
        /*
 
        /*

-        * Closing delimiters only suppress the preceding space
-        * when they follow something, not when they start a new
-        * block or element, and not when they follow `No'.
-        *
-        * XXX  Explicitly special-casing MDOC_No here feels
-        *      like a layering violation.  Find a better way
-        *      and solve this in the code related to `No'!
+        * If the word consists of a bare delimiter,
+        * flag the new node accordingly,
+        * unless doing so was vetoed by the invoking macro.
+        * Always clear the veto, it is only valid for one word.

         */
 
         */
 

-       else if (DELIM_CLOSE == d && mdoc->last->prev &&
-                       mdoc->last->prev->tok != MDOC_No &&
-                       mdoc->last->parent->tok != MDOC_Fd)
-               mdoc->last->flags |= MDOC_DELIMC;
-
-       return(1);
+       if (d == DELIM_OPEN)
+               mdoc->last->flags |= NODE_DELIMO;
+       else if (d == DELIM_CLOSE &&
+           ! (mdoc->flags & MDOC_NODELIMC) &&
+           mdoc->last->parent->tok != MDOC_Fd)
+               mdoc->last->flags |= NODE_DELIMC;
+       mdoc->flags &= ~MDOC_NODELIMC;

 }
 
 }
 

-static int
-append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
+static void
+append_delims(struct roff_man *mdoc, int line, int *pos, char *buf)

 {
 {

-       int              la;
-       enum margserr    ac;

        char            *p;
        char            *p;

+       int              la;

 
 

-       if ('\0' == buf[*pos])
-               return(1);
+       if (buf[*pos] == '\0')
+               return;

 
        for (;;) {
                la = *pos;
 
        for (;;) {
                la = *pos;

-               ac = mdoc_zargs(mdoc, line, pos, buf, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               else if (ARGS_EOLN == ac)
+               if (mdoc_args(mdoc, line, pos, buf, TOKEN_NONE, &p) ==
+                   ARGS_EOLN)

                        break;
                        break;

-

                dword(mdoc, line, la, p, DELIM_MAX, 1);
 
                /*
                dword(mdoc, line, la, p, DELIM_MAX, 1);
 
                /*


@@ -683,173 +491,264 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
                 * knowing which symbols break this behaviour, for
                 * example, `.  ;' shouldn't propagate the double-space.
                 */
                 * knowing which symbols break this behaviour, for
                 * example, `.  ;' shouldn't propagate the double-space.
                 */

+

                if (mandoc_eos(p, strlen(p)))
                if (mandoc_eos(p, strlen(p)))

-                       mdoc->last->flags |= MDOC_EOS;
+                       mdoc->last->flags |= NODE_EOS;

        }
        }

-
-       return(1);

 }
 
 }
 

-

 /*
 /*

- * Close out block partial/full explicit.  
+ * Parse one word.
+ * If it is a macro, call it and return 1.
+ * Otherwise, allocate it and return 0.

  */
 static int
  */
 static int

-blk_exp_close(MACRO_PROT_ARGS)
+macro_or_word(MACRO_PROT_ARGS, int parsed)

 {
 {

-       struct mdoc_node *body;         /* Our own body. */
-       struct mdoc_node *later;        /* A sub-block starting later. */
-       struct mdoc_node *n;            /* For searching backwards. */
+       char            *p;
+       int              ntok;
+
+       p = buf + ppos;
+       ntok = TOKEN_NONE;
+       if (*p == '"')
+               p++;
+       else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT))
+               ntok = lookup(mdoc, tok, line, ppos, p);
+
+       if (ntok == TOKEN_NONE) {
+               dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE ||
+                   mdoc_macros[tok].flags & MDOC_JOIN);
+               return 0;
+       } else {
+               if (tok != TOKEN_NONE &&
+                   mdoc_macros[tok].fp == in_line_eoln)
+                       rew_elem(mdoc, tok);
+               mdoc_macro(mdoc, ntok, line, ppos, pos, buf);
+               if (tok == TOKEN_NONE)
+                       append_delims(mdoc, line, pos, buf);
+               return 1;
+       }
+}

 
 

-       int              j, lastarg, maxargs, flushed, nl;
+/*
+ * Close out block partial/full explicit.
+ */
+static void
+blk_exp_close(MACRO_PROT_ARGS)
+{
+       struct roff_node *body;         /* Our own body. */
+       struct roff_node *endbody;      /* Our own end marker. */
+       struct roff_node *itblk;        /* An It block starting later. */
+       struct roff_node *later;        /* A sub-block starting later. */
+       struct roff_node *n;            /* Search back to our block. */
+       struct roff_node *target;       /* For find_pending(). */
+
+       int              j, lastarg, maxargs, nl, pending;

        enum margserr    ac;
        enum margserr    ac;

-       enum mdoct       atok, ntok;
+       enum roff_tok    atok, ntok;

        char            *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
        switch (tok) {
        char            *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
        switch (tok) {

-       case (MDOC_Ec):
+       case MDOC_Ec:

                maxargs = 1;
                break;
                maxargs = 1;
                break;

-       case (MDOC_Ek):
+       case MDOC_Ek:

                mdoc->flags &= ~MDOC_KEEP;
                mdoc->flags &= ~MDOC_KEEP;

+               /* FALLTHROUGH */

        default:
                maxargs = 0;
                break;
        }
 
        default:
                maxargs = 0;
                break;
        }
 

+       /* Search backwards for the beginning of our own body. */
+
+       atok = rew_alt(tok);
+       body = NULL;
+       for (n = mdoc->last; n; n = n->parent) {
+               if (n->flags & NODE_ENDED || n->tok != atok ||
+                   n->type != ROFFT_BODY || n->end != ENDBODY_NOT)
+                       continue;
+               body = n;
+               break;
+       }
+

        /*
         * Search backwards for beginnings of blocks,
         * both of our own and of pending sub-blocks.
         */
        /*
         * Search backwards for beginnings of blocks,
         * both of our own and of pending sub-blocks.
         */

-       atok = rew_alt(tok);
-       body = later = NULL;
+
+       endbody = itblk = later = NULL;

        for (n = mdoc->last; n; n = n->parent) {
        for (n = mdoc->last; n; n = n->parent) {

-               if (MDOC_VALID & n->flags)
+               if (n->flags & NODE_ENDED)

                        continue;
 
                        continue;
 

-               /* Remember the start of our own body. */
-               if (MDOC_BODY == n->type && atok == n->tok) {
-                       if (ENDBODY_NOT == n->end)
-                               body = n;
+               /*
+                * Mismatching end macros can never break anything
+                * and we only care about the breaking of BLOCKs.
+                */
+
+               if (body == NULL || n->type != ROFFT_BLOCK)
+                       continue;
+
+               /*
+                * SYNOPSIS name blocks can not be broken themselves,
+                * but they do get broken together with a broken child.
+                */
+
+               if (n->tok == MDOC_Nm) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;

                        continue;
                }
 
                        continue;
                }
 

-               if (MDOC_BLOCK != n->type || MDOC_Nm == n->tok)
+               if (n->tok == MDOC_It) {
+                       itblk = n;

                        continue;
                        continue;

+               }
+

                if (atok == n->tok) {
                if (atok == n->tok) {

-                       assert(body);

 
                        /*
                         * Found the start of our own block.
                         * When there is no pending sub block,
                         * just proceed to closing out.
                         */
 
                        /*
                         * Found the start of our own block.
                         * When there is no pending sub block,
                         * just proceed to closing out.
                         */

-                       if (NULL == later)
-                               break;

 
 

-                       /* 
-                        * When there is a pending sub block,
-                        * postpone closing out the current block
-                        * until the rew_sub() closing out the sub-block.
-                        */
-                       make_pending(later, tok, mdoc, line, ppos);
+                       if (later == NULL ||
+                           (tok == MDOC_El && itblk == NULL))
+                               break;

 
                        /*
 
                        /*

+                        * When there is a pending sub block, postpone
+                        * closing out the current block until the
+                        * rew_pending() closing out the sub-block.

                         * Mark the place where the formatting - but not
                         * the scope - of the current block ends.
                         */
                         * Mark the place where the formatting - but not
                         * the scope - of the current block ends.
                         */

-                       if ( ! mdoc_endbody_alloc(mdoc, line, ppos,
-                           atok, body, ENDBODY_SPACE))
-                               return(0);
+
+                       mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse,
+                           line, ppos, "%s breaks %s",
+                           roff_name[atok], roff_name[later->tok]);
+
+                       endbody = mdoc_endbody_alloc(mdoc, line, ppos,
+                           atok, body);
+
+                       if (tok == MDOC_El)
+                               itblk->flags |= NODE_ENDED | NODE_BROKEN;
+
+                       /*
+                        * If a block closing macro taking arguments
+                        * breaks another block, put the arguments
+                        * into the end marker.
+                        */
+
+                       if (maxargs)
+                               mdoc->next = ROFF_NEXT_CHILD;

                        break;
                }
 
                /*
                        break;
                }
 
                /*

-                * When finding an open sub block, remember the last
-                * open explicit block, or, in case there are only
-                * implicit ones, the first open implicit block.
+                * Explicit blocks close out description lines, but
+                * even those can get broken together with a child.

                 */
                 */

-               if (later &&
-                   MDOC_EXPLICIT & mdoc_macros[later->tok].flags)
+
+               if (n->tok == MDOC_Nd) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;
+                       else
+                               rew_last(mdoc, n);

                        continue;
                        continue;

-               if (MDOC_It != n->tok)
+               }
+
+               /* Breaking an open sub block. */
+
+               break_intermediate(mdoc->last, body);
+               n->flags |= NODE_BROKEN;
+               if (later == NULL)

                        later = n;
        }
 
                        later = n;
        }
 

-       if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-               /* FIXME: do this in validate */
-               if (buf[*pos]) 
-                       mdoc_pmsg(mdoc, line, ppos, MANDOCERR_ARGSLOST);
-
-               if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
-                       return(0);
-               return(rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos));
+       if (body == NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse,
+                   line, ppos, roff_name[tok]);
+               if (maxargs && endbody == NULL) {
+                       /*
+                        * Stray .Ec without previous .Eo:
+                        * Break the output line, keep the arguments.
+                        */
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);
+               }
+       } else if (endbody == NULL) {
+               rew_last(mdoc, body);
+               if (maxargs)
+                       mdoc_tail_alloc(mdoc, line, ppos, atok);

        }
 
        }
 

-       if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
-               return(0);
+       if ( ! (mdoc_macros[tok].flags & MDOC_PARSED)) {
+               if (buf[*pos] != '\0')
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                           mdoc->parse, line, ppos,
+                           "%s %s", roff_name[tok],
+                           buf + *pos);
+               if (endbody == NULL && n != NULL)
+                       rew_pending(mdoc, n);
+               return;
+       }

 
 

-       if (NULL == later && maxargs > 0) 
-               if ( ! mdoc_tail_alloc(mdoc, line, ppos, rew_alt(tok)))
-                       return(0);
+       if (endbody != NULL)
+               n = endbody;

 
 

-       for (flushed = j = 0; ; j++) {
+       ntok = TOKEN_NONE;
+       for (j = 0; ; j++) {

                lastarg = *pos;
 
                lastarg = *pos;
 

-               if (j == maxargs && ! flushed) {
-                       if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
-                               return(0);
-                       flushed = 1;
-               }
+               if (j == maxargs && n != NULL)
+                       rew_last(mdoc, n);

 
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
 
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_PUNCT == ac)
-                       break;
-               if (ARGS_EOLN == ac)
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN)

                        break;
 
                        break;
 

-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
+               ntok = ac == ARGS_QWORD ? TOKEN_NONE :
+                   lookup(mdoc, tok, line, lastarg, p);

 
 

-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, lastarg, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags))
-                               return(0);
+               if (ntok == TOKEN_NONE) {
+                       dword(mdoc, line, lastarg, p, DELIM_MAX,
+                           MDOC_JOIN & mdoc_macros[tok].flags);

                        continue;
                }
 
                        continue;
                }
 

-               if ( ! flushed) {
-                       if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
-                               return(0);
-                       flushed = 1;
-               }
-
+               if (n != NULL)
+                       rew_last(mdoc, n);

                mdoc->flags &= ~MDOC_NEWLINE;
                mdoc->flags &= ~MDOC_NEWLINE;

-
-               if ( ! mdoc_macro(mdoc, ntok, line, lastarg, pos, buf))
-                       return(0);
+               mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);

                break;
        }
 
                break;
        }
 

-       if ( ! flushed && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
-               return(0);
-
-       if ( ! nl)
-               return(1);
-       return(append_delims(mdoc, line, pos, buf));
+       if (n != NULL) {
+               pending = 0;
+               if (ntok != TOKEN_NONE && n->flags & NODE_BROKEN) {
+                       target = n;
+                       do
+                               target = target->parent;
+                       while ( ! (target->flags & NODE_ENDED));
+                       pending = find_pending(mdoc, ntok, line, ppos, target);
+               }
+               if ( ! pending)
+                       rew_pending(mdoc, n);
+       }
+       if (nl)
+               append_delims(mdoc, line, pos, buf);

 }
 
 }
 

-
-static int
+static void

 in_line(MACRO_PROT_ARGS)
 {
 in_line(MACRO_PROT_ARGS)
 {

-       int              la, scope, cnt, nc, nl;
-       enum margverr    av;
-       enum mdoct       ntok;
+       int              la, scope, cnt, firstarg, mayopen, nc, nl;
+       enum roff_tok    ntok;

        enum margserr    ac;
        enum mdelim      d;
        struct mdoc_arg *arg;
        enum margserr    ac;
        enum mdelim      d;
        struct mdoc_arg *arg;


@@ -863,17 +762,12 @@ in_line(MACRO_PROT_ARGS)
         */
 
        switch (tok) {
         */
 
        switch (tok) {

-       case (MDOC_An):
-               /* FALLTHROUGH */
-       case (MDOC_Ar):
-               /* FALLTHROUGH */
-       case (MDOC_Fl):
-               /* FALLTHROUGH */
-       case (MDOC_Mt):
-               /* FALLTHROUGH */
-       case (MDOC_Nm):
-               /* FALLTHROUGH */
-       case (MDOC_Pa):
+       case MDOC_An:
+       case MDOC_Ar:
+       case MDOC_Fl:
+       case MDOC_Mt:
+       case MDOC_Nm:
+       case MDOC_Pa:

                nc = 1;
                break;
        default:
                nc = 1;
                break;
        default:


@@ -881,126 +775,134 @@ in_line(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-       for (arg = NULL;; ) {
-               la = *pos;
-               av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               } 
-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
-                       continue;
-
-               mdoc_argv_free(arg);
-               return(0);
-       }
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);

 
 

+       d = DELIM_NONE;
+       firstarg = 1;
+       mayopen = 1;

        for (cnt = scope = 0;; ) {
                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
 
        for (cnt = scope = 0;; ) {
                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
 

-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
+               /*
+                * At the end of a macro line,
+                * opening delimiters do not suppress spacing.
+                */
+
+               if (ac == ARGS_EOLN) {
+                       if (d == DELIM_OPEN)
+                               mdoc->last->flags &= ~NODE_DELIMO;

                        break;
                        break;

-               if (ARGS_PUNCT == ac)
+               }
+
+               /*
+                * The rest of the macro line is only punctuation,
+                * to be handled by append_delims().
+                * If there were no other arguments,
+                * do not allow the first one to suppress spacing,
+                * even if it turns out to be a closing one.
+                */
+
+               if (ac == ARGS_PUNCT) {
+                       if (cnt == 0 && (nc == 0 || tok == MDOC_An))
+                               mdoc->flags |= MDOC_NODELIMC;

                        break;
                        break;

+               }

 
 

-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
+               ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?
+                   TOKEN_NONE : lookup(mdoc, tok, line, la, p);

 
 

-               /* 
+               /*

                 * In this case, we've located a submacro and must
                 * execute it.  Close out scope, if open.  If no
                 * elements have been generated, either create one (nc)
                 * or raise a warning.
                 */
 
                 * In this case, we've located a submacro and must
                 * execute it.  Close out scope, if open.  If no
                 * elements have been generated, either create one (nc)
                 * or raise a warning.
                 */
 

-               if (MDOC_MAX != ntok) {
-                       if (scope && ! rew_elem(mdoc, tok))
-                               return(0);
-                       if (nc && 0 == cnt) {
-                               if ( ! mdoc_elem_alloc(mdoc, line,
-                                               ppos, tok, arg))
-                                       return(0);
-                               if ( ! rew_last(mdoc, mdoc->last))
-                                       return(0);
-                       } else if ( ! nc && 0 == cnt) {
+               if (ntok != TOKEN_NONE) {
+                       if (scope)
+                               rew_elem(mdoc, tok);
+                       if (nc && ! cnt) {
+                               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                               rew_last(mdoc, mdoc->last);
+                       } else if ( ! nc && ! cnt) {

                                mdoc_argv_free(arg);
                                mdoc_argv_free(arg);

-                               mdoc_pmsg(mdoc, line, ppos,
-                                       MANDOCERR_MACROEMPTY);
+                               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                                   mdoc->parse, line, ppos,
+                                   roff_name[tok]);

                        }
                        }

+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       if (nl)
+                               append_delims(mdoc, line, pos, buf);
+                       return;
+               }

 
 

-                       if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                               return(0);
-                       if ( ! nl)
-                               return(1);
-                       return(append_delims(mdoc, line, pos, buf));
-               } 
-
-               /* 
+               /*

                 * Non-quote-enclosed punctuation.  Set up our scope, if
                 * a word; rewind the scope, if a delimiter; then append
                 * Non-quote-enclosed punctuation.  Set up our scope, if
                 * a word; rewind the scope, if a delimiter; then append

-                * the word. 
+                * the word.

                 */
 
                 */
 

-               d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p);
+               d = ac == ARGS_QWORD ? DELIM_NONE : mdoc_isdelim(p);

 
                if (DELIM_NONE != d) {
                        /*
                         * If we encounter closing punctuation, no word
 
                if (DELIM_NONE != d) {
                        /*
                         * If we encounter closing punctuation, no word

-                        * has been omitted, no scope is open, and we're
+                        * has been emitted, no scope is open, and we're

                         * allowed to have an empty element, then start
                         * allowed to have an empty element, then start

-                        * a new scope.  `Ar', `Fl', and `Li', only do
-                        * this once per invocation.  There may be more
-                        * of these (all of them?).
+                        * a new scope.

                         */
                         */

-                       if (0 == cnt && (nc || MDOC_Li == tok) && 
-                                       DELIM_CLOSE == d && ! scope) {
-                               if ( ! mdoc_elem_alloc(mdoc, line,
-                                               ppos, tok, arg))
-                                       return(0);
-                               if (MDOC_Ar == tok || MDOC_Li == tok || 
-                                               MDOC_Fl == tok)
-                                       cnt++;
+                       if ((d == DELIM_CLOSE ||
+                            (d == DELIM_MIDDLE && tok == MDOC_Fl)) &&
+                           !cnt && !scope && nc && mayopen) {
+                               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

                                scope = 1;
                                scope = 1;

+                               cnt++;
+                               if (tok == MDOC_Nm)
+                                       mayopen = 0;

                        }
                        /*
                         * Close out our scope, if one is open, before
                         * any punctuation.
                         */
                        }
                        /*
                         * Close out our scope, if one is open, before
                         * any punctuation.
                         */

-                       if (scope && ! rew_elem(mdoc, tok))
-                               return(0);
+                       if (scope)
+                               rew_elem(mdoc, tok);

                        scope = 0;
                        scope = 0;

-               } else if ( ! scope) {
-                       if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
-                               return(0);
+                       if (tok == MDOC_Fn)
+                               mayopen = 0;
+               } else if (mayopen && !scope) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

                        scope = 1;
                        scope = 1;

+                       cnt++;

                }
 
                }
 

-               if (DELIM_NONE == d)
-                       cnt++;
+               dword(mdoc, line, la, p, d,
+                   mdoc_macros[tok].flags & MDOC_JOIN);

 
 

-               if ( ! dword(mdoc, line, la, p, d,
-                   MDOC_JOIN & mdoc_macros[tok].flags))
-                       return(0);
+               /*
+                * If the first argument is a closing delimiter,
+                * do not suppress spacing before it.
+                */
+
+               if (firstarg && d == DELIM_CLOSE && !nc)
+                       mdoc->last->flags &= ~NODE_DELIMC;
+               firstarg = 0;

 
                /*
                 * `Fl' macros have their scope re-opened with each new
                 * word so that the `-' can be added to each one without
                 * having to parse out spaces.
                 */
 
                /*
                 * `Fl' macros have their scope re-opened with each new
                 * word so that the `-' can be added to each one without
                 * having to parse out spaces.
                 */

-               if (scope && MDOC_Fl == tok) {
-                       if ( ! rew_elem(mdoc, tok))
-                               return(0);
+               if (scope && tok == MDOC_Fl) {
+                       rew_elem(mdoc, tok);

                        scope = 0;
                }
        }
 
                        scope = 0;
                }
        }
 

-       if (scope && ! rew_elem(mdoc, tok))
-               return(0);
+       if (scope && tok != MDOC_Lk) {
+               rew_elem(mdoc, tok);
+               scope = 0;
+       }

 
        /*
         * If no elements have been collected and we're allowed to have
 
        /*
         * If no elements have been collected and we're allowed to have


@@ -1008,45 +910,119 @@ in_line(MACRO_PROT_ARGS)
         * raise a warning.
         */
 
         * raise a warning.
         */
 

-       if (nc && 0 == cnt) {
-               if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
-                       return(0);
-               if ( ! rew_last(mdoc, mdoc->last))
-                       return(0);
-       } else if ( ! nc && 0 == cnt) {
-               mdoc_argv_free(arg);
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROEMPTY);
+       if ( ! cnt) {
+               if (nc) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                       rew_last(mdoc, mdoc->last);
+               } else {
+                       mdoc_argv_free(arg);
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                           line, ppos, roff_name[tok]);
+               }

        }
        }

-
-       if ( ! nl)
-               return(1);
-       return(append_delims(mdoc, line, pos, buf));
+       if (nl)
+               append_delims(mdoc, line, pos, buf);
+       if (scope)
+               rew_elem(mdoc, tok);

 }
 
 }
 

-
-static int
+static void

 blk_full(MACRO_PROT_ARGS)
 {
 blk_full(MACRO_PROT_ARGS)
 {

-       int               la, nl, nparsed;
+       int               la, nl, parsed;

        struct mdoc_arg  *arg;
        struct mdoc_arg  *arg;

-       struct mdoc_node *head; /* save of head macro */
-       struct mdoc_node *body; /* save of body macro */
-       struct mdoc_node *n;
-       enum mdoc_type    mtt;
-       enum mdoct        ntok;
+       struct roff_node *blk; /* Our own or a broken block. */
+       struct roff_node *head; /* Our own head. */
+       struct roff_node *body; /* Our own body. */
+       struct roff_node *n;

        enum margserr     ac, lac;
        enum margserr     ac, lac;

-       enum margverr     av;

        char             *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
        char             *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 

-       /* Close out prior implicit scope. */
+       if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, roff_name[tok]);
+               return;
+       }
+
+       if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
+
+               /* Here, tok is one of Sh Ss Nm Nd It. */
+
+               blk = NULL;
+               for (n = mdoc->last; n != NULL; n = n->parent) {
+                       if (n->flags & NODE_ENDED) {
+                               if ( ! (n->flags & NODE_VALID))
+                                       n->flags |= NODE_BROKEN;
+                               continue;
+                       }
+                       if (n->type != ROFFT_BLOCK)
+                               continue;
+
+                       if (tok == MDOC_It && n->tok == MDOC_Bl) {
+                               if (blk != NULL) {
+                                       mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                           mdoc->parse, line, ppos,
+                                           "It breaks %s",
+                                           roff_name[blk->tok]);
+                                       rew_pending(mdoc, blk);
+                               }
+                               break;
+                       }
+
+                       if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                               switch (tok) {
+                               case MDOC_Sh:
+                               case MDOC_Ss:
+                                       mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                           mdoc->parse, line, ppos,
+                                           "%s breaks %s", roff_name[tok],
+                                           roff_name[n->tok]);
+                                       rew_pending(mdoc, n);
+                                       n = mdoc->last;
+                                       continue;
+                               case MDOC_It:
+                                       /* Delay in case it's astray. */
+                                       blk = n;
+                                       continue;
+                               default:
+                                       break;
+                               }
+                               break;
+                       }
+
+                       /* Here, n is one of Sh Ss Nm Nd It. */
+
+                       if (tok != MDOC_Sh && (n->tok == MDOC_Sh ||
+                           (tok != MDOC_Ss && (n->tok == MDOC_Ss ||
+                            (tok != MDOC_It && n->tok == MDOC_It)))))
+                               break;
+
+                       /* Item breaking an explicit block. */
+
+                       if (blk != NULL) {
+                               mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                   mdoc->parse, line, ppos,
+                                   "It breaks %s", roff_name[blk->tok]);
+                               rew_pending(mdoc, blk);
+                               blk = NULL;
+                       }
+
+                       /* Close out prior implicit scopes. */
+
+                       rew_pending(mdoc, n);
+               }
+
+               /* Skip items outside lists. */

 
 

-       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
-               if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
-                       return(0);
-               if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
-                       return(0);
+               if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
+                       mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
+                           line, ppos, "It %s", buf + *pos);
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);
+                       return;
+               }

        }
 
        /*
        }
 
        /*


@@ -1058,223 +1034,157 @@ blk_full(MACRO_PROT_ARGS)
         * regular child nodes.
         */
 
         * regular child nodes.
         */
 

-       for (arg = NULL;; ) {
-               la = *pos;
-               av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               } 
-
-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
-                       continue;
-
-               mdoc_argv_free(arg);
-               return(0);
-       }
-
-       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg))
-               return(0);
-
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+       blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);

        head = body = NULL;
 
        /*
         * Exception: Heads of `It' macros in `-diag' lists are not
         * parsed, even though `It' macros in general are parsed.
         */
        head = body = NULL;
 
        /*
         * Exception: Heads of `It' macros in `-diag' lists are not
         * parsed, even though `It' macros in general are parsed.
         */

-       nparsed = MDOC_It == tok &&
-               MDOC_Bl == mdoc->last->parent->tok &&
-               LIST_diag == mdoc->last->parent->norm->Bl.type;
+
+       parsed = tok != MDOC_It ||
+           mdoc->last->parent->tok != MDOC_Bl ||
+           mdoc->last->parent->norm->Bl.type != LIST_diag;

 
        /*
         * The `Nd' macro has all arguments in its body: it's a hybrid
         * of block partial-explicit and full-implicit.  Stupid.
         */
 
 
        /*
         * The `Nd' macro has all arguments in its body: it's a hybrid
         * of block partial-explicit and full-implicit.  Stupid.
         */
 

-       if (MDOC_Nd == tok) {
-               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
-                       return(0);
-               head = mdoc->last;
-               if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
-                       return(0);
-               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                       return(0);
-               body = mdoc->last;
+       if (tok == MDOC_Nd) {
+               head = roff_head_alloc(mdoc, line, ppos, tok);
+               rew_last(mdoc, head);
+               body = roff_body_alloc(mdoc, line, ppos, tok);

        }
 
        }
 

-       if (MDOC_Bk == tok)
+       if (tok == MDOC_Bk)

                mdoc->flags |= MDOC_KEEP;
 
                mdoc->flags |= MDOC_KEEP;
 

-       ac = ARGS_ERROR;
-
-       for ( ; ; ) {
-               la = *pos;
-               /* Initialise last-phrase-type with ARGS_PEND. */
-               lac = ARGS_ERROR == ac ? ARGS_PEND : ac;
-               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+       ac = ARGS_EOLN;
+       for (;;) {

 
 

-               if (ARGS_PUNCT == ac)
-                       break;
+               /*
+                * If we are right after a tab character,
+                * do not parse the first word for macros.
+                */

 
 

-               if (ARGS_ERROR == ac)
-                       return(0);
+               if (mdoc->flags & MDOC_PHRASEQN) {
+                       mdoc->flags &= ~MDOC_PHRASEQN;
+                       mdoc->flags |= MDOC_PHRASEQF;
+               }

 
 

-               if (ARGS_EOLN == ac) {
-                       if (ARGS_PPHRASE != lac && ARGS_PHRASE != lac)
+               la = *pos;
+               lac = ac;
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_EOLN) {
+                       if (lac != ARGS_PHRASE ||
+                           ! (mdoc->flags & MDOC_PHRASEQF))

                                break;
                                break;

+

                        /*
                        /*

-                        * This is necessary: if the last token on a
-                        * line is a `Ta' or tab, then we'll get
-                        * ARGS_EOLN, so we must be smart enough to
-                        * reopen our scope if the last parse was a
-                        * phrase or partial phrase.
+                        * This line ends in a tab; start the next
+                        * column now, with a leading blank.

                         */
                         */

-                       if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
-                               return(0);
-                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                               return(0);
-                       body = mdoc->last;
+
+                       if (body != NULL)
+                               rew_last(mdoc, body);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);
+                       roff_word_alloc(mdoc, line, ppos, "\\&");

                        break;
                }
 
                        break;
                }
 

-               /* 
+               if (tok == MDOC_Bd || tok == MDOC_Bk) {
+                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+                           mdoc->parse, line, la, "%s ... %s",
+                           roff_name[tok], buf + la);
+                       break;
+               }
+               if (tok == MDOC_Rs) {
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
+                           line, la, "Rs %s", buf + la);
+                       break;
+               }
+               if (ac == ARGS_PUNCT)
+                       break;
+
+               /*

                 * Emit leading punctuation (i.e., punctuation before
                 * Emit leading punctuation (i.e., punctuation before

-                * the MDOC_HEAD) for non-phrase types.
+                * the ROFFT_HEAD) for non-phrase types.

                 */
 
                 */
 

-               if (NULL == head && 
-                               ARGS_PEND != ac &&
-                               ARGS_PHRASE != ac &&
-                               ARGS_PPHRASE != ac &&
-                               ARGS_QWORD != ac &&
-                               DELIM_OPEN == mdoc_isdelim(p)) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))
-                               return(0);
+               if (head == NULL &&
+                   ac != ARGS_PHRASE &&
+                   ac != ARGS_QWORD &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);

                        continue;
                }
 
                /* Open a head if one hasn't been opened. */
 
                        continue;
                }
 
                /* Open a head if one hasn't been opened. */
 

-               if (NULL == head) {
-                       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
-                               return(0);
-                       head = mdoc->last;
-               }
+               if (head == NULL)
+                       head = roff_head_alloc(mdoc, line, ppos, tok);
+
+               if (ac == ARGS_PHRASE) {

 
 

-               if (ARGS_PHRASE == ac || 
-                               ARGS_PEND == ac ||
-                               ARGS_PPHRASE == ac) {

                        /*
                         * If we haven't opened a body yet, rewind the
                         * head; if we have, rewind that instead.
                         */
 
                        /*
                         * If we haven't opened a body yet, rewind the
                         * head; if we have, rewind that instead.
                         */
 

-                       mtt = body ? MDOC_BODY : MDOC_HEAD;
-                       if ( ! rew_sub(mtt, mdoc, tok, line, ppos))
-                               return(0);
-                       
-                       /* Then allocate our body context. */
-
-                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                               return(0);
-                       body = mdoc->last;
-
-                       /*
-                        * Process phrases: set whether we're in a
-                        * partial-phrase (this effects line handling)
-                        * then call down into the phrase parser.
-                        */
-
-                       if (ARGS_PPHRASE == ac)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       if (ARGS_PEND == ac && ARGS_PPHRASE == lac)
-                               mdoc->flags |= MDOC_PPHRASE;
+                       rew_last(mdoc, body == NULL ? head : body);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-                       if ( ! phrase(mdoc, line, la, buf))
-                               return(0);
+                       /* Process to the tab or to the end of the line. */

 
 

-                       mdoc->flags &= ~MDOC_PPHRASE;
-                       continue;
-               }
+                       mdoc->flags |= MDOC_PHRASE;
+                       parse_rest(mdoc, TOKEN_NONE, line, &la, buf);
+                       mdoc->flags &= ~MDOC_PHRASE;

 
 

-               ntok = nparsed || ARGS_QWORD == ac ? 
-                       MDOC_MAX : lookup(tok, p);
+                       /* There may have been `Ta' macros. */

 
 

-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags))
-                               return(0);
+                       while (body->next != NULL)
+                               body = body->next;

                        continue;
                }
 
                        continue;
                }
 

-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               break;
-       }
-
-       if (NULL == head) {
-               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
-                       return(0);
-               head = mdoc->last;
+               if (macro_or_word(mdoc, tok, line, la, pos, buf, parsed))
+                       break;

        }
        }

-       
-       if (nl && ! append_delims(mdoc, line, pos, buf))
-               return(0);
-
-       /* If we've already opened our body, exit now. */

 
 

-       if (NULL != body)
+       if (blk->flags & NODE_VALID)
+               return;
+       if (head == NULL)
+               head = roff_head_alloc(mdoc, line, ppos, tok);
+       if (nl && tok != MDOC_Bd && tok != MDOC_Bl && tok != MDOC_Rs)
+               append_delims(mdoc, line, pos, buf);
+       if (body != NULL)

                goto out;
                goto out;

-
-       /*
-        * If there is an open (i.e., unvalidated) sub-block requiring
-        * explicit close-out, postpone switching the current block from
-        * head to body until the rew_sub() call closing out that
-        * sub-block.
-        */
-       for (n = mdoc->last; n && n != head; n = n->parent) {
-               if (MDOC_BLOCK == n->type && 
-                               MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
-                               ! (MDOC_VALID & n->flags)) {
-                       n->pending = head;
-                       return(1);
-               }
-       }
+       if (find_pending(mdoc, tok, line, ppos, head))
+               return;

 
        /* Close out scopes to remain in a consistent state. */
 
 
        /* Close out scopes to remain in a consistent state. */
 

-       if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
-               return(0);
-       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-               return(0);
-
+       rew_last(mdoc, head);
+       body = roff_body_alloc(mdoc, line, ppos, tok);

 out:
 out:

-       if ( ! (MDOC_FREECOL & mdoc->flags))
-               return(1);
-
-       if ( ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
-               return(0);
-       if ( ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
-               return(0);
-
-       mdoc->flags &= ~MDOC_FREECOL;
-       return(1);
+       if (mdoc->flags & MDOC_FREECOL) {
+               rew_last(mdoc, body);
+               rew_last(mdoc, blk);
+               mdoc->flags &= ~MDOC_FREECOL;
+       }

 }
 
 }
 

-
-static int
+static void

 blk_part_imp(MACRO_PROT_ARGS)
 {
        int               la, nl;
 blk_part_imp(MACRO_PROT_ARGS)
 {
        int               la, nl;

-       enum mdoct        ntok;

        enum margserr     ac;
        char             *p;
        enum margserr     ac;
        char             *p;

-       struct mdoc_node *blk; /* saved block context */
-       struct mdoc_node *body; /* saved body context */
-       struct mdoc_node *n;
+       struct roff_node *blk; /* saved block context */
+       struct roff_node *body; /* saved body context */
+       struct roff_node *n;

 
        nl = MDOC_NEWLINE & mdoc->flags;
 
 
        nl = MDOC_NEWLINE & mdoc->flags;
 


@@ -1287,15 +1197,8 @@ blk_part_imp(MACRO_PROT_ARGS)
         * or more closing punctuation nodes.
         */
 
         * or more closing punctuation nodes.
         */
 

-       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
-               return(0);
-
-       blk = mdoc->last;
-
-       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
-               return(0);
-       if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
-               return(0);
+       blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL);
+       rew_last(mdoc, roff_head_alloc(mdoc, line, ppos, tok));

 
        /*
         * Open the body scope "on-demand", that is, after we've
 
        /*
         * Open the body scope "on-demand", that is, after we've


@@ -1306,110 +1209,47 @@ blk_part_imp(MACRO_PROT_ARGS)
        for (body = NULL; ; ) {
                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
        for (body = NULL; ; ) {
                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
-                       break;
-               if (ARGS_PUNCT == ac)
+               if (ac == ARGS_EOLN || ac == ARGS_PUNCT)

                        break;
 
                        break;
 

-               if (NULL == body && ARGS_QWORD != ac &&
-                               DELIM_OPEN == mdoc_isdelim(p)) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))
-                               return(0);
-                       continue;
-               }
-
-               if (NULL == body) {
-                      if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                              return(0);
-                       body = mdoc->last;
-               }
-
-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
-
-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags))
-                               return(0);
+               if (body == NULL && ac != ARGS_QWORD &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);

                        continue;
                }
 
                        continue;
                }
 

-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               break;
-       }
-
-       /* Clean-ups to leave in a consistent state. */
+               if (body == NULL)
+                       body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-       if (NULL == body) {
-               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                       return(0);
-               body = mdoc->last;
-       }
-
-       /*
-        * If there is an open sub-block requiring explicit close-out,
-        * postpone closing out the current block
-        * until the rew_sub() call closing out the sub-block.
-        */
-       for (n = mdoc->last; n && n != body && n != blk->parent;
-                       n = n->parent) {
-               if (MDOC_BLOCK == n->type &&
-                   MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
-                   ! (MDOC_VALID & n->flags)) {
-                       make_pending(n, tok, mdoc, line, ppos);
-                       if ( ! mdoc_endbody_alloc(mdoc, line, ppos,
-                           tok, body, ENDBODY_NOSPACE))
-                               return(0);
-                       return(1);
-               }
+               if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
+                       break;

        }
        }

+       if (body == NULL)
+               body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-       /* 
-        * If we can't rewind to our body, then our scope has already
-        * been closed by another macro (like `Oc' closing `Op').  This
-        * is ugly behaviour nodding its head to OpenBSD's overwhelming
-        * crufty use of `Op' breakage.
-        */
-       if (n != body)
-               mandoc_vmsg(MANDOCERR_SCOPENEST, mdoc->parse, line, ppos, 
-                               "%s broken", mdoc_macronames[tok]);
-
-       if (n && ! rew_sub(MDOC_BODY, mdoc, tok, line, ppos))
-               return(0);
-
-       /* Standard appending of delimiters. */
-
-       if (nl && ! append_delims(mdoc, line, pos, buf))
-               return(0);
-
-       /* Rewind scope, if applicable. */
+       if (find_pending(mdoc, tok, line, ppos, body))
+               return;

 
 

-       if (n && ! rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos))
-               return(0);
+       rew_last(mdoc, body);
+       if (nl)
+               append_delims(mdoc, line, pos, buf);
+       rew_pending(mdoc, blk);

 
        /* Move trailing .Ns out of scope. */
 
        for (n = body->child; n && n->next; n = n->next)
                /* Do nothing. */ ;
 
        /* Move trailing .Ns out of scope. */
 
        for (n = body->child; n && n->next; n = n->next)
                /* Do nothing. */ ;

-       if (n && MDOC_Ns == n->tok)
+       if (n && n->tok == MDOC_Ns)

                mdoc_node_relink(mdoc, n);
                mdoc_node_relink(mdoc, n);

-
-       return(1);

 }
 
 }
 

-
-static int
+static void

 blk_part_exp(MACRO_PROT_ARGS)
 {
        int               la, nl;
        enum margserr     ac;
 blk_part_exp(MACRO_PROT_ARGS)
 {
        int               la, nl;
        enum margserr     ac;

-       struct mdoc_node *head; /* keep track of head */
-       struct mdoc_node *body; /* keep track of body */
+       struct roff_node *head; /* keep track of head */

        char             *p;
        char             *p;

-       enum mdoct        ntok;

 
        nl = MDOC_NEWLINE & mdoc->flags;
 
 
        nl = MDOC_NEWLINE & mdoc->flags;
 


@@ -1419,108 +1259,57 @@ blk_part_exp(MACRO_PROT_ARGS)
         * case of `Eo'); and a body that may be empty.
         */
 
         * case of `Eo'); and a body that may be empty.
         */
 

-       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
-               return(0); 
-
-       for (head = body = NULL; ; ) {
+       roff_block_alloc(mdoc, line, ppos, tok);
+       head = NULL;
+       for (;;) {

                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_PUNCT == ac)
-                       break;
-               if (ARGS_EOLN == ac)
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN)

                        break;
 
                /* Flush out leading punctuation. */
 
                        break;
 
                /* Flush out leading punctuation. */
 

-               if (NULL == head && ARGS_QWORD != ac &&
-                               DELIM_OPEN == mdoc_isdelim(p)) {
-                       assert(NULL == body);
-                       if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))
-                               return(0);
+               if (head == NULL && ac != ARGS_QWORD &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);

                        continue;
                }
 
                        continue;
                }
 

-               if (NULL == head) {
-                       assert(NULL == body);
-                       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
-                               return(0);
-                       head = mdoc->last;
-               }
-
-               /*
-                * `Eo' gobbles any data into the head, but most other
-                * macros just immediately close out and begin the body.
-                */
-
-               if (NULL == body) {
-                       assert(head);
-                       /* No check whether it's a macro! */
-                       if (MDOC_Eo == tok)
-                               if ( ! dword(mdoc, line, la, p, DELIM_MAX, 0))
-                                       return(0);
-
-                       if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
-                               return(0);
-                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                               return(0);
-                       body = mdoc->last;
-
-                       if (MDOC_Eo == tok)
+               if (head == NULL) {
+                       head = roff_head_alloc(mdoc, line, ppos, tok);
+                       if (tok == MDOC_Eo)  /* Not parsed. */
+                               dword(mdoc, line, la, p, DELIM_MAX, 0);
+                       rew_last(mdoc, head);
+                       roff_body_alloc(mdoc, line, ppos, tok);
+                       if (tok == MDOC_Eo)

                                continue;
                }
 
                                continue;
                }
 

-               assert(NULL != head && NULL != body);
-
-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
-
-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags))
-                               return(0);
-                       continue;
-               }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               break;
+               if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
+                       break;

        }
 
        /* Clean-up to leave in a consistent state. */
 
        }
 
        /* Clean-up to leave in a consistent state. */
 

-       if (NULL == head)
-               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
-                       return(0);
-
-       if (NULL == body) {
-               if ( ! rew_sub(MDOC_HEAD, mdoc, tok, line, ppos))
-                       return(0);
-               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
-                       return(0);
+       if (head == NULL) {
+               rew_last(mdoc, roff_head_alloc(mdoc, line, ppos, tok));
+               roff_body_alloc(mdoc, line, ppos, tok);

        }
        }

-
-       /* Standard appending of delimiters. */
-
-       if ( ! nl)
-               return(1);
-       return(append_delims(mdoc, line, pos, buf));
+       if (nl)
+               append_delims(mdoc, line, pos, buf);

 }
 
 }
 

-
-/* ARGSUSED */
-static int
+static void

 in_line_argn(MACRO_PROT_ARGS)
 {
 in_line_argn(MACRO_PROT_ARGS)
 {

-       int              la, flushed, j, maxargs, nl;
-       enum margserr    ac;
-       enum margverr    av;

        struct mdoc_arg *arg;
        char            *p;
        struct mdoc_arg *arg;
        char            *p;

-       enum mdoct       ntok;
+       enum margserr    ac;
+       enum roff_tok    ntok;
+       int              state; /* arg#; -1: not yet open; -2: closed */
+       int              la, maxargs, nl;

 
 

-       nl = MDOC_NEWLINE & mdoc->flags;
+       nl = mdoc->flags & MDOC_NEWLINE;

 
        /*
         * A line macro that has a fixed number of arguments (maxargs).
 
        /*
         * A line macro that has a fixed number of arguments (maxargs).


@@ -1531,18 +1320,14 @@ in_line_argn(MACRO_PROT_ARGS)
         */
 
        switch (tok) {
         */
 
        switch (tok) {

-       case (MDOC_Ap):
-               /* FALLTHROUGH */
-       case (MDOC_No):
-               /* FALLTHROUGH */
-       case (MDOC_Ns):
-               /* FALLTHROUGH */
-       case (MDOC_Ux):
+       case MDOC_Ap:
+       case MDOC_Ns:
+       case MDOC_Ux:

                maxargs = 0;
                break;
                maxargs = 0;
                break;

-       case (MDOC_Bx):
-               /* FALLTHROUGH */
-       case (MDOC_Xr):
+       case MDOC_Bx:
+       case MDOC_Es:
+       case MDOC_Xr:

                maxargs = 2;
                break;
        default:
                maxargs = 2;
                break;
        default:


@@ -1550,286 +1335,177 @@ in_line_argn(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-       for (arg = NULL; ; ) {
-               la = *pos;
-               av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);

 
 

-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               } 
+       state = -1;
+       p = NULL;
+       for (;;) {
+               la = *pos;
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);

 
 

-               if (ARGV_EOLN == av)
-                       break;
-               if (ARGV_ARG == av)
+               if (ac == ARGS_WORD && state == -1 &&
+                   ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);

                        continue;
                        continue;

+               }

 
 

-               mdoc_argv_free(arg);
-               return(0);
-       }
-
-       for (flushed = j = 0; ; ) {
-               la = *pos;
-               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (state == -1 && tok != MDOC_In &&
+                   tok != MDOC_St && tok != MDOC_Xr) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                       state = 0;
+               }

 
 

-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_PUNCT == ac)
-                       break;
-               if (ARGS_EOLN == ac)
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN) {
+                       if (abs(state) < 2 && tok == MDOC_Pf)
+                               mandoc_vmsg(MANDOCERR_PF_SKIP,
+                                   mdoc->parse, line, ppos, "Pf %s",
+                                   p == NULL ? "at eol" : p);

                        break;
                        break;

+               }

 
 

-               if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) && 
-                               ARGS_QWORD != ac && 0 == j && 
-                               DELIM_OPEN == mdoc_isdelim(p)) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_OPEN, 0))
-                               return(0);
-                       continue;
-               } else if (0 == j)
-                      if ( ! mdoc_elem_alloc(mdoc, line, la, tok, arg))
-                              return(0);
-
-               if (j == maxargs && ! flushed) {
-                       if ( ! rew_elem(mdoc, tok))
-                               return(0);
-                       flushed = 1;
+               if (state == maxargs) {
+                       rew_elem(mdoc, tok);
+                       state = -2;

                }
 
                }
 

-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
+               ntok = (ac == ARGS_QWORD || (tok == MDOC_Pf && state == 0)) ?
+                   TOKEN_NONE : lookup(mdoc, tok, line, la, p);

 
 

-               if (MDOC_MAX != ntok) {
-                       if ( ! flushed && ! rew_elem(mdoc, tok))
-                               return(0);
-                       flushed = 1;
-                       if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                               return(0);
-                       j++;
+               if (ntok != TOKEN_NONE) {
+                       if (state >= 0) {
+                               rew_elem(mdoc, tok);
+                               state = -2;
+                       }
+                       mdoc_macro(mdoc, ntok, line, la, pos, buf);

                        break;
                }
 
                        break;
                }
 

-               if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
-                               ARGS_QWORD != ac &&
-                               ! flushed &&
-                               DELIM_NONE != mdoc_isdelim(p)) {
-                       if ( ! rew_elem(mdoc, tok))
-                               return(0);
-                       flushed = 1;
+               if (ac == ARGS_QWORD ||
+                   mdoc_macros[tok].flags & MDOC_IGNDELIM ||
+                   mdoc_isdelim(p) == DELIM_NONE) {
+                       if (state == -1) {
+                               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                               state = 1;
+                       } else if (state >= 0)
+                               state++;
+               } else if (state >= 0) {
+                       rew_elem(mdoc, tok);
+                       state = -2;

                }
 
                }
 

-               if ( ! dword(mdoc, line, la, p, DELIM_MAX,
-                   MDOC_JOIN & mdoc_macros[tok].flags))
-                       return(0);
-               j++;
+               dword(mdoc, line, la, p, DELIM_MAX,
+                   mdoc_macros[tok].flags & MDOC_JOIN);

        }
 
        }
 

-       if (0 == j && ! mdoc_elem_alloc(mdoc, line, la, tok, arg))
-              return(0);
-
-       /* Close out in a consistent state. */
+       if (state == -1) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, roff_name[tok]);
+               return;
+       }

 
 

-       if ( ! flushed && ! rew_elem(mdoc, tok))
-               return(0);
-       if ( ! nl)
-               return(1);
-       return(append_delims(mdoc, line, pos, buf));
+       if (state == 0 && tok == MDOC_Pf)
+               append_delims(mdoc, line, pos, buf);
+       if (state >= 0)
+               rew_elem(mdoc, tok);
+       if (nl)
+               append_delims(mdoc, line, pos, buf);

 }
 
 }
 

-
-static int
+static void

 in_line_eoln(MACRO_PROT_ARGS)
 {
 in_line_eoln(MACRO_PROT_ARGS)
 {

-       int              la;
-       enum margserr    ac;
-       enum margverr    av;
-       struct mdoc_arg *arg;
-       char            *p;
-       enum mdoct       ntok;
-
-       assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));
+       struct roff_node        *n;
+       struct mdoc_arg         *arg;

 
 

-       if (tok == MDOC_Pp)
-               rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);
-
-       /* Parse macro arguments. */
-
-       for (arg = NULL; ; ) {
-               la = *pos;
-               av = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
-
-               if (ARGV_WORD == av) {
-                       *pos = la;
-                       break;
-               }
-               if (ARGV_EOLN == av) 
-                       break;
-               if (ARGV_ARG == av)
-                       continue;
-
-               mdoc_argv_free(arg);
-               return(0);
+       if ((tok == MDOC_Pp || tok == MDOC_Lp) &&
+           ! (mdoc->flags & MDOC_SYNOPSIS)) {
+               n = mdoc->last;
+               if (mdoc->next == ROFF_NEXT_SIBLING)
+                       n = n->parent;
+               if (n->tok == MDOC_Nm)
+                       rew_last(mdoc, n->parent);

        }
 
        }
 

-       /* Open element scope. */
-
-       if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
-               return(0);
-
-       /* Parse argument terms. */
-
-       for (;;) {
-               la = *pos;
-               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
-                       break;
-
-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup(tok, p);
-
-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags))
-                               return(0);
-                       continue;
-               }
-
-               if ( ! rew_elem(mdoc, tok))
-                       return(0);
-               return(mdoc_macro(mdoc, ntok, line, la, pos, buf));
+       if (buf[*pos] == '\0' &&
+           (tok == MDOC_Fd || *roff_name[tok] == '%')) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, roff_name[tok]);
+               return;

        }
 
        }
 

-       /* Close out (no delimiters). */
-
-       return(rew_elem(mdoc, tok));
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+       if (parse_rest(mdoc, tok, line, pos, buf))
+               return;
+       rew_elem(mdoc, tok);

 }
 
 }
 

-
-/* ARGSUSED */
+/*
+ * The simplest argument parser available: Parse the remaining
+ * words until the end of the phrase or line and return 0
+ * or until the next macro, call that macro, and return 1.
+ */

 static int
 static int

-ctx_synopsis(MACRO_PROT_ARGS)
+parse_rest(struct roff_man *mdoc, enum roff_tok tok,
+    int line, int *pos, char *buf)

 {
 {

-       int              nl;
-
-       nl = MDOC_NEWLINE & mdoc->flags;
-
-       /* If we're not in the SYNOPSIS, go straight to in-line. */
-       if ( ! (MDOC_SYNOPSIS & mdoc->flags))
-               return(in_line(mdoc, tok, line, ppos, pos, buf));
-
-       /* If we're a nested call, same place. */
-       if ( ! nl)
-               return(in_line(mdoc, tok, line, ppos, pos, buf));
+       int              la;

 
 

-       /*
-        * XXX: this will open a block scope; however, if later we end
-        * up formatting the block scope, then child nodes will inherit
-        * the formatting.  Be careful.
-        */
-       if (MDOC_Nm == tok)
-               return(blk_full(mdoc, tok, line, ppos, pos, buf));
-       assert(MDOC_Vt == tok);
-       return(blk_part_imp(mdoc, tok, line, ppos, pos, buf));
+       for (;;) {
+               la = *pos;
+               if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN)
+                       return 0;
+               if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
+                       return 1;
+       }

 }
 
 }
 

-
-/* ARGSUSED */
-static int
-obsolete(MACRO_PROT_ARGS)
+static void
+ctx_synopsis(MACRO_PROT_ARGS)

 {
 
 {
 

-       mdoc_pmsg(mdoc, line, ppos, MANDOCERR_MACROOBS);
-       return(1);
+       if (~mdoc->flags & (MDOC_SYNOPSIS | MDOC_NEWLINE))
+               in_line(mdoc, tok, line, ppos, pos, buf);
+       else if (tok == MDOC_Nm)
+               blk_full(mdoc, tok, line, ppos, pos, buf);
+       else {
+               assert(tok == MDOC_Vt);
+               blk_part_imp(mdoc, tok, line, ppos, pos, buf);
+       }

 }
 
 }
 

-

 /*
  * Phrases occur within `Bl -column' entries, separated by `Ta' or tabs.
  * They're unusual because they're basically free-form text until a
  * macro is encountered.
  */
 /*
  * Phrases occur within `Bl -column' entries, separated by `Ta' or tabs.
  * They're unusual because they're basically free-form text until a
  * macro is encountered.
  */

-static int
-phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
+static void
+phrase_ta(MACRO_PROT_ARGS)

 {
 {

-       int              la, pos;
-       enum margserr    ac;
-       enum mdoct       ntok;
-       char            *p;
-
-       for (pos = ppos; ; ) {
-               la = pos;
-
-               ac = mdoc_zargs(mdoc, line, &pos, buf, &p);
+       struct roff_node *body, *n;

 
 

-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
-                       break;
-
-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
+       /* Make sure we are in a column list or ignore this macro. */

 
 

-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_MAX, 1))
-                               return(0);
+       body = NULL;
+       for (n = mdoc->last; n != NULL; n = n->parent) {
+               if (n->flags & NODE_ENDED)

                        continue;
                        continue;

-               }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, &pos, buf))
-                       return(0);
-               return(append_delims(mdoc, line, &pos, buf));
+               if (n->tok == MDOC_It && n->type == ROFFT_BODY)
+                       body = n;
+               if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT)
+                       break;

        }
 
        }
 

-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-phrase_ta(MACRO_PROT_ARGS)
-{
-       struct mdoc_node *n;
-       int               la;
-       enum mdoct        ntok;
-       enum margserr     ac;
-       char             *p;
-
-       /* Make sure we are in a column list or ignore this macro. */
-       n = mdoc->last;
-       while (NULL != n && MDOC_Bl != n->tok)
-               n = n->parent;
-       if (NULL == n || LIST_column != n->norm->Bl.type) {
-               mdoc_pmsg(mdoc, line, ppos, MANDOCERR_STRAYTA);
-               return(1);
+       if (n == NULL || n->norm->Bl.type != LIST_column) {
+               mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,
+                   line, ppos, "Ta");
+               return;

        }
 
        /* Advance to the next column. */
        }
 
        /* Advance to the next column. */

-       if ( ! rew_sub(MDOC_BODY, mdoc, MDOC_It, line, ppos))
-               return(0);
-       if ( ! mdoc_body_alloc(mdoc, line, ppos, MDOC_It))
-               return(0);
-
-       for (;;) {
-               la = *pos;
-               ac = mdoc_zargs(mdoc, line, pos, buf, &p);
-
-               if (ARGS_ERROR == ac)
-                       return(0);
-               if (ARGS_EOLN == ac)
-                       break;
-
-               ntok = ARGS_QWORD == ac ? MDOC_MAX : lookup_raw(p);
-
-               if (MDOC_MAX == ntok) {
-                       if ( ! dword(mdoc, line, la, p, DELIM_MAX,
-                           MDOC_JOIN & mdoc_macros[tok].flags))
-                               return(0);
-                       continue;
-               }
-
-               if ( ! mdoc_macro(mdoc, ntok, line, la, pos, buf))
-                       return(0);
-               return(append_delims(mdoc, line, pos, buf));
-       }

 
 

-       return(1);
+       rew_last(mdoc, body);
+       roff_body_alloc(mdoc, line, ppos, MDOC_It);
+       parse_rest(mdoc, TOKEN_NONE, line, pos, buf);

 }
 }