merge OpenBSD commit by jmc@:

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 09a4de57efeb75d11b456ac7a91c781012c0ff0e..dd3885c702b737dfc992d04a1eb5467ead161605 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,15 +1,15 @@
-/*     $Id: mdoc_macro.c,v 1.151 2014/11/28 04:47:03 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.234 2020/01/19 18:02:00 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, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2020 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
  * 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


@@ -26,19 +26,12 @@
 #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"

-
-enum   rew {   /* see rew_dohalt() */
-       REWIND_NONE,
-       REWIND_THIS,
-       REWIND_MORE,
-       REWIND_FORCE,
-       REWIND_LATER,
-       REWIND_ERROR
-};
+#include "roff_int.h"
+#include "libmdoc.h"

 
 static void            blk_full(MACRO_PROT_ARGS);
 static void            blk_exp_close(MACRO_PROT_ARGS);
 
 static void            blk_full(MACRO_PROT_ARGS);
 static void            blk_exp_close(MACRO_PROT_ARGS);


@@ -50,25 +43,25 @@ static      void            in_line_argn(MACRO_PROT_ARGS);
 static void            in_line(MACRO_PROT_ARGS);
 static void            phrase_ta(MACRO_PROT_ARGS);
 
 static void            in_line(MACRO_PROT_ARGS);
 static void            phrase_ta(MACRO_PROT_ARGS);
 

-static void            dword(struct mdoc *, int, int, const char *,
-                                enum mdelim, int);
-static void            append_delims(struct mdoc *, 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 void            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 void            rew_elem(struct mdoc *, enum mdoct);
-static void            rew_last(struct mdoc *, const struct mdoc_node *);
-static void            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 */
-       { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
+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, char *, int);
+static void            break_intermediate(struct roff_node *,
+                               struct roff_node *);
+static int             parse_rest(struct roff_man *, enum roff_tok,
+                               int, int *, char *);
+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 *);
+
+static const struct mdoc_macro mdoc_macros[MDOC_MAX - MDOC_Dd] = {
+       { in_line_eoln, MDOC_PROLOGUE | MDOC_JOIN }, /* Dd */

        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* Sh */
        { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
        { in_line_eoln, MDOC_PROLOGUE }, /* Os */
        { blk_full, MDOC_PARSED | MDOC_JOIN }, /* Sh */


@@ -83,6 +76,8 @@ 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_IGNDELIM | 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 */


@@ -203,15 +198,18 @@ const     struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* En */
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
        { in_line_eoln, MDOC_JOIN }, /* %Q */
        { 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_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 */

-       { in_line_eoln, MDOC_PROLOGUE }, /* ll */
+       { in_line_eoln, 0 }, /* Tg */

 };
 
 };
 

-const  struct mdoc_macro * const mdoc_macros = __mdoc_macros;

 
 

+const struct mdoc_macro *
+mdoc_macro(enum roff_tok tok)
+{
+       assert(tok >= MDOC_Dd && tok < MDOC_MAX);
+       return mdoc_macros + (tok - MDOC_Dd);
+}

 
 /*
  * This is called at the end of parsing.  It must traverse up the tree,
 
 /*
  * This is called at the end of parsing.  It must traverse up the tree,


@@ -219,377 +217,220 @@ const   struct mdoc_macro * const mdoc_macros = __mdoc_macros;
  * are errors.
  */
 void
  * are errors.
  */
 void

-mdoc_macroend(struct mdoc *mdoc)
+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->last->flags & MDOC_VALID ?
+       n = mdoc->last->flags & NODE_VALID ?

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

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

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

-       rew_last(mdoc, mdoc->first);
+       rew_last(mdoc, mdoc->meta.first);

 }
 
 /*
 }
 
 /*

- * 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_macro(from)->flags & MDOC_PARSED) {
+               res = roffhash_find(mdoc->mdocmac, p, 0);
+               if (res != TOKEN_NONE) {
+                       if (mdoc_macro(res)->flags & MDOC_CALLABLE)
+                               return res;
+                       mandoc_msg(MANDOCERR_MACRO_CALL, line, ppos, "%s", 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)
+static void
+rew_last(struct roff_man *mdoc, const struct roff_node *to)

 {
 {

-       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);
+       if (to->flags & NODE_VALID)
+               return;
+
+       while (mdoc->last != to) {
+               mdoc_state(mdoc, mdoc->last);
+               mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+               mdoc->last = mdoc->last->parent;
+       }
+       mdoc_state(mdoc, mdoc->last);
+       mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+       mdoc->next = ROFF_NEXT_SIBLING;

 }
 
 }
 

+/*
+ * Rewind up to a specific block, including all blocks that broke it.
+ */

 static void
 static void

-rew_last(struct mdoc *mdoc, const struct mdoc_node *to)
+rew_pending(struct roff_man *mdoc, const struct roff_node *n)

 {
 {

-       struct mdoc_node *n, *np;

 
 

-       assert(to);
-       mdoc->next = MDOC_NEXT_SIBLING;
-       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;
-               mdoc_valid_post(mdoc);
-               n = mdoc->last;
-               mdoc->last = np;
-               assert(mdoc->last);
-               mdoc->last->last = n;
+       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);
+                               if (n->tok == MDOC_Ss)
+                                       mdoc->flags &= ~ROFF_NONOFILL;
+                               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;
+                       }
+               }

        }
        }

-       mdoc_valid_post(mdoc);

 }
 
 /*
  * For a block closing macro, return the corresponding opening one.
  * Otherwise, return the macro itself.
  */
 }
 
 /*
  * For a block closing macro, return the corresponding opening one.
  * Otherwise, return the macro itself.
  */

-static enum mdoct
-rew_alt(enum mdoct tok)
+static enum roff_tok
+rew_alt(enum roff_tok tok)

 {
        switch (tok) {
        case MDOC_Ac:
 {
        switch (tok) {
        case MDOC_Ac:

-               return(MDOC_Ao);
+               return MDOC_Ao;

        case MDOC_Bc:
        case MDOC_Bc:

-               return(MDOC_Bo);
+               return MDOC_Bo;

        case MDOC_Brc:
        case MDOC_Brc:

-               return(MDOC_Bro);
+               return MDOC_Bro;

        case MDOC_Dc:
        case MDOC_Dc:

-               return(MDOC_Do);
+               return MDOC_Do;

        case MDOC_Ec:
        case MDOC_Ec:

-               return(MDOC_Eo);
+               return MDOC_Eo;

        case MDOC_Ed:
        case MDOC_Ed:

-               return(MDOC_Bd);
+               return MDOC_Bd;

        case MDOC_Ef:
        case MDOC_Ef:

-               return(MDOC_Bf);
+               return MDOC_Bf;

        case MDOC_Ek:
        case MDOC_Ek:

-               return(MDOC_Bk);
+               return MDOC_Bk;

        case MDOC_El:
        case MDOC_El:

-               return(MDOC_Bl);
+               return MDOC_Bl;

        case MDOC_Fc:
        case MDOC_Fc:

-               return(MDOC_Fo);
+               return MDOC_Fo;

        case MDOC_Oc:
        case MDOC_Oc:

-               return(MDOC_Oo);
+               return MDOC_Oo;

        case MDOC_Pc:
        case MDOC_Pc:

-               return(MDOC_Po);
+               return MDOC_Po;

        case MDOC_Qc:
        case MDOC_Qc:

-               return(MDOC_Qo);
+               return MDOC_Qo;

        case MDOC_Re:
        case MDOC_Re:

-               return(MDOC_Rs);
+               return MDOC_Rs;

        case MDOC_Sc:
        case MDOC_Sc:

-               return(MDOC_So);
+               return MDOC_So;

        case MDOC_Xc:
        case MDOC_Xc:

-               return(MDOC_Xo);
+               return MDOC_Xo;

        default:
        default:

-               return(tok);
+               return tok;

        }
        }

-       /* 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.
- */
-static enum rew
-rew_dohalt(enum mdoct tok, enum mdoc_type type,
-               const struct mdoc_node *p)
-{
-
-       /*
-        * 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) {
-       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_ROOT == p->parent->type)
-                       return(REWIND_THIS);
-               if (MDOC_Nd == p->tok || MDOC_Ss == p->tok ||
-                   MDOC_Sh == p->tok)
-                       return(REWIND_MORE);
-               break;
-       default:
-               break;
-       }
-
-       /*
-        * Default block rewinding rules.
-        * In particular, always skip block end markers,
-        * and let all blocks rewind Nm children.
-        * Do not warn again when closing a block,
-        * since closing the body already warned.
-        */
-       if (ENDBODY_NOT != p->end || MDOC_Nm == p->tok ||
-           MDOC_BLOCK == type || (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 void
 }
 
 static void

-rew_elem(struct mdoc *mdoc, enum mdoct tok)
+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);
        rew_last(mdoc, n);
 }
 
        assert(tok == n->tok);
        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_BLK_NEST, 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);

 }
 
 }
 

-static void
-rew_sub(enum mdoc_type t, struct mdoc *mdoc,
-               enum mdoct tok, int line, int ppos)
+/*
+ * 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
+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;
-               case REWIND_THIS:
-                       n->lastline = line -
-                           (mdoc->flags & MDOC_NEWLINE &&
-                            ! (mdoc_macros[tok].flags & MDOC_EXPLICIT));
-                       break;
-               case REWIND_FORCE:
-                       mandoc_vmsg(MANDOCERR_BLK_BROKEN, mdoc->parse,
-                           line, ppos, "%s breaks %s",
-                           mdoc_macronames[tok],
-                           mdoc_macronames[n->tok]);
-                       /* FALLTHROUGH */
-               case REWIND_MORE:
-                       n->lastline = line -
-                           (mdoc->flags & MDOC_NEWLINE ? 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) ||
-                           t != MDOC_BLOCK)
-                               return;
-                       /* FALLTHROUGH */
-               case REWIND_ERROR:
-                       mandoc_msg(MANDOCERR_BLK_NOTOPEN,
-                           mdoc->parse, line, ppos,
-                           mdoc_macronames[tok]);
-                       return;
+               if (n->type == ROFFT_BLOCK &&
+                   mdoc_macro(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_msg(MANDOCERR_BLK_NEST,
+                                   line, ppos, "%s breaks %s",
+                                   roff_name[tok], roff_name[n->tok]);
+                               mdoc_endbody_alloc(mdoc, line, ppos,
+                                   tok, target);
+                       }

                }
                }

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

        }
        }

+       return irc;

 }
 
 /*
 }
 
 /*


@@ -597,7 +438,7 @@ rew_sub(enum mdoc_type t, struct mdoc *mdoc,
  * Punctuation consists of those tokens found in mdoc_isdelim().
  */
 static void
  * Punctuation consists of those tokens found in mdoc_isdelim().
  */
 static void

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

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


@@ -606,13 +447,13 @@ dword(struct mdoc *mdoc, int line, int col, const char *p,
 
        if (may_append &&
            ! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) &&
 
        if (may_append &&
            ! (mdoc->flags & (MDOC_SYNOPSIS | MDOC_KEEP | MDOC_SMOFF)) &&

-           d == DELIM_NONE && mdoc->last->type == MDOC_TEXT &&
+           d == DELIM_NONE && mdoc->last->type == ROFFT_TEXT &&

            mdoc_isdelim(mdoc->last->string) == DELIM_NONE) {
            mdoc_isdelim(mdoc->last->string) == DELIM_NONE) {

-               mdoc_word_append(mdoc, p);
+               roff_word_append(mdoc, p);

                return;
        }
 
                return;
        }
 

-       mdoc_word_alloc(mdoc, line, col, p);
+       roff_word_alloc(mdoc, line, col, p);

 
        /*
         * If the word consists of a bare delimiter,
 
        /*
         * If the word consists of a bare delimiter,


@@ -622,27 +463,27 @@ dword(struct mdoc *mdoc, int line, int col, const char *p,
         */
 
        if (d == DELIM_OPEN)
         */
 
        if (d == DELIM_OPEN)

-               mdoc->last->flags |= MDOC_DELIMO;
+               mdoc->last->flags |= NODE_DELIMO;

        else if (d == DELIM_CLOSE &&
            ! (mdoc->flags & MDOC_NODELIMC) &&
            mdoc->last->parent->tok != MDOC_Fd)
        else if (d == DELIM_CLOSE &&
            ! (mdoc->flags & MDOC_NODELIMC) &&
            mdoc->last->parent->tok != MDOC_Fd)

-               mdoc->last->flags |= MDOC_DELIMC;
+               mdoc->last->flags |= NODE_DELIMC;

        mdoc->flags &= ~MDOC_NODELIMC;
 }
 
 static void
        mdoc->flags &= ~MDOC_NODELIMC;
 }
 
 static void

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

 {
 {

+       char            *p;

        int              la;
        enum margserr    ac;
        int              la;
        enum margserr    ac;

-       char            *p;

 
        if (buf[*pos] == '\0')
                return;
 
        for (;;) {
                la = *pos;
 
        if (buf[*pos] == '\0')
                return;
 
        for (;;) {
                la = *pos;

-               ac = mdoc_zargs(mdoc, line, pos, buf, &p);
+               ac = mdoc_args(mdoc, line, pos, buf, TOKEN_NONE, &p);

                if (ac == ARGS_EOLN)
                        break;
                dword(mdoc, line, la, p, DELIM_MAX, 1);
                if (ac == ARGS_EOLN)
                        break;
                dword(mdoc, line, la, p, DELIM_MAX, 1);


@@ -660,7 +501,38 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
                 */
 
                if (mandoc_eos(p, strlen(p)))
                 */
 
                if (mandoc_eos(p, strlen(p)))

-                       mdoc->last->flags |= MDOC_EOS;
+                       mdoc->last->flags |= NODE_EOS;
+               if (ac == ARGS_ALLOC)
+                       free(p);
+       }
+}
+
+/*
+ * Parse one word.
+ * If it is a macro, call it and return 1.
+ * Otherwise, allocate it and return 0.
+ */
+static int
+macro_or_word(MACRO_PROT_ARGS, char *p, int parsed)
+{
+       int              ntok;
+
+       ntok = buf[ppos] == '"' || parsed == 0 ||
+           mdoc->flags & MDOC_PHRASELIT ? TOKEN_NONE :
+           lookup(mdoc, tok, line, ppos, p);
+
+       if (ntok == TOKEN_NONE) {
+               dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE ||
+                   mdoc_macro(tok)->flags & MDOC_JOIN);
+               return 0;
+       } else {
+               if (tok != TOKEN_NONE &&
+                   mdoc_macro(tok)->fp == in_line_eoln)
+                       rew_elem(mdoc, tok);
+               (*mdoc_macro(ntok)->fp)(mdoc, ntok, line, ppos, pos, buf);
+               if (tok == TOKEN_NONE)
+                       append_delims(mdoc, line, pos, buf);
+               return 1;

        }
 }
 
        }
 }
 


@@ -670,14 +542,16 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
 static void
 blk_exp_close(MACRO_PROT_ARGS)
 {
 static void
 blk_exp_close(MACRO_PROT_ARGS)
 {

-       struct mdoc_node *body;         /* Our own body. */
-       struct mdoc_node *endbody;      /* Our own end marker. */
-       struct mdoc_node *later;        /* A sub-block starting later. */
-       struct mdoc_node *n;            /* For searching backwards. */
-
-       int              j, lastarg, maxargs, flushed, nl;
+       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;
        char            *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;


@@ -694,29 +568,53 @@ blk_exp_close(MACRO_PROT_ARGS)
                break;
        }
 
                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 = endbody = later = NULL;
+       endbody = itblk = later = NULL;

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

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

                        continue;
 
                        continue;
 

-               /* Remember the start of our own body. */
+               /*
+                * 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->type == MDOC_BODY && atok == n->tok) {
-                       if (n->end == ENDBODY_NOT)
-                               body = n;
+               if (n->tok == MDOC_Nm) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;

                        continue;
                }
 
                        continue;
                }
 

-               if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm)
+               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.
 
                        /*
                         * Found the start of our own block.


@@ -724,116 +622,143 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * just proceed to closing out.
                         */
 
                         * just proceed to closing out.
                         */
 

-                       if (later == NULL)
+                       if (later == NULL ||
+                           (tok == MDOC_El && itblk == NULL))

                                break;
 
                        /*
                                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);
-
-                       /*
+                        * 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.
                         */
 

-                       mdoc_endbody_alloc(mdoc, line, ppos,
-                           atok, body, ENDBODY_SPACE);
+                       mandoc_msg(MANDOCERR_BLK_NEST,
+                           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
 
                        /*
                         * If a block closing macro taking arguments
                         * breaks another block, put the arguments

-                        * into the end marker and remeber the
-                        * end marker in order to close it out.
+                        * into the end marker.

                         */
 
                         */
 

-                       if (maxargs) {
-                               endbody = mdoc->last;
-                               mdoc->next = MDOC_NEXT_CHILD;
-                       }
+                       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_macros[later->tok].flags & MDOC_EXPLICIT)
+               if (n->tok == MDOC_Nd) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;
+                       else
+                               rew_last(mdoc, n);

                        continue;
                        continue;

-               if (n->tok != MDOC_It)
-                       later = n;
-       }
-       rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
+               }

 
 

-       if ( ! (mdoc_macros[tok].flags & MDOC_PARSED)) {
-               if (buf[*pos] != '\0')
-                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                           mdoc->parse, line, ppos,
-                           "%s %s", mdoc_macronames[tok],
-                           buf + *pos);
-               rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
-               return;
+               /* Breaking an open sub block. */
+
+               break_intermediate(mdoc->last, body);
+               n->flags |= NODE_BROKEN;
+               if (later == NULL)
+                       later = n;

        }
 
        }
 

-       if (maxargs && endbody == NULL) {
-               if (n == NULL) {
+       if (body == NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, line, ppos,
+                   "%s", roff_name[tok]);
+               if (maxargs && endbody == NULL) {

                        /*
                         * Stray .Ec without previous .Eo:
                        /*
                         * Stray .Ec without previous .Eo:

-                        * Break the output line, ignore any arguments.
+                        * Break the output line, keep the arguments.

                         */
                         */

-                       mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
-                       rew_elem(mdoc, MDOC_br);
-               } else
+                       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);
        }
 
                        mdoc_tail_alloc(mdoc, line, ppos, atok);
        }
 

-       flushed = n == NULL;
-       for (j = 0; ; j++) {
-               lastarg = *pos;
+       if ((mdoc_macro(tok)->flags & MDOC_PARSED) == 0) {
+               if (buf[*pos] != '\0')
+                       mandoc_msg(MANDOCERR_ARG_SKIP, line, ppos,
+                           "%s %s", roff_name[tok], buf + *pos);
+               if (endbody == NULL && n != NULL)
+                       rew_pending(mdoc, n);

 
 

-               if (j == maxargs && ! flushed) {
-                       if (endbody == NULL)
-                               rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
+               /*
+                * Restore the fill mode that was set before the display.
+                * This needs to be done here rather than during validation
+                * such that subsequent nodes get the right flags.
+                */
+
+               if (tok == MDOC_Ed && body != NULL) {
+                       if (body->flags & NODE_NOFILL)
+                               mdoc->flags |= ROFF_NOFILL;

                        else
                        else

-                               rew_last(mdoc, endbody);
-                       flushed = 1;
+                               mdoc->flags &= ~ROFF_NOFILL;

                }
                }

+               return;
+       }
+
+       if (endbody != NULL)
+               n = endbody;
+
+       ntok = TOKEN_NONE;
+       for (j = 0; ; j++) {
+               lastarg = *pos;
+
+               if (j == maxargs && n != NULL)
+                       rew_last(mdoc, n);

 
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
                        break;
 
 
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
                        break;
 

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

 
 

-               if (ntok == MDOC_MAX) {
+               if (ntok == TOKEN_NONE) {

                        dword(mdoc, line, lastarg, p, DELIM_MAX,
                        dword(mdoc, line, lastarg, p, DELIM_MAX,

-                           MDOC_JOIN & mdoc_macros[tok].flags);
+                           mdoc_macro(tok)->flags & MDOC_JOIN);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                }
                        continue;
                }

+               if (ac == ARGS_ALLOC)
+                       free(p);

 
 

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

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

-               mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);
+               (*mdoc_macro(ntok)->fp)(mdoc, ntok, line, lastarg, pos, buf);

                break;
        }
 
                break;
        }
 

-       if ( ! flushed) {
-               if (endbody == NULL)
-                       rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
-               else
-                       rew_last(mdoc, endbody);
+       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);
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);


@@ -843,8 +768,7 @@ static void
 in_line(MACRO_PROT_ARGS)
 {
        int              la, scope, cnt, firstarg, mayopen, nc, nl;
 in_line(MACRO_PROT_ARGS)
 {
        int              la, scope, cnt, firstarg, mayopen, nc, nl;

-       enum margverr    av;
-       enum mdoct       ntok;
+       enum roff_tok    ntok;

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


@@ -859,15 +783,10 @@ in_line(MACRO_PROT_ARGS)
 
        switch (tok) {
        case MDOC_An:
 
        switch (tok) {
        case MDOC_An:

-               /* FALLTHROUGH */

        case MDOC_Ar:
        case MDOC_Ar:

-               /* FALLTHROUGH */

        case MDOC_Fl:
        case MDOC_Fl:

-               /* FALLTHROUGH */

        case MDOC_Mt:
        case MDOC_Mt:

-               /* FALLTHROUGH */

        case MDOC_Nm:
        case MDOC_Nm:

-               /* FALLTHROUGH */

        case MDOC_Pa:
                nc = 1;
                break;
        case MDOC_Pa:
                nc = 1;
                break;


@@ -876,15 +795,7 @@ in_line(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

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

 
        d = DELIM_NONE;
        firstarg = 1;
 
        d = DELIM_NONE;
        firstarg = 1;


@@ -900,7 +811,7 @@ in_line(MACRO_PROT_ARGS)
 
                if (ac == ARGS_EOLN) {
                        if (d == DELIM_OPEN)
 
                if (ac == ARGS_EOLN) {
                        if (d == DELIM_OPEN)

-                               mdoc->last->flags &= ~MDOC_DELIMO;
+                               mdoc->last->flags &= ~NODE_DELIMO;

                        break;
                }
 
                        break;
                }
 


@@ -913,13 +824,13 @@ in_line(MACRO_PROT_ARGS)
                 */
 
                if (ac == ARGS_PUNCT) {
                 */
 
                if (ac == ARGS_PUNCT) {

-                       if (cnt == 0 && nc == 0)
+                       if (cnt == 0 && (nc == 0 || tok == MDOC_An))

                                mdoc->flags |= MDOC_NODELIMC;
                        break;
                }
 
                                mdoc->flags |= MDOC_NODELIMC;
                        break;
                }
 

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

 
                /*
                 * In this case, we've located a submacro and must
 
                /*
                 * In this case, we've located a submacro and must


@@ -928,7 +839,7 @@ in_line(MACRO_PROT_ARGS)
                 * or raise a warning.
                 */
 
                 * or raise a warning.
                 */
 

-               if (ntok != MDOC_MAX) {
+               if (ntok != TOKEN_NONE) {

                        if (scope)
                                rew_elem(mdoc, tok);
                        if (nc && ! cnt) {
                        if (scope)
                                rew_elem(mdoc, tok);
                        if (nc && ! cnt) {


@@ -937,24 +848,23 @@ in_line(MACRO_PROT_ARGS)
                        } else if ( ! nc && ! cnt) {
                                mdoc_argv_free(arg);
                                mandoc_msg(MANDOCERR_MACRO_EMPTY,
                        } else if ( ! nc && ! cnt) {
                                mdoc_argv_free(arg);
                                mandoc_msg(MANDOCERR_MACRO_EMPTY,

-                                   mdoc->parse, line, ppos,
-                                   mdoc_macronames[tok]);
+                                   line, ppos, "%s", roff_name[tok]);

                        }
                        }

-                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       (*mdoc_macro(ntok)->fp)(mdoc, ntok,
+                           line, la, pos, buf);

                        if (nl)
                                append_delims(mdoc, line, pos, buf);
                        if (nl)
                                append_delims(mdoc, line, pos, buf);

+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        return;
                }
 
                /*
                        return;
                }
 
                /*

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

                 */
 
                 */
 

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

                        /*
                         * If we encounter closing punctuation, no word
                         * has been emitted, no scope is open, and we're
                        /*
                         * If we encounter closing punctuation, no word
                         * has been emitted, no scope is open, and we're


@@ -974,11 +884,12 @@ in_line(MACRO_PROT_ARGS)
                         * Close out our scope, if one is open, before
                         * any punctuation.
                         */
                         * Close out our scope, if one is open, before
                         * any punctuation.
                         */

-                       if (scope)
+                       if (scope && tok != MDOC_Lk) {

                                rew_elem(mdoc, tok);
                                rew_elem(mdoc, tok);

-                       scope = 0;
-                       if (tok == MDOC_Fn)
-                               mayopen = 0;
+                               scope = 0;
+                               if (tok == MDOC_Fn)
+                                       mayopen = 0;
+                       }

                } else if (mayopen && !scope) {
                        mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
                        scope = 1;
                } else if (mayopen && !scope) {
                        mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
                        scope = 1;


@@ -986,7 +897,10 @@ in_line(MACRO_PROT_ARGS)
                }
 
                dword(mdoc, line, la, p, d,
                }
 
                dword(mdoc, line, la, p, d,

-                   MDOC_JOIN & mdoc_macros[tok].flags);
+                   mdoc_macro(tok)->flags & MDOC_JOIN);
+
+               if (ac == ARGS_ALLOC)
+                       free(p);

 
                /*
                 * If the first argument is a closing delimiter,
 
                /*
                 * If the first argument is a closing delimiter,


@@ -994,7 +908,7 @@ in_line(MACRO_PROT_ARGS)
                 */
 
                if (firstarg && d == DELIM_CLOSE && !nc)
                 */
 
                if (firstarg && d == DELIM_CLOSE && !nc)

-                       mdoc->last->flags &= ~MDOC_DELIMC;
+                       mdoc->last->flags &= ~NODE_DELIMC;

                firstarg = 0;
 
                /*
                firstarg = 0;
 
                /*


@@ -1008,8 +922,10 @@ in_line(MACRO_PROT_ARGS)
                }
        }
 
                }
        }
 

-       if (scope)
+       if (scope && tok != MDOC_Lk) {

                rew_elem(mdoc, tok);
                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


@@ -1023,50 +939,112 @@ in_line(MACRO_PROT_ARGS)
                        rew_last(mdoc, mdoc->last);
                } else {
                        mdoc_argv_free(arg);
                        rew_last(mdoc, mdoc->last);
                } else {
                        mdoc_argv_free(arg);

-                       mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
-                           line, ppos, mdoc_macronames[tok]);
+                       mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                           line, ppos, "%s", roff_name[tok]);

                }
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);
                }
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);

+       if (scope)
+               rew_elem(mdoc, tok);

 }
 
 static void
 blk_full(MACRO_PROT_ARGS)
 {
 }
 
 static void
 blk_full(MACRO_PROT_ARGS)
 {

-       int               la, nl, nparsed;

        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 mdoct        ntok;
-       enum margserr     ac, lac;
-       enum margverr     av;
+       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;

        char             *p;
        char             *p;

+       size_t            iarg;
+       int               done, la, nl, parsed;
+       enum margserr     ac, lac;

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

-       /* Skip items outside lists. */
+       if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);
+               return;
+       }
+
+       if ((mdoc_macro(tok)->flags & MDOC_EXPLICIT) == 0) {
+
+               /* Here, tok is one of Sh Ss Nm Nd It. */

 
 

-       if (tok == MDOC_It) {
-               for (n = mdoc->last; n; n = n->parent)
-                       if (n->tok == MDOC_Bl &&
-                           ! (n->flags & MDOC_VALID))
+               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_msg(MANDOCERR_BLK_BROKEN,
+                                           line, ppos, "It breaks %s",
+                                           roff_name[blk->tok]);
+                                       rew_pending(mdoc, blk);
+                               }

                                break;
                                break;

-               if (n == NULL) {
-                       mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
-                           line, ppos, "It %s", buf + *pos);
-                       mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
-                       rew_elem(mdoc, MDOC_br);
-                       return;
+                       }
+
+                       if (mdoc_macro(n->tok)->flags & MDOC_EXPLICIT) {
+                               switch (tok) {
+                               case MDOC_Sh:
+                               case MDOC_Ss:
+                                       mandoc_msg(MANDOCERR_BLK_BROKEN,
+                                           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_msg(MANDOCERR_BLK_BROKEN, line, ppos,
+                                   "It breaks %s", roff_name[blk->tok]);
+                               rew_pending(mdoc, blk);
+                               blk = NULL;
+                       }
+
+                       /* Close out prior implicit scopes. */
+
+                       rew_pending(mdoc, n);

                }
                }

-       }

 
 

-       /* Close out prior implicit scope. */
+               /* Skip items outside lists. */

 
 

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

        }
 
        /*
        }
 
        /*


@@ -1078,17 +1056,18 @@ 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 (av == ARGV_ARG)
-                       continue;
-               if (av == ARGV_WORD)
-                       *pos = la;
+       switch (tok) {
+       case MDOC_Sh:
+               mdoc->flags &= ~ROFF_NOFILL;
+               break;
+       case MDOC_Ss:
+               mdoc->flags |= ROFF_NONOFILL;
+               break;
+       default:

                break;
        }
                break;
        }

-
-       mdoc_block_alloc(mdoc, line, ppos, tok, arg);
+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+       blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);

        head = body = NULL;
 
        /*
        head = body = NULL;
 
        /*


@@ -1096,9 +1075,9 @@ blk_full(MACRO_PROT_ARGS)
         * parsed, even though `It' macros in general are parsed.
         */
 
         * parsed, even though `It' macros in general are parsed.
         */
 

-       nparsed = tok == MDOC_It &&
-           mdoc->last->parent->tok == MDOC_Bl &&
-           mdoc->last->parent->norm->Bl.type == LIST_diag;
+       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
 
        /*
         * The `Nd' macro has all arguments in its body: it's a hybrid


@@ -1106,125 +1085,159 @@ blk_full(MACRO_PROT_ARGS)
         */
 
        if (tok == MDOC_Nd) {
         */
 
        if (tok == MDOC_Nd) {

-               head = mdoc_head_alloc(mdoc, line, ppos, tok);
-               rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);
-               body = mdoc_body_alloc(mdoc, line, ppos, tok);
+               head = roff_head_alloc(mdoc, line, ppos, tok);
+               rew_last(mdoc, head);
+               body = roff_body_alloc(mdoc, line, ppos, tok);

        }
 
        if (tok == MDOC_Bk)
                mdoc->flags |= MDOC_KEEP;
 
        }
 
        if (tok == MDOC_Bk)
                mdoc->flags |= MDOC_KEEP;
 

-       ac = ARGS_PEND;
+       ac = ARGS_EOLN;

        for (;;) {
        for (;;) {

+
+               /*
+                * If we are right after a tab character,
+                * do not parse the first word for macros.
+                */
+
+               if (mdoc->flags & MDOC_PHRASEQN) {
+                       mdoc->flags &= ~MDOC_PHRASEQN;
+                       mdoc->flags |= MDOC_PHRASEQF;
+               }
+

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

-               if (ac == ARGS_PUNCT)
-                       break;

                if (ac == ARGS_EOLN) {
                if (ac == ARGS_EOLN) {

-                       if (lac != ARGS_PPHRASE && lac != ARGS_PHRASE)
+                       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.

                         */
                         */

-                       rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
-                       body = mdoc_body_alloc(mdoc, line, ppos, tok);
+
+                       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_msg(MANDOCERR_ARG_EXCESS, line, la,
+                           "%s ... %s", roff_name[tok], buf + la);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       break;
+               }
+               if (tok == MDOC_Rs) {
+                       mandoc_msg(MANDOCERR_ARG_SKIP,
+                           line, la, "Rs %s", buf + la);
+                       if (ac == ARGS_ALLOC)
+                               free(p);
+                       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 (head == NULL &&
                 */
 
                if (head == NULL &&

-                   ac != ARGS_PEND &&

                    ac != ARGS_PHRASE &&
                    ac != ARGS_PHRASE &&

-                   ac != ARGS_PPHRASE &&
-                   ac != ARGS_QWORD &&

                    mdoc_isdelim(p) == DELIM_OPEN) {
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);
                    mdoc_isdelim(p) == DELIM_OPEN) {
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);

+                       if (ac == ARGS_ALLOC)
+                               free(p);

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

-                       head = mdoc_head_alloc(mdoc, line, ppos, tok);
+                       head = roff_head_alloc(mdoc, line, ppos, tok);

 
 

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

 
                        /*
                         * 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.
                         */
 

-                       rew_sub(body ? MDOC_BODY : MDOC_HEAD,
-                           mdoc, tok, line, ppos);
-                       body = mdoc_body_alloc(mdoc, line, ppos, tok);
+                       rew_last(mdoc, body == NULL ? head : body);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-                       /*
-                        * Process phrases: set whether we're in a
-                        * partial-phrase (this effects line handling)
-                        * then call down into the phrase parser.
-                        */
+                       /* Process to the tab or to the end of the line. */
+
+                       mdoc->flags |= MDOC_PHRASE;
+                       parse_rest(mdoc, TOKEN_NONE, line, &la, buf);
+                       mdoc->flags &= ~MDOC_PHRASE;

 
 

-                       if (ac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       if (ac == ARGS_PEND && lac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       phrase(mdoc, line, la, buf);
-                       mdoc->flags &= ~MDOC_PPHRASE;
+                       /* There may have been `Ta' macros. */
+
+                       while (body->next != NULL)
+                               body = body->next;

                        continue;
                }
 
                        continue;
                }
 

-               ntok = nparsed || ac == ARGS_QWORD ?
-                   MDOC_MAX : lookup(tok, p);
-
-               if (ntok != MDOC_MAX) {
-                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, parsed);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)

                        break;
                        break;

-               }
-               dword(mdoc, line, la, p, DELIM_MAX,
-                   MDOC_JOIN & mdoc_macros[tok].flags);

        }
 
        }
 

+       if (blk->flags & NODE_VALID)
+               return;

        if (head == NULL)
        if (head == NULL)

-               head = mdoc_head_alloc(mdoc, line, ppos, tok);
-       if (nl)
+               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;
                append_delims(mdoc, line, pos, buf);
        if (body != NULL)
                goto out;

+       if (find_pending(mdoc, tok, line, ppos, head))
+               return;
+
+       /* Close out scopes to remain in a consistent state. */
+
+       rew_last(mdoc, head);
+       body = roff_body_alloc(mdoc, line, ppos, tok);
+       if (tok == MDOC_Ss)
+               mdoc->flags &= ~ROFF_NONOFILL;

 
        /*
 
        /*

-        * 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.
+        * Set up fill mode for display blocks.
+        * This needs to be done here up front rather than during
+        * validation such that child nodes get the right flags.

         */
         */

-       for (n = mdoc->last; n && n != head; n = n->parent) {
-               if (n->type == MDOC_BLOCK &&
-                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT &&
-                   ! (n->flags & MDOC_VALID)) {
-                       n->pending = head;
-                       return;
+
+       if (tok == MDOC_Bd && arg != NULL) {
+               for (iarg = 0; iarg < arg->argc; iarg++) {
+                       switch (arg->argv[iarg].arg) {
+                       case MDOC_Unfilled:
+                       case MDOC_Literal:
+                               mdoc->flags |= ROFF_NOFILL;
+                               break;
+                       case MDOC_Filled:
+                       case MDOC_Ragged:
+                       case MDOC_Centred:
+                               mdoc->flags &= ~ROFF_NOFILL;
+                               break;
+                       default:
+                               continue;
+                       }
+                       break;

                }
        }
                }
        }

-
-       /* Close out scopes to remain in a consistent state. */
-
-       rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);
-       mdoc_body_alloc(mdoc, line, ppos, tok);

 out:
        if (mdoc->flags & MDOC_FREECOL) {
 out:
        if (mdoc->flags & MDOC_FREECOL) {

-               rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
-               rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
+               rew_last(mdoc, body);
+               rew_last(mdoc, blk);

                mdoc->flags &= ~MDOC_FREECOL;
        }
 }
                mdoc->flags &= ~MDOC_FREECOL;
        }
 }


@@ -1232,13 +1245,12 @@ out:
 static void
 blk_part_imp(MACRO_PROT_ARGS)
 {
 static void
 blk_part_imp(MACRO_PROT_ARGS)
 {

-       int               la, nl;
-       enum mdoct        ntok;
+       int               done, la, nl;

        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;
 


@@ -1252,8 +1264,7 @@ blk_part_imp(MACRO_PROT_ARGS)
         */
 
        blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL);
         */
 
        blk = mdoc_block_alloc(mdoc, line, ppos, tok, NULL);

-       mdoc_head_alloc(mdoc, line, ppos, tok);
-       rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);
+       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


@@ -1267,67 +1278,48 @@ blk_part_imp(MACRO_PROT_ARGS)
                if (ac == ARGS_EOLN || ac == ARGS_PUNCT)
                        break;
 
                if (ac == ARGS_EOLN || ac == ARGS_PUNCT)
                        break;
 

-               if (body == NULL && ac != ARGS_QWORD &&
-                   mdoc_isdelim(p) == DELIM_OPEN) {
+               if (body == NULL && mdoc_isdelim(p) == DELIM_OPEN) {

                        dword(mdoc, line, la, p, DELIM_OPEN, 0);
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);

+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                }
 
                if (body == NULL)
                        continue;
                }
 
                if (body == NULL)

-                       body = mdoc_body_alloc(mdoc, line, ppos, tok);
-
-               ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-               if (ntok != MDOC_MAX) {
-                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, 1);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)

                        break;
                        break;

-               }
-               dword(mdoc, line, la, p, DELIM_MAX,
-                   MDOC_JOIN & mdoc_macros[tok].flags);

        }
        if (body == NULL)
        }
        if (body == NULL)

-               body = mdoc_body_alloc(mdoc, line, ppos, tok);
+               body = roff_body_alloc(mdoc, line, ppos, tok);

 
 

-       /*
-        * 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.
-        */
+       if (find_pending(mdoc, tok, line, ppos, body))
+               return;

 
 

-       for (n = mdoc->last; n && n != body && n != blk->parent;
-            n = n->parent) {
-               if (n->type == MDOC_BLOCK &&
-                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT &&
-                   ! (n->flags & MDOC_VALID)) {
-                       make_pending(n, tok, mdoc, line, ppos);
-                       mdoc_endbody_alloc(mdoc, line, ppos,
-                           tok, body, ENDBODY_NOSPACE);
-                       return;
-               }
-       }
-       assert(n == body);
-       rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
+       rew_last(mdoc, body);

        if (nl)
                append_delims(mdoc, line, pos, buf);
        if (nl)
                append_delims(mdoc, line, pos, buf);

-       rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
+       rew_pending(mdoc, blk);

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

-               mdoc_node_relink(mdoc, n);
+               roff_node_relink(mdoc, n);

 }
 
 static void
 blk_part_exp(MACRO_PROT_ARGS)
 {
 }
 
 static void
 blk_part_exp(MACRO_PROT_ARGS)
 {

-       int               la, nl;
+       int               done, la, nl;

        enum margserr     ac;
        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;
 


@@ -1337,8 +1329,9 @@ 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.
         */
 

-       mdoc_block_alloc(mdoc, line, ppos, tok, NULL);
-       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);
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
                la = *pos;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN)


@@ -1346,52 +1339,38 @@ blk_part_exp(MACRO_PROT_ARGS)
 
                /* Flush out leading punctuation. */
 
 
                /* Flush out leading punctuation. */
 

-               if (head == NULL && ac != ARGS_QWORD &&
-                   mdoc_isdelim(p) == DELIM_OPEN) {
-                       assert(NULL == body);
+               if (head == NULL && mdoc_isdelim(p) == DELIM_OPEN) {

                        dword(mdoc, line, la, p, DELIM_OPEN, 0);
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);

+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                }
 
                if (head == NULL) {
                        continue;
                }
 
                if (head == NULL) {

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

                                dword(mdoc, line, la, p, DELIM_MAX, 0);
                                dword(mdoc, line, la, p, DELIM_MAX, 0);

-                       rew_sub(MDOC_HEAD, mdoc, tok, line, ppos);
-                       body = mdoc_body_alloc(mdoc, line, ppos, tok);
-                       if (tok == MDOC_Eo)
+                       rew_last(mdoc, head);
+                       roff_body_alloc(mdoc, line, ppos, tok);
+                       if (tok == MDOC_Eo) {
+                               if (ac == ARGS_ALLOC)
+                                       free(p);

                                continue;
                                continue;

+                       }

                }
                }

-               assert(head != NULL && body != NULL);

 
 

-               ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup(tok, p);
-               if (ntok != MDOC_MAX) {
-                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, 1);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)

                        break;
                        break;

-               }
-               dword(mdoc, line, la, p, DELIM_MAX,
-                   MDOC_JOIN & mdoc_macros[tok].flags);

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

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

        }
        if (nl)
                append_delims(mdoc, line, pos, buf);
        }
        if (nl)
                append_delims(mdoc, line, pos, buf);


@@ -1400,14 +1379,14 @@ blk_part_exp(MACRO_PROT_ARGS)
 static void
 in_line_argn(MACRO_PROT_ARGS)
 {
 static void
 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).


@@ -1419,16 +1398,12 @@ in_line_argn(MACRO_PROT_ARGS)
 
        switch (tok) {
        case MDOC_Ap:
 
        switch (tok) {
        case MDOC_Ap:

-               /* FALLTHROUGH */

        case MDOC_Ns:
        case MDOC_Ns:

-               /* FALLTHROUGH */

        case MDOC_Ux:
                maxargs = 0;
                break;
        case MDOC_Bx:
        case MDOC_Ux:
                maxargs = 0;
                break;
        case MDOC_Bx:

-               /* FALLTHROUGH */

        case MDOC_Es:
        case MDOC_Es:

-               /* FALLTHROUGH */

        case MDOC_Xr:
                maxargs = 2;
                break;
        case MDOC_Xr:
                maxargs = 2;
                break;


@@ -1437,61 +1412,85 @@ in_line_argn(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

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

 
 

-       for (flushed = j = 0; ; ) {
+       state = -1;
+       p = 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 (ac == ARGS_PUNCT || ac == ARGS_EOLN)
-                       break;

 
 

-               if ( ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) &&
-                   ac != ARGS_QWORD && j == 0 &&
+               if ((ac == ARGS_WORD || ac == ARGS_ALLOC) && state == -1 &&
+                   (mdoc_macro(tok)->flags & MDOC_IGNDELIM) == 0 &&

                    mdoc_isdelim(p) == DELIM_OPEN) {
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);
                    mdoc_isdelim(p) == DELIM_OPEN) {
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);

+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        continue;
                        continue;

-               } else if (j == 0)
-                      mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+               }
+
+               if (state == -1 && tok != MDOC_In &&
+                   tok != MDOC_St && tok != MDOC_Xr) {
+                       mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+                       state = 0;
+               }
+
+               if (ac == ARGS_PUNCT || ac == ARGS_EOLN) {
+                       if (abs(state) < 2 && tok == MDOC_Pf)
+                               mandoc_msg(MANDOCERR_PF_SKIP,
+                                   line, ppos, "Pf %s",
+                                   p == NULL ? "at eol" : p);
+                       break;
+               }

 
 

-               if (j == maxargs && ! flushed) {
+               if (state == maxargs) {

                        rew_elem(mdoc, tok);
                        rew_elem(mdoc, tok);

-                       flushed = 1;
+                       state = -2;

                }
 
                }
 

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

 
 

-               if (ntok != MDOC_MAX) {
-                       if ( ! flushed)
+               if (ntok != TOKEN_NONE) {
+                       if (state >= 0) {

                                rew_elem(mdoc, tok);
                                rew_elem(mdoc, tok);

-                       flushed = 1;
-                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
-                       j++;
+                               state = -2;
+                       }
+                       (*mdoc_macro(ntok)->fp)(mdoc, ntok,
+                           line, la, pos, buf);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        break;
                }
 
                        break;
                }
 

-               if ( ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) &&
-                   ac != ARGS_QWORD && ! flushed &&
-                   mdoc_isdelim(p) != DELIM_NONE) {
+               if (mdoc_macro(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);
                        rew_elem(mdoc, tok);

-                       flushed = 1;
+                       state = -2;

                }
 
                dword(mdoc, line, la, p, DELIM_MAX,
                }
 
                dword(mdoc, line, la, p, DELIM_MAX,

-                   MDOC_JOIN & mdoc_macros[tok].flags);
-               j++;
+                   mdoc_macro(tok)->flags & MDOC_JOIN);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               p = mdoc->last->string;
+       }
+
+       if (state == -1) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);
+               return;

        }
 
        }
 

-       if (j == 0)
-               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
-       if ( ! flushed)
+       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);
                rew_elem(mdoc, tok);
        if (nl)
                append_delims(mdoc, line, pos, buf);


@@ -1500,56 +1499,56 @@ in_line_argn(MACRO_PROT_ARGS)
 static void
 in_line_eoln(MACRO_PROT_ARGS)
 {
 static void
 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 (av == ARGV_ARG)
-                       continue;
-               if (av == ARGV_WORD)
-                       *pos = la;
-               break;
+       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 (buf[*pos] == '\0' &&
+           (tok == MDOC_Fd || *roff_name[tok] == '%')) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);
+               return;
+       }

 
 

+       mdoc_argv(mdoc, line, tok, &arg, pos, buf);

        mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
        mdoc_elem_alloc(mdoc, line, ppos, tok, arg);

+       if (parse_rest(mdoc, tok, line, pos, buf))
+               return;
+       rew_elem(mdoc, tok);
+}

 
 

-       /* Parse argument terms. */
+/*
+ * 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
+parse_rest(struct roff_man *mdoc, enum roff_tok tok,
+    int line, int *pos, char *buf)
+{
+       char            *p;
+       int              done, la;
+       enum margserr    ac;

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

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

        }
        }

-
-       /* Close out (no delimiters). */
-
-       rew_elem(mdoc, tok);

 }
 
 static void
 }
 
 static void


@@ -1572,70 +1571,30 @@ ctx_synopsis(MACRO_PROT_ARGS)
  * macro is encountered.
  */
 static void
  * macro is encountered.
  */
 static void

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

 {
 {

-       int              la, pos;
-       enum margserr    ac;
-       enum mdoct       ntok;
-       char            *p;
+       struct roff_node *body, *n;

 
 

-       for (pos = ppos; ; ) {
-               la = pos;
+       /* Make sure we are in a column list or ignore this macro. */

 
 

-               ac = mdoc_zargs(mdoc, line, &pos, buf, &p);
-               if (ac == ARGS_EOLN)
+       body = NULL;
+       for (n = mdoc->last; n != NULL; n = n->parent) {
+               if (n->flags & NODE_ENDED)
+                       continue;
+               if (n->tok == MDOC_It && n->type == ROFFT_BODY)
+                       body = n;
+               if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT)

                        break;
                        break;

-
-               ntok = ac == ARGS_QWORD ? MDOC_MAX : lookup_raw(p);
-
-               if (ntok != MDOC_MAX) {
-                       mdoc_macro(mdoc, ntok, line, la, &pos, buf);
-                       append_delims(mdoc, line, &pos, buf);
-                       return;
-               }
-               dword(mdoc, line, la, p, DELIM_MAX, 1);

        }
        }

-}

 
 

-static void
-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 (n != NULL && n->tok != MDOC_Bl)
-               n = n->parent;

        if (n == NULL || n->norm->Bl.type != LIST_column) {
        if (n == NULL || n->norm->Bl.type != LIST_column) {

-               mandoc_msg(MANDOCERR_TA_STRAY, mdoc->parse,
-                   line, ppos, "Ta");
+               mandoc_msg(MANDOCERR_TA_STRAY, line, ppos, "Ta");

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

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

 }
 }