Documentation, more validations, cleaned up actions, added Nm action.

[mandoc.git] / macro.c

diff --git a/macro.c b/macro.c
index 4340e46e32b0e6554f37a26813b5ab98f7252532..4c24c01fbbd4d2fc73e2cab6bc58f4125bcb1b21 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.16 2009/01/01 20:40:16 kristaps Exp $ */
+/* $Id: macro.c,v 1.40 2009/01/17 16:15:27 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -29,92 +29,401 @@
 
 /* FIXME: maxlineargs should be per LINE, no per TOKEN. */
 
 
 /* FIXME: maxlineargs should be per LINE, no per TOKEN. */
 

-#define        _CC(p)  ((const char **)p)
+static int       rewind_alt(int);
+static int       rewind_dohalt(int, enum mdoc_type, 
+                       const struct mdoc_node *);
+#define        REWIND_REWIND   (1 << 0)
+#define        REWIND_NOHALT   (1 << 1)
+#define        REWIND_HALT     (1 << 2)
+static int       rewind_dobreak(int, enum mdoc_type, 
+                       const struct mdoc_node *);

 
 

-static int       scope_rewind_imp(struct mdoc *, int, int);
-static int       scope_rewind_exp(struct mdoc *, int, int, int);
-static int       scope_rewind_line(struct mdoc *, int, int);
-static int       append_text(struct mdoc *, int, 
-                       int, int, char *[]);
-static int       append_text_argv(struct mdoc *, int, int, 
-                       int, char *[], int, const struct mdoc_arg *);
-static int       append_delims(struct mdoc *, int, int *, char *);
+
+static int       rewind_elem(struct mdoc *, int);
+static int       rewind_impblock(struct mdoc *, int, int, int);
+static int       rewind_expblock(struct mdoc *, int, int, int);
+static int       rewind_subblock(enum mdoc_type, struct mdoc *, int);
+static int       rewind_last(int, int, 
+                       struct mdoc *, struct mdoc_node *);
+static int       append_delims(struct mdoc *, 
+                       int, int, int *, char *);
+static int       lookup(struct mdoc *, int, int, int, const char *);
+
+
+static int
+lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
+{
+       int              res;
+
+       res = mdoc_find(mdoc, p);
+       if (MDOC_PARSED & mdoc_macros[from].flags)
+               return(res);
+       if (MDOC_MAX == res)
+               return(res);
+
+       if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter"))
+               return(-1);
+       return(MDOC_MAX);
+}
+
+
+static int
+rewind_last(int tok, int type, struct mdoc *mdoc, struct mdoc_node *to)
+{
+
+       assert(to);
+       mdoc->next = MDOC_NEXT_SIBLING;
+       if (mdoc->last == to) {
+               if ( ! mdoc_valid_post(mdoc))
+                       return(0);
+               if ( ! mdoc_action_post(mdoc))
+                       return(0);
+               mdoc_msg(mdoc, "rewound %s %s to %s %s", 
+                               mdoc_type2a(type),
+                               mdoc_macronames[tok],
+                               mdoc_type2a(mdoc->last->type),
+                               mdoc_macronames[mdoc->last->tok]);
+               return(1);
+       }
+
+       do {
+               mdoc->last = mdoc->last->parent;
+               assert(mdoc->last);
+               if ( ! mdoc_valid_post(mdoc))
+                       return(0);
+               if ( ! mdoc_action_post(mdoc))
+                       return(0);
+               mdoc_msg(mdoc, "rewound %s %s to %s %s",
+                               mdoc_type2a(type),
+                               mdoc_macronames[tok],
+                               mdoc_type2a(mdoc->last->type),
+                               mdoc_macronames[mdoc->last->tok]);
+       } while (mdoc->last != to);
+
+       return(1);
+}
+
+
+static int
+rewind_alt(int tok)
+{
+       switch (tok) {
+       case (MDOC_Ac):
+               return(MDOC_Ao);
+       case (MDOC_Bc):
+               return(MDOC_Bo);
+       case (MDOC_Dc):
+               return(MDOC_Do);
+       case (MDOC_Ec):
+               return(MDOC_Eo);
+       case (MDOC_Ed):
+               return(MDOC_Bd);
+       case (MDOC_Ef):
+               return(MDOC_Bf);
+       case (MDOC_Ek):
+               return(MDOC_Bk);
+       case (MDOC_El):
+               return(MDOC_Bl);
+       case (MDOC_Fc):
+               return(MDOC_Fo);
+       case (MDOC_Oc):
+               return(MDOC_Oo);
+       case (MDOC_Pc):
+               return(MDOC_Po);
+       case (MDOC_Qc):
+               return(MDOC_Qo);
+       case (MDOC_Re):
+               return(MDOC_Rs);
+       case (MDOC_Sc):
+               return(MDOC_So);
+       case (MDOC_Xc):
+               return(MDOC_Xo);
+       default:
+               break;
+       }
+       abort();
+       /* NOTREACHED */
+}
+
+
+static int
+rewind_dohalt(int tok, enum mdoc_type type, const struct mdoc_node *p)
+{
+
+       if (MDOC_ROOT == p->type)
+               return(REWIND_HALT);
+       if (MDOC_TEXT == p->type) 
+               return(REWIND_NOHALT);
+       if (MDOC_ELEM == p->type) 
+               return(REWIND_NOHALT);
+
+       switch (tok) {
+       /* One-liner implicit-scope. */
+       case (MDOC_Aq):
+               /* FALLTHROUGH */
+       case (MDOC_Bq):
+               /* FALLTHROUGH */
+       case (MDOC_D1):
+               /* FALLTHROUGH */
+       case (MDOC_Dl):
+               /* FALLTHROUGH */
+       case (MDOC_Dq):
+               /* FALLTHROUGH */
+       case (MDOC_Op):
+               /* FALLTHROUGH */
+       case (MDOC_Pq):
+               /* FALLTHROUGH */
+       case (MDOC_Ql):
+               /* FALLTHROUGH */
+       case (MDOC_Qq):
+               /* FALLTHROUGH */
+       case (MDOC_Sq):
+               assert(MDOC_BODY != type);
+               assert(MDOC_TAIL != type);
+               if (type == p->type && tok == p->tok)
+                       return(REWIND_REWIND);
+               break;
+
+       /* Multi-line implicit-scope. */
+       case (MDOC_It):
+               assert(MDOC_TAIL != type);
+               if (type == p->type && tok == p->tok)
+                       return(REWIND_REWIND);
+               if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
+                       return(REWIND_HALT);
+               break;
+       case (MDOC_Sh):
+               if (type == p->type && tok == p->tok)
+                       return(REWIND_REWIND);
+               break;
+       case (MDOC_Ss):
+               assert(MDOC_TAIL != type);
+               if (type == p->type && tok == p->tok)
+                       return(REWIND_REWIND);
+               if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
+                       return(REWIND_HALT);
+               break;
+       
+       /* Multi-line explicit scope start. */
+       case (MDOC_Ao):
+               /* FALLTHROUGH */
+       case (MDOC_Bd):
+               /* FALLTHROUGH */
+       case (MDOC_Bf):
+               /* FALLTHROUGH */
+       case (MDOC_Bk):
+               /* FALLTHROUGH */
+       case (MDOC_Bl):
+               /* FALLTHROUGH */
+       case (MDOC_Bo):
+               /* FALLTHROUGH */
+       case (MDOC_Do):
+               /* FALLTHROUGH */
+       case (MDOC_Eo):
+               /* FALLTHROUGH */
+       case (MDOC_Fo):
+               /* FALLTHROUGH */
+       case (MDOC_Oo):
+               /* FALLTHROUGH */
+       case (MDOC_Po):
+               /* FALLTHROUGH */
+       case (MDOC_Qo):
+               /* FALLTHROUGH */
+       case (MDOC_Rs):
+               /* FALLTHROUGH */
+       case (MDOC_So):
+               /* FALLTHROUGH */
+       case (MDOC_Xo):
+               if (type == p->type && tok == p->tok)
+                       return(REWIND_REWIND);
+               break;
+
+       /* Multi-line explicit scope close. */
+       case (MDOC_Ac):
+               /* FALLTHROUGH */
+       case (MDOC_Bc):
+               /* FALLTHROUGH */
+       case (MDOC_Dc):
+               /* FALLTHROUGH */
+       case (MDOC_Ec):
+               /* FALLTHROUGH */
+       case (MDOC_Ed):
+               /* FALLTHROUGH */
+       case (MDOC_Ek):
+               /* FALLTHROUGH */
+       case (MDOC_El):
+               /* FALLTHROUGH */
+       case (MDOC_Fc):
+               /* FALLTHROUGH */
+       case (MDOC_Ef):
+               /* FALLTHROUGH */
+       case (MDOC_Oc):
+               /* FALLTHROUGH */
+       case (MDOC_Pc):
+               /* FALLTHROUGH */
+       case (MDOC_Qc):
+               /* FALLTHROUGH */
+       case (MDOC_Re):
+               /* FALLTHROUGH */
+       case (MDOC_Sc):
+               /* FALLTHROUGH */
+       case (MDOC_Xc):
+               if (type == p->type && rewind_alt(tok) == p->tok)
+                       return(REWIND_REWIND);
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       return(REWIND_NOHALT);
+}
+
+
+static int
+rewind_dobreak(int tok, enum mdoc_type type, const struct mdoc_node *p)
+{
+
+       assert(MDOC_ROOT != p->type);
+       if (MDOC_ELEM == p->type)
+               return(1);
+       if (MDOC_TEXT == p->type)
+               return(1);
+
+       switch (tok) {
+       /* Implicit rules. */
+       case (MDOC_It):
+               return(MDOC_It == p->tok);
+       case (MDOC_Ss):
+               return(MDOC_Ss == p->tok);
+       case (MDOC_Sh):
+               if (MDOC_Ss == p->tok)
+                       return(1);
+               return(MDOC_Sh == p->tok);
+
+       /* Extra scope rules. */
+       case (MDOC_El):
+               if (MDOC_It == p->tok)
+                       return(1);
+               break;
+       default:
+               break;
+       }
+
+       if (MDOC_EXPLICIT & mdoc_macros[tok].flags) 
+               return(p->tok == rewind_alt(tok));
+       else if (MDOC_BLOCK == p->type)
+               return(1);
+
+       return(tok == p->tok);
+}

 
 
 static int
 
 
 static int

-scope_rewind_line(struct mdoc *mdoc, int ppos, int tok)
+rewind_elem(struct mdoc *mdoc, int tok)

 {
        struct mdoc_node *n;
 {
        struct mdoc_node *n;

-       int               t;
+
+       n = mdoc->last;
+       if (MDOC_ELEM != n->type)
+               n = n->parent;
+       assert(MDOC_ELEM == n->type);
+       assert(tok == n->tok);
+
+       return(rewind_last(tok, MDOC_ELEM, mdoc, n));
+}
+
+
+static int
+rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, int tok)
+{
+       struct mdoc_node *n;
+       int               c;
+
+       c = rewind_dohalt(tok, type, mdoc->last);
+       if (REWIND_HALT == c)
+               return(1);
+       if (REWIND_REWIND == c)
+               return(rewind_last(tok, type, mdoc, mdoc->last));

 
        /* LINTED */
 
        /* LINTED */

-       for (n = mdoc->last; n; n = n->parent) {
-               if (MDOC_HEAD != n->type) 
-                       continue;
-               if (tok == (t = n->data.head.tok))
+       for (n = mdoc->last->parent; n; n = n->parent) {
+               c = rewind_dohalt(tok, type, n);
+               if (REWIND_HALT == c)
+                       return(1);
+               if (REWIND_REWIND == c)

                        break;
                        break;

-               if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+               else if (rewind_dobreak(tok, type, n))

                        continue;
                        continue;

-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+               return(mdoc_nerr(mdoc, n, "body scope broken"));

        }
 
        }
 

-       mdoc->last = n ? n : mdoc->last;
-       mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
+       assert(n);
+       return(rewind_last(tok, type, mdoc, n));

 }
 
 
 static int
 }
 
 
 static int

-scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, int tt)
+rewind_expblock(struct mdoc *mdoc, int tok, int line, int ppos)

 {
        struct mdoc_node *n;
 {
        struct mdoc_node *n;

+       int               c;

 
 

-       assert(mdoc->last);
+       c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last);
+       if (REWIND_HALT == c)
+               return(mdoc_perr(mdoc, line, ppos, "closing macro has no context"));
+       if (REWIND_REWIND == c)
+               return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last));

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

-               if (MDOC_BLOCK != n->type) 
-                       continue;
-               if (tt == n->data.block.tok)
+               c = rewind_dohalt(tok, MDOC_BLOCK, n);
+               if (REWIND_HALT == c)
+                       return(mdoc_perr(mdoc, line, ppos, "closing macro has no context"));
+               if (REWIND_REWIND == c)

                        break;
                        break;

-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+               else if (rewind_dobreak(tok, MDOC_BLOCK, n))
+                       continue;
+               return(mdoc_nerr(mdoc, n, "block scope broken"));

        }
 
        }
 

-       if (NULL == (mdoc->last = n))
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
-
-       mdoc->next = MDOC_NEXT_SIBLING;
-       return(mdoc_valid_post(mdoc, tok, ppos));
+       assert(n);
+       return(rewind_last(tok, MDOC_BLOCK, mdoc, n));

 }
 
 
 static int
 }
 
 
 static int

-scope_rewind_imp(struct mdoc *mdoc, int ppos, int tok)
+rewind_impblock(struct mdoc *mdoc, int tok, int line, int ppos)

 {
        struct mdoc_node *n;
 {
        struct mdoc_node *n;

-       int               t;
+       int               c;

 
 

-       n = mdoc->last ? mdoc->last->parent : NULL;
+       c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last);
+       if (REWIND_HALT == c)
+               return(1);
+       if (REWIND_REWIND == c)
+               return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last));

 
        /* LINTED */
 
        /* LINTED */

-       for ( ; n; n = n->parent) {
-               if (MDOC_BLOCK != n->type) 
-                       continue;
-               if (tok == (t = n->data.block.tok))
+       for (n = mdoc->last->parent; n; n = n->parent) {
+               c = rewind_dohalt(tok, MDOC_BLOCK, n);
+               if (REWIND_HALT == c)
+                       return(1);
+               else if (REWIND_REWIND == c)

                        break;
                        break;

-               if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
+               else if (rewind_dobreak(tok, MDOC_BLOCK, n))

                        continue;
                        continue;

-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+               return(mdoc_nerr(mdoc, n, "block scope broken"));

        }
 
        }
 

-       mdoc->last = n ? n : mdoc->last;
-       mdoc->next = MDOC_NEXT_SIBLING;
-       return(mdoc_valid_post(mdoc, tok, ppos));
+       assert(n);
+       return(rewind_last(tok, MDOC_BLOCK, mdoc, n));

 }
 
 
 static int
 }
 
 
 static int

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

 {
        int              c, lastarg;
        char            *p;
 {
        int              c, lastarg;
        char            *p;


@@ -124,13 +433,14 @@ append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
 
        for (;;) {
                lastarg = *pos;
 
        for (;;) {
                lastarg = *pos;

-               c = mdoc_args(mdoc, tok, pos, buf, 0, &p);
+               c = mdoc_args(mdoc, line, pos, buf, 0, &p);

                if (ARGS_ERROR == c)
                        return(0);
                else if (ARGS_EOLN == c)
                        break;
                assert(mdoc_isdelim(p));
                if (ARGS_ERROR == c)
                        return(0);
                else if (ARGS_EOLN == c)
                        break;
                assert(mdoc_isdelim(p));

-               mdoc_word_alloc(mdoc, lastarg, p);
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);

                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 


@@ -138,429 +448,513 @@ append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
 }
 
 
 }
 
 

-static int
-append_text_argv(struct mdoc *mdoc, int tok, int pos, 
-               int sz, char *args[],
-               int argc, const struct mdoc_arg *argv)
+/* ARGSUSED */
+int
+macro_scoped_close(MACRO_PROT_ARGS)

 {
 {

+       int              tt, j, c, lastarg, maxargs, flushed;
+       char            *p;

 
 

-       if ( ! mdoc_valid_pre(mdoc, tok, pos, 0, NULL, argc, argv))
-               return(0);
-       mdoc_elem_alloc(mdoc, pos, tok, (size_t)argc, 
-                       argv, (size_t)sz, _CC(args));
-       mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
-}
-
+       switch (tok) {
+       case (MDOC_Ec):
+               maxargs = 1;
+               break;
+       default:
+               maxargs = 0;
+               break;
+       }

 
 

-static int
-append_text(struct mdoc *mdoc, int tok, 
-               int pos, int sz, char *args[])
-{
+       tt = rewind_alt(tok);

 
 

-       if ( ! mdoc_valid_pre(mdoc, tok, pos, sz, _CC(args), 0, NULL))
-               return(0);
+       mdoc_msg(mdoc, "parse-quiet: %s closing %s",
+                       mdoc_macronames[tok], mdoc_macronames[tt]);

 
 

-       switch (tok) {
-       case (MDOC_At):
-               if (0 == sz)
-                       break;
-               if (ATT_DEFAULT == mdoc_atoatt(args[0])) {
-                       mdoc_elem_alloc(mdoc, pos, tok, 
-                                       0, NULL, 0, NULL);
-                       mdoc->next = MDOC_NEXT_SIBLING;
-                       mdoc_word_alloc(mdoc, pos, args[0]);
-                       mdoc->next = MDOC_NEXT_SIBLING;
-               } else {
-                       mdoc_elem_alloc(mdoc, pos, tok, 0, 
-                                       NULL, 1, _CC(&args[0]));
-                       mdoc->next = MDOC_NEXT_SIBLING;
+       if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
+               if (0 == buf[*pos]) {
+                       if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
+                               return(0);
+                       return(rewind_expblock(mdoc, tok, line, ppos));

                }
                }

-
-               if (sz > 1)
-                       mdoc_word_alloc(mdoc, pos, args[1]);
-               mdoc->next = MDOC_NEXT_SIBLING;
-               return(1);
-
-       default:
-               break;
+               return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters"));

        }
 
        }
 

-       mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
-       mdoc->next = MDOC_NEXT_SIBLING;
-       return(1);
-}
+       if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
+               return(0);

 
 

+       lastarg = ppos;
+       flushed = 0;

 
 

-int
-macro_text(MACRO_PROT_ARGS)
-{
-       int               lastarg, lastpunct, c, j, fl;
-       char             *args[MDOC_LINEARG_MAX];
+       if (maxargs > 0) {
+               if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+                       return(0);
+               mdoc->next = MDOC_NEXT_CHILD;
+       }

 
 

-       /* Token pre-processing.  */
+       for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+               lastarg = *pos;

 
 

-       switch (tok) {
-       case (MDOC_Pp):
-               /* `.Pp' ignored when following `.Sh' or `.Ss'. */
-               assert(mdoc->last);
-               if (MDOC_BODY != mdoc->last->type)
+               if (j == maxargs && ! flushed) {
+                       if ( ! rewind_expblock(mdoc, tok, line, ppos))
+                               return(0);
+                       flushed = 1;
+               }
+
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+               if (ARGS_ERROR == c)
+                       return(0);
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)

                        break;
                        break;

-               switch (mdoc->last->data.body.tok) {
-               case (MDOC_Ss):
-                       /* FALLTHROUGH */
-               case (MDOC_Sh):
-                       if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_AFTER_BLK))
+
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX != c) {
+                       if ( ! flushed) {
+                               if ( ! rewind_expblock(mdoc, tok, line, ppos))
+                                       return(0);
+                               flushed = 1;
+                       }
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))

                                return(0);
                                return(0);

-                       return(1);
-               default:

                        break;
                        break;

-               }
-               break;
-       default:
-               break;
+               } 
+
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;

        }
 
        }
 

-       /* Process line parameters. */
+       if (MDOC_LINEARG_MAX == j)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

 
 

-       j = 0;
-       lastarg = ppos;
-       lastpunct = 0;
-       fl = ARGS_DELIM;
+       if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos))
+               return(0);

 
 

-       if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
-               fl |= ARGS_QUOTED;
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, tok, line, pos, buf));
+}

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));

 
 

-       /* 
-        * Parse out the next argument, unquoted and unescaped.   If
-        * we're a word (which may be punctuation followed eventually by
-        * a real word), then fall into checking for callables.  If
-        * only punctuation remains and we're the first, then flush
-        * arguments, punctuation and exit; else, return to the caller.
-        */
+/*
+ * A general text domain macro.  When invoked, this opens a scope that
+ * accepts words until either end-of-line, only-punctuation, or a
+ * callable macro.  If the word is punctuation (not only-punctuation),
+ * then the scope is closed out, the punctuation appended, then the
+ * scope opened again.  If any terminating conditions are met, the scope
+ * is closed out.  If this is the first macro in the line and
+ * only-punctuation remains, this punctuation is flushed.
+ */
+int
+macro_text(MACRO_PROT_ARGS)
+{
+       int               la, lastpunct, c, sz, fl, argc;
+       struct mdoc_arg   argv[MDOC_LINEARG_MAX];
+       char             *p;

 
 

-       lastarg = *pos;
+       la = ppos;
+       lastpunct = 0;

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, fl, &args[j])) {
-       case (ARGS_ERROR):
+       for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+               la = *pos;
+
+               c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+               if (ARGV_EOLN == c)
+                       break;
+               if (ARGV_WORD == c) {
+                       *pos = la;
+                       break;
+               } else if (ARGV_ARG == c)
+                       continue;
+
+               mdoc_argv_free(argc, argv);

                return(0);
                return(0);

-       case (ARGS_WORD):
-               break;
-       case (ARGS_PUNCT):
-               if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
-                       return(0);
-               if (ppos > 1)
-                       return(1);
-               return(append_delims(mdoc, tok, pos, buf));
-       case (ARGS_EOLN):
-               if (lastpunct)
-                       return(1);
-               return(append_text(mdoc, tok, ppos, j, args));
-       default:
-               abort();
-               /* NOTREACHED */

        }
 
        }
 

-       /* 
-        * Command found.  First flush out arguments, then call the
-        * command.  If we're the line macro when it exits, flush
-        * terminal punctuation.
-        */
-
-       if (MDOC_MAX != (c = mdoc_find(mdoc, args[j]))) {
-               if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
-                       return(0);
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
-                       return(0);
-               if (ppos > 1)
-                       return(1);
-               return(append_delims(mdoc, tok, pos, buf));
+       if (MDOC_LINEARG_MAX == argc) {
+               mdoc_argv_free(argc, argv);
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

        }
 
        }
 

-       /* Word/non-term-punctuation found. */
+       c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);

 
 

-       if ( ! mdoc_isdelim(args[j])) {
-               /* Words are appended to the array of arguments. */
-               j++;
-               lastpunct = 0;
-               goto again;
+       if (0 == c) {
+               mdoc_argv_free(argc, argv);
+               return(0);

        }
 
        }
 

-       /* 
-        * For punctuation, flush all collected words, then flush
-        * punctuation, then start collecting again.   Of course, this
-        * is non-terminal punctuation.
-        */
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

-       if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
-               return(0);
+       fl = ARGS_DELIM;
+       if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
+               fl |= ARGS_QUOTED;

 
 

-       mdoc_word_alloc(mdoc, lastarg, args[j]);
-       mdoc->next = MDOC_NEXT_SIBLING;
-       j = 0;
-       lastpunct = 1;
+       for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
+               la = *pos;

 
 

-       goto again;
-       /* NOTREACHED */
-}
+               c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+               if (ARGS_ERROR == c) {
+                       mdoc_argv_free(argc, argv);
+                       return(0);
+               }

 
 

+               if (ARGS_EOLN == c)
+                       break;
+               if (ARGS_PUNCT == c)
+                       break;

 
 

+               if (-1 == (c = lookup(mdoc, line, la, tok, p)))
+                       return(0);
+               else if (MDOC_MAX != c) {
+                       if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
+                               mdoc_argv_free(argc, argv);
+                               return(0);
+                       }
+                       mdoc_argv_free(argc, argv);

 
 

-/* ARGSUSED */
-int
-macro_close_explicit(MACRO_PROT_ARGS)
-{
-       int              tt;
+                       c = mdoc_macro(mdoc, c, line, la, pos, buf);
+                       if (0 == c)
+                               return(0);
+                       if (ppos > 1)
+                               return(1);
+                       return(append_delims(mdoc, tok, line, pos, buf));
+               }
+
+               if (mdoc_isdelim(p)) {
+                       if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
+                               mdoc_argv_free(argc, argv);
+                               return(0);
+                       }
+                       lastpunct = 1;
+               } else if (lastpunct) {
+                       c = mdoc_elem_alloc(mdoc, line, 
+                                       ppos, tok, argc, argv);
+                       if (0 == c) {
+                               mdoc_argv_free(argc, argv);
+                               return(0);
+                       }
+                       mdoc->next = MDOC_NEXT_CHILD;
+                       lastpunct = 0;
+               }
+
+               if ( ! mdoc_word_alloc(mdoc, line, la, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;
+       }

 
 

-       /*
-        * First close out the explicit scope.  The `end' tags (such as
-        * `.El' to `.Bl' don't cause anything to happen: we merely
-        * readjust our last parse point.
-        */
+       mdoc_argv_free(argc, argv);

 
 

-       switch (tok) {
-       case (MDOC_El):
-               tt = MDOC_Bl;
-               break;
-       case (MDOC_Ed):
-               tt = MDOC_Bd;
-               break;
-       case (MDOC_Re):
-               tt = MDOC_Rs;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
+       if (sz == MDOC_LINEARG_MAX)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

 
 

-       return(scope_rewind_exp(mdoc, ppos, tok, tt));
+       if (0 == lastpunct && ! rewind_elem(mdoc, tok))
+               return(0);
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, tok, line, pos, buf));

 }
 
 
 }
 
 

+/*
+ * Implicit- or explicit-end multi-line scoped macro.
+ */

 int
 macro_scoped(MACRO_PROT_ARGS)
 {
 int
 macro_scoped(MACRO_PROT_ARGS)
 {

-       int               i, c, lastarg, argc, sz;
-       char             *args[MDOC_LINEARG_MAX];
+       int               c, lastarg, argc, j, fl;

        struct mdoc_arg   argv[MDOC_LINEARG_MAX];
        struct mdoc_arg   argv[MDOC_LINEARG_MAX];

-       enum mdoc_sec     sec;
-       struct mdoc_node *n;
+       char             *p;

 
        assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
 
        assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 

-       /* Token pre-processing. */
-
-       switch (tok) {
-       case (MDOC_Bl):
-               /* FALLTHROUGH */
-       case (MDOC_Bd):
-               /* `.Pp' ignored when preceding `.Bl' or `.Bd'. */
-               assert(mdoc->last);
-               if (MDOC_ELEM != mdoc->last->type)
-                       break;
-               if (MDOC_Pp != mdoc->last->data.elem.tok)
-                       break;
-               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK))
+       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
+               if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))

                        return(0);
                        return(0);

-               assert(mdoc->last->prev);
-               n = mdoc->last;
-               mdoc->last = mdoc->last->prev;
-               mdoc->last->next = NULL;
-               mdoc_node_free(n);
-               break;
-       case (MDOC_Sh):
-               /* FALLTHROUGH */
-       case (MDOC_Ss):
-               if ( ! scope_rewind_imp(mdoc, ppos, tok))
+               if ( ! rewind_impblock(mdoc, tok, line, ppos))

                        return(0);
                        return(0);

-               /* `.Pp' ignored when preceding `.Ss' or `.Sh'. */
-               if (NULL == mdoc->last)
-                       break;
-               if (MDOC_ELEM != mdoc->last->type)
-                       break;
-               if (MDOC_Pp != mdoc->last->data.elem.tok)
-                       break;
-               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK))
-                       return(0);
-               assert(mdoc->last->prev);
-               n = mdoc->last;
-               mdoc_msg(mdoc, ppos, "removing prior `Pp' macro");
-               mdoc->last = mdoc->last->prev;
-               mdoc->last->next = NULL;
-               mdoc_node_free(n);
-               break;
-       default:
-               break;

        }
 
        }
 

-       /* Argument processing. */
-
-       lastarg = *pos;
-

        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
                lastarg = *pos;
        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
                lastarg = *pos;

-               c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
-               if (ARGV_EOLN == c || ARGV_WORD == c)
+               c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+               if (ARGV_EOLN == c)

                        break;
                        break;

-               else if (ARGV_ARG == c)
-                       continue;
-               mdoc_argv_free(argc, argv);
-               return(0);
-       }
-
-       /* Parameter processing. */
-
-       for (sz = 0; argc + sz < MDOC_LINEARG_MAX; sz++) {
-               lastarg = *pos;
-               c = mdoc_args(mdoc, tok, pos, buf, 0, &args[sz]);
-               if (ARGS_EOLN == c)
+               if (ARGV_WORD == c) {
+                       *pos = lastarg;

                        break;
                        break;

-               if (ARGS_WORD == c)
+               } else if (ARGV_ARG == c)

                        continue;
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
                        continue;
                mdoc_argv_free(argc, argv);
                return(0);
        }
 

-       if (MDOC_LINEARG_MAX == (argc + sz)) {
+       if (MDOC_LINEARG_MAX == argc) {

                mdoc_argv_free(argc, argv);
                mdoc_argv_free(argc, argv);

-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

        }
 
        }
 

-       /* Post-processing. */
+       c = mdoc_block_alloc(mdoc, line, ppos, 
+                       tok, (size_t)argc, argv);
+       mdoc_argv_free(argc, argv);

 
 

-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, sz, _CC(args), argc, argv)) {
-               mdoc_argv_free(argc, argv);
+       if (0 == c)

                return(0);
                return(0);

-       }

 
 

-       switch (tok) {
-       case (MDOC_Sh):
-               sec = mdoc_atosec((size_t)sz, _CC(args));
-               if (SEC_CUSTOM != sec)
-                       mdoc->sec_lastn = sec;
-               mdoc->sec_last = sec;
-               break;
-       default:
-               break;
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       if (0 == buf[*pos]) {
+               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                       return(0);
+               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               mdoc->next = MDOC_NEXT_CHILD;
+               return(1);

        }
 
        }
 

-       mdoc_block_alloc(mdoc, ppos, tok, (size_t)argc, argv);
+       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+               return(0);

        mdoc->next = MDOC_NEXT_CHILD;
 
        mdoc->next = MDOC_NEXT_CHILD;
 

-       mdoc_argv_free(argc, argv);
+       fl = ARGS_DELIM;
+       if (MDOC_TABSEP & mdoc_macros[tok].flags)
+               fl |= ARGS_TABSEP;

 
 

-       mdoc_head_alloc(mdoc, ppos, tok);
-       mdoc->next = MDOC_NEXT_CHILD;
+       for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+               lastarg = *pos;
+               c = mdoc_args(mdoc, line, pos, buf, fl, &p);
+       
+               if (ARGS_ERROR == c)
+                       return(0);
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;
+       
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX == c) {
+                       if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                               return(0);
+                       mdoc->next = MDOC_NEXT_SIBLING;
+                       continue;
+               } 

 
 

-       for (i = 0; i < sz; i++) {
-               mdoc_word_alloc(mdoc, ppos, args[i]);
-               mdoc->next = MDOC_NEXT_SIBLING;
+               if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+                       return(0);
+               break;

        }
 
        }
 

-       if ( ! scope_rewind_line(mdoc, ppos, tok))
+       if (j == MDOC_LINEARG_MAX)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+
+       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+               return(0);
+       if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf))

                return(0);
 
                return(0);
 

-       mdoc_body_alloc(mdoc, ppos, tok);
+       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+               return(0);

        mdoc->next = MDOC_NEXT_CHILD;
 
        return(1);
 }
 
 
        mdoc->next = MDOC_NEXT_CHILD;
 
        return(1);
 }
 
 

+/*
+ * When scoped to a line, a macro encompasses all of the contents.  This
+ * differs from constants or text macros, where a new macro will
+ * terminate the existing context.
+ */

 int
 macro_scoped_line(MACRO_PROT_ARGS)
 {
        int               lastarg, c, j;
        char              *p;
 
 int
 macro_scoped_line(MACRO_PROT_ARGS)
 {
        int               lastarg, c, j;
        char              *p;
 

-       assert(1 == ppos);
-       
-       mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
-       mdoc->next = MDOC_NEXT_CHILD;
-
-       mdoc_head_alloc(mdoc, ppos, tok);
+       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+               return(0);

        mdoc->next = MDOC_NEXT_CHILD;
 
        mdoc->next = MDOC_NEXT_CHILD;
 

-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL, 0, NULL))
+       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

                return(0);
                return(0);

+       mdoc->next = MDOC_NEXT_CHILD;

 
 

-       /* Process line parameters. */
+       /* XXX - no known argument macros. */

 
 

-       j = 0;
-       lastarg = ppos;
+       for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
+               lastarg = *pos;
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               if (ARGS_ERROR == c)
+                       return(0);
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;

 
 

-       lastarg = *pos;
-       c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX == c) {
+                       if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                               return(0);
+                       mdoc->next = MDOC_NEXT_SIBLING;
+                       continue;
+               } 

 
 

-       switch (c) {
-       case (ARGS_ERROR):
-               return(0);
-       case (ARGS_WORD):
+               if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+                       return(0);

                break;
                break;

-       case (ARGS_PUNCT):
-               if (ppos > 1)
-                       return(scope_rewind_imp(mdoc, ppos, tok));
-               if ( ! scope_rewind_line(mdoc, ppos, tok))
+       }
+
+       if (j == MDOC_LINEARG_MAX)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+
+       if (1 == ppos) {
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))

                        return(0);
                        return(0);

-               if ( ! append_delims(mdoc, tok, pos, buf))
+               if ( ! append_delims(mdoc, tok, line, pos, buf))

                        return(0);
                        return(0);

-               return(scope_rewind_imp(mdoc, ppos, tok));
-       case (ARGS_EOLN):
-               return(scope_rewind_imp(mdoc, ppos, tok));
+       } else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+               return(0);
+       return(rewind_impblock(mdoc, tok, line, ppos));
+}
+
+
+/*
+ * Constant-scope macros accept a fixed number of arguments and behave
+ * like constant macros except that they're scoped across lines.
+ */
+int
+macro_constant_scoped(MACRO_PROT_ARGS)
+{
+       int               lastarg, flushed, j, c, maxargs;
+       char             *p;
+
+       lastarg = ppos;
+       flushed = 0;
+
+       switch (tok) {
+       case (MDOC_Eo):
+               maxargs = 1;
+               break;

        default:
        default:

-               abort();
-               /* NOTREACHED */
+               maxargs = 0;
+               break;

        }
 
        }
 

-       if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+               return(0); 
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       if (0 == maxargs) {
+               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                       return(0);
+               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               flushed = 1;
+       } else if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+               return(0);
+
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+               lastarg = *pos;
+
+               if (j == maxargs && ! flushed) {
+                       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                               return(0);
+                       flushed = 1;
+                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                               return(0);
+                       mdoc->next = MDOC_NEXT_CHILD;
+               }
+
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+               if (ARGS_ERROR == c)

                        return(0);
                        return(0);

-               if (ppos > 1)
-                       return(scope_rewind_imp(mdoc, ppos, tok));
-               if ( ! scope_rewind_line(mdoc, ppos, tok))
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;
+
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))

                        return(0);
                        return(0);

-               if ( ! append_delims(mdoc, tok, pos, buf))
+               else if (MDOC_MAX != c) {
+                       if ( ! flushed) {
+                               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                                       return(0);
+                               flushed = 1;
+                               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                                       return(0);
+                               mdoc->next = MDOC_NEXT_CHILD;
+                       }
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+                               return(0);
+                       break;
+               }
+
+               if ( ! flushed && mdoc_isdelim(p)) {
+                       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                               return(0);
+                       flushed = 1;
+                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                               return(0);
+                       mdoc->next = MDOC_NEXT_CHILD;
+               }
+       
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))

                        return(0);
                        return(0);

-               return(scope_rewind_imp(mdoc, ppos, tok));
+               mdoc->next = MDOC_NEXT_SIBLING;

        }
 
        }
 

-       if (mdoc_isdelim(p))
-               j = 0;
+       if (MDOC_LINEARG_MAX == j)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

 
 

-       mdoc_word_alloc(mdoc, lastarg, p);
-       mdoc->next = MDOC_NEXT_SIBLING;
-       goto again;
-       /* NOTREACHED */
+       if ( ! flushed) {
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                       return(0);
+               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               mdoc->next = MDOC_NEXT_CHILD;
+       }
+
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, tok, line, pos, buf));

 }
 
 
 }
 
 

+/*
+ * Delimited macros are like text macros except that, should punctuation
+ * be encountered, the macro isn't re-started with remaining tokens
+ * (it's only emitted once).  Delimited macros can have a maximum number
+ * of arguments.
+ */

 int
 macro_constant_delimited(MACRO_PROT_ARGS)
 {
 int
 macro_constant_delimited(MACRO_PROT_ARGS)
 {

-       int               lastarg, flushed, c, maxargs;
+       int               lastarg, flushed, j, c, maxargs, argc;
+       struct mdoc_arg   argv[MDOC_LINEARG_MAX];

        char             *p;
 
        char             *p;
 

-       /* Process line parameters. */
-

        lastarg = ppos;
        flushed = 0;
 
        lastarg = ppos;
        flushed = 0;
 

-       /* Token pre-processing. */
-

        switch (tok) {
        case (MDOC_No):
                /* FALLTHROUGH */
        case (MDOC_Ns):
                /* FALLTHROUGH */
        switch (tok) {
        case (MDOC_No):
                /* FALLTHROUGH */
        case (MDOC_Ns):
                /* FALLTHROUGH */

+       case (MDOC_Pf):
+               /* FALLTHROUGH */

        case (MDOC_Ux):
        case (MDOC_Ux):

+               /* FALLTHROUGH */
+       case (MDOC_St):

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


@@ -568,76 +962,89 @@ macro_constant_delimited(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-again:
-       lastarg = *pos;
-
-       switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p)) {
-       case (ARGS_ERROR):
+       for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+               lastarg = *pos;
+               c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+               if (ARGV_EOLN == c)
+                       break;
+               if (ARGV_WORD == c) {
+                       *pos = lastarg;
+                       break;
+               } else if (ARGV_ARG == c)
+                       continue;
+               mdoc_argv_free(argc, argv);

                return(0);
                return(0);

-       case (ARGS_WORD):
-               break;
-       case (ARGS_PUNCT):
-               if ( ! flushed && ! append_text(mdoc, tok, ppos, 0, &p))
-                       return(0);
-               if (ppos > 1)
-                       return(1);
-               return(append_delims(mdoc, tok, pos, buf));
-       case (ARGS_EOLN):
-               if (flushed)
-                       return(1);
-               return(append_text(mdoc, tok, ppos, 0, &p));
-       default:
-               abort();
-               /* NOTREACHED */

        }
 
        }
 

-       /* Accepts no arguments: flush out symbol and continue. */
+       c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+       mdoc_argv_free(argc, argv);
+
+       if (0 == c)
+               return(0);
+
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+               lastarg = *pos;
+
+               if (j == maxargs && ! flushed) {
+                       if ( ! rewind_elem(mdoc, tok))
+                               return(0);
+                       flushed = 1;
+               }

 
 

-       if ( ! flushed && 0 == maxargs) {
-               if ( ! append_text(mdoc, tok, ppos, 0, &p))
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+               if (ARGS_ERROR == c)

                        return(0);
                        return(0);

-               flushed = 1;
-       }
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;

 
 

-       if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-               if ( ! flushed && ! append_text(mdoc, tok, ppos, 0, &p))
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))

                        return(0);
                        return(0);

-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+               else if (MDOC_MAX != c) {
+                       if ( ! flushed && ! rewind_elem(mdoc, tok))
+                               return(0);
+                       flushed = 1;
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+                               return(0);
+                       break;
+               }
+
+               if ( ! flushed && mdoc_isdelim(p)) {
+                       if ( ! rewind_elem(mdoc, tok))
+                               return(0);
+                       flushed = 1;
+               }
+       
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))

                        return(0);
                        return(0);

-               if (ppos > 1)
-                       return(1);
-               return(append_delims(mdoc, tok, pos, buf));
+               mdoc->next = MDOC_NEXT_SIBLING;

        }
 
        }
 

-       /* 
-        * We only accept one argument; subsequent tokens are considered
-        * as literal words (until a macro).
-        */
+       if (MDOC_LINEARG_MAX == j)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

 
 

-       if ( ! flushed && ! mdoc_isdelim(p)) {
-              if ( ! append_text(mdoc, tok, ppos, 1, &p))
-                       return(0);
-               flushed = 1;
-               goto again;
-       } else if ( ! flushed) {
-               if ( ! append_text(mdoc, tok, ppos, 0, &p))
-                       return(0);
-               flushed = 1;
-       }
+       if ( ! flushed && rewind_elem(mdoc, tok))
+               return(0);

 
 

-       mdoc_word_alloc(mdoc, lastarg, p);
-       mdoc->next = MDOC_NEXT_SIBLING;
-       goto again;
-       /* NOTREACHED */
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, tok, line, pos, buf));

 }
 
 
 }
 
 

+/*
+ * Constant macros span an entire line:  they constitute a macro and all
+ * of its arguments and child data.
+ */

 int
 macro_constant(MACRO_PROT_ARGS)
 {
 int
 macro_constant(MACRO_PROT_ARGS)
 {

-       int               c, lastarg, argc, sz, fl;
-       char             *args[MDOC_LINEARG_MAX];
-       struct mdoc_arg   argv[MDOC_LINEARG_MAX];
+       int              c, lastarg, argc, sz, fl;
+       struct mdoc_arg  argv[MDOC_LINEARG_MAX];
+       char            *p;

 
        fl = 0;
        if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
 
        fl = 0;
        if (MDOC_QUOTABLE & mdoc_macros[tok].flags)


@@ -645,40 +1052,56 @@ macro_constant(MACRO_PROT_ARGS)
 
        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
                lastarg = *pos;
 
        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
                lastarg = *pos;

-               c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+               c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);

                if (ARGV_EOLN == c) 
                        break;
                if (ARGV_EOLN == c) 
                        break;

-               else if (ARGV_ARG == c)
-                       continue;
-               else if (ARGV_WORD == c)
+               if (ARGV_WORD == c) {
+                       *pos = lastarg;

                        break;
                        break;

+               } else if (ARGV_ARG == c)
+                       continue;

 
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
 
                mdoc_argv_free(argc, argv);
                return(0);
        }
 

-       if (MDOC_LINEARG_MAX == argc) {
-               mdoc_argv_free(argc, argv);
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-       }
+       c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+       mdoc_argv_free(argc, argv);
+
+       if (0 == c)
+               return(0);
+
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       if (MDOC_LINEARG_MAX == argc)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));

 
        for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
                lastarg = *pos;
 
        for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
                lastarg = *pos;

-               c = mdoc_args(mdoc, tok, pos, buf, fl, &args[sz]);
+               c = mdoc_args(mdoc, line, pos, buf, fl, &p);

                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_EOLN == c)
                        break;
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_EOLN == c)
                        break;

-       }

 
 

-       if (MDOC_LINEARG_MAX == sz + argc) {
-               mdoc_argv_free(argc, argv);
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX != c) {
+                       if ( ! rewind_elem(mdoc, tok))
+                               return(0);
+                       return(mdoc_macro(mdoc, c, line, 
+                                               lastarg, pos, buf));
+               }
+
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;

        }
 
        }
 

-       c = append_text_argv(mdoc, tok, ppos, sz, args, argc, argv);
-       mdoc_argv_free(argc, argv);
-       return(c);
+       if (MDOC_LINEARG_MAX == sz + argc)
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+
+       return(rewind_elem(mdoc, tok));

 }
 
 
 }
 
 


@@ -687,5 +1110,16 @@ int
 macro_obsolete(MACRO_PROT_ARGS)
 {
 
 macro_obsolete(MACRO_PROT_ARGS)
 {
 

-       return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE));
+       return(mdoc_pwarn(mdoc, line, ppos, WARN_SYNTAX, "macro is obsolete"));
+}
+
+
+int
+macro_end(struct mdoc *mdoc)
+{
+
+       assert(mdoc->first);
+       assert(mdoc->last);
+       return(rewind_last(mdoc->last->tok, mdoc->last->type,
+                               mdoc, mdoc->first));

 }
 }