]> git.cameronkatri.com Git - mandoc.git/blobdiff - macro.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Documentation, more validations, cleaned up actions, added Nm action.
[mandoc.git] / macro.c
diff --git a/macro.c b/macro.c
index d15ad3df9418bb1170b0724cfd875c5b1a9c7be1..4c24c01fbbd4d2fc73e2cab6bc58f4125bcb1b21 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.24 2009/01/06 15:49:44 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,154 +29,401 @@
 
 /* FIXME: maxlineargs should be per LINE, no per TOKEN. */
 
 
 /* FIXME: maxlineargs should be per LINE, no per TOKEN. */
 
-static int       rewind_elem(struct mdoc *, int, int);
-static int       rewind_impblock(struct mdoc *, int, int);
+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       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_expblock(struct mdoc *, int, int, int);
-static int       rewind_head(struct mdoc *, int, int);
-static int       rewind_body(struct mdoc *, int, int, int);
-static int       append_delims(struct mdoc *, int, int *, char *);
-static int       lookup(struct mdoc *, int, const char *);
+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
 
 
 static int
-lookup(struct mdoc *mdoc, int from, const char *p)
+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_PARSED & mdoc_macros[from].flags))
-               return(MDOC_MAX);
-       return(mdoc_find(mdoc, p));
+       if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter"))
+               return(-1);
+       return(MDOC_MAX);
 }
 
 
 static int
 }
 
 
 static int
-rewind_elem(struct mdoc *mdoc, int ppos, int tok)
+rewind_last(int tok, int type, struct mdoc *mdoc, struct mdoc_node *to)
 {
 {
-       struct mdoc_node *n;
 
 
-       n = mdoc->last;
-       if (MDOC_ELEM != n->type)
-               n = n->parent;
-       assert(MDOC_ELEM == n->type);
-       assert(tok == n->data.elem.tok);
-
-       mdoc->last = n;
+       assert(to);
        mdoc->next = MDOC_NEXT_SIBLING;
        mdoc->next = MDOC_NEXT_SIBLING;
-       if ( ! mdoc_valid_post(mdoc, tok, ppos))
-               return(0);
-       return(mdoc_action(mdoc, tok, ppos));
+       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
 }
 
 
 static int
-rewind_body(struct mdoc *mdoc, int ppos, int tok, int tt)
+rewind_alt(int tok)
 {
 {
-       struct mdoc_node *n;
+       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 */
+}
 
 
-       /* LINTED */
-       for (n = mdoc->last; n; n = n->parent) {
-               if (MDOC_BODY != n->type) 
-                       continue;
-               if (tt == n->data.head.tok)
-                       break;
-               if ( ! (MDOC_EXPLICIT & mdoc_macros[tt].flags))
-                       continue;
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+
+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 */
        }
 
        }
 
-       mdoc->last = n ? n : mdoc->last;
-       mdoc->next = MDOC_NEXT_SIBLING;
-       /* XXX - no validation, we do this only for blocks/elements. */
-       return(1);
+       return(REWIND_NOHALT);
 }
 
 
 static int
 }
 
 
 static int
-rewind_head(struct mdoc *mdoc, int ppos, int tok)
+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
+rewind_elem(struct mdoc *mdoc, int tok)
+{
+       struct mdoc_node *n;
+
+       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;
 {
        struct mdoc_node *n;
-       int               t;
+       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;
-       /* XXX - no validation, we do this only for blocks/elements. */
-       return(1);
+       assert(n);
+       return(rewind_last(tok, type, mdoc, n));
 }
 
 
 static int
 }
 
 
 static int
-rewind_expblock(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               t;
+       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 == (t = 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;
-               if (MDOC_NESTED & 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"));
        }
 
        }
 
-       if (NULL == (mdoc->last = n))
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
-
-       mdoc->next = MDOC_NEXT_SIBLING;
-       if ( ! mdoc_valid_post(mdoc, tok, ppos))
-               return(0);
-       return(mdoc_action(mdoc, tok, ppos));
+       assert(n);
+       return(rewind_last(tok, MDOC_BLOCK, mdoc, n));
 }
 
 
 static int
 }
 
 
 static int
-rewind_impblock(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;
-               if (MDOC_NESTED & mdoc_macros[tok].flags)
-                       return(1);
-               return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+               return(mdoc_nerr(mdoc, n, "block scope broken"));
        }
 
        }
 
-       if (NULL == n)
-               return(1);
-
-       mdoc->next = MDOC_NEXT_SIBLING;
-       mdoc->last = n;
-       if ( ! mdoc_valid_post(mdoc, tok, ppos))
-               return(0);
-       return(mdoc_action(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;
@@ -186,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;
        }
 
@@ -202,62 +450,11 @@ append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
 
 /* ARGSUSED */
 int
 
 /* ARGSUSED */
 int
-macro_close_explicit(MACRO_PROT_ARGS)
+macro_scoped_close(MACRO_PROT_ARGS)
 {
 {
-       int              tt, j, c, lastarg, maxargs, flushed;
+       int              tt, j, c, lastarg, maxargs, flushed;
        char            *p;
 
        char            *p;
 
-       switch (tok) {
-       case (MDOC_Ac):
-               tt = MDOC_Ao;
-               break;
-       case (MDOC_Bc):
-               tt = MDOC_Bo;
-               break;
-       case (MDOC_Dc):
-               tt = MDOC_Do;
-               break;
-       case (MDOC_Ec):
-               tt = MDOC_Eo;
-               break;
-       case (MDOC_Ed):
-               tt = MDOC_Bd;
-               break;
-       case (MDOC_Ef):
-               tt = MDOC_Bf;
-               break;
-       case (MDOC_Ek):
-               tt = MDOC_Bk;
-               break;
-       case (MDOC_El):
-               tt = MDOC_Bl;
-               break;
-       case (MDOC_Fc):
-               tt = MDOC_Fo;
-               break;
-       case (MDOC_Oc):
-               tt = MDOC_Oo;
-               break;
-       case (MDOC_Pc):
-               tt = MDOC_Po;
-               break;
-       case (MDOC_Qc):
-               tt = MDOC_Qo;
-               break;
-       case (MDOC_Re):
-               tt = MDOC_Rs;
-               break;
-       case (MDOC_Sc):
-               tt = MDOC_So;
-               break;
-       case (MDOC_Xc):
-               tt = MDOC_Xo;
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-
        switch (tok) {
        case (MDOC_Ec):
                maxargs = 1;
        switch (tok) {
        case (MDOC_Ec):
                maxargs = 1;
@@ -267,22 +464,29 @@ macro_close_explicit(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 
+       tt = rewind_alt(tok);
+
+       mdoc_msg(mdoc, "parse-quiet: %s closing %s",
+                       mdoc_macronames[tok], mdoc_macronames[tt]);
+
        if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
        if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-               if ( ! rewind_expblock(mdoc, ppos, tok, tt))
-                       return(0);
-               if (0 != buf[*pos])
-                       return(mdoc_err(mdoc, tok, *pos, ERR_ARGS_EQ0));
-               return(1);
+               if (0 == buf[*pos]) {
+                       if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
+                               return(0);
+                       return(rewind_expblock(mdoc, tok, line, ppos));
+               }
+               return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters"));
        }
 
        }
 
-       if ( ! rewind_body(mdoc, ppos, tok, tt))
+       if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
                return(0);
 
        lastarg = ppos;
        flushed = 0;
 
        if (maxargs > 0) {
                return(0);
 
        lastarg = ppos;
        flushed = 0;
 
        if (maxargs > 0) {
-               mdoc_tail_alloc(mdoc, ppos, tt);
+               if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+                       return(0);
                mdoc->next = MDOC_NEXT_CHILD;
        }
 
                mdoc->next = MDOC_NEXT_CHILD;
        }
 
@@ -290,12 +494,12 @@ macro_close_explicit(MACRO_PROT_ARGS)
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
-                       if ( ! rewind_expblock(mdoc, ppos, tok, tt))
+                       if ( ! rewind_expblock(mdoc, tok, line, ppos))
                                return(0);
                        flushed = 1;
                }
 
                                return(0);
                        flushed = 1;
                }
 
-               c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_PUNCT == c)
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_PUNCT == c)
@@ -303,31 +507,33 @@ macro_close_explicit(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 
-               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX != c) {
                        if ( ! flushed) {
                        if ( ! flushed) {
-                               if ( ! rewind_expblock(mdoc, ppos, tok, tt))
+                               if ( ! rewind_expblock(mdoc, tok, line, ppos))
                                        return(0);
                                flushed = 1;
                        }
                                        return(0);
                                flushed = 1;
                        }
-                       if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
                                return(0);
                        break;
                                return(0);
                        break;
-               }
+               } 
 
 
-               mdoc_word_alloc(mdoc, lastarg, p);
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == j)
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == j)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
 
-       if ( ! flushed) 
-               if ( ! rewind_expblock(mdoc, ppos, tok, tt))
-                       return(0);
+       if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos))
+               return(0);
 
        if (ppos > 1)
                return(1);
 
        if (ppos > 1)
                return(1);
-       return(append_delims(mdoc, tok, pos, buf));
+       return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
 }
 
 
@@ -343,47 +549,51 @@ macro_close_explicit(MACRO_PROT_ARGS)
 int
 macro_text(MACRO_PROT_ARGS)
 {
 int
 macro_text(MACRO_PROT_ARGS)
 {
-       int               lastarg, lastpunct, c, sz, fl, argc;
+       int               la, lastpunct, c, sz, fl, argc;
        struct mdoc_arg   argv[MDOC_LINEARG_MAX];
        char             *p;
 
        struct mdoc_arg   argv[MDOC_LINEARG_MAX];
        char             *p;
 
-       lastarg = ppos;
+       la = ppos;
        lastpunct = 0;
 
        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
        lastpunct = 0;
 
        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
-               lastarg = *pos;
+               la = *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;
+               if (ARGV_WORD == c) {
+                       *pos = la;
                        break;
                        break;
-               else if (ARGV_ARG == c)
+               } else if (ARGV_ARG == c)
                        continue;
                        continue;
+
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
+       if (MDOC_LINEARG_MAX == argc) {
+               mdoc_argv_free(argc, argv);
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
+       }
+
+       c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+
+       if (0 == c) {
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
+       mdoc->next = MDOC_NEXT_CHILD;
+
        fl = ARGS_DELIM;
        if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
                fl |= ARGS_QUOTED;
 
        fl = ARGS_DELIM;
        if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
                fl |= ARGS_QUOTED;
 
-       mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
-       mdoc->next = MDOC_NEXT_CHILD;
-
        for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
        for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
-               lastarg = *pos;
-
-               if (lastpunct) {
-                       mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
-                       mdoc->next = MDOC_NEXT_CHILD;
-                       lastpunct = 0;
-               }
+               la = *pos;
 
 
-               c = mdoc_args(mdoc, tok, pos, buf, fl, &p);
+               c = mdoc_args(mdoc, line, pos, buf, fl, &p);
                if (ARGS_ERROR == c) {
                        mdoc_argv_free(argc, argv);
                        return(0);
                if (ARGS_ERROR == c) {
                        mdoc_argv_free(argc, argv);
                        return(0);
@@ -394,94 +604,127 @@ macro_text(MACRO_PROT_ARGS)
                if (ARGS_PUNCT == c)
                        break;
 
                if (ARGS_PUNCT == c)
                        break;
 
-               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
-                       if ( ! rewind_elem(mdoc, ppos, tok)) {
+               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);
                                mdoc_argv_free(argc, argv);
                                return(0);
                        }
                        mdoc_argv_free(argc, argv);
-                       if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+
+                       c = mdoc_macro(mdoc, c, line, la, pos, buf);
+                       if (0 == c)
                                return(0);
                        if (ppos > 1)
                                return(1);
                                return(0);
                        if (ppos > 1)
                                return(1);
-                       return(append_delims(mdoc, tok, pos, buf));
+                       return(append_delims(mdoc, tok, line, pos, buf));
                }
 
                if (mdoc_isdelim(p)) {
                }
 
                if (mdoc_isdelim(p)) {
-                       if ( ! rewind_elem(mdoc, ppos, tok)) {
+                       if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
                                mdoc_argv_free(argc, argv);
                                return(0);
                        }
                        lastpunct = 1;
                                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;
                }
                }
-               mdoc_word_alloc(mdoc, lastarg, p);
+
+               if ( ! mdoc_word_alloc(mdoc, line, la, p))
+                       return(0);
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        mdoc_argv_free(argc, argv);
 
        if (sz == MDOC_LINEARG_MAX)
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        mdoc_argv_free(argc, argv);
 
        if (sz == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
 
-       if ( ! rewind_elem(mdoc, ppos, tok))
+       if (0 == lastpunct && ! rewind_elem(mdoc, tok))
                return(0);
        if (ppos > 1)
                return(1);
                return(0);
        if (ppos > 1)
                return(1);
-       return(append_delims(mdoc, tok, pos, buf));
+       return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
 /*
 }
 
 
 /*
- * Multi-line-scoped macro.
+ * Implicit- or explicit-end multi-line scoped macro.
  */
 int
 macro_scoped(MACRO_PROT_ARGS)
 {
  */
 int
 macro_scoped(MACRO_PROT_ARGS)
 {
-       int               c, lastarg, argc, j;
+       int               c, lastarg, argc, j, fl;
        struct mdoc_arg   argv[MDOC_LINEARG_MAX];
        char             *p;
 
        assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
        struct mdoc_arg   argv[MDOC_LINEARG_MAX];
        char             *p;
 
        assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
 
-       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) 
-               if ( ! rewind_impblock(mdoc, ppos, tok))
+       if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
+               if ( ! rewind_subblock(MDOC_BODY, mdoc, tok))
                        return(0);
                        return(0);
-
-       lastarg = ppos;
+               if ( ! rewind_impblock(mdoc, tok, line, ppos))
+                       return(0);
+       }
 
        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)
+               if (ARGV_WORD == c) {
+                       *pos = lastarg;
+                       break;
+               } else if (ARGV_ARG == c)
                        continue;
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
                        continue;
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
+       if (MDOC_LINEARG_MAX == argc) {
                mdoc_argv_free(argc, argv);
                mdoc_argv_free(argc, argv);
-               return(0);
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
        }
 
        }
 
-       mdoc_block_alloc(mdoc, ppos, tok, (size_t)argc, argv);
-       mdoc->next = MDOC_NEXT_CHILD;
-
+       c = mdoc_block_alloc(mdoc, line, ppos, 
+                       tok, (size_t)argc, argv);
        mdoc_argv_free(argc, argv);
 
        mdoc_argv_free(argc, argv);
 
+       if (0 == c)
+               return(0);
+
+       mdoc->next = MDOC_NEXT_CHILD;
+
        if (0 == buf[*pos]) {
        if (0 == buf[*pos]) {
-               mdoc_body_alloc(mdoc, ppos, tok);
+               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->next = MDOC_NEXT_CHILD;
                return(1);
        }
 
-       mdoc_head_alloc(mdoc, ppos, tok);
+       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+               return(0);
        mdoc->next = MDOC_NEXT_CHILD;
 
        mdoc->next = MDOC_NEXT_CHILD;
 
+       fl = ARGS_DELIM;
+       if (MDOC_TABSEP & mdoc_macros[tok].flags)
+               fl |= ARGS_TABSEP;
+
        for (j = 0; j < MDOC_LINEARG_MAX; j++) {
                lastarg = *pos;
        for (j = 0; j < MDOC_LINEARG_MAX; j++) {
                lastarg = *pos;
-               c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               c = mdoc_args(mdoc, line, pos, buf, fl, &p);
        
                if (ARGS_ERROR == c)
                        return(0);
        
                if (ARGS_ERROR == c)
                        return(0);
@@ -490,26 +733,30 @@ macro_scoped(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
        
                if (ARGS_EOLN == c)
                        break;
        
-               if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {
-                       mdoc_word_alloc(mdoc, lastarg, 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;
                        mdoc->next = MDOC_NEXT_SIBLING;
                        continue;
-               }
+               } 
 
 
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+               if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
                        return(0);
                break;
        }
 
        if (j == MDOC_LINEARG_MAX)
                        return(0);
                break;
        }
 
        if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
 
-       if ( ! rewind_head(mdoc, ppos, tok))
+       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
                return(0);
                return(0);
-       if (1 == ppos && ! append_delims(mdoc, tok, pos, buf))
+       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);
@@ -527,22 +774,19 @@ macro_scoped_line(MACRO_PROT_ARGS)
        int               lastarg, c, j;
        char              *p;
 
        int               lastarg, c, j;
        char              *p;
 
-       mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+               return(0);
        mdoc->next = MDOC_NEXT_CHILD;
 
        mdoc->next = MDOC_NEXT_CHILD;
 
-       mdoc_head_alloc(mdoc, ppos, tok);
+       if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+               return(0);
        mdoc->next = MDOC_NEXT_CHILD;
 
        /* XXX - no known argument macros. */
 
        mdoc->next = MDOC_NEXT_CHILD;
 
        /* XXX - no known argument macros. */
 
-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL))
-               return(0);
-
-       /* Process line parameters. */
-
        for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
                lastarg = *pos;
        for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
                lastarg = *pos;
-               c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
 
                if (ARGS_ERROR == c)
                        return(0);
 
                if (ARGS_ERROR == c)
                        return(0);
@@ -551,30 +795,38 @@ macro_scoped_line(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 
-               if (MDOC_MAX == (c = lookup(mdoc, tok, p))) {
-                       mdoc_word_alloc(mdoc, lastarg, 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;
                        mdoc->next = MDOC_NEXT_SIBLING;
                        continue;
-               }
+               } 
 
 
-               if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+               if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
                        return(0);
                break;
        }
 
        if (j == MDOC_LINEARG_MAX)
                        return(0);
                break;
        }
 
        if (j == MDOC_LINEARG_MAX)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
        if (1 == ppos) {
 
        if (1 == ppos) {
-               if ( ! rewind_head(mdoc, ppos, tok))
+               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(rewind_impblock(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
 macro_constant_scoped(MACRO_PROT_ARGS)
 {
@@ -593,17 +845,20 @@ macro_constant_scoped(MACRO_PROT_ARGS)
                break;
        }
 
                break;
        }
 
-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL))
-               return(0);
-
-       mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+       if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+               return(0); 
        mdoc->next = MDOC_NEXT_CHILD;
 
        if (0 == maxargs) {
        mdoc->next = MDOC_NEXT_CHILD;
 
        if (0 == maxargs) {
-               mdoc_body_alloc(mdoc, ppos, tok);
+               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;
                flushed = 1;
-       } else
-               mdoc_head_alloc(mdoc, ppos, tok);
+       } else if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+               return(0);
 
        mdoc->next = MDOC_NEXT_CHILD;
 
 
        mdoc->next = MDOC_NEXT_CHILD;
 
@@ -611,14 +866,15 @@ macro_constant_scoped(MACRO_PROT_ARGS)
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
-                       if ( ! rewind_head(mdoc, ppos, tok))
+                       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
                                return(0);
                        flushed = 1;
                                return(0);
                        flushed = 1;
-                       mdoc_body_alloc(mdoc, ppos, tok);
+                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                               return(0);
                        mdoc->next = MDOC_NEXT_CHILD;
                }
 
                        mdoc->next = MDOC_NEXT_CHILD;
                }
 
-               c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_PUNCT == c)
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_PUNCT == c)
@@ -626,44 +882,50 @@ macro_constant_scoped(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 
-               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX != c) {
                        if ( ! flushed) {
                        if ( ! flushed) {
-                               if ( ! rewind_head(mdoc, ppos, tok))
+                               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
                                        return(0);
                                flushed = 1;
                                        return(0);
                                flushed = 1;
-                               mdoc_body_alloc(mdoc, ppos, tok);
+                               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                                       return(0);
                                mdoc->next = MDOC_NEXT_CHILD;
                        }
                                mdoc->next = MDOC_NEXT_CHILD;
                        }
-                       if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
                                return(0);
                        break;
                }
 
                if ( ! flushed && mdoc_isdelim(p)) {
                                return(0);
                        break;
                }
 
                if ( ! flushed && mdoc_isdelim(p)) {
-                       if ( ! rewind_head(mdoc, ppos, tok))
+                       if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
                                return(0);
                        flushed = 1;
                                return(0);
                        flushed = 1;
-                       mdoc_body_alloc(mdoc, ppos, tok);
+                       if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+                               return(0);
                        mdoc->next = MDOC_NEXT_CHILD;
                }
        
                        mdoc->next = MDOC_NEXT_CHILD;
                }
        
-               mdoc_word_alloc(mdoc, lastarg, p);
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == j)
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == j)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
        if ( ! flushed) {
 
        if ( ! flushed) {
-               if ( ! rewind_head(mdoc, ppos, tok))
+               if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok))
+                       return(0);
+               if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
                        return(0);
                        return(0);
-               mdoc_body_alloc(mdoc, ppos, tok);
                mdoc->next = MDOC_NEXT_CHILD;
        }
 
        if (ppos > 1)
                return(1);
                mdoc->next = MDOC_NEXT_CHILD;
        }
 
        if (ppos > 1)
                return(1);
-       return(append_delims(mdoc, tok, pos, buf));
+       return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
 }
 
 
@@ -688,6 +950,8 @@ macro_constant_delimited(MACRO_PROT_ARGS)
                /* FALLTHROUGH */
        case (MDOC_Ns):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (MDOC_Ns):
                /* FALLTHROUGH */
+       case (MDOC_Pf):
+               /* FALLTHROUGH */
        case (MDOC_Ux):
                /* FALLTHROUGH */
        case (MDOC_St):
        case (MDOC_Ux):
                /* FALLTHROUGH */
        case (MDOC_St):
@@ -700,35 +964,36 @@ macro_constant_delimited(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);
-               if (ARGV_EOLN == c || ARGV_WORD == c)
+               c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+               if (ARGV_EOLN == c)
+                       break;
+               if (ARGV_WORD == c) {
+                       *pos = lastarg;
                        break;
                        break;
-               else if (ARGV_ARG == c)
+               } else if (ARGV_ARG == c)
                        continue;
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
                        continue;
                mdoc_argv_free(argc, argv);
                return(0);
        }
 
-       if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
-               mdoc_argv_free(argc, argv);
+       c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+       mdoc_argv_free(argc, argv);
+
+       if (0 == c)
                return(0);
                return(0);
-       }
 
 
-       mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
        mdoc->next = MDOC_NEXT_CHILD;
 
        mdoc->next = MDOC_NEXT_CHILD;
 
-       mdoc_argv_free(argc, argv);
-
        for (j = 0; j < MDOC_LINEARG_MAX; j++) {
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
        for (j = 0; j < MDOC_LINEARG_MAX; j++) {
                lastarg = *pos;
 
                if (j == maxargs && ! flushed) {
-                       if ( ! rewind_elem(mdoc, ppos, tok))
+                       if ( ! rewind_elem(mdoc, tok))
                                return(0);
                        flushed = 1;
                }
 
                                return(0);
                        flushed = 1;
                }
 
-               c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_PUNCT == c)
                if (ARGS_ERROR == c)
                        return(0);
                if (ARGS_PUNCT == c)
@@ -736,34 +1001,37 @@ macro_constant_delimited(MACRO_PROT_ARGS)
                if (ARGS_EOLN == c)
                        break;
 
                if (ARGS_EOLN == c)
                        break;
 
-               if (MDOC_MAX != (c = lookup(mdoc, tok, p))) {
-                       if ( ! flushed && ! rewind_elem(mdoc, ppos, tok))
+               if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+                       return(0);
+               else if (MDOC_MAX != c) {
+                       if ( ! flushed && ! rewind_elem(mdoc, tok))
                                return(0);
                        flushed = 1;
                                return(0);
                        flushed = 1;
-                       if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+                       if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
                                return(0);
                        break;
                }
 
                if ( ! flushed && mdoc_isdelim(p)) {
                                return(0);
                        break;
                }
 
                if ( ! flushed && mdoc_isdelim(p)) {
-                       if ( ! rewind_elem(mdoc, ppos, tok))
+                       if ( ! rewind_elem(mdoc, tok))
                                return(0);
                        flushed = 1;
                }
        
                                return(0);
                        flushed = 1;
                }
        
-               mdoc_word_alloc(mdoc, lastarg, p);
+               if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+                       return(0);
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == j)
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == j)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
 
-       if ( ! flushed && rewind_elem(mdoc, ppos, tok))
+       if ( ! flushed && rewind_elem(mdoc, tok))
                return(0);
 
        if (ppos > 1)
                return(1);
                return(0);
 
        if (ppos > 1)
                return(1);
-       return(append_delims(mdoc, tok, pos, buf));
+       return(append_delims(mdoc, tok, line, pos, buf));
 }
 
 
 }
 
 
@@ -778,53 +1046,62 @@ macro_constant(MACRO_PROT_ARGS)
        struct mdoc_arg  argv[MDOC_LINEARG_MAX];
        char            *p;
 
        struct mdoc_arg  argv[MDOC_LINEARG_MAX];
        char            *p;
 
-       /*assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));*/
-       /*FIXME*/
-
        fl = 0;
        if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
                fl = ARGS_QUOTED;
 
        for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
                lastarg = *pos;
        fl = 0;
        if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
                fl = ARGS_QUOTED;
 
        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_elem_alloc(mdoc, ppos, tok, argc, argv);
        mdoc->next = MDOC_NEXT_CHILD;
 
        mdoc->next = MDOC_NEXT_CHILD;
 
-       mdoc_argv_free(argc, argv);
+       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, &p);
+               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;
 
-               mdoc_word_alloc(mdoc, lastarg, p);
+               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;
        }
 
        if (MDOC_LINEARG_MAX == sz + argc)
                mdoc->next = MDOC_NEXT_SIBLING;
        }
 
        if (MDOC_LINEARG_MAX == sz + argc)
-               return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+               return(mdoc_perr(mdoc, line, ppos, "too many arguments"));
 
 
-       return(rewind_elem(mdoc, ppos, tok));
+       return(rewind_elem(mdoc, tok));
 }
 
 
 }
 
 
@@ -833,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));
 }
 }
A git conversion mirror of mandoc.bsd.lv