add arm64 architecture; from deraadt@

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index 192b01a8b09d0a88672a0ec94911172875f944a3..d4edcea1416269ac5121615e2da7a2a0b15c3808 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,15 +1,15 @@
-/*     $Id: mdoc_macro.c,v 1.169 2015/02/02 19:23:23 schwarze Exp $ */
+/*     $Id: mdoc_macro.c,v 1.210 2017/01/10 13:47: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-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2016 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,17 +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
-};
+#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);


@@ -48,24 +43,19 @@ 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(struct mdoc *, enum mdoct,
-                               int, int, const char *);
+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 *, int, int, int,
+                               struct roff_node *);
+static int             lookup(struct roff_man *, int, int, int, const char *);

 static int             macro_or_word(MACRO_PROT_ARGS, int);
 static int             macro_or_word(MACRO_PROT_ARGS, int);

-static void            make_pending(struct mdoc *, struct mdoc_node *,
-                               struct mdoc_node *, int, int);
-static int             parse_rest(struct mdoc *, enum mdoct,
-                               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_pending(struct mdoc *, const struct mdoc_node *);
-static void            rew_sub(enum mdoc_type, struct mdoc *,
-                               enum mdoct, int, int);
+static int             parse_rest(struct roff_man *, int, int, int *, char *);
+static int             rew_alt(int);
+static void            rew_elem(struct roff_man *, int);
+static void            rew_last(struct roff_man *, const struct roff_node *);
+static void            rew_pending(struct roff_man *,
+                               const struct roff_node *);

 
 const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */
 
 const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
        { in_line_argn, MDOC_CALLABLE | MDOC_PARSED | MDOC_JOIN }, /* Ap */


@@ -220,17 +210,17 @@ 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 &&
+               if (n->type == ROFFT_BLOCK &&

                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT)
                        mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,
                            n->line, n->pos, mdoc_macronames[n->tok]);
                    mdoc_macros[n->tok].flags & MDOC_EXPLICIT)
                        mandoc_msg(MANDOCERR_BLK_NOEND, mdoc->parse,
                            n->line, n->pos, mdoc_macronames[n->tok]);


@@ -238,76 +228,93 @@ mdoc_macroend(struct mdoc *mdoc)
        /* Rewind to the first. */
 
        rew_last(mdoc, mdoc->first);
        /* Rewind to the first. */
 
        rew_last(mdoc, mdoc->first);

+       mdoc_state_reset(mdoc);

 }
 
 /*
  * Look up the macro at *p called by "from",
 }
 
 /*
  * Look up the macro at *p called by "from",

- * or as a line macro if from == MDOC_MAX.
+ * or as a line macro if from == TOKEN_NONE.

  */
  */

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

 {
 {

-       enum mdoct       res;
+       int      res;

 
 

-       if (from == MDOC_MAX || mdoc_macros[from].flags & MDOC_PARSED) {
+       if (mdoc->flags & MDOC_PHRASEQF) {
+               mdoc->flags &= ~MDOC_PHRASEQF;
+               return TOKEN_NONE;
+       }
+       if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) {

                res = mdoc_hash_find(p);
                res = mdoc_hash_find(p);

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

                        if (mdoc_macros[res].flags & MDOC_CALLABLE)
                        if (mdoc_macros[res].flags & MDOC_CALLABLE)

-                               return(res);
+                               return res;

                        if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll)
                                mandoc_msg(MANDOCERR_MACRO_CALL,
                                    mdoc->parse, line, ppos, p);
                }
        }
                        if (res != MDOC_br && res != MDOC_sp && res != MDOC_ll)
                                mandoc_msg(MANDOCERR_MACRO_CALL,
                                    mdoc->parse, line, ppos, p);
                }
        }

-       return(MDOC_MAX);
+       return TOKEN_NONE;

 }
 
 /*
  * Rewind up to and including a specific node.
  */
 static void
 }
 
 /*
  * Rewind up to and including a specific node.
  */
 static void

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

 {
 {

-       struct mdoc_node *n, *np;

 
 

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

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

-               if ( ! (mdoc->last->flags & MDOC_VALID))
-                       mdoc->last->lastline = to->lastline -
-                           (mdoc->flags & MDOC_NEWLINE ? 1 : 0);
-               /*
-                * 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;
+               mdoc_state(mdoc, mdoc->last);
+               mdoc->last->flags |= NODE_VALID | NODE_ENDED;
+               mdoc->last = mdoc->last->parent;

        }
        }

-       mdoc_valid_post(mdoc);
+       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
 }
 
 /*
  * Rewind up to a specific block, including all blocks that broke it.
  */
 static void

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

 {
 
 {
 

-       rew_last(mdoc, n);
+       for (;;) {
+               rew_last(mdoc, n);

 
 

-       if (n->type != MDOC_BLOCK)
-               return;
+               if (mdoc->last == n) {
+                       switch (n->type) {
+                       case ROFFT_HEAD:
+                               roff_body_alloc(mdoc, n->line, n->pos,
+                                   n->tok);
+                               break;
+                       case ROFFT_BLOCK:
+                               break;
+                       default:
+                               return;
+                       }
+                       if ( ! (n->flags & NODE_BROKEN))
+                               return;
+               } else
+                       n = mdoc->last;

 
 

-       while ((n = n->pending) != NULL) {
-               rew_last(mdoc, n);
-               if (n->type == MDOC_HEAD)
-                       mdoc_body_alloc(mdoc, n->line, n->pos, n->tok);
+               for (;;) {
+                       if ((n = n->parent) == NULL)
+                               return;
+
+                       if (n->type == ROFFT_BLOCK ||
+                           n->type == ROFFT_HEAD) {
+                               if (n->flags & NODE_ENDED)
+                                       break;
+                               else
+                                       return;
+                       }
+               }

        }
 }
 
        }
 }
 


@@ -315,259 +322,96 @@ rew_pending(struct mdoc *mdoc, const struct mdoc_node *n)
  * 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 int
+rew_alt(int 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.
- */
-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(REWIND_NONE);
-
-       /*
-        * When starting to rewind, skip plain text
-        * and nodes that have already been rewound.
-        */
-       if (p->type == MDOC_TEXT || p->flags & (MDOC_VALID | MDOC_BREAK))
-               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(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_It:
-               if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
-                       return(REWIND_NONE);
-               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, let all blocks rewind Nm children.
-        * Do not warn again when closing a block,
-        * since closing the body already warned.
-        */
-       if (MDOC_Nm == p->tok ||
-           MDOC_BLOCK == type || MDOC_BLOCK == p->type)
-               return(REWIND_MORE);
-
-       /*
-        * By default, closing out full blocks
-        * forces closing of broken explicit blocks.
-        */
-       return (REWIND_FORCE);

 }
 
 static void
 }
 
 static void

-rew_elem(struct mdoc *mdoc, enum mdoct tok)
+rew_elem(struct roff_man *mdoc, int 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 the block *breaker,
- * but the child block *broken is still open.
- * Thus, postpone closing the *breaker
- * until the rew_pending() call closing *broken.
+ * 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 void
-make_pending(struct mdoc *mdoc, struct mdoc_node *breaker,
-       struct mdoc_node *broken, int line, int ppos)
-{
-       struct mdoc_node *n;
-
-       mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse, line, ppos,
-           "%s breaks %s", mdoc_macronames[breaker->tok],
-           mdoc_macronames[broken->tok]);
-
-       /*
-        * If the *broken block (Z) is already broken by a block (B)
-        * contained in the breaker (A), make the breaker pending
-        * on that inner breaker (B).  Graphically,
-        *
-        * breaker=[A! broken=n=[B!->A (old broken=)[Z->B B] A] Z]
-        *
-        * In these graphics, "->" indicates the "pending" pointer and
-        * "!" indicates the MDOC_BREAK flag.  Each of the cases gets
-        * one additional pointer (B->A) and one additional flag (A!).
-        */
-
-       for (n = broken->parent; ; n = n->parent)
-               if (n == broken->pending)
-                       broken = n;
-               else if (n == breaker)
-                       break;
-
-       /*
-        * Found the breaker.
-        *
-        * If another, outer breaker (X) is already pending on
-        * the *broken block (B), we must not clobber the link
-        * to the outer breaker, but make it pending on the new,
-        * now inner breaker (A).  Graphically,
-        *
-        * [X! n=breaker=[A!->X broken=[B(->X)->A X] A] B].
-        */
-
-       if (broken->pending != NULL) {
-               n = breaker;
-
-               /*
-                * If the inner breaker (A) is already broken, too,
-                * it cannot take on the outer breaker (X) but must
-                * hand it on to its own breakers (Y).  Graphically,
-                *
-                * [X! n=[Y!->X breaker=[A!->Y Y] broken=[B(->X)->A X] A] B]
-                */
-
-               while (n->pending)
-                       n = n->pending;
-               n->pending = broken->pending;
-       }
-
-       /*
-        * Now we have reduced the situation to the simplest case:
-        * breaker=[A! broken=[B->A A] B].
-        */
-
-       broken->pending = breaker;
-       breaker->flags |= MDOC_BREAK;
-       if (breaker->body != NULL)
-               breaker->body->flags |= MDOC_BREAK;
-}
-
-static void
-rew_sub(enum mdoc_type t, struct mdoc *mdoc,
-               enum mdoct tok, int line, int ppos)
+static int
+find_pending(struct roff_man *mdoc, int tok, int line, int ppos,
+       struct roff_node *target)

 {
 {

-       struct mdoc_node *n, *to;
-
-       to = NULL;
-       n = mdoc->last;
-       while (n) {
-               switch (rew_dohalt(tok, t, n)) {
-               case REWIND_NONE:
-                       if (to == NULL)
-                               return;
-                       n = to;
-                       break;
-               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);
-                       to = n;
-                       n = n->parent;
+       struct roff_node        *n;
+       int                      irc;
+
+       irc = 0;
+       for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
+               if (n->flags & NODE_ENDED) {
+                       if ( ! (n->flags & NODE_VALID))
+                               n->flags |= NODE_BROKEN;

                        continue;
                }
                        continue;
                }

-               break;
+               if (n->type == ROFFT_BLOCK &&
+                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                       irc = 1;
+                       n->flags = NODE_BROKEN;
+                       if (target->type == ROFFT_HEAD)
+                               target->flags = NODE_ENDED;
+                       else if ( ! (target->flags & NODE_ENDED)) {
+                               mandoc_vmsg(MANDOCERR_BLK_NEST,
+                                   mdoc->parse, line, ppos,
+                                   "%s breaks %s", mdoc_macronames[tok],
+                                   mdoc_macronames[n->tok]);
+                               mdoc_endbody_alloc(mdoc, line, ppos,
+                                   tok, target, ENDBODY_NOSPACE);
+                       }
+               }

        }
        }

-       assert(n);
-       rew_pending(mdoc, n);
+       return irc;

 }
 
 /*
 }
 
 /*


@@ -575,7 +419,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)
 {
 


@@ -584,13 +428,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,


@@ -600,16 +444,16 @@ 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;
 {
        char            *p;
        int              la;


@@ -619,7 +463,8 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
 
        for (;;) {
                la = *pos;
 
        for (;;) {
                la = *pos;

-               if (mdoc_args(mdoc, line, pos, buf, MDOC_MAX, &p) == ARGS_EOLN)
+               if (mdoc_args(mdoc, line, pos, buf, TOKEN_NONE, &p) ==
+                   ARGS_EOLN)

                        break;
                dword(mdoc, line, la, p, DELIM_MAX, 1);
 
                        break;
                dword(mdoc, line, la, p, DELIM_MAX, 1);
 


@@ -636,7 +481,7 @@ 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;

        }
 }
 
        }
 }
 


@@ -649,26 +494,26 @@ static int
 macro_or_word(MACRO_PROT_ARGS, int parsed)
 {
        char            *p;
 macro_or_word(MACRO_PROT_ARGS, int parsed)
 {
        char            *p;

-       enum mdoct       ntok;
+       int              ntok;

 
        p = buf + ppos;
 
        p = buf + ppos;

-       ntok = MDOC_MAX;
+       ntok = TOKEN_NONE;

        if (*p == '"')
                p++;
        else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT))
                ntok = lookup(mdoc, tok, line, ppos, p);
 
        if (*p == '"')
                p++;
        else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT))
                ntok = lookup(mdoc, tok, line, ppos, p);
 

-       if (ntok == MDOC_MAX) {
-               dword(mdoc, line, ppos, p, DELIM_MAX, tok == MDOC_MAX ||
+       if (ntok == TOKEN_NONE) {
+               dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE ||

                    mdoc_macros[tok].flags & MDOC_JOIN);
                    mdoc_macros[tok].flags & MDOC_JOIN);

-               return(0);
+               return 0;

        } else {
                if (mdoc_macros[tok].fp == in_line_eoln)
                        rew_elem(mdoc, tok);
                mdoc_macro(mdoc, ntok, line, ppos, pos, buf);
        } else {
                if (mdoc_macros[tok].fp == in_line_eoln)
                        rew_elem(mdoc, tok);
                mdoc_macro(mdoc, ntok, line, ppos, pos, buf);

-               if (tok == MDOC_MAX)
+               if (tok == TOKEN_NONE)

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

-               return(1);
+               return 1;

        }
 }
 
        }
 }
 


@@ -678,14 +523,16 @@ macro_or_word(MACRO_PROT_ARGS, int parsed)
 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;            /* Search back to our block. */
-
-       int              have_it, j, lastarg, maxargs, 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;
+       int              atok, ntok;

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


@@ -702,38 +549,48 @@ blk_exp_close(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

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

 
 

-       have_it = 0;

        atok = rew_alt(tok);
        atok = rew_alt(tok);

-       body = endbody = later = NULL;
+       body = NULL;

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

-               if (n->flags & (MDOC_VALID | MDOC_BREAK))
+               if (n->flags & NODE_ENDED || n->tok != atok ||
+                   n->type != ROFFT_BODY || n->end != ENDBODY_NOT)

                        continue;
                        continue;

+               body = n;
+               break;
+       }

 
 

-               /* Remember the start of our own body. */
+       /*
+        * Search backwards for beginnings of blocks,
+        * both of our own and of pending sub-blocks.
+        */

 
 

-               if (n->type == MDOC_BODY && atok == n->tok) {
-                       if (n->end == ENDBODY_NOT) {
-                               body = n;
-                               n->lastline = line;
-                       }
+       endbody = itblk = later = NULL;
+       for (n = mdoc->last; n; n = n->parent) {
+               if (n->flags & NODE_ENDED) {
+                       if ( ! (n->flags & NODE_VALID))
+                               n->flags |= NODE_BROKEN;

                        continue;
                }
 
                        continue;
                }
 

-               if (n->type != MDOC_BLOCK || n->tok == MDOC_Nm)
+               /*
+                * Mismatching end macros can never break anything,
+                * SYNOPSIS name blocks can never be broken,
+                * and we only care about the breaking of BLOCKs.
+                */
+
+               if (body == NULL ||
+                   n->tok == MDOC_Nm ||
+                   n->type != ROFFT_BLOCK)

                        continue;
 
                if (n->tok == MDOC_It) {
                        continue;
 
                if (n->tok == MDOC_It) {

-                       have_it = 1;
+                       itblk = n;

                        continue;
                }
 
                if (atok == n->tok) {
                        continue;
                }
 
                if (atok == n->tok) {

-                       n->lastline = line;

                        assert(body);
 
                        /*
                        assert(body);
 
                        /*


@@ -743,25 +600,28 @@ blk_exp_close(MACRO_PROT_ARGS)
                         */
 
                        if (later == NULL ||
                         */
 
                        if (later == NULL ||

-                           (tok == MDOC_El && !have_it))
+                           (tok == MDOC_El && itblk == NULL))

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

-                        */
-
-                       make_pending(mdoc, n, later, line, ppos);
-
-                       /*

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

+                       mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse,
+                           line, ppos, "%s breaks %s",
+                           mdoc_macronames[atok],
+                           mdoc_macronames[later->tok]);
+

                        endbody = mdoc_endbody_alloc(mdoc, line, ppos,
                            atok, body, ENDBODY_SPACE);
 
                        endbody = mdoc_endbody_alloc(mdoc, line, ppos,
                            atok, body, ENDBODY_SPACE);
 

+                       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


@@ -769,18 +629,21 @@ blk_exp_close(MACRO_PROT_ARGS)
                         */
 
                        if (maxargs)
                         */
 
                        if (maxargs)

-                               mdoc->next = MDOC_NEXT_CHILD;
+                               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. */
+
+               if (n->tok == MDOC_Nd) {
+                       rew_last(mdoc, n);
+                       continue;
+               }

 
 

-               if (later == NULL ||
-                   ! (mdoc_macros[later->tok].flags & MDOC_EXPLICIT))
+               /* Breaking an open sub block. */
+
+               n->flags |= NODE_BROKEN;
+               if (later == NULL)

                        later = n;
        }
 
                        later = n;
        }
 


@@ -792,7 +655,7 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * Stray .Ec without previous .Eo:
                         * Break the output line, keep the arguments.
                         */
                         * Stray .Ec without previous .Eo:
                         * Break the output line, keep the arguments.
                         */

-                       mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
+                       roff_elem_alloc(mdoc, line, ppos, MDOC_br);

                        rew_elem(mdoc, MDOC_br);
                }
        } else if (endbody == NULL) {
                        rew_elem(mdoc, MDOC_br);
                }
        } else if (endbody == NULL) {


@@ -807,45 +670,54 @@ blk_exp_close(MACRO_PROT_ARGS)
                            mdoc->parse, line, ppos,
                            "%s %s", mdoc_macronames[tok],
                            buf + *pos);
                            mdoc->parse, line, ppos,
                            "%s %s", mdoc_macronames[tok],
                            buf + *pos);

-               if (endbody == NULL)
+               if (endbody == NULL && n != NULL)

                        rew_pending(mdoc, n);
                return;
        }
 
        if (endbody != NULL)
                n = endbody;
                        rew_pending(mdoc, n);
                return;
        }
 
        if (endbody != NULL)
                n = endbody;

+
+       ntok = TOKEN_NONE;

        for (j = 0; ; j++) {
                lastarg = *pos;
 
        for (j = 0; ; j++) {
                lastarg = *pos;
 

-               if (j == maxargs && n != NULL) {
-                       rew_pending(mdoc, n);
-                       n = NULL;
-               }
+               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 :
+               ntok = ac == ARGS_QWORD ? TOKEN_NONE :

                    lookup(mdoc, tok, line, lastarg, p);
 
                    lookup(mdoc, tok, line, lastarg, p);
 

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

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

-               if (n != NULL) {
-                       rew_pending(mdoc, n);
-                       n = NULL;
-               }
+               if (n != NULL)
+                       rew_last(mdoc, n);

                mdoc->flags &= ~MDOC_NEWLINE;
                mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);
                break;
        }
 
                mdoc->flags &= ~MDOC_NEWLINE;
                mdoc_macro(mdoc, ntok, line, lastarg, pos, buf);
                break;
        }
 

-       if (n != NULL)
-               rew_pending(mdoc, n);
+       if (n != NULL) {
+               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);
+               } else
+                       pending = 0;
+               if ( ! pending)
+                       rew_pending(mdoc, n);
+       }

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


@@ -854,7 +726,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 mdoct       ntok;
+       int              ntok;

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


@@ -869,15 +741,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;


@@ -902,7 +769,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;
                }
 


@@ -915,13 +782,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;
                }
 
                ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?
                                mdoc->flags |= MDOC_NODELIMC;
                        break;
                }
 
                ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?

-                   MDOC_MAX : lookup(mdoc, tok, line, la, p);
+                   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


@@ -930,7 +797,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) {


@@ -996,7 +863,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;
 
                /*


@@ -1038,38 +905,102 @@ blk_full(MACRO_PROT_ARGS)
 {
        int               la, nl, parsed;
        struct mdoc_arg  *arg;
 {
        int               la, nl, parsed;
        struct mdoc_arg  *arg;

-       struct mdoc_node *blk; /* Our own block. */
-       struct mdoc_node *head; /* Our own head. */
-       struct mdoc_node *body; /* Our own body. */
-       struct mdoc_node *n;
+       struct roff_node *blk; /* Our own or a broken block. */
+       struct roff_node *head; /* Our own head. */
+       struct roff_node *body; /* Our own body. */
+       struct roff_node *n;

        enum margserr     ac, lac;
        char             *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
        enum margserr     ac, lac;
        char             *p;
 
        nl = MDOC_NEWLINE & mdoc->flags;
 

-       /* Skip items outside lists. */
+       if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);
+               return;
+       }
+
+       if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
+
+               /* Here, tok is one of Sh Ss Nm Nd It. */
+
+               blk = NULL;
+               for (n = mdoc->last; n != NULL; n = n->parent) {
+                       if (n->flags & NODE_ENDED) {
+                               if ( ! (n->flags & NODE_VALID))
+                                       n->flags |= NODE_BROKEN;
+                               continue;
+                       }
+                       if (n->type != ROFFT_BLOCK)
+                               continue;
+
+                       if (tok == MDOC_It && n->tok == MDOC_Bl) {
+                               if (blk != NULL) {
+                                       mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                           mdoc->parse, line, ppos,
+                                           "It breaks %s",
+                                           mdoc_macronames[blk->tok]);
+                                       rew_pending(mdoc, blk);
+                               }
+                               break;
+                       }
+
+                       if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                               switch (tok) {
+                               case MDOC_Sh:
+                               case MDOC_Ss:
+                                       mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                           mdoc->parse, line, ppos,
+                                           "%s breaks %s",
+                                           mdoc_macronames[tok],
+                                           mdoc_macronames[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_It) {
-               for (n = mdoc->last; n; n = n->parent)
-                       if (n->tok == MDOC_Bl && n->type == MDOC_BLOCK &&
-                           ! (n->flags & (MDOC_VALID | MDOC_BREAK)))
+                       if (tok != MDOC_Sh && (n->tok == MDOC_Sh ||
+                           (tok != MDOC_Ss && (n->tok == MDOC_Ss ||
+                            (tok != MDOC_It && n->tok == MDOC_It)))))

                                break;
                                break;

-               if (n == NULL) {
+
+                       /* Item breaking an explicit block. */
+
+                       if (blk != NULL) {
+                               mandoc_vmsg(MANDOCERR_BLK_BROKEN,
+                                   mdoc->parse, line, ppos,
+                                   "It breaks %s",
+                                   mdoc_macronames[blk->tok]);
+                               rew_pending(mdoc, blk);
+                               blk = NULL;
+                       }
+
+                       /* Close out prior implicit scopes. */
+
+                       rew_last(mdoc, n);
+               }
+
+               /* Skip items outside lists. */
+
+               if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {

                        mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
                            line, ppos, "It %s", buf + *pos);
                        mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
                            line, ppos, "It %s", buf + *pos);

-                       mdoc_elem_alloc(mdoc, line, ppos, MDOC_br, NULL);
+                       roff_elem_alloc(mdoc, line, ppos, MDOC_br);

                        rew_elem(mdoc, MDOC_br);
                        return;
                }
        }
 
                        rew_elem(mdoc, MDOC_br);
                        return;
                }
        }
 

-       /* Close out prior implicit scope. */
-
-       if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
-               rew_sub(MDOC_BODY, mdoc, tok, line, ppos);
-               rew_sub(MDOC_BLOCK, mdoc, tok, line, ppos);
-       }
-

        /*
         * This routine accommodates implicitly- and explicitly-scoped
         * macro openings.  Implicit ones first close out prior scope
        /*
         * This routine accommodates implicitly- and explicitly-scoped
         * macro openings.  Implicit ones first close out prior scope


@@ -1098,46 +1029,68 @@ blk_full(MACRO_PROT_ARGS)
         */
 
        if (tok == MDOC_Nd) {
         */
 
        if (tok == MDOC_Nd) {

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

                rew_last(mdoc, head);
                rew_last(mdoc, head);

-               body = mdoc_body_alloc(mdoc, line, ppos, tok);
+               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.

                         */
                         */

+

                        if (body != NULL)
                                rew_last(mdoc, body);
                        if (body != NULL)
                                rew_last(mdoc, body);

-                       body = mdoc_body_alloc(mdoc, line, ppos, tok);
+                       body = roff_body_alloc(mdoc, line, ppos, tok);
+                       roff_word_alloc(mdoc, line, ppos, "\\&");
+                       break;
+               }
+
+               if (tok == MDOC_Bd || tok == MDOC_Bk) {
+                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+                           mdoc->parse, line, la, "%s ... %s",
+                           mdoc_macronames[tok], buf + la);

                        break;
                }
                        break;
                }

+               if (tok == MDOC_Rs) {
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
+                           line, la, "Rs %s", buf + la);
+                       break;
+               }
+               if (ac == ARGS_PUNCT)
+                       break;

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

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

                 */
 
                if (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);
                    ac != ARGS_QWORD &&
                    mdoc_isdelim(p) == DELIM_OPEN) {
                        dword(mdoc, line, la, p, DELIM_OPEN, 0);


@@ -1147,11 +1100,9 @@ blk_full(MACRO_PROT_ARGS)
                /* Open a head if one hasn't been opened. */
 
                if (head == NULL)
                /* 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
 
                        /*
                         * If we haven't opened a body yet, rewind the


@@ -1159,20 +1110,18 @@ blk_full(MACRO_PROT_ARGS)
                         */
 
                        rew_last(mdoc, body == NULL ? head : body);
                         */
 
                        rew_last(mdoc, body == NULL ? head : body);

-                       body = mdoc_body_alloc(mdoc, line, ppos, tok);
+                       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;
+
+                       /* There may have been `Ta' macros. */

 
 

-                       if (ac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       if (ac == ARGS_PEND && lac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       parse_rest(mdoc, MDOC_MAX, line, &la, buf);
-                       mdoc->flags &= ~MDOC_PPHRASE;
+                       while (body->next != NULL)
+                               body = body->next;

                        continue;
                }
 
                        continue;
                }
 


@@ -1180,34 +1129,21 @@ blk_full(MACRO_PROT_ARGS)
                        break;
        }
 
                        break;
        }
 

-       if (blk->flags & MDOC_VALID)
+       if (blk->flags & NODE_VALID)

                return;
        if (head == NULL)
                return;
        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 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_pending() call closing out that
-        * sub-block.
-        */
-       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 (find_pending(mdoc, tok, line, ppos, head))
+               return;

 
        /* Close out scopes to remain in a consistent state. */
 
        rew_last(mdoc, head);
 
        /* Close out scopes to remain in a consistent state. */
 
        rew_last(mdoc, head);

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

 out:
        if (mdoc->flags & MDOC_FREECOL) {
                rew_last(mdoc, body);
 out:
        if (mdoc->flags & MDOC_FREECOL) {
                rew_last(mdoc, body);


@@ -1222,9 +1158,9 @@ blk_part_imp(MACRO_PROT_ARGS)
        int               la, nl;
        enum margserr     ac;
        char             *p;
        int               la, nl;
        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;
 


@@ -1238,7 +1174,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);

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


@@ -1259,32 +1195,17 @@ blk_part_imp(MACRO_PROT_ARGS)
                }
 
                if (body == NULL)
                }
 
                if (body == NULL)

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

 
                if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
                        break;
        }
        if (body == NULL)
 
                if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
                        break;
        }
        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_pending() 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(mdoc, blk, n, line, ppos);
-                       mdoc_endbody_alloc(mdoc, line, ppos,
-                           tok, body, ENDBODY_NOSPACE);
-                       return;
-               }
-       }
-       assert(n == body);

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


@@ -1303,7 +1224,7 @@ blk_part_exp(MACRO_PROT_ARGS)
 {
        int               la, nl;
        enum margserr     ac;
 {
        int               la, nl;
        enum margserr     ac;

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

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


@@ -1314,7 +1235,7 @@ 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);
+       roff_block_alloc(mdoc, line, ppos, tok);

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


@@ -1331,11 +1252,11 @@ blk_part_exp(MACRO_PROT_ARGS)
                }
 
                if (head == NULL) {
                }
 
                if (head == NULL) {

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

                        if (tok == MDOC_Eo)  /* Not parsed. */
                                dword(mdoc, line, la, p, DELIM_MAX, 0);
                        rew_last(mdoc, head);
                        if (tok == MDOC_Eo)  /* Not parsed. */
                                dword(mdoc, line, la, p, DELIM_MAX, 0);
                        rew_last(mdoc, head);

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

                        if (tok == MDOC_Eo)
                                continue;
                }
                        if (tok == MDOC_Eo)
                                continue;
                }


@@ -1347,8 +1268,8 @@ blk_part_exp(MACRO_PROT_ARGS)
        /* Clean-up to leave in a consistent state. */
 
        if (head == NULL) {
        /* Clean-up to leave in a consistent state. */
 
        if (head == NULL) {

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


@@ -1357,11 +1278,12 @@ 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;

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

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

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


@@ -1375,16 +1297,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;


@@ -1395,62 +1313,76 @@ in_line_argn(MACRO_PROT_ARGS)
 
        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 
 
        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
 

+       state = -1;

        p = NULL;
        p = NULL;

-       flushed = j = 0;

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

+
+               if (ac == ARGS_WORD && state == -1 &&
+                   ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) &&
+                   mdoc_isdelim(p) == DELIM_OPEN) {
+                       dword(mdoc, line, la, p, DELIM_OPEN, 0);
+                       continue;
+               }
+
+               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 (ac == ARGS_PUNCT || ac == ARGS_EOLN) {

-                       if (j < 2 && tok == MDOC_Pf)
+                       if (abs(state) < 2 && tok == MDOC_Pf)

                                mandoc_vmsg(MANDOCERR_PF_SKIP,
                                    mdoc->parse, line, ppos, "Pf %s",
                                    p == NULL ? "at eol" : p);
                        break;
                }
 
                                mandoc_vmsg(MANDOCERR_PF_SKIP,
                                    mdoc->parse, line, ppos, "Pf %s",
                                    p == NULL ? "at eol" : p);
                        break;
                }
 

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

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

-                       flushed = 1;
+                       state = -2;

                }
 
                }
 

-               ntok = (ac == ARGS_QWORD || (tok == MDOC_Pf && j == 0)) ?
-                   MDOC_MAX : lookup(mdoc, tok, line, la, p);
+               ntok = (ac == ARGS_QWORD || (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;
+                               state = -2;
+                       }

                        mdoc_macro(mdoc, ntok, line, la, pos, buf);
                        mdoc_macro(mdoc, ntok, line, la, pos, buf);

-                       j++;

                        break;
                }
 
                        break;
                }
 

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

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

-                       flushed = 1;
+                       state = -2;

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

-               j++;

        }
 
        }
 

-       if (j == 0) {
-               mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
-               if (ac == ARGS_PUNCT && tok == MDOC_Pf)
-                       append_delims(mdoc, line, pos, buf);
+       if (state == -1) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);
+               return;

        }
        }

-       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);


@@ -1459,10 +1391,24 @@ in_line_argn(MACRO_PROT_ARGS)
 static void
 in_line_eoln(MACRO_PROT_ARGS)
 {
 static void
 in_line_eoln(MACRO_PROT_ARGS)
 {

-       struct mdoc_arg *arg;
+       struct roff_node        *n;
+       struct mdoc_arg         *arg;

 
 

-       if (tok == MDOC_Pp)
-               rew_sub(MDOC_BLOCK, mdoc, MDOC_Nm, line, ppos);
+       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);
+       }
+
+       if (buf[*pos] == '\0' &&
+           (tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+                   line, ppos, mdoc_macronames[tok]);
+               return;
+       }

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


@@ -1477,16 +1423,16 @@ in_line_eoln(MACRO_PROT_ARGS)
  * or until the next macro, call that macro, and return 1.
  */
 static int
  * or until the next macro, call that macro, and return 1.
  */
 static int

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

 {
        int              la;
 
        for (;;) {
                la = *pos;
                if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN)
 {
        int              la;
 
        for (;;) {
                la = *pos;
                if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN)

-                       return(0);
+                       return 0;

                if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))
                if (macro_or_word(mdoc, tok, line, la, pos, buf, 1))

-                       return(1);
+                       return 1;

        }
 }
 
        }
 }
 


@@ -1512,17 +1458,17 @@ ctx_synopsis(MACRO_PROT_ARGS)
 static void
 phrase_ta(MACRO_PROT_ARGS)
 {
 static void
 phrase_ta(MACRO_PROT_ARGS)
 {

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

 
        /* Make sure we are in a column list or ignore this macro. */
 
        body = NULL;
        for (n = mdoc->last; n != NULL; n = n->parent) {
 
        /* Make sure we are in a column list or ignore this macro. */
 
        body = NULL;
        for (n = mdoc->last; n != NULL; n = n->parent) {

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

                        continue;
                        continue;

-               if (n->tok == MDOC_It && n->type == MDOC_BODY)
+               if (n->tok == MDOC_It && n->type == ROFFT_BODY)

                        body = n;
                        body = n;

-               if (n->tok == MDOC_Bl)
+               if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT)

                        break;
        }
 
                        break;
        }
 


@@ -1535,6 +1481,6 @@ phrase_ta(MACRO_PROT_ARGS)
        /* Advance to the next column. */
 
        rew_last(mdoc, body);
        /* Advance to the next column. */
 
        rew_last(mdoc, body);

-       mdoc_body_alloc(mdoc, line, ppos, MDOC_It);
-       parse_rest(mdoc, MDOC_MAX, line, pos, buf);
+       roff_body_alloc(mdoc, line, ppos, MDOC_It);
+       parse_rest(mdoc, TOKEN_NONE, line, pos, buf);

 }
 }