MANWIDTH

[mandoc.git] / mdoc_macro.c

diff --git a/mdoc_macro.c b/mdoc_macro.c
index bb453b6b1371d352008d78481c088a02626a6dda..dd3885c702b737dfc992d04a1eb5467ead161605 100644 (file)
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_macro.c,v 1.204 2015/10/15 22:27:24 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-2015 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -46,20 +46,22 @@ static      void            phrase_ta(MACRO_PROT_ARGS);
 static void            append_delims(struct roff_man *, int, int *, char *);
 static void            dword(struct roff_man *, int, int, const char *,
                                enum mdelim, int);
 static 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             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             lookup(struct roff_man *, int, int, int, const char *);

-static int             macro_or_word(MACRO_PROT_ARGS, 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 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 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 */
-       { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
+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 */


@@ -74,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 */


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


@@ -216,18 +223,18 @@ mdoc_endparse(struct roff_man *mdoc)
 
        /* 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)
                if (n->type == ROFFT_BLOCK &&
            mdoc->last->parent : mdoc->last;
 
        for ( ; n; n = n->parent)
                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_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);

 }
 
 /*
 }
 
 /*


@@ -237,16 +244,18 @@ mdoc_endparse(struct roff_man *mdoc)
 static int
 lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 {
 static int
 lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 {

-       int      res;
+       enum roff_tok    res;

 
 

-       if (from == TOKEN_NONE || mdoc_macros[from].flags & MDOC_PARSED) {
-               res = mdoc_hash_find(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 (res != TOKEN_NONE) {

-                       if (mdoc_macros[res].flags & MDOC_CALLABLE)
+                       if (mdoc_macro(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);
+                       mandoc_msg(MANDOCERR_MACRO_CALL, line, ppos, "%s", p);

                }
        }
        return TOKEN_NONE;
                }
        }
        return TOKEN_NONE;


@@ -258,25 +267,18 @@ lookup(struct roff_man *mdoc, int from, int line, int ppos, const char *p)
 static void
 rew_last(struct roff_man *mdoc, const struct roff_node *to)
 {
 static void
 rew_last(struct roff_man *mdoc, const struct roff_node *to)
 {

-       struct roff_node        *np;

 
 

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

                return;
 
        while (mdoc->last != to) {
                return;
 
        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);
-               mdoc->last = np;
-               assert(mdoc->last);
+               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;
        mdoc->next = ROFF_NEXT_SIBLING;

-       mdoc_valid_post(mdoc);

 }
 
 /*
 }
 
 /*


@@ -294,13 +296,15 @@ rew_pending(struct roff_man *mdoc, const struct roff_node *n)
                        case ROFFT_HEAD:
                                roff_body_alloc(mdoc, n->line, n->pos,
                                    n->tok);
                        case ROFFT_HEAD:
                                roff_body_alloc(mdoc, n->line, n->pos,
                                    n->tok);

-                               return;
+                               if (n->tok == MDOC_Ss)
+                                       mdoc->flags &= ~ROFF_NONOFILL;
+                               break;

                        case ROFFT_BLOCK:
                                break;
                        default:
                                return;
                        }
                        case ROFFT_BLOCK:
                                break;
                        default:
                                return;
                        }

-                       if ( ! (n->flags & MDOC_BROKEN))
+                       if ( ! (n->flags & NODE_BROKEN))

                                return;
                } else
                        n = mdoc->last;
                                return;
                } else
                        n = mdoc->last;


@@ -311,7 +315,7 @@ rew_pending(struct roff_man *mdoc, const struct roff_node *n)
 
                        if (n->type == ROFFT_BLOCK ||
                            n->type == ROFFT_HEAD) {
 
                        if (n->type == ROFFT_BLOCK ||
                            n->type == ROFFT_HEAD) {

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

                                        break;
                                else
                                        return;
                                        break;
                                else
                                        return;


@@ -324,8 +328,8 @@ rew_pending(struct roff_man *mdoc, const struct roff_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 int
-rew_alt(int tok)
+static enum roff_tok
+rew_alt(enum roff_tok tok)

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


@@ -366,7 +370,7 @@ rew_alt(int tok)
 }
 
 static void
 }
 
 static void

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

 {
        struct roff_node *n;
 
 {
        struct roff_node *n;
 


@@ -378,38 +382,51 @@ rew_elem(struct roff_man *mdoc, int tok)
        rew_last(mdoc, n);
 }
 
        rew_last(mdoc, n);
 }
 

+static void
+break_intermediate(struct roff_node *n, struct roff_node *breaker)
+{
+       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;
+       }
+}
+

 /*
  * 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
 /*
  * 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, int tok, int line, int ppos,
+find_pending(struct roff_man *mdoc, enum roff_tok tok, int line, int ppos,

        struct roff_node *target)
 {
        struct roff_node        *n;
        int                      irc;
 
        struct roff_node *target)
 {
        struct roff_node        *n;
        int                      irc;
 

+       if (target->flags & NODE_VALID)
+               return 0;
+

        irc = 0;
        for (n = mdoc->last; n != NULL && n != target; n = n->parent) {
        irc = 0;
        for (n = mdoc->last; n != NULL && n != target; n = n->parent) {

-               if (n->flags & MDOC_ENDED) {
-                       if ( ! (n->flags & MDOC_VALID))
-                               n->flags |= MDOC_BROKEN;
+               if (n->flags & NODE_ENDED)

                        continue;
                        continue;

-               }

                if (n->type == ROFFT_BLOCK &&
                if (n->type == ROFFT_BLOCK &&

-                   mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                   mdoc_macro(n->tok)->flags & MDOC_EXPLICIT) {

                        irc = 1;
                        irc = 1;

-                       n->flags = MDOC_BROKEN;
+                       break_intermediate(mdoc->last, target);

                        if (target->type == ROFFT_HEAD)
                        if (target->type == ROFFT_HEAD)

-                               target->flags = MDOC_ENDED;
-                       else if ( ! (target->flags & MDOC_ENDED)) {
-                               mandoc_vmsg(MANDOCERR_BLK_NEST,
-                                   mdoc->parse, line, ppos,
-                                   "%s breaks %s", mdoc_macronames[tok],
-                                   mdoc_macronames[n->tok]);
+                               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,
                                mdoc_endbody_alloc(mdoc, line, ppos,

-                                   tok, target, ENDBODY_NOSPACE);
+                                   tok, target);

                        }
                }
        }
                        }
                }
        }


@@ -446,11 +463,11 @@ dword(struct roff_man *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;
 }
 
        mdoc->flags &= ~MDOC_NODELIMC;
 }
 


@@ -459,14 +476,15 @@ append_delims(struct roff_man *mdoc, int line, int *pos, char *buf)
 {
        char            *p;
        int              la;
 {
        char            *p;
        int              la;

+       enum margserr    ac;

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

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

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


@@ -483,7 +501,9 @@ append_delims(struct roff_man *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);

        }
 }
 
        }
 }
 


@@ -493,26 +513,23 @@ append_delims(struct roff_man *mdoc, int line, int *pos, char *buf)
  * Otherwise, allocate it and return 0.
  */
 static int
  * Otherwise, allocate it and return 0.
  */
 static int

-macro_or_word(MACRO_PROT_ARGS, int parsed)
+macro_or_word(MACRO_PROT_ARGS, char *p, int parsed)

 {
 {

-       char            *p;

        int              ntok;
 
        int              ntok;
 

-       p = buf + ppos;
-       ntok = TOKEN_NONE;
-       if (*p == '"')
-               p++;
-       else if (parsed && ! (mdoc->flags & MDOC_PHRASELIT))
-               ntok = lookup(mdoc, tok, line, ppos, p);
+       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 ||
 
        if (ntok == TOKEN_NONE) {
                dword(mdoc, line, ppos, p, DELIM_MAX, tok == TOKEN_NONE ||

-                   mdoc_macros[tok].flags & MDOC_JOIN);
+                   mdoc_macro(tok)->flags & MDOC_JOIN);

                return 0;
        } else {
                return 0;
        } else {

-               if (mdoc_macros[tok].fp == in_line_eoln)
+               if (tok != TOKEN_NONE &&
+                   mdoc_macro(tok)->fp == in_line_eoln)

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

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

                if (tok == TOKEN_NONE)
                        append_delims(mdoc, line, pos, buf);
                return 1;
                if (tok == TOKEN_NONE)
                        append_delims(mdoc, line, pos, buf);
                return 1;


@@ -534,7 +551,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 
        int              j, lastarg, maxargs, nl, pending;
        enum margserr    ac;
 
        int              j, lastarg, maxargs, nl, pending;
        enum margserr    ac;

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

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


@@ -551,30 +568,46 @@ 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 = itblk = 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_ENDED) {
-                       if ( ! (n->flags & MDOC_VALID))
-                               n->flags |= MDOC_BROKEN;
+               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 (n->type == ROFFT_BODY && atok == n->tok) {
-                       if (n->end == ENDBODY_NOT)
-                               body = n;
+               if (body == NULL || n->type != ROFFT_BLOCK)

                        continue;
                        continue;

-               }

 
 

-               if (n->type != ROFFT_BLOCK || n->tok == MDOC_Nm)
+               /*
+                * SYNOPSIS name blocks can not be broken themselves,
+                * but they do get broken together with a broken child.
+                */
+
+               if (n->tok == MDOC_Nm) {
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;

                        continue;
                        continue;

+               }

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


@@ -582,7 +615,6 @@ blk_exp_close(MACRO_PROT_ARGS)
                }
 
                if (atok == n->tok) {
                }
 
                if (atok == n->tok) {

-                       assert(body);

 
                        /*
                         * Found the start of our own block.
 
                        /*
                         * Found the start of our own block.


@@ -602,16 +634,15 @@ blk_exp_close(MACRO_PROT_ARGS)
                         * the scope - of the current block ends.
                         */
 
                         * the scope - of the current block ends.
                         */
 

-                       mandoc_vmsg(MANDOCERR_BLK_NEST, mdoc->parse,
+                       mandoc_msg(MANDOCERR_BLK_NEST,

                            line, ppos, "%s breaks %s",
                            line, ppos, "%s breaks %s",

-                           mdoc_macronames[atok],
-                           mdoc_macronames[later->tok]);
+                           roff_name[atok], roff_name[later->tok]);

 
                        endbody = mdoc_endbody_alloc(mdoc, line, ppos,
 
                        endbody = mdoc_endbody_alloc(mdoc, line, ppos,

-                           atok, body, ENDBODY_SPACE);
+                           atok, body);

 
                        if (tok == MDOC_El)
 
                        if (tok == MDOC_El)

-                               itblk->flags |= MDOC_ENDED | MDOC_BROKEN;
+                               itblk->flags |= NODE_ENDED | NODE_BROKEN;

 
                        /*
                         * If a block closing macro taking arguments
 
                        /*
                         * If a block closing macro taking arguments


@@ -624,32 +655,37 @@ blk_exp_close(MACRO_PROT_ARGS)
                        break;
                }
 
                        break;
                }
 

-               /* Explicit blocks close out description lines. */
+               /*
+                * Explicit blocks close out description lines, but
+                * even those can get broken together with a child.
+                */

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

-                       rew_last(mdoc, n);
+                       if (later != NULL)
+                               n->flags |= NODE_BROKEN | NODE_ENDED;
+                       else
+                               rew_last(mdoc, n);

                        continue;
                }
 
                /* Breaking an open sub block. */
 
                        continue;
                }
 
                /* Breaking an open sub block. */
 

-               n->flags |= MDOC_BROKEN;
+               break_intermediate(mdoc->last, body);
+               n->flags |= NODE_BROKEN;

                if (later == NULL)
                        later = n;
        }
 
        if (body == NULL) {
                if (later == NULL)
                        later = n;
        }
 
        if (body == NULL) {

-               mandoc_msg(MANDOCERR_BLK_NOTOPEN, mdoc->parse,
-                   line, ppos, mdoc_macronames[tok]);
-               if (later != NULL)
-                       later->flags &= ~MDOC_BROKEN;
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, line, ppos,
+                   "%s", roff_name[tok]);

                if (maxargs && endbody == NULL) {
                        /*
                         * Stray .Ec without previous .Eo:
                         * Break the output line, keep the arguments.
                         */
                if (maxargs && endbody == NULL) {
                        /*
                         * Stray .Ec without previous .Eo:
                         * Break the output line, keep the arguments.
                         */

-                       roff_elem_alloc(mdoc, line, ppos, MDOC_br);
-                       rew_elem(mdoc, MDOC_br);
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);

                }
        } else if (endbody == NULL) {
                rew_last(mdoc, body);
                }
        } else if (endbody == NULL) {
                rew_last(mdoc, body);


@@ -657,14 +693,25 @@ blk_exp_close(MACRO_PROT_ARGS)
                        mdoc_tail_alloc(mdoc, line, ppos, atok);
        }
 
                        mdoc_tail_alloc(mdoc, line, ppos, atok);
        }
 

-       if ( ! (mdoc_macros[tok].flags & MDOC_PARSED)) {
+       if ((mdoc_macro(tok)->flags & MDOC_PARSED) == 0) {

                if (buf[*pos] != '\0')
                if (buf[*pos] != '\0')

-                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
-                           mdoc->parse, line, ppos,
-                           "%s %s", mdoc_macronames[tok],
-                           buf + *pos);
+                       mandoc_msg(MANDOCERR_ARG_SKIP, line, ppos,
+                           "%s %s", roff_name[tok], buf + *pos);

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

+
+               /*
+                * 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
+                               mdoc->flags &= ~ROFF_NOFILL;
+               }

                return;
        }
 
                return;
        }
 


@@ -682,32 +729,34 @@ blk_exp_close(MACRO_PROT_ARGS)
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
                        break;
 
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN)
                        break;
 

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

 
                if (ntok == TOKEN_NONE) {
                        dword(mdoc, line, lastarg, p, DELIM_MAX,
 
                if (ntok == TOKEN_NONE) {
                        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 (n != NULL)
                        rew_last(mdoc, n);
                mdoc->flags &= ~MDOC_NEWLINE;
 
                if (n != NULL)
                        rew_last(mdoc, n);
                mdoc->flags &= ~MDOC_NEWLINE;

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

                break;
        }
 
        if (n != NULL) {
                break;
        }
 
        if (n != NULL) {

-               if (ntok != TOKEN_NONE && n->flags & MDOC_BROKEN) {
+               pending = 0;
+               if (ntok != TOKEN_NONE && n->flags & NODE_BROKEN) {

                        target = n;
                        do
                                target = target->parent;
                        target = n;
                        do
                                target = target->parent;

-                       while ( ! (target->flags & MDOC_ENDED));
-                       pending = find_pending(mdoc, ntok, line, ppos,
-                           target);
-               } else
-                       pending = 0;
+                       while ( ! (target->flags & NODE_ENDED));
+                       pending = find_pending(mdoc, ntok, line, ppos, target);
+               }

                if ( ! pending)
                        rew_pending(mdoc, n);
        }
                if ( ! pending)
                        rew_pending(mdoc, n);
        }


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

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


@@ -762,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;
                }
 


@@ -780,7 +829,7 @@ in_line(MACRO_PROT_ARGS)
                        break;
                }
 
                        break;
                }
 

-               ntok = (ac == ARGS_QWORD || (tok == MDOC_Fn && !cnt)) ?
+               ntok = (tok == MDOC_Fn && !cnt) ?

                    TOKEN_NONE : lookup(mdoc, tok, line, la, p);
 
                /*
                    TOKEN_NONE : lookup(mdoc, tok, line, la, p);
 
                /*


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


@@ -836,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;


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


@@ -856,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;
 
                /*


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


@@ -885,43 +939,46 @@ 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, parsed;

        struct mdoc_arg  *arg;
        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;
        struct mdoc_arg  *arg;
        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;
        char             *p;

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

 
        nl = MDOC_NEWLINE & mdoc->flags;
 
        if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
 
        nl = MDOC_NEWLINE & mdoc->flags;
 
        if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {

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

                return;
        }
 
                return;
        }
 

-       if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
+       if ((mdoc_macro(tok)->flags & MDOC_EXPLICIT) == 0) {

 
                /* Here, tok is one of Sh Ss Nm Nd It. */
 
                blk = NULL;
                for (n = mdoc->last; n != NULL; n = n->parent) {
 
                /* Here, tok is one of Sh Ss Nm Nd It. */
 
                blk = NULL;
                for (n = mdoc->last; n != NULL; n = n->parent) {

-                       if (n->flags & MDOC_ENDED) {
-                               if ( ! (n->flags & MDOC_VALID))
-                                       n->flags |= MDOC_BROKEN;
+                       if (n->flags & NODE_ENDED) {
+                               if ( ! (n->flags & NODE_VALID))
+                                       n->flags |= NODE_BROKEN;

                                continue;
                        }
                        if (n->type != ROFFT_BLOCK)
                                continue;
                        }
                        if (n->type != ROFFT_BLOCK)


@@ -929,24 +986,22 @@ blk_full(MACRO_PROT_ARGS)
 
                        if (tok == MDOC_It && n->tok == MDOC_Bl) {
                                if (blk != NULL) {
 
                        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]);
+                                       mandoc_msg(MANDOCERR_BLK_BROKEN,
+                                           line, ppos, "It breaks %s",
+                                           roff_name[blk->tok]);

                                        rew_pending(mdoc, blk);
                                }
                                break;
                        }
 
                                        rew_pending(mdoc, blk);
                                }
                                break;
                        }
 

-                       if (mdoc_macros[n->tok].flags & MDOC_EXPLICIT) {
+                       if (mdoc_macro(n->tok)->flags & MDOC_EXPLICIT) {

                                switch (tok) {
                                case MDOC_Sh:
                                case MDOC_Ss:
                                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]);
+                                       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;
                                        rew_pending(mdoc, n);
                                        n = mdoc->last;
                                        continue;


@@ -970,26 +1025,24 @@ blk_full(MACRO_PROT_ARGS)
                        /* Item breaking an explicit block. */
 
                        if (blk != 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]);
+                               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, blk);
                                blk = NULL;
                        }
 
                        /* Close out prior implicit scopes. */
 

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

                }
 
                /* Skip items outside lists. */
 
                if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {
                }
 
                /* Skip items outside lists. */
 
                if (tok == MDOC_It && (n == NULL || n->tok != MDOC_Bl)) {

-                       mandoc_vmsg(MANDOCERR_IT_STRAY, mdoc->parse,
+                       mandoc_msg(MANDOCERR_IT_STRAY,

                            line, ppos, "It %s", buf + *pos);
                            line, ppos, "It %s", buf + *pos);

-                       roff_elem_alloc(mdoc, line, ppos, MDOC_br);
-                       rew_elem(mdoc, MDOC_br);
+                       roff_elem_alloc(mdoc, line, ppos, ROFF_br);
+                       rew_elem(mdoc, ROFF_br);

                        return;
                }
        }
                        return;
                }
        }


@@ -1003,6 +1056,16 @@ blk_full(MACRO_PROT_ARGS)
         * regular child nodes.
         */
 
         * regular child nodes.
         */
 

+       switch (tok) {
+       case MDOC_Sh:
+               mdoc->flags &= ~ROFF_NOFILL;
+               break;
+       case MDOC_Ss:
+               mdoc->flags |= ROFF_NONOFILL;
+               break;
+       default:
+               break;
+       }

        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
        blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
        head = body = NULL;
        mdoc_argv(mdoc, line, tok, &arg, pos, buf);
        blk = mdoc_block_alloc(mdoc, line, ppos, tok, arg);
        head = body = NULL;


@@ -1030,35 +1093,51 @@ blk_full(MACRO_PROT_ARGS)
        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);
                if (ac == ARGS_EOLN) {
                la = *pos;
                lac = ac;
                ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
                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);
                        body = roff_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) {
                if (tok == MDOC_Bd || tok == MDOC_Bk) {

-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
-                           mdoc->parse, line, la, "%s ... %s",
-                           mdoc_macronames[tok], buf + la);
+                       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) {
                        break;
                }
                if (tok == MDOC_Rs) {

-                       mandoc_vmsg(MANDOCERR_ARG_SKIP, mdoc->parse,
+                       mandoc_msg(MANDOCERR_ARG_SKIP,

                            line, la, "Rs %s", buf + la);
                            line, la, "Rs %s", buf + la);

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

                        break;
                }
                if (ac == ARGS_PUNCT)
                        break;
                }
                if (ac == ARGS_PUNCT)


@@ -1070,12 +1149,11 @@ blk_full(MACRO_PROT_ARGS)
                 */
 
                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;
                }
 
                        continue;
                }
 


@@ -1084,9 +1162,7 @@ blk_full(MACRO_PROT_ARGS)
                if (head == NULL)
                        head = roff_head_alloc(mdoc, line, ppos, tok);
 
                if (head == NULL)
                        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


@@ -1096,18 +1172,11 @@ blk_full(MACRO_PROT_ARGS)
                        rew_last(mdoc, body == NULL ? head : body);
                        body = roff_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. */

 
 

-                       if (ac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
-                       if (ac == ARGS_PEND && lac == ARGS_PPHRASE)
-                               mdoc->flags |= MDOC_PPHRASE;
+                       mdoc->flags |= MDOC_PHRASE;

                        parse_rest(mdoc, TOKEN_NONE, line, &la, buf);
                        parse_rest(mdoc, TOKEN_NONE, line, &la, buf);

-                       mdoc->flags &= ~MDOC_PPHRASE;
+                       mdoc->flags &= ~MDOC_PHRASE;

 
                        /* There may have been `Ta' macros. */
 
 
                        /* There may have been `Ta' macros. */
 


@@ -1116,11 +1185,14 @@ blk_full(MACRO_PROT_ARGS)
                        continue;
                }
 
                        continue;
                }
 

-               if (macro_or_word(mdoc, tok, line, la, pos, buf, parsed))
+               done = macro_or_word(mdoc, tok, line, la, pos, buf, p, parsed);
+               if (ac == ARGS_ALLOC)
+                       free(p);
+               if (done)

                        break;
        }
 
                        break;
        }
 

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

                return;
        if (head == NULL)
                head = roff_head_alloc(mdoc, line, ppos, tok);
                return;
        if (head == NULL)
                head = roff_head_alloc(mdoc, line, ppos, tok);


@@ -1135,6 +1207,33 @@ blk_full(MACRO_PROT_ARGS)
 
        rew_last(mdoc, head);
        body = roff_body_alloc(mdoc, line, ppos, tok);
 
        rew_last(mdoc, head);
        body = roff_body_alloc(mdoc, line, ppos, tok);

+       if (tok == MDOC_Ss)
+               mdoc->flags &= ~ROFF_NONOFILL;
+
+       /*
+        * 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.
+        */
+
+       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;
+               }
+       }

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


@@ -1146,7 +1245,7 @@ out:
 static void
 blk_part_imp(MACRO_PROT_ARGS)
 {
 static void
 blk_part_imp(MACRO_PROT_ARGS)
 {

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

        enum margserr     ac;
        char             *p;
        struct roff_node *blk; /* saved block context */
        enum margserr     ac;
        char             *p;
        struct roff_node *blk; /* saved block context */


@@ -1179,16 +1278,20 @@ 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)
                        body = roff_body_alloc(mdoc, line, ppos, tok);
 
                        continue;
                }
 
                if (body == NULL)
                        body = roff_body_alloc(mdoc, line, ppos, tok);
 

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

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


@@ -1207,13 +1310,13 @@ blk_part_imp(MACRO_PROT_ARGS)
        for (n = body->child; n && n->next; n = n->next)
                /* Do nothing. */ ;
        if (n && n->tok == MDOC_Ns)
        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;
        struct roff_node *head; /* keep track of head */
        char             *p;
        enum margserr     ac;
        struct roff_node *head; /* keep track of head */
        char             *p;


@@ -1236,9 +1339,10 @@ 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) {
+               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;
                }
 
                        continue;
                }
 


@@ -1248,11 +1352,17 @@ blk_part_exp(MACRO_PROT_ARGS)
                                dword(mdoc, line, la, p, DELIM_MAX, 0);
                        rew_last(mdoc, head);
                        roff_body_alloc(mdoc, line, ppos, tok);
                                dword(mdoc, line, la, p, DELIM_MAX, 0);
                        rew_last(mdoc, head);
                        roff_body_alloc(mdoc, line, ppos, tok);

-                       if (tok == MDOC_Eo)
+                       if (tok == MDOC_Eo) {
+                               if (ac == ARGS_ALLOC)
+                                       free(p);

                                continue;
                                continue;

+                       }

                }
 
                }
 

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

                        break;
        }
 
                        break;
        }
 


@@ -1272,7 +1382,7 @@ in_line_argn(MACRO_PROT_ARGS)
        struct mdoc_arg *arg;
        char            *p;
        enum margserr    ac;
        struct mdoc_arg *arg;
        char            *p;
        enum margserr    ac;

-       int              ntok;
+       enum roff_tok    ntok;

        int              state; /* arg#; -1: not yet open; -2: closed */
        int              la, maxargs, nl;
 
        int              state; /* arg#; -1: not yet open; -2: closed */
        int              la, maxargs, nl;
 


@@ -1310,10 +1420,12 @@ in_line_argn(MACRO_PROT_ARGS)
                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_WORD && state == -1 &&
-                   ! (mdoc_macros[tok].flags & MDOC_IGNDELIM) &&
+               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;
                }
 


@@ -1325,8 +1437,8 @@ in_line_argn(MACRO_PROT_ARGS)
 
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN) {
                        if (abs(state) < 2 && tok == MDOC_Pf)
 
                if (ac == ARGS_PUNCT || ac == ARGS_EOLN) {
                        if (abs(state) < 2 && tok == MDOC_Pf)

-                               mandoc_vmsg(MANDOCERR_PF_SKIP,
-                                   mdoc->parse, line, ppos, "Pf %s",
+                               mandoc_msg(MANDOCERR_PF_SKIP,
+                                   line, ppos, "Pf %s",

                                    p == NULL ? "at eol" : p);
                        break;
                }
                                    p == NULL ? "at eol" : p);
                        break;
                }


@@ -1336,7 +1448,7 @@ in_line_argn(MACRO_PROT_ARGS)
                        state = -2;
                }
 
                        state = -2;
                }
 

-               ntok = (ac == ARGS_QWORD || (tok == MDOC_Pf && state == 0)) ?
+               ntok = (tok == MDOC_Pf && state == 0) ?

                    TOKEN_NONE : lookup(mdoc, tok, line, la, p);
 
                if (ntok != TOKEN_NONE) {
                    TOKEN_NONE : lookup(mdoc, tok, line, la, p);
 
                if (ntok != TOKEN_NONE) {


@@ -1344,12 +1456,14 @@ in_line_argn(MACRO_PROT_ARGS)
                                rew_elem(mdoc, tok);
                                state = -2;
                        }
                                rew_elem(mdoc, tok);
                                state = -2;
                        }

-                       mdoc_macro(mdoc, ntok, line, la, pos, buf);
+                       (*mdoc_macro(ntok)->fp)(mdoc, ntok,
+                           line, la, pos, buf);
+                       if (ac == ARGS_ALLOC)
+                               free(p);

                        break;
                }
 
                        break;
                }
 

-               if (ac == ARGS_QWORD ||
-                   mdoc_macros[tok].flags & MDOC_IGNDELIM ||
+               if (mdoc_macro(tok)->flags & MDOC_IGNDELIM ||

                    mdoc_isdelim(p) == DELIM_NONE) {
                        if (state == -1) {
                                mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
                    mdoc_isdelim(p) == DELIM_NONE) {
                        if (state == -1) {
                                mdoc_elem_alloc(mdoc, line, ppos, tok, arg);


@@ -1362,12 +1476,15 @@ in_line_argn(MACRO_PROT_ARGS)
                }
 
                dword(mdoc, line, la, p, DELIM_MAX,
                }
 
                dword(mdoc, line, la, p, DELIM_MAX,

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

        }
 
        if (state == -1) {
        }
 
        if (state == -1) {

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

                return;
        }
 
                return;
        }
 


@@ -1395,9 +1512,9 @@ in_line_eoln(MACRO_PROT_ARGS)
        }
 
        if (buf[*pos] == '\0' &&
        }
 
        if (buf[*pos] == '\0' &&

-           (tok == MDOC_Fd || mdoc_macronames[tok][0] == '%')) {
-               mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
-                   line, ppos, mdoc_macronames[tok]);
+           (tok == MDOC_Fd || *roff_name[tok] == '%')) {
+               mandoc_msg(MANDOCERR_MACRO_EMPTY,
+                   line, ppos, "%s", roff_name[tok]);

                return;
        }
 
                return;
        }
 


@@ -1414,15 +1531,22 @@ 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 roff_man *mdoc, int tok, int line, int *pos, char *buf)
+parse_rest(struct roff_man *mdoc, enum roff_tok tok,
+    int line, int *pos, char *buf)

 {
 {

-       int              la;
+       char            *p;
+       int              done, la;
+       enum margserr    ac;

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

-               if (mdoc_args(mdoc, line, pos, buf, tok, NULL) == ARGS_EOLN)
+               ac = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               if (ac == ARGS_EOLN)

                        return 0;
                        return 0;

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

                        return 1;
        }
 }
                        return 1;
        }
 }


@@ -1455,17 +1579,16 @@ phrase_ta(MACRO_PROT_ARGS)
 
        body = NULL;
        for (n = mdoc->last; n != NULL; n = n->parent) {
 
        body = NULL;
        for (n = mdoc->last; n != NULL; n = n->parent) {

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

                        continue;
                if (n->tok == MDOC_It && n->type == ROFFT_BODY)
                        body = n;
                        continue;
                if (n->tok == MDOC_It && n->type == ROFFT_BODY)
                        body = n;

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

                        break;
        }
 
        if (n == NULL || n->norm->Bl.type != LIST_column) {
                        break;
        }
 
        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;
        }
 
                return;
        }