Strings abstracted into dynamically-created C files.

[mandoc.git] / macro.c

diff --git a/macro.c b/macro.c
index d39a1c673c41995007bee098a05436d1bcfef7ff..939ac3bdc3bc20dafb9a1b301e3645d10ce7bcd0 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.14 2008/12/30 18:15:26 kristaps Exp $ */
+/* $Id: macro.c,v 1.57 2009/03/06 14:13:47 kristaps Exp $ */

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


@@ -25,843 +25,1185 @@
 #include <time.h>
 #endif
 
 #include <time.h>
 #endif
 

-#include "private.h"
+/*
+ * This has scanning/parsing routines, each of which extract a macro and
+ * its arguments and parameters, then know how to progress to the next
+ * macro. 
+ */

 
 

-/* FIXME: maxlineargs should be per LINE, no per TOKEN. */
-/* FIXME: prologue check should be in macro_call. */
+/* 
+ * FIXME: don't use static mdoc_argv values, as they require us to do a
+ * complicated copy-over when actually assigning them to dynamic memory.
+ */

 
 

-#define        _CC(p)  ((const char **)p)
+#include "private.h"

 
 

-static int       scope_rewind_exp(struct mdoc *, int, int, int);
-static int       scope_rewind_imp(struct mdoc *, int, int);
-static int       append_text(struct mdoc *, int, 
-                       int, int, char *[]);
-static int       append_const(struct mdoc *, int, int, int, char *[]);
-static int       append_constarg(struct mdoc *, int, int, 
-                        int, const struct mdoc_arg *);
-static int       append_scoped(struct mdoc *, int, int, int, 
-                       const char *[], int, const struct mdoc_arg *);
+static int       macro_obsolete(MACRO_PROT_ARGS);
+static int       macro_constant(MACRO_PROT_ARGS);
+static int       macro_constant_scoped(MACRO_PROT_ARGS);
+static int       macro_constant_delimited(MACRO_PROT_ARGS);
+static int       macro_text(MACRO_PROT_ARGS);
+static int       macro_scoped(MACRO_PROT_ARGS);
+static int       macro_scoped_close(MACRO_PROT_ARGS);
+static int       macro_scoped_line(MACRO_PROT_ARGS);
+
+#define        REWIND_REWIND   (1 << 0)
+#define        REWIND_NOHALT   (1 << 1)
+#define        REWIND_HALT     (1 << 2)
+
+static int       rewind_dohalt(int, enum mdoc_type, 
+                       const struct mdoc_node *);
+static int       rewind_alt(int);
+static int       rewind_dobreak(int, const struct mdoc_node *);
+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, int, int);
+static int       rewind_last(struct mdoc *, struct mdoc_node *);

 static int       append_delims(struct mdoc *, int, int *, char *);
 static int       append_delims(struct mdoc *, int, int *, char *);

+static int       lookup(struct mdoc *, int, int, int, const char *);
+static int       pwarn(struct mdoc *, int, int, int);
+static int       perr(struct mdoc *, int, int, int);
+
+#define        WMACPARM        (1)
+#define        WOBS            (2)
+
+#define        ENOCTX          (1)
+#define        ENOPARMS        (2)
+#define        EARGVLIM        (3)
+
+/* Central table of library: who gets parsed how. */
+
+const  struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
+       { NULL, 0 }, /* \" */
+       { macro_constant, MDOC_PROLOGUE }, /* Dd */
+       { macro_constant, MDOC_PROLOGUE }, /* Dt */
+       { macro_constant, MDOC_PROLOGUE }, /* Os */
+       { macro_scoped, 0 }, /* Sh */
+       { macro_scoped, 0 }, /* Ss */ 
+       { macro_text, 0 }, /* Pp */ 
+       { macro_scoped_line, MDOC_PARSED }, /* D1 */
+       { macro_scoped_line, MDOC_PARSED }, /* Dl */
+       { macro_scoped, MDOC_EXPLICIT }, /* Bd */
+       { macro_scoped_close, MDOC_EXPLICIT }, /* Ed */
+       { macro_scoped, MDOC_EXPLICIT }, /* Bl */
+       { macro_scoped_close, MDOC_EXPLICIT }, /* El */
+       { macro_scoped, MDOC_PARSED }, /* It */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ 
+       { macro_text, MDOC_PARSED }, /* An */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
+       { macro_constant, 0 }, /* Cd */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */ 
+       { macro_constant, 0 }, /* Ex */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fa */ 
+       { macro_constant, 0 }, /* Fd */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ 
+       { macro_text, MDOC_PARSED }, /* Ft */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ 
+       { macro_constant, 0 }, /* In */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
+       { macro_constant, 0 }, /* Nd */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ 
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
+       { macro_obsolete, 0 }, /* Ot */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
+       { macro_constant, 0 }, /* Rv */
+       /* XXX - .St supposed to be (but isn't) callable. */
+       { macro_constant_delimited, MDOC_PARSED }, /* St */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Va */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ 
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */
+       { macro_constant, 0 }, /* %A */
+       { macro_constant, 0 }, /* %B */
+       { macro_constant, 0 }, /* %D */
+       { macro_constant, 0 }, /* %I */
+       { macro_constant, 0 }, /* %J */
+       { macro_constant, 0 }, /* %N */
+       { macro_constant, 0 }, /* %O */
+       { macro_constant, 0 }, /* %P */
+       { macro_constant, 0 }, /* %R */
+       { macro_constant, 0 }, /* %T */
+       { macro_constant, 0 }, /* %V */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
+       { macro_constant_delimited, 0 }, /* At */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
+       { macro_scoped, MDOC_EXPLICIT }, /* Bf */ 
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
+       { macro_constant_delimited, MDOC_PARSED }, /* Bsx */
+       { macro_constant_delimited, MDOC_PARSED }, /* Bx */
+       { macro_constant, 0 }, /* Db */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ec */
+       { macro_scoped_close, MDOC_EXPLICIT }, /* Ef */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ 
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
+       { macro_constant_delimited, MDOC_PARSED }, /* Fx */
+       { macro_text, MDOC_PARSED }, /* Ms */
+       { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */
+       { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
+       { macro_constant_delimited, MDOC_PARSED }, /* Nx */
+       { macro_constant_delimited, MDOC_PARSED }, /* Ox */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
+       { macro_constant_delimited, MDOC_PARSED }, /* Pf */
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Qo */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */
+       { macro_scoped_close, MDOC_EXPLICIT }, /* Re */
+       { macro_scoped, MDOC_EXPLICIT }, /* Rs */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Sc */
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* So */
+       { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */
+       { macro_constant, 0 }, /* Sm */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
+       { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
+       { macro_constant_delimited, MDOC_PARSED }, /* Ux */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
+       /* XXX - .Fo supposed to be (but isn't) callable. */
+       { macro_scoped, MDOC_EXPLICIT }, /* Fo */ 
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Fc */ 
+       { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Oo */
+       { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Oc */
+       { macro_scoped, MDOC_EXPLICIT }, /* Bk */
+       { macro_scoped_close, MDOC_EXPLICIT }, /* Ek */
+       { macro_constant, 0 }, /* Bt */
+       { macro_constant, 0 }, /* Hf */
+       { macro_obsolete, 0 }, /* Fr */
+       { macro_constant, 0 }, /* Ud */
+       { macro_constant, 0 }, /* Lb */
+};
+
+const  struct mdoc_macro * const mdoc_macros = __mdoc_macros;

 
 
 static int
 
 
 static int

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

 {
 {

-       int              c, lastarg;
-       char            *p;
-
-       if (0 == buf[*pos])
-               return(1);
-
-       mdoc_msg(mdoc, *pos, "`%s' flushing punctuation",
-                       mdoc_macronames[tok]);
+       int              c;

 
 

-       for (;;) {
-               lastarg = *pos;
-               c = mdoc_args(mdoc, tok, pos, buf, 0, &p);
-               if (ARGS_ERROR == c)
-                       return(0);
-               else if (ARGS_EOLN == c)
-                       break;
-               assert(mdoc_isdelim(p));
-               mdoc_word_alloc(mdoc, lastarg, p);
+       switch (type) {
+       case (ENOCTX):
+               c = mdoc_perr(mdoc, line, pos, 
+                               "closing macro has prior context");
+               break;
+       case (ENOPARMS):
+               c = mdoc_perr(mdoc, line, pos, 
+                               "macro doesn't expect parameters");
+               break;
+       case (EARGVLIM):
+               c = mdoc_perr(mdoc, line, pos, 
+                               "argument hard-limit %d reached",
+                               MDOC_LINEARG_MAX);
+               break;
+       default:
+               abort();
+               /* NOTREACHED */

        }
        }

-
-       return(1);
+       return(c);

 }
 
 }
 

-

 static int
 static int

-scope_rewind_imp(struct mdoc *mdoc, int ppos, int tok)
+pwarn(struct mdoc *mdoc, int line, int pos, int type)

 {
 {

-       struct mdoc_node *n;
-       int               t;
-
-       n = mdoc->last ? mdoc->last->parent : NULL;
+       int              c;

 
 

-       /* LINTED */
-       for ( ; n; n = n->parent) {
-               if (MDOC_BLOCK != n->type) 
-                       continue;
-               if (tok == (t = n->data.block.tok))
-                       break;
-               if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
-                       continue;
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+       switch (type) {
+       case (WMACPARM):
+               c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX,
+                               "macro-like parameter");
+               break;
+       case (WOBS):
+               c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX,
+                               "macro is marked obsolete");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */

        }
        }

+       return(c);
+}

 
 

-       if (n) {
-               mdoc->last = n;
-               mdoc_msg(mdoc, ppos, "scope: rewound implicit `%s'",
-                               mdoc_macronames[tok]);
-               return(1);
-       } 

 
 

-       mdoc_msg(mdoc, ppos, "scope: new implicit `%s'", 
-                       mdoc_macronames[tok]);
-       return(1);
+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 ( ! pwarn(mdoc, line, pos, WMACPARM))
+               return(-1);
+       return(MDOC_MAX);

 }
 
 
 static int
 }
 
 
 static int

-scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, int dst)
+rewind_last(struct mdoc *mdoc, struct mdoc_node *to)

 {
 {

-       struct mdoc_node *n;

 
 

-       assert(mdoc->last);
+       assert(to);
+       mdoc->next = MDOC_NEXT_SIBLING;

 
        /* LINTED */
 
        /* LINTED */

-       for (n = mdoc->last->parent; n; n = n->parent) {
-               if (MDOC_BLOCK != n->type) 
-                       continue;
-               if (dst == n->data.block.tok)
-                       break;
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+       while (mdoc->last != to) {
+               if ( ! mdoc_valid_post(mdoc))
+                       return(0);
+               if ( ! mdoc_action_post(mdoc))
+                       return(0);
+               mdoc->last = mdoc->last->parent;
+               assert(mdoc->last);

        }
 
        }
 

-       if (NULL == (mdoc->last = n))
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
-
-       mdoc_msg(mdoc, ppos, "scope: rewound explicit `%s' to `%s'",
-                       mdoc_macronames[tok], mdoc_macronames[dst]);
-
-       return(1);
+       if ( ! mdoc_valid_post(mdoc))
+               return(0);
+       return(mdoc_action_post(mdoc));

 }
 
 
 static int
 }
 
 
 static int

-append_constarg(struct mdoc *mdoc, int tok, int pos, 
-               int argc, const struct mdoc_arg *argv)
+rewind_alt(int tok)

 {
 {

-

        switch (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;
        }
        default:
                break;
        }

-
-       mdoc_elem_alloc(mdoc, pos, tok, argc, argv, 0, NULL);
-       return(1);
+       abort();
+       /* NOTREACHED */

 }
 
 
 }
 
 

-/*
- * Append a node with implicit or explicit scoping ONLY.  ALL macros
- * with the implicit- or explicit-scope callback must be included here.
- */

 static int
 static int

-append_scoped(struct mdoc *mdoc, int tok, int pos, 
-               int sz, const char *args[], 
-               int argc, const struct mdoc_arg *argv)
+rewind_dohalt(int tok, enum mdoc_type type, const struct mdoc_node *p)

 {
 {

-       enum mdoc_sec     sec;

 
 

-       if ( ! mdoc_valid(mdoc, tok, pos, sz, args, argc, argv))
-               return(0);
+       if (MDOC_ROOT == p->type)
+               return(REWIND_HALT);
+       if (MDOC_VALID & p->flags)
+               return(REWIND_NOHALT);

 
        switch (tok) {
 
        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_HEAD != 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):
        case (MDOC_Sh):

-               sec = mdoc_atosec((size_t)sz, _CC(args));
-               if (SEC_CUSTOM != sec)
-                       mdoc->sec_lastn = sec;
-               mdoc->sec_last = sec;
+               if (type == p->type && tok == p->tok)
+                       return(REWIND_REWIND);

                break;
                break;

-       default:
+       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;
                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 */

        }
 
        }
 

-       mdoc_block_alloc(mdoc, pos, tok, (size_t)argc, argv);
-       mdoc_head_alloc(mdoc, pos, tok, (size_t)sz, _CC(args));
-       mdoc_body_alloc(mdoc, pos, tok);
-       return(1);
+       return(REWIND_NOHALT);

 }
 
 
 static int
 }
 
 
 static int

-append_const(struct mdoc *mdoc, int tok, 
-               int pos, int sz, char *args[])
+rewind_dobreak(int tok, const struct mdoc_node *p)

 {
 
 {
 

-       if ( ! mdoc_valid(mdoc, tok, pos, sz, _CC(args), 0, NULL))
-               return(0);
+       assert(MDOC_ROOT != p->type);
+       if (MDOC_ELEM == p->type)
+               return(1);
+       if (MDOC_TEXT == p->type)
+               return(1);
+       if (MDOC_VALID & p->flags)
+               return(1);

 
        switch (tok) {
 
        switch (tok) {

-       case (MDOC_At):
-               if (0 == sz)
-                       break;
-
-               if (ATT_DEFAULT != mdoc_atoatt(args[0])) {
-                       mdoc_elem_alloc(mdoc, pos, tok, 0, 
-                                       NULL, 1, _CC(&args[0]));
-               } else {
-                       mdoc_elem_alloc(mdoc, pos, tok, 
-                                       0, NULL, 0, NULL);
-                       mdoc_word_alloc(mdoc, pos, args[0]);
-               }
+       /* 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);

 
 

-               if (1 == sz)
+       /* Extra scope rules. */
+       case (MDOC_El):
+               if (MDOC_It == p->tok)

                        return(1);
                        return(1);

-               mdoc_word_alloc(mdoc, pos, args[1]);
-               return(1);
+               break;

        default:
                break;
        }
 
        default:
                break;
        }
 

-       mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
-       return(1);
+       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

-append_text(struct mdoc *mdoc, int tok, 
-               int pos, int sz, char *args[])
+rewind_elem(struct mdoc *mdoc, int tok)

 {
 {

+       struct mdoc_node *n;

 
 

-       if ( ! mdoc_valid(mdoc, tok, pos, sz, _CC(args), 0, NULL))
-               return(0);
-       mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
-       return(1);
+       n = mdoc->last;
+       if (MDOC_ELEM != n->type)
+               n = n->parent;
+       assert(MDOC_ELEM == n->type);
+       assert(tok == n->tok);
+
+       return(rewind_last(mdoc, n));

 }
 
 
 }
 
 

-int
-macro_text(MACRO_PROT_ARGS)
+static int
+rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, 
+               int tok, int line, int ppos)

 {
 {

-       int               lastarg, lastpunct, c, j;
-       char             *args[MDOC_LINEARG_MAX];
-
-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
-
-       /* Token pre-processing.  */
+       struct mdoc_node *n;
+       int               c;

 
 

-       switch (tok) {
-       case (MDOC_Pp):
-               /* `.Pp' ignored when following `.Sh' or `.Ss'. */
-               assert(mdoc->last);
-               if (MDOC_BODY != mdoc->last->type)
-                       break;
-               switch (mdoc->last->data.body.tok) {
-               case (MDOC_Ss):
-                       /* FALLTHROUGH */
-               case (MDOC_Sh):
-                       if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_AFTER_BLK))
-                               return(0);
+       /* LINTED */
+       for (n = mdoc->last; n; n = n->parent) {
+               c = rewind_dohalt(tok, type, n);
+               if (REWIND_HALT == c)

                        return(1);
                        return(1);

-               default:
+               if (REWIND_REWIND == c)

                        break;
                        break;

-               }
-               break;
-       default:
-               break;
+               else if (rewind_dobreak(tok, n))
+                       continue;
+               return(mdoc_perr(mdoc, line, ppos, 
+                       "scope breaks %s", MDOC_ROOT == n->type ?
+                       "<root>" : mdoc_macronames[n->tok]));

        }
 
        }
 

-       /* Process line parameters. */
+       assert(n);
+       return(rewind_last(mdoc, n));
+}

 
 

-       j = 0;
-       lastarg = ppos;
-       lastpunct = 0;

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+static int
+rewind_expblock(struct mdoc *mdoc, int tok, int line, int ppos)
+{
+       struct mdoc_node *n;
+       int               c;

 
 

-       /* 
-        * 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.
-        */
+       /* LINTED */
+       for (n = mdoc->last; n; n = n->parent) {
+               c = rewind_dohalt(tok, MDOC_BLOCK, n);
+               if (REWIND_HALT == c)
+                       return(perr(mdoc, line, ppos, ENOCTX));
+               if (REWIND_REWIND == c)
+                       break;
+               else if (rewind_dobreak(tok, n))
+                       continue;
+               return(mdoc_perr(mdoc, line, ppos, 
+                       "scope breaks %s", MDOC_ROOT == n->type ?
+                       "<root>" : mdoc_macronames[n->tok]));
+       }

 
 

-       lastarg = *pos;
+       assert(n);
+       return(rewind_last(mdoc, n));
+}

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &args[j])) {
-       case (ARGS_ERROR):
-               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.
-        */
+static int
+rewind_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
+{
+       struct mdoc_node *n;
+       int               c;

 
 

-       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)
+       /* LINTED */
+       for (n = mdoc->last; n; n = n->parent) {
+               c = rewind_dohalt(tok, MDOC_BLOCK, n);
+               if (REWIND_HALT == c)

                        return(1);
                        return(1);

-               return(append_delims(mdoc, tok, pos, buf));
+               else if (REWIND_REWIND == c)
+                       break;
+               else if (rewind_dobreak(tok, n))
+                       continue;
+               return(mdoc_perr(mdoc, line, ppos, 
+                       "scope breaks %s", MDOC_ROOT == n->type ?
+                       "<root>" : mdoc_macronames[n->tok]));

        }
 
        }
 

-       /* Word/non-term-punctuation found. */
+       assert(n);
+       return(rewind_last(mdoc, n));
+}

 
 

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

 
 

-       /* 
-        * For punctuation, flush all collected words, then flush
-        * punctuation, then start collecting again.   Of course, this
-        * is non-terminal punctuation.
-        */
+static int
+append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
+{
+       int              c, lastarg;
+       char            *p;

 
 

-       if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
-               return(0);
+       if (0 == buf[*pos])
+               return(1);

 
 

-       mdoc_word_alloc(mdoc, lastarg, args[j]);
-       j = 0;
-       lastpunct = 1;
+       for (;;) {
+               lastarg = *pos;
+               c = mdoc_args(mdoc, line, pos, buf, 0, &p);
+               assert(ARGS_PHRASE != c);

 
 

-       goto again;
-       /* NOTREACHED */
+               if (ARGS_ERROR == c)
+                       return(0);
+               else if (ARGS_EOLN == c)
+                       break;
+               assert(mdoc_isdelim(p));
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;
+       }
+
+       return(1);

 }
 
 
 }
 
 

-int
-macro_prologue_dtitle(MACRO_PROT_ARGS)
+/*
+ * Close out an explicit scope.  This optionally parses a TAIL type with
+ * a set number of TEXT children.
+ */
+static int
+macro_scoped_close(MACRO_PROT_ARGS)

 {
 {

-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX];
-
-       if (SEC_PROLOGUE != mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-       if (0 == mdoc->meta.date)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-       if (mdoc->meta.title[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+       int              tt, j, c, lastarg, maxargs, flushed;
+       char            *p;

 
 

-       j = -1;
-       lastarg = ppos;
+       switch (tok) {
+       case (MDOC_Ec):
+               maxargs = 1;
+               break;
+       default:
+               maxargs = 0;
+               break;
+       }

 
 

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

 
 

-       lastarg = *pos;
+       mdoc_msg(mdoc, "parse: %s closing %s",
+                       mdoc_macronames[tok], mdoc_macronames[tt]);

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) {
-       case (ARGS_EOLN):
-               if (mdoc->meta.title)
-                       return(1);
-               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1))
-                       return(0);
-               (void)xstrlcpy(mdoc->meta.title, 
-                               "UNTITLED", META_TITLE_SZ);
-               return(1);
-       case (ARGS_ERROR):
-               return(0);
-       default:
-               break;
+       if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
+               if (0 == buf[*pos]) {
+                       if ( ! rewind_subblock(MDOC_BODY, mdoc, 
+                                               tok, line, ppos))
+                               return(0);
+                       return(rewind_expblock(mdoc, tok, line, ppos));
+               }
+               return(perr(mdoc, line, ppos, ENOPARMS));

        }
 
        }
 

-       if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
-                       (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+       if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))

                return(0);
 
                return(0);
 

-       if (0 == j) {
-               if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ))
-                       goto again;
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-
-       } else if (1 == j) {
-               mdoc->meta.msec = mdoc_atomsec(args[1]);
-               if (MSEC_DEFAULT != mdoc->meta.msec)
-                       goto again;
-               return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGFORM));
+       lastarg = ppos;
+       flushed = 0;

 
 

-       } else if (2 == j) {
-               mdoc->meta.vol = mdoc_atovol(args[2]);
-               if (VOL_DEFAULT != mdoc->meta.vol)
-                       goto again;
-               mdoc->meta.arch = mdoc_atoarch(args[2]);
-               if (ARCH_DEFAULT != mdoc->meta.arch)
-                       goto again;
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
+       if (maxargs > 0) {
+               if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+                       return(0);
+               mdoc->next = MDOC_NEXT_CHILD;

        }
 
        }
 

-       return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-}
-
+       for (j = 0; /* No sentinel. */; j++) {
+               lastarg = *pos;

 
 

-int
-macro_prologue_os(MACRO_PROT_ARGS)
-{
-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX];
+               if (j == maxargs && ! flushed) {
+                       if ( ! rewind_expblock(mdoc, tok, line, ppos))
+                               return(0);
+                       flushed = 1;
+               }

 
 

-       if (SEC_PROLOGUE != mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-       if (0 == mdoc->meta.title[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-       if (mdoc->meta.os[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
+               c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               assert(ARGS_PHRASE != c);

 
 

-       j = -1;
-       lastarg = ppos;
+               if (ARGS_ERROR == c)
+                       return(0);
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               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 ( ! flushed) {
+                               if ( ! rewind_expblock(mdoc, tok, 
+                                                       line, ppos))
+                                       return(0);
+                               flushed = 1;
+                       }
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+                               return(0);
+                       break;
+               } 

 
 

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

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, 
-                               ARGS_QUOTED, &args[++j])) {
-       case (ARGS_EOLN):
-               mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
-               return(1);
-       case (ARGS_ERROR):
+       if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos))

                return(0);
                return(0);

-       default:
-               break;
-       }
-       
-       if ( ! xstrlcat(mdoc->meta.os, args[j], sizeof(mdoc->meta.os)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-       if ( ! xstrlcat(mdoc->meta.os, " ", sizeof(mdoc->meta.os)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));

 
 

-       goto again;
-       /* NOTREACHED */
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, line, pos, buf));

 }
 
 
 }
 
 

-int
-macro_prologue_ddate(MACRO_PROT_ARGS)
+/*
+ * A general text macro.  This is a complex case because of punctuation.
+ * If a text macro is followed by words, then punctuation, the macro is
+ * "stopped" and "reopened" following the punctuation.  Thus, the
+ * following arises:
+ *
+ *    .Fl a ; b
+ *
+ *    ELEMENT (.Fl)
+ *        TEXT (`a')
+ *    TEXT (`;')
+ *    ELEMENT (.Fl)
+ *        TEXT (`b')
+ *
+ * This must handle the following situations:
+ *
+ *    .Fl Ar b ; ;
+ *
+ *    ELEMENT (.Fl)
+ *    ELEMENT (.Ar)
+ *        TEXT (`b')
+ *    TEXT (`;')
+ *    TEXT (`;')
+ */
+static int
+macro_text(MACRO_PROT_ARGS)

 {
 {

-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX], date[64];
-
-       if (SEC_PROLOGUE != mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE));
-       if (mdoc->meta.title[0])
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO));
-       if (mdoc->meta.date)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP));
-
-       j = -1;
-       date[0] = 0;
-       lastarg = ppos;
+       int               la, lastpunct, c, w, argc;
+       struct mdoc_arg   argv[MDOC_LINEARG_MAX];
+       char             *p;

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+       la = ppos;
+       lastpunct = 0;

 
 

-       lastarg = *pos;
-       switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) {
-       case (ARGS_EOLN):
-               if (mdoc->meta.date)
-                       return(1);
-               mdoc->meta.date = mdoc_atotime(date);
-               if (mdoc->meta.date)
-                       return(1);
-               return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGFORM));
-       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);

-       default:
-               break;

        }
        }

-       
-       if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
-                       (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
-               return(0);
-       
-       if (0 == j) {
-               if (xstrcmp("$Mdocdate: December 30 2008 $", args[j])) {
-                       mdoc->meta.date = time(NULL);
-                       goto again;
-               } else if (xstrcmp("$Mdocdate:", args[j])) 
-                       goto again;
-       } else if (4 == j)
-               if ( ! xstrcmp("$", args[j]))
-                       goto again;
-
-       if ( ! xstrlcat(date, args[j], sizeof(date)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-       if ( ! xstrlcat(date, " ", sizeof(date)))
-               return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM));
-
-       goto again;
-       /* NOTREACHED */
-}

 
 

+       if (MDOC_LINEARG_MAX == argc) {
+               mdoc_argv_free(argc - 1, argv);
+               return(perr(mdoc, line, ppos, EARGVLIM));
+       }

 
 

-int
-macro_scoped_explicit(MACRO_PROT_ARGS)
-{
-       int               c, lastarg, j;
-       struct mdoc_arg   argv[MDOC_LINEARG_MAX];
-       struct mdoc_node *n;
-
-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
-
-       /*
-        * 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.
-        */
+       c = mdoc_elem_alloc(mdoc, line, ppos, 
+                       tok, (size_t)argc, argv);

 
 

-       switch (tok) {
-       case (MDOC_El):
-               return(scope_rewind_exp(mdoc, ppos, tok, MDOC_Bl));
-       case (MDOC_Ed):
-               return(scope_rewind_exp(mdoc, ppos, tok, MDOC_Bd));
-       default:
-               break;
+       if (0 == c) {
+               mdoc_argv_free(argc, argv);
+               return(0);

        }
 
        }
 

-       assert(MDOC_EXPLICIT & mdoc_macros[tok].flags);
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

-       /* Token pre-processing. */
+       lastpunct = 0;
+       for (;;) {
+               la = *pos;
+               w = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               assert(ARGS_PHRASE != c);

 
 

-       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)
+               if (ARGS_ERROR == w) {
+                       mdoc_argv_free(argc, argv);
+                       return(0);
+               }
+
+               if (ARGS_EOLN == w)

                        break;
                        break;

-               if (MDOC_Pp != mdoc->last->data.elem.tok)
+               if (ARGS_PUNCT == w)

                        break;
                        break;

-               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK))
+
+               c = ARGS_QWORD == w ? MDOC_MAX :
+                       lookup(mdoc, line, la, tok, p);
+
+               if (MDOC_MAX != c && -1 != c) {
+                       if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
+                               mdoc_argv_free(argc, argv);
+                               return(0);
+                       }
+                       mdoc_argv_free(argc, argv);
+                       c = mdoc_macro(mdoc, c, line, la, pos, buf);
+                       if (0 == c)
+                               return(0);
+                       if (ppos > 1)
+                               return(1);
+                       return(append_delims(mdoc, line, pos, buf));
+               } else if (-1 == c) {
+                       mdoc_argv_free(argc, argv);

                        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;
-       default:
-               break;
-       }
+               }

 
 

-       lastarg = *pos;
+               /* FIXME: .Fl and .Ar handling of `|'. */

 
 

-       for (j = 0; j < MDOC_LINEARG_MAX; j++) {
-               lastarg = *pos;
-               c = mdoc_argv(mdoc, tok, &argv[j], pos, buf);
-               if (0 == c)
-                       break;
-               else if (1 == c)
-                       continue;
+               if (ARGS_QWORD != w && 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, (size_t)argc, argv);
+                       if (0 == c) {
+                               mdoc_argv_free(argc, argv);
+                               return(0);
+                       }
+                       mdoc->next = MDOC_NEXT_CHILD;
+                       lastpunct = 0;
+               }

 
 

-               mdoc_argv_free(j, argv);
-               return(0);
+               if ( ! mdoc_word_alloc(mdoc, line, la, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;

        }
 
        }
 

-       if (MDOC_LINEARG_MAX == j) {
-               mdoc_argv_free(j, argv);
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-       }
+       mdoc_argv_free(argc, argv);

 
 

-       c = append_scoped(mdoc, tok, ppos, 0, NULL, j, argv);
-       mdoc_argv_free(j, argv);
-       return(c);
+       if (0 == lastpunct && ! rewind_elem(mdoc, tok))
+               return(0);
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, line, pos, buf));

 }
 
 
 /*
 }
 
 
 /*

- * Implicity-scoped macros, like `.Ss', have a scope that terminates
- * with a subsequent call to the same macro.  Implicit macros cannot
- * break the scope of explicitly-scoped macros; however, they can break
- * the scope of other implicit macros (so `.Sh' can break `.Ss').  This
- * is ok with macros like `.It' because they exist only within an
- * explicit context.
+ * Handle explicit-scope (having a different closure token) and implicit
+ * scope (closing out prior scopes when re-invoked) macros.  These
+ * constitute the BLOCK type and usually span multiple lines.  These
+ * always have HEAD and sometimes have BODY types.  In the multi-line
+ * case:
+ *
+ *     .Bd -ragged
+ *     Text.
+ *     .Fl macro
+ *     Another.
+ *     .Ed
+ *
+ *     BLOCK (.Bd)
+ *         HEAD
+ *         BODY
+ *             TEXT (`Text.')
+ *             ELEMENT (.Fl)
+ *                 TEXT (`macro')
+ *             TEXT (`Another.')

  *
  *

- * These macros put line arguments (which it's allowed to have) into the
- * HEAD section and open a BODY scope to be used until the macro scope
- * closes.
+ * Note that the `.It' macro, possibly the most difficult (as it has
+ * embedded scope, etc.) is handled by this routine.

  */
  */

-int
-macro_scoped_implicit(MACRO_PROT_ARGS)
+static int
+macro_scoped(MACRO_PROT_ARGS)

 {
 {

-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX];
-       struct mdoc_node *n;
+       int               c, lastarg, argc;
+       struct mdoc_arg   argv[MDOC_LINEARG_MAX];
+       char             *p;
+
+       assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
+
+       /* First rewind extant implicit scope. */
+
+       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
+               if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+                       return(0);
+               if ( ! rewind_impblock(mdoc, tok, line, ppos))
+                       return(0);
+       }

 
 

-       assert( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags));
+       /* Parse arguments. */

 
 

-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+       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);
+       }
+
+       if (MDOC_LINEARG_MAX == argc) {
+               mdoc_argv_free(argc - 1, argv);
+               return(perr(mdoc, line, ppos, EARGVLIM));
+       }
+
+       c = mdoc_block_alloc(mdoc, line, ppos, 
+                       tok, (size_t)argc, argv);
+       mdoc_argv_free(argc, argv);
+
+       if (0 == c)
+               return(0);

 
 

-       /* Token pre-processing. */
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

-       switch (tok) {
-       case (MDOC_Ss):
-               /* FALLTHROUGH */
-       case (MDOC_Sh):
-               /* `.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;
+       if (0 == buf[*pos]) {
+               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, 
+                                       tok, line, ppos))
+                       return(0);
+               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               mdoc->next = MDOC_NEXT_CHILD;
+               return(1);

        }
 
        }
 

-       /* Rewind our scope. */
-
-       if ( ! scope_rewind_imp(mdoc, ppos, tok))
+       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))

                return(0);
                return(0);

+       mdoc->next = MDOC_NEXT_CHILD;

 
 

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

 
 

-       /*
-        * Process until we hit a line.  Note that current implicit
-        * macros don't have any arguments, so we don't need to do any
-        * argument processing.
-        */
+               if (ARGS_ERROR == c)
+                       return(0);
+               if (ARGS_EOLN == c)
+                       break;
+               if (ARGS_PHRASE == c) {
+                       /*
+                       if ( ! mdoc_phrase(mdoc, line, lastarg, buf))
+                               return(0);
+                       */
+                       continue;
+               }

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               /* FIXME: if .It -column, the lookup must be for a
+                * sub-line component.  BLAH. */
+       
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);

 
 

-       lastarg = *pos;
+               if (MDOC_MAX == c) {
+                       if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                               return(0);
+                       mdoc->next = MDOC_NEXT_SIBLING;
+                       continue;
+               } 

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) {
-       case (ARGS_ERROR):
-               return(0);
-       case (ARGS_EOLN):
-               return(append_scoped(mdoc, tok, ppos, j, _CC(args), 0, NULL));
-       default:
+               if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+                       return(0);

                break;
        }
                break;
        }

+       
+       if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
+               return(0);
+       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+               return(0);

 
 

-       if (MDOC_MAX != mdoc_find(mdoc, args[j]))
-               if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
-                       return(0);
+       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+               return(0);
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

-       j++;
-       goto again;
-       /* NOTREACHED */
+       return(1);

 }
 
 
 /*
 }
 
 
 /*

- * A line-scoped macro opens a scope for the contents of its line, which
- * are placed under the HEAD node.  Punctuation trailing the line is put
- * as a sibling to the HEAD node, under the BLOCK node.  
+ * This handles a case of implicitly-scoped macro (BLOCK) limited to a
+ * single line.  Instead of being closed out by a subsequent call to
+ * another macro, the scope is closed at the end of line.  These don't
+ * have BODY or TAIL types.  Notice that the punctuation falls outside
+ * of the HEAD type.
+ *
+ *     .Qq a Fl b Ar d ; ;
+ *
+ *     BLOCK (Qq)
+ *         HEAD
+ *             TEXT (`a')
+ *             ELEMENT (.Fl)
+ *                 TEXT (`b')
+ *             ELEMENT (.Ar)
+ *                 TEXT (`d')
+ *         TEXT (`;')
+ *         TEXT (`;')

  */
  */

-int
+static int

 macro_scoped_line(MACRO_PROT_ARGS)
 {
 macro_scoped_line(MACRO_PROT_ARGS)
 {

-       int               lastarg, c, j;
+       int               lastarg, c;

        char              *p;
        char              *p;

-       struct mdoc_node  *n;
-
-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
-
-       assert(1 == ppos);
-       
-       /* Token pre-processing.  */
-
-       switch (tok) {
-       case (MDOC_D1):
-               /* FALLTHROUGH */
-       case (MDOC_Dl):
-               /* These can't be nested in a display block. */
-               assert(mdoc->last);
-               for (n = mdoc->last->parent ; n; n = n->parent)
-                       if (MDOC_BLOCK != n->type) 
-                               continue;
-                       else if (MDOC_Bd == n->data.block.tok)
-                               break;
-               if (NULL == n)
-                       break;
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NONEST));
-       default:
-               break;
-       }

 
 

-       /*
-        * All line-scoped macros have a HEAD and optionally a BODY
-        * section.  We open our scope here; when we exit this function,
-        * we'll rewind our scope appropriately.
-        */
+       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+               return(0);
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

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

 
 

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

 
 

-       j = 0;

        lastarg = ppos;
        lastarg = ppos;

+       for (;;) {
+               lastarg = *pos;
+               c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               assert(ARGS_PHRASE != c);

 
 

-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):
-               break;
-       case (ARGS_PUNCT):
-               if ( ! append_delims(mdoc, tok, pos, buf))
+               if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))

                        return(0);
                        return(0);

-               return(scope_rewind_imp(mdoc, ppos, tok));
-       case (ARGS_EOLN):
-               return(scope_rewind_imp(mdoc, ppos, tok));
-       default:
-               abort();
-               /* NOTREACHED */
+               break;

        }
 
        }
 

-       if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+       if (1 == ppos) {
+               if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))

                        return(0);
                        return(0);

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

                        return(0);
                        return(0);

-               return(scope_rewind_imp(mdoc, ppos, tok));
-       }
-
-       if (mdoc_isdelim(p))
-               j = 0;
-
-       mdoc_word_alloc(mdoc, lastarg, p);
-       goto again;
-       /* NOTREACHED */
+       } else if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+               return(0);
+       return(rewind_impblock(mdoc, tok, line, ppos));

 }
 
 
 }
 
 

-/* 
- * Partial-line scope is identical to line scope (macro_scoped_line())
- * except that trailing punctuation is appended to the BLOCK, instead of
- * contained within the HEAD.
+/*
+ * A constant-scoped macro is like a simple-scoped macro (mdoc_scoped)
+ * except that it doesn't handle implicit scopes and explicit ones have
+ * a fixed number of TEXT children to the BODY.
+ *
+ *     .Fl a So b Sc ;
+ *
+ *     ELEMENT (.Fl)
+ *         TEXT (`a')
+ *     BLOCK (.So)
+ *         HEAD
+ *         BODY
+ *             TEXT (`b')
+ *     TEXT (';')

  */
  */

-int
-macro_scoped_pline(MACRO_PROT_ARGS)
+static int
+macro_constant_scoped(MACRO_PROT_ARGS)

 {
 {

-       int               lastarg, c, j;
-       char              *p;
-
-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+       int               lastarg, flushed, j, c, maxargs;
+       char             *p;

 
 

-       /* Token pre-processing.  */
+       lastarg = ppos;
+       flushed = 0;

 
        switch (tok) {
 
        switch (tok) {

-       case (MDOC_Ql):
-               if ( ! mdoc_warn(mdoc, tok, ppos, WARN_COMPAT_TROFF))
-                       return(0);
+       case (MDOC_Eo):
+               maxargs = 1;

                break;
        default:
                break;
        default:

+               maxargs = 0;

                break;
        }
 
                break;
        }
 

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

 
 

-       /* Process line parameters. */
+       if (0 == maxargs) {
+               if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+                       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);

 
 

-       j = 0;
-       lastarg = ppos;
+       mdoc->next = MDOC_NEXT_CHILD;

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+       for (j = 0; /* No sentinel. */; j++) {
+               lastarg = *pos;
+
+               if (j == maxargs && ! flushed) {
+                       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+                               return(0);
+                       flushed = 1;
+                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                               return(0);
+                       mdoc->next = MDOC_NEXT_CHILD;
+               }

 
 

-       lastarg = *pos;
-       c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               assert(ARGS_PHRASE != c);

 
 

-       switch (c) {
-       case (ARGS_ERROR):
-               return(0);
-       case (ARGS_WORD):
-               break;
-       case (ARGS_PUNCT):
-               if ( ! scope_rewind_imp(mdoc, ppos, tok))
+               if (ARGS_ERROR == c)

                        return(0);
                        return(0);

-               if (ppos > 1)
-                       return(1);
-               return(append_delims(mdoc, tok, pos, buf));
-       case (ARGS_EOLN):
-               return(scope_rewind_imp(mdoc, ppos, tok));
-       default:
-               abort();
-               /* NOTREACHED */
-       }
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;

 
 

-       if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))

                        return(0);
                        return(0);

-               if ( ! scope_rewind_imp(mdoc, ppos, tok))
+               else if (MDOC_MAX != c) {
+                       if ( ! flushed) {
+                               if ( ! rewind_subblock(MDOC_HEAD, mdoc, 
+                                                       tok, line, ppos))
+                                       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, line, ppos))
+                               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);

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

        }
 
        }
 

-       if (mdoc_isdelim(p))
-               j = 0;
+       if ( ! flushed) {
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+                       return(0);
+               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                       return(0);
+               mdoc->next = MDOC_NEXT_CHILD;
+       }

 
 

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

 }
 
 
 /*
 }
 
 
 /*

- * A delimited-constant macro is similar to a general text macro: the
- * macro is followed by a 0 or 1 arguments (possibly-unspecified) then
- * terminating punctuation, other words, or another callable macro.
+ * A delimited constant is very similar to the macros parsed by
+ * macro_text except that, in the event of punctuation, the macro isn't
+ * "re-opened" as it is in macro_text.  Also, these macros have a fixed
+ * number of parameters.
+ *
+ *    .Fl a No b
+ *
+ *    ELEMENT (.Fl)
+ *        TEXT (`a')
+ *    ELEMENT (.No)
+ *    TEXT (`b')

  */
  */

-int
+static int

 macro_constant_delimited(MACRO_PROT_ARGS)
 {
 macro_constant_delimited(MACRO_PROT_ARGS)
 {

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

        char             *p;
 
        char             *p;
 

-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
-
-       /* Process line parameters. */
-

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

-       /* Token pre-processing. */
+       
+       /* 
+        * Maximum arguments per macro.  Some of these have none and
+        * exit as soon as they're parsed.
+        */

 
        switch (tok) {
 
        switch (tok) {

+       case (MDOC_No):
+               /* FALLTHROUGH */
+       case (MDOC_Ns):
+               /* FALLTHROUGH */

        case (MDOC_Ux):
                maxargs = 0;
                break;
        case (MDOC_Ux):
                maxargs = 0;
                break;


@@ -870,138 +1212,225 @@ macro_constant_delimited(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 

-again:
-       lastarg = *pos;
+       /* 
+        * Whether to ignore delimiter characters.  `Pf' accepts its
+        * first token as a parameter no matter what it looks like (if
+        * it's text).
+        */

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p)) {
-       case (ARGS_ERROR):
-               return(0);
-       case (ARGS_WORD):
+       switch (tok) {
+       case (MDOC_Pf):
+               igndelim = 1;

                break;
                break;

-       case (ARGS_PUNCT):
-               if ( ! flushed && ! append_const(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_const(mdoc, tok, ppos, 0, &p));

        default:
        default:

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

        }
 
        }
 

-       /* Accepts no arguments: flush out symbol and continue. */
+       /* 
+        * Whether to ignore arguments: `St', for example, handles its
+        * argument-like parameters as regular parameters.
+        */

 
 

-       if (0 == maxargs) {
-               if ( ! append_const(mdoc, tok, ppos, 0, &p))
-                       return(0);
-               flushed = 1;
+       switch (tok) {
+       case (MDOC_St):
+               ignargs = 1;
+               break;
+       default:
+               ignargs = 0;
+               break;

        }
 
        }
 

-       if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
-               if ( ! flushed && ! append_const(mdoc, tok, ppos, 0, &p))
-                       return(0);
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+       argc = 0;
+
+       if ( ! ignargs)
+               for ( ; 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);

-               if (ppos > 1)
-                       return(1);
-               return(append_delims(mdoc, tok, pos, buf));
+               }
+
+       if (MDOC_LINEARG_MAX == argc) {
+               mdoc_argv_free(argc - 1, argv);
+               return(perr(mdoc, line, ppos, EARGVLIM));

        }
 
        }
 

-       /* 
-        * We only accept one argument; subsequent tokens are considered
-        * as literal words (until a macro).
-        */
+       c = mdoc_elem_alloc(mdoc, line, ppos, 
+                       tok, (size_t)argc, argv);
+
+       mdoc_argv_free(argc, argv);
+
+       if (0 == c)
+               return(0);
+
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       for (j = 0; /* No sentinel. */; j++) {
+               lastarg = *pos;
+
+               if (j == maxargs && ! flushed) {
+                       if ( ! rewind_elem(mdoc, tok))
+                               return(0);
+                       flushed = 1;
+               }
+
+               c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               assert(ARGS_PHRASE != c);

 
 

-       if ( ! flushed && ! mdoc_isdelim(p)) {
-              if ( ! append_const(mdoc, tok, ppos, 1, &p))
+               if (ARGS_ERROR == c)

                        return(0);
                        return(0);

-               flushed = 1;
-               goto again;
-       } else if ( ! flushed) {
-               if ( ! append_const(mdoc, tok, ppos, 0, &p))
+               if (ARGS_PUNCT == c)
+                       break;
+               if (ARGS_EOLN == c)
+                       break;
+
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))

                        return(0);
                        return(0);

-               flushed = 1;
+               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) && ! igndelim) {
+                       if ( ! rewind_elem(mdoc, tok))
+                               return(0);
+                       flushed = 1;
+               }
+       
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;

        }
 
        }
 

-       mdoc_word_alloc(mdoc, lastarg, p);
-       goto again;
-       /* NOTREACHED */
+       if ( ! flushed && ! rewind_elem(mdoc, tok))
+               return(0);
+
+       if (ppos > 1)
+               return(1);
+       return(append_delims(mdoc, line, pos, buf));

 }
 
 
 }
 
 

-int
+/*
+ * A constant macro is the simplest classification.  It spans an entire
+ * line.  
+ */
+static int

 macro_constant(MACRO_PROT_ARGS)
 {
 macro_constant(MACRO_PROT_ARGS)
 {

-       int               lastarg, j;
-       char             *args[MDOC_LINEARG_MAX];
+       int               c, w, la, argc;
+       struct mdoc_arg   argv[MDOC_LINEARG_MAX];
+       char             *p;

 
 

-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+       assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));

 
 

-       j = 0;
-       lastarg = ppos;
+       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);
+       }

 
 

-again:
-       if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+       if (MDOC_LINEARG_MAX == argc) {
+               mdoc_argv_free(argc - 1, argv);
+               return(perr(mdoc, line, ppos, EARGVLIM));
+       }
+
+       c = mdoc_elem_alloc(mdoc, line, ppos, 
+                       tok, (size_t)argc, argv);

 
 

-       lastarg = *pos;
+       mdoc_argv_free(argc, argv);

 
 

-       switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) {
-       case (ARGS_ERROR):
+       if (0 == c)

                return(0);
                return(0);

-       case (ARGS_WORD):
-               break;
-       case (ARGS_EOLN):
-               return(append_const(mdoc, tok, ppos, j, args));
-       default:
-               abort();
-               /* NOTREACHED */
-       }

 
 

-       if (MDOC_MAX != mdoc_find(mdoc, args[j])) 
-               if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+       mdoc->next = MDOC_NEXT_CHILD;
+
+       for (;;) {
+               la = *pos;
+               w = mdoc_args(mdoc, line, pos, buf, tok, &p);
+               assert(ARGS_PHRASE != c);
+
+               if (ARGS_ERROR == w)

                        return(0);
                        return(0);

+               if (ARGS_EOLN == w)
+                       break;

 
 

-       j++;
-       goto again;
-       /* NOTREACHED */
+               c = ARGS_QWORD == w ? MDOC_MAX :
+                       lookup(mdoc, line, la, tok, p);
+
+               if (MDOC_MAX != c && -1 != c) {
+                       if ( ! rewind_elem(mdoc, tok))
+                               return(0);
+                       return(mdoc_macro(mdoc, c, line, la, pos, buf));
+               } else if (-1 == c)
+                       return(0);
+
+               if ( ! mdoc_word_alloc(mdoc, line, la, p))
+                       return(0);
+               mdoc->next = MDOC_NEXT_SIBLING;
+       }
+
+       return(rewind_elem(mdoc, tok));

 }
 
 
 }
 
 

-int
-macro_constant_argv(MACRO_PROT_ARGS)
+/* ARGSUSED */
+static int
+macro_obsolete(MACRO_PROT_ARGS)

 {
 {

-       int               c, lastarg, j;
-       struct mdoc_arg   argv[MDOC_LINEARG_MAX];

 
 

-       if (SEC_PROLOGUE == mdoc->sec_lastn)
-               return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+       return(pwarn(mdoc, line, ppos, WOBS));
+}

 
 

-       lastarg = *pos;

 
 

-       for (j = 0; j < MDOC_LINEARG_MAX; j++) {
-               lastarg = *pos;
-               c = mdoc_argv(mdoc, tok, &argv[j], pos, buf);
-               if (0 == c)
-                       break;
-               else if (1 == c)
-                       continue;
+/*
+ * This is called at the end of parsing.  It must traverse up the tree,
+ * closing out open [implicit] scopes.  Obviously, open explicit scopes
+ * are errors.
+ */
+int
+macro_end(struct mdoc *mdoc)
+{
+       struct mdoc_node *n;

 
 

-               mdoc_argv_free(j, argv);
-               return(0);
-       }
+       assert(mdoc->first);
+       assert(mdoc->last);
+
+       /* Scan for open explicit scopes. */
+
+       n = MDOC_VALID & mdoc->last->flags ?
+               mdoc->last->parent : mdoc->last;

 
 

-       if (MDOC_LINEARG_MAX == j) {
-               mdoc_argv_free(j, argv);
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+       for ( ; n; n = n->parent) {
+               if (MDOC_BLOCK != n->type)
+                       continue;
+               if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
+                       continue;
+               return(mdoc_nerr(mdoc, n, 
+                               "macro scope still open on exit"));

        }
 
        }
 

-       c = append_constarg(mdoc, tok, ppos, j, argv);
-       mdoc_argv_free(j, argv);
-       return(c);
+       return(rewind_last(mdoc, mdoc->first));

 }
 }