Note version 1.11.4 bits. Here we go!

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index cb962277fbf3fff102e7cd8d07ca6d4af16dd047..79d0897ef3a79b22efa07b5c2867d0875d8ee43c 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,15 +1,15 @@
-/*     $Id: roff.c,v 1.98 2010/08/20 01:02:07 schwarze Exp $ */
+/*     $Id: roff.c,v 1.144 2011/07/08 09:28:33 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES

  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR

  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF


@@ -20,31 +20,19 @@
 #endif
 
 #include <assert.h>
 #endif
 
 #include <assert.h>

-#include <errno.h>

 #include <ctype.h>
 #include <ctype.h>

-#include <limits.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

-#include <stdio.h>

 
 #include "mandoc.h"
 
 #include "mandoc.h"

-#include "roff.h"
+#include "libroff.h"

 #include "libmandoc.h"
 
 #include "libmandoc.h"
 

+/* Maximum number of nested if-else conditionals. */

 #define        RSTACK_MAX      128
 
 #define        RSTACK_MAX      128
 

-#define        ROFF_CTL(c) \
-       ('.' == (c) || '\'' == (c))
-
-#if 1
-#define        ROFF_DEBUG(fmt, args...) \
-       do { /* Nothing. */ } while (/*CONSTCOND*/ 0)
-#else
-#define        ROFF_DEBUG(fmt, args...) \
-       do { fprintf(stderr, fmt , ##args); } while (/*CONSTCOND*/ 0)
-#endif
-

 enum   rofft {
 enum   rofft {

+       ROFF_ad,

        ROFF_am,
        ROFF_ami,
        ROFF_am1,
        ROFF_am,
        ROFF_ami,
        ROFF_am1,


@@ -53,14 +41,28 @@ enum        rofft {
        ROFF_de1,
        ROFF_ds,
        ROFF_el,
        ROFF_de1,
        ROFF_ds,
        ROFF_el,

+       ROFF_hy,

        ROFF_ie,
        ROFF_if,
        ROFF_ig,
        ROFF_ie,
        ROFF_if,
        ROFF_ig,

+       ROFF_it,
+       ROFF_ne,
+       ROFF_nh,
+       ROFF_nr,
+       ROFF_ns,
+       ROFF_ps,

        ROFF_rm,
        ROFF_rm,

+       ROFF_so,
+       ROFF_ta,

        ROFF_tr,
        ROFF_tr,

+       ROFF_TS,
+       ROFF_TE,
+       ROFF_T_,
+       ROFF_EQ,
+       ROFF_EN,

        ROFF_cblock,
        ROFF_ccond,
        ROFF_cblock,
        ROFF_ccond,

-       ROFF_nr,
+       ROFF_USERDEF,

        ROFF_MAX
 };
 
        ROFF_MAX
 };
 


@@ -69,7 +71,6 @@ enum  roffrule {
        ROFFRULE_DENY
 };
 
        ROFFRULE_DENY
 };
 

-

 struct roffstr {
        char            *name; /* key of symbol */
        char            *string; /* current value */
 struct roffstr {
        char            *name; /* key of symbol */
        char            *string; /* current value */


@@ -77,13 +78,19 @@ struct      roffstr {
 };
 
 struct roff {
 };
 
 struct roff {

+       struct mparse   *parse; /* parse point */

        struct roffnode *last; /* leaf of stack */
        struct roffnode *last; /* leaf of stack */

-       mandocmsg        msg; /* err/warn/fatal messages */
-       void            *data; /* privdata for messages */

        enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */
        int              rstackpos; /* position in rstack */
        struct regset   *regs; /* read/writable registers */
        enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */
        int              rstackpos; /* position in rstack */
        struct regset   *regs; /* read/writable registers */

-       struct roffstr  *first_string;
+       struct roffstr  *first_string; /* user-defined strings & macros */
+       const char      *current_string; /* value of last called user macro */
+       struct tbl_node *first_tbl; /* first table parsed */
+       struct tbl_node *last_tbl; /* last table parsed */
+       struct tbl_node *tbl; /* current table being parsed */
+       struct eqn_node *last_eqn; /* last equation parsed */
+       struct eqn_node *first_eqn; /* first equation parsed */
+       struct eqn_node *eqn; /* current equation being parsed */

 };
 
 struct roffnode {
 };
 
 struct roffnode {


@@ -91,6 +98,7 @@ struct        roffnode {
        struct roffnode *parent; /* up one in stack */
        int              line; /* parse line */
        int              col; /* parse col */
        struct roffnode *parent; /* up one in stack */
        int              line; /* parse line */
        int              col; /* parse col */

+       char            *name; /* node name, e.g. macro name */

        char            *end; /* end-rules: custom token */
        int              endspan; /* end-rules: next-line or infty */
        enum roffrule    rule; /* current evaluation rule */
        char            *end; /* end-rules: custom token */
        int              endspan; /* end-rules: next-line or infty */
        enum roffrule    rule; /* current evaluation rule */


@@ -117,6 +125,14 @@ struct     roffmac {
        struct roffmac  *next;
 };
 
        struct roffmac  *next;
 };
 

+struct predef {
+       const char      *name; /* predefined input name */
+       const char      *str; /* replacement symbol */
+};
+
+#define        PREDEF(__name, __str) \
+       { (__name), (__str) },
+

 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_block_sub(ROFF_ARGS);
 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_block_sub(ROFF_ARGS);


@@ -128,14 +144,23 @@ static    enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum roffrule    roff_evalcond(const char *, int *);
 static void             roff_freestr(struct roff *);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum roffrule    roff_evalcond(const char *, int *);
 static void             roff_freestr(struct roff *);

+static char            *roff_getname(struct roff *, char **, int, int);

 static const char      *roff_getstrn(const struct roff *, 
                                const char *, size_t);
 static const char      *roff_getstrn(const struct roff *, 
                                const char *, size_t);

-static enum rofferr     roff_line(ROFF_ARGS);
+static enum rofferr     roff_line_ignore(ROFF_ARGS);

 static enum rofferr     roff_nr(ROFF_ARGS);
 static int              roff_res(struct roff *, 
 static enum rofferr     roff_nr(ROFF_ARGS);
 static int              roff_res(struct roff *, 

-                               char **, size_t *, int);
+                               char **, size_t *, int, int);
+static enum rofferr     roff_rm(ROFF_ARGS);

 static void             roff_setstr(struct roff *,
 static void             roff_setstr(struct roff *,

-                               const char *, const char *);
+                               const char *, const char *, int);
+static enum rofferr     roff_so(ROFF_ARGS);
+static enum rofferr     roff_TE(ROFF_ARGS);
+static enum rofferr     roff_TS(ROFF_ARGS);
+static enum rofferr     roff_EQ(ROFF_ARGS);
+static enum rofferr     roff_EN(ROFF_ARGS);
+static enum rofferr     roff_T_(ROFF_ARGS);
+static enum rofferr     roff_userdef(ROFF_ARGS);

 
 /* See roff_hash_find() */
 
 
 /* See roff_hash_find() */
 


@@ -146,6 +171,7 @@ static      void             roff_setstr(struct roff *,
 static struct roffmac  *hash[HASHWIDTH];
 
 static struct roffmac   roffs[ROFF_MAX] = {
 static struct roffmac  *hash[HASHWIDTH];
 
 static struct roffmac   roffs[ROFF_MAX] = {

+       { "ad", roff_line_ignore, NULL, NULL, 0, NULL },

        { "am", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "am", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL },


@@ -154,25 +180,44 @@ static    struct roffmac   roffs[ROFF_MAX] = {
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },

+       { "hy", roff_line_ignore, NULL, NULL, 0, NULL },

        { "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL },

-       { "rm", roff_line, NULL, NULL, 0, NULL },
-       { "tr", roff_line, NULL, NULL, 0, NULL },
+       { "it", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ne", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "nr", roff_nr, NULL, NULL, 0, NULL },
+       { "ns", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ps", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "rm", roff_rm, NULL, NULL, 0, NULL },
+       { "so", roff_so, NULL, NULL, 0, NULL },
+       { "ta", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tr", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "TS", roff_TS, NULL, NULL, 0, NULL },
+       { "TE", roff_TE, NULL, NULL, 0, NULL },
+       { "T&", roff_T_, NULL, NULL, 0, NULL },
+       { "EQ", roff_EQ, NULL, NULL, 0, NULL },
+       { "EN", roff_EN, NULL, NULL, 0, NULL },

        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "\\}", roff_ccond, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "\\}", roff_ccond, NULL, NULL, 0, NULL },

-       { "nr", roff_nr, NULL, NULL, 0, NULL },
+       { NULL, roff_userdef, NULL, NULL, 0, NULL },
+};
+
+/* Array of injected predefined strings. */
+#define        PREDEFS_MAX      38
+static const struct predef predefs[PREDEFS_MAX] = {
+#include "predefs.in"

 };
 
 static void             roff_free1(struct roff *);
 };
 
 static void             roff_free1(struct roff *);

-static enum rofft       roff_hash_find(const char *);
+static enum rofft       roff_hash_find(const char *, size_t);

 static void             roff_hash_init(void);
 static void             roffnode_cleanscope(struct roff *);
 static void             roff_hash_init(void);
 static void             roffnode_cleanscope(struct roff *);

-static void             roffnode_push(struct roff *, 
-                               enum rofft, int, int);
+static void             roffnode_push(struct roff *, enum rofft,
+                               const char *, int, int);

 static void             roffnode_pop(struct roff *);
 static void             roffnode_pop(struct roff *);

-static enum rofft       roff_parse(const char *, int *);
-static int              roff_parse_nat(const char *, unsigned int *);
+static enum rofft       roff_parse(struct roff *, const char *, int *);

 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)
 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)


@@ -183,7 +228,7 @@ roff_hash_init(void)
        struct roffmac   *n;
        int               buc, i;
 
        struct roffmac   *n;
        int               buc, i;
 

-       for (i = 0; i < (int)ROFF_MAX; i++) {
+       for (i = 0; i < (int)ROFF_USERDEF; i++) {

                assert(roffs[i].name[0] >= ASCII_LO);
                assert(roffs[i].name[0] <= ASCII_HI);
 
                assert(roffs[i].name[0] >= ASCII_LO);
                assert(roffs[i].name[0] <= ASCII_HI);
 


@@ -198,13 +243,12 @@ roff_hash_init(void)
        }
 }
 
        }
 }
 

-

 /*
  * Look up a roff token by its name.  Returns ROFF_MAX if no macro by
  * the nil-terminated string name could be found.
  */
 static enum rofft
 /*
  * Look up a roff token by its name.  Returns ROFF_MAX if no macro by
  * the nil-terminated string name could be found.
  */
 static enum rofft

-roff_hash_find(const char *p)
+roff_hash_find(const char *p, size_t s)

 {
        int              buc;
        struct roffmac  *n;
 {
        int              buc;
        struct roffmac  *n;


@@ -224,7 +268,7 @@ roff_hash_find(const char *p)
        if (NULL == (n = hash[buc]))
                return(ROFF_MAX);
        for ( ; n; n = n->next)
        if (NULL == (n = hash[buc]))
                return(ROFF_MAX);
        for ( ; n; n = n->next)

-               if (0 == strcmp(n->name, p))
+               if (0 == strncmp(n->name, p, s) && '\0' == n->name[(int)s])

                        return((enum rofft)(n - roffs));
 
        return(ROFF_MAX);
                        return((enum rofft)(n - roffs));
 
        return(ROFF_MAX);


@@ -243,13 +287,9 @@ roffnode_pop(struct roff *r)
        assert(r->last);
        p = r->last; 
 
        assert(r->last);
        p = r->last; 
 

-       if (ROFF_el == p->tok)
-               if (r->rstackpos > -1)
-                       r->rstackpos--;
-

        r->last = r->last->parent;
        r->last = r->last->parent;

-       if (p->end)
-               free(p->end);
+       free(p->name);
+       free(p->end);

        free(p);
 }
 
        free(p);
 }
 


@@ -259,12 +299,15 @@ roffnode_pop(struct roff *r)
  * removed with roffnode_pop().
  */
 static void
  * removed with roffnode_pop().
  */
 static void

-roffnode_push(struct roff *r, enum rofft tok, int line, int col)
+roffnode_push(struct roff *r, enum rofft tok, const char *name,
+               int line, int col)

 {
        struct roffnode *p;
 
        p = mandoc_calloc(1, sizeof(struct roffnode));
        p->tok = tok;
 {
        struct roffnode *p;
 
        p = mandoc_calloc(1, sizeof(struct roffnode));
        p->tok = tok;

+       if (name)
+               p->name = mandoc_strdup(name);

        p->parent = r->last;
        p->line = line;
        p->col = col;
        p->parent = r->last;
        p->line = line;
        p->col = col;


@@ -277,9 +320,26 @@ roffnode_push(struct roff *r, enum rofft tok, int line, int col)
 static void
 roff_free1(struct roff *r)
 {
 static void
 roff_free1(struct roff *r)
 {

+       struct tbl_node *t;
+       struct eqn_node *e;
+
+       while (NULL != (t = r->first_tbl)) {
+               r->first_tbl = t->next;
+               tbl_free(t);
+       }
+
+       r->first_tbl = r->last_tbl = r->tbl = NULL;
+
+       while (NULL != (e = r->first_eqn)) {
+               r->first_eqn = e->next;
+               eqn_free(e);
+       }
+
+       r->first_eqn = r->last_eqn = r->eqn = NULL;

 
        while (r->last)
                roffnode_pop(r);
 
        while (r->last)
                roffnode_pop(r);

+

        roff_freestr(r);
 }
 
        roff_freestr(r);
 }
 


@@ -287,8 +347,12 @@ roff_free1(struct roff *r)
 void
 roff_reset(struct roff *r)
 {
 void
 roff_reset(struct roff *r)
 {

+       int              i;

 
        roff_free1(r);
 
        roff_free1(r);

+
+       for (i = 0; i < PREDEFS_MAX; i++) 
+               roff_setstr(r, predefs[i].name, predefs[i].str, 0);

 }
 
 
 }
 
 


@@ -302,17 +366,21 @@ roff_free(struct roff *r)
 
 
 struct roff *
 
 
 struct roff *

-roff_alloc(struct regset *regs, void *data, const mandocmsg msg)
+roff_alloc(struct regset *regs, struct mparse *parse)

 {
        struct roff     *r;
 {
        struct roff     *r;

+       int              i;

 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->regs = regs;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->regs = regs;

-       r->msg = msg;
-       r->data = data;
+       r->parse = parse;

        r->rstackpos = -1;
        
        roff_hash_init();
        r->rstackpos = -1;
        
        roff_hash_init();

+
+       for (i = 0; i < PREDEFS_MAX; i++) 
+               roff_setstr(r, predefs[i].name, predefs[i].str, 0);
+

        return(r);
 }
 
        return(r);
 }
 


@@ -323,17 +391,42 @@ roff_alloc(struct regset *regs, void *data, const mandocmsg msg)
  * is processed. 
  */
 static int
  * is processed. 
  */
 static int

-roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
+roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)

 {
 {

-       const char      *cp, *cpp, *st, *res;
+       const char      *stesc; /* start of an escape sequence ('\\') */
+       const char      *stnam; /* start of the name, after "[(*" */
+       const char      *cp;    /* end of the name, e.g. before ']' */
+       const char      *res;   /* the string to be substituted */

        int              i, maxl;
        size_t           nsz;
        char            *n;
 
        int              i, maxl;
        size_t           nsz;
        char            *n;
 

-       /* LINTED */
-       for (cp = &(*bufp)[pos]; (cpp = strstr(cp, "\\*")); cp++) {
-               cp = cpp + 2;
+       /* Search for a leading backslash and save a pointer to it. */
+
+       cp = *bufp + pos;
+       while (NULL != (cp = strchr(cp, '\\'))) {
+               stesc = cp++;
+
+               /*
+                * The second character must be an asterisk.
+                * If it isn't, skip it anyway:  It is escaped,
+                * so it can't start another escape sequence.
+                */
+
+               if ('\0' == *cp)
+                       return(1);
+               if ('*' != *cp++)
+                       continue;
+
+               /*
+                * The third character decides the length
+                * of the name of the string.
+                * Save a pointer to the name.
+                */
+

                switch (*cp) {
                switch (*cp) {

+               case ('\0'):
+                       return(1);

                case ('('):
                        cp++;
                        maxl = 2;
                case ('('):
                        cp++;
                        maxl = 2;


@@ -346,8 +439,9 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
                        maxl = 1;
                        break;
                }
                        maxl = 1;
                        break;
                }

+               stnam = cp;

 
 

-               st = cp;
+               /* Advance to the end of the name. */

 
                for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
                        if ('\0' == *cp)
 
                for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
                        if ('\0' == *cp)


@@ -356,21 +450,25 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
                                break;
                }
 
                                break;
                }
 

-               res = roff_getstrn(r, st, (size_t)i);
+               /*
+                * Retrieve the replacement string; if it is
+                * undefined, resume searching for escapes.
+                */
+
+               res = roff_getstrn(r, stnam, (size_t)i);

 
                if (NULL == res) {
 
                if (NULL == res) {

-                       cp -= maxl ? 1 : 0;
-                       continue;
+                       /* TODO: keep track of the correct position. */
+                       mandoc_msg(MANDOCERR_BADESCAPE, r->parse, ln, pos, NULL);
+                       res = "";

                }
 
                }
 

-               ROFF_DEBUG("roff: splicing reserved: [%.*s]\n", i, st);
+               /* Replace the escape sequence by the string. */

 
                nsz = *szp + strlen(res) + 1;
                n = mandoc_malloc(nsz);
 
 
                nsz = *szp + strlen(res) + 1;
                n = mandoc_malloc(nsz);
 

-               *n = '\0';
-
-               strlcat(n, *bufp, (size_t)(cpp - *bufp + 1));
+               strlcpy(n, *bufp, (size_t)(stesc - *bufp + 1));

                strlcat(n, res, nsz);
                strlcat(n, cp + (maxl ? 0 : 1), nsz);
 
                strlcat(n, res, nsz);
                strlcat(n, cp + (maxl ? 0 : 1), nsz);
 


@@ -390,46 +488,62 @@ roff_parseln(struct roff *r, int ln, char **bufp,
                size_t *szp, int pos, int *offs)
 {
        enum rofft       t;
                size_t *szp, int pos, int *offs)
 {
        enum rofft       t;

-       int              ppos;
+       enum rofferr     e;
+       int              ppos, ctl;

 
        /*
         * Run the reserved-word filter only if we have some reserved
         * words to fill in.
         */
 
 
        /*
         * Run the reserved-word filter only if we have some reserved
         * words to fill in.
         */
 

-       if (r->first_string && ! roff_res(r, bufp, szp, pos))
-               return(ROFF_RERUN);
+       if (r->first_string && ! roff_res(r, bufp, szp, ln, pos))
+               return(ROFF_REPARSE);
+
+       ppos = pos;
+       ctl = mandoc_getcontrol(*bufp, &pos);

 
        /*
         * First, if a scope is open and we're not a macro, pass the
         * text through the macro's filter.  If a scope isn't open and
         * we're not a macro, just let it through.
 
        /*
         * First, if a scope is open and we're not a macro, pass the
         * text through the macro's filter.  If a scope isn't open and
         * we're not a macro, just let it through.

+        * Finally, if there's an equation scope open, divert it into it
+        * no matter our state.

         */
 
         */
 

-       if (r->last && ! ROFF_CTL((*bufp)[pos])) {
+       if (r->last && ! ctl) {

                t = r->last->tok;
                assert(roffs[t].text);
                t = r->last->tok;
                assert(roffs[t].text);

-               ROFF_DEBUG("roff: intercept scoped text: %s, [%s]\n", 
-                               roffs[t].name, &(*bufp)[pos]);
-               return((*roffs[t].text)
-                               (r, t, bufp, szp, 
-                                ln, pos, pos, offs));
-       } else if ( ! ROFF_CTL((*bufp)[pos]))
+               e = (*roffs[t].text)
+                       (r, t, bufp, szp, ln, pos, pos, offs);
+               assert(ROFF_IGN == e || ROFF_CONT == e);
+               if (ROFF_CONT != e)
+                       return(e);
+               if (r->eqn)
+                       return(eqn_read(&r->eqn, ln, *bufp, pos));
+               if (r->tbl)
+                       return(tbl_read(r->tbl, ln, *bufp, pos));
+               return(ROFF_CONT);
+       } else if ( ! ctl) {
+               if (r->eqn)
+                       return(eqn_read(&r->eqn, ln, *bufp, pos));
+               if (r->tbl)
+                       return(tbl_read(r->tbl, ln, *bufp, pos));

                return(ROFF_CONT);
                return(ROFF_CONT);

+       } else if (r->eqn)
+               return(eqn_read(&r->eqn, ln, *bufp, ppos));

 
        /*
         * If a scope is open, go to the child handler for that macro,
         * as it may want to preprocess before doing anything with it.
 
        /*
         * If a scope is open, go to the child handler for that macro,
         * as it may want to preprocess before doing anything with it.

+        * Don't do so if an equation is open.

         */
 
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
         */
 
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);

-               ROFF_DEBUG("roff: intercept scoped context: %s\n", 
-                               roffs[t].name);

                return((*roffs[t].sub)
                                (r, t, bufp, szp, 
                return((*roffs[t].sub)
                                (r, t, bufp, szp, 

-                                ln, pos, pos, offs));
+                                ln, ppos, pos, offs));

        }
 
        /*
        }
 
        /*


@@ -438,12 +552,9 @@ roff_parseln(struct roff *r, int ln, char **bufp,
         * the compilers handle it.
         */
 
         * the compilers handle it.
         */
 

-       ppos = pos;
-       if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
+       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos)))

                return(ROFF_CONT);
 
                return(ROFF_CONT);
 

-       ROFF_DEBUG("roff: intercept new-scope: %s, [%s]\n", 
-                       roffs[t].name, &(*bufp)[pos]);

        assert(roffs[t].proc);
        return((*roffs[t].proc)
                        (r, t, bufp, szp, 
        assert(roffs[t].proc);
        return((*roffs[t].proc)
                        (r, t, bufp, szp, 


@@ -451,50 +562,57 @@ roff_parseln(struct roff *r, int ln, char **bufp,
 }
 
 
 }
 
 

-int
+void

 roff_endparse(struct roff *r)
 {
 
 roff_endparse(struct roff *r)
 {
 

-       if (NULL == r->last)
-               return(1);
-       return((*r->msg)(MANDOCERR_SCOPEEXIT, r->data, r->last->line, 
-                               r->last->col, NULL));
-}
+       if (r->last)
+               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
+                               r->last->line, r->last->col, NULL);
+
+       if (r->eqn) {
+               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
+                               r->eqn->eqn.line, r->eqn->eqn.pos, NULL);
+               eqn_end(r->eqn);
+               r->eqn = NULL;
+       }

 
 

+       if (r->tbl) {
+               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
+                               r->tbl->line, r->tbl->pos, NULL);
+               tbl_end(r->tbl);
+               r->tbl = NULL;
+       }
+}

 
 /*
  * Parse a roff node's type from the input buffer.  This must be in the
  * form of ".foo xxx" in the usual way.
  */
 static enum rofft
 
 /*
  * Parse a roff node's type from the input buffer.  This must be in the
  * form of ".foo xxx" in the usual way.
  */
 static enum rofft

-roff_parse(const char *buf, int *pos)
+roff_parse(struct roff *r, const char *buf, int *pos)

 {
 {

-       int              j;
-       char             mac[5];
+       const char      *mac;
+       size_t           maclen;

        enum rofft       t;
 
        enum rofft       t;
 

-       assert(ROFF_CTL(buf[*pos]));
-       (*pos)++;
-
-       while (buf[*pos] && (' ' == buf[*pos] || '\t' == buf[*pos]))
-               (*pos)++;
-
-       if ('\0' == buf[*pos])
+       if ('\0' == buf[*pos] || '"' == buf[*pos] || 
+                       '\t' == buf[*pos] || ' ' == buf[*pos])

                return(ROFF_MAX);
 
                return(ROFF_MAX);
 

-       for (j = 0; j < 4; j++, (*pos)++)
-               if ('\0' == (mac[j] = buf[*pos]))
-                       break;
-               else if (' ' == buf[*pos] || (j && '\\' == buf[*pos]))
-                       break;
+       /*
+        * We stop the macro parse at an escape, tab, space, or nil.
+        * However, `\}' is also a valid macro, so make sure we don't
+        * clobber it by seeing the `\' as the end of token.
+        */

 
 

-       if (j == 4 || j < 1)
-               return(ROFF_MAX);
+       mac = buf + *pos;
+       maclen = strcspn(mac + 1, " \\\t\0") + 1;

 
 

-       mac[j] = '\0';
+       t = (r->current_string = roff_getstrn(r, mac, maclen))
+           ? ROFF_USERDEF : roff_hash_find(mac, maclen);

 
 

-       if (ROFF_MAX == (t = roff_hash_find(mac)))
-               return(t);
+       *pos += (int)maclen;

 
        while (buf[*pos] && ' ' == buf[*pos])
                (*pos)++;
 
        while (buf[*pos] && ' ' == buf[*pos])
                (*pos)++;


@@ -502,27 +620,6 @@ roff_parse(const char *buf, int *pos)
        return(t);
 }
 
        return(t);
 }
 

-
-static int
-roff_parse_nat(const char *buf, unsigned int *res)
-{
-       char            *ep;
-       long             lval;
-
-       errno = 0;
-       lval = strtol(buf, &ep, 10);
-       if (buf[0] == '\0' || *ep != '\0')
-               return(0);
-       if ((errno == ERANGE && 
-                       (lval == LONG_MAX || lval == LONG_MIN)) ||
-                       (lval > INT_MAX || lval < 0))
-               return(0);
-
-       *res = (unsigned int)lval;
-       return(1);
-}
-
-

 /* ARGSUSED */
 static enum rofferr
 roff_cblock(ROFF_ARGS)
 /* ARGSUSED */
 static enum rofferr
 roff_cblock(ROFF_ARGS)


@@ -534,8 +631,7 @@ roff_cblock(ROFF_ARGS)
         */
 
        if (NULL == r->last) {
         */
 
        if (NULL == r->last) {

-               if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

                return(ROFF_IGN);
        }
 
                return(ROFF_IGN);
        }
 


@@ -547,22 +643,19 @@ roff_cblock(ROFF_ARGS)
        case (ROFF_am1):
                /* FALLTHROUGH */
        case (ROFF_de):
        case (ROFF_am1):
                /* FALLTHROUGH */
        case (ROFF_de):

+               /* ROFF_de1 is remapped to ROFF_de in roff_block(). */

                /* FALLTHROUGH */
        case (ROFF_dei):
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case (ROFF_dei):
                /* FALLTHROUGH */

-       case (ROFF_de1):
-               /* FALLTHROUGH */

        case (ROFF_ig):
                break;
        default:
        case (ROFF_ig):
                break;
        default:

-               if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

                return(ROFF_IGN);
        }
 
        if ((*bufp)[pos])
                return(ROFF_IGN);
        }
 
        if ((*bufp)[pos])

-               if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);

 
        roffnode_pop(r);
        roffnode_cleanscope(r);
 
        roffnode_pop(r);
        roffnode_cleanscope(r);


@@ -589,8 +682,7 @@ roff_ccond(ROFF_ARGS)
 {
 
        if (NULL == r->last) {
 {
 
        if (NULL == r->last) {

-               if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

                return(ROFF_IGN);
        }
 
                return(ROFF_IGN);
        }
 


@@ -602,20 +694,17 @@ roff_ccond(ROFF_ARGS)
        case (ROFF_if):
                break;
        default:
        case (ROFF_if):
                break;
        default:

-               if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

                return(ROFF_IGN);
        }
 
        if (r->last->endspan > -1) {
                return(ROFF_IGN);
        }
 
        if (r->last->endspan > -1) {

-               if ( ! (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

                return(ROFF_IGN);
        }
 
        if ((*bufp)[pos])
                return(ROFF_IGN);
        }
 
        if ((*bufp)[pos])

-               if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);

 
        roffnode_pop(r);
        roffnode_cleanscope(r);
 
        roffnode_pop(r);
        roffnode_cleanscope(r);


@@ -629,26 +718,54 @@ roff_block(ROFF_ARGS)
 {
        int             sv;
        size_t          sz;
 {
        int             sv;
        size_t          sz;

+       char            *name;

 
 

-       if (ROFF_ig != tok && '\0' == (*bufp)[pos]) {
-               if ( ! (*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
-               return(ROFF_IGN);
-       } else if (ROFF_ig != tok) {
-               while ((*bufp)[pos] && ' ' != (*bufp)[pos])
-                       pos++;
-               while (' ' == (*bufp)[pos])
+       name = NULL;
+
+       if (ROFF_ig != tok) {
+               if ('\0' == (*bufp)[pos]) {
+                       mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
+                       return(ROFF_IGN);
+               }
+
+               /*
+                * Re-write `de1', since we don't really care about
+                * groff's strange compatibility mode, into `de'.
+                */
+
+               if (ROFF_de1 == tok)
+                       tok = ROFF_de;
+               if (ROFF_de == tok)
+                       name = *bufp + pos;
+               else
+                       mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,
+                           roffs[tok].name);
+
+               while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))

                        pos++;
                        pos++;

+
+               while (isspace((unsigned char)(*bufp)[pos]))
+                       (*bufp)[pos++] = '\0';

        }
 
        }
 

-       roffnode_push(r, tok, ln, ppos);
+       roffnode_push(r, tok, name, ln, ppos);
+
+       /*
+        * At the beginning of a `de' macro, clear the existing string
+        * with the same name, if there is one.  New content will be
+        * added from roff_block_text() in multiline mode.
+        */
+
+       if (ROFF_de == tok)
+               roff_setstr(r, name, "", 0);

 
        if ('\0' == (*bufp)[pos])
                return(ROFF_IGN);
 
 
        if ('\0' == (*bufp)[pos])
                return(ROFF_IGN);
 

+       /* If present, process the custom end-of-line marker. */
+

        sv = pos;
        sv = pos;

-       while ((*bufp)[pos] && ' ' != (*bufp)[pos] && 
-                       '\t' != (*bufp)[pos])
+       while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))

                pos++;
 
        /*
                pos++;
 
        /*


@@ -669,8 +786,7 @@ roff_block(ROFF_ARGS)
        r->last->end[(int)sz] = '\0';
 
        if ((*bufp)[pos])
        r->last->end[(int)sz] = '\0';
 
        if ((*bufp)[pos])

-               if ( ! (*r->msg)(MANDOCERR_ARGSLOST, r->data, ln, pos, NULL))
-                       return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);

 
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }


@@ -693,11 +809,7 @@ roff_block_sub(ROFF_ARGS)
         */
 
        if (r->last->end) {
         */
 
        if (r->last->end) {

-               i = pos + 1;
-               while (' ' == (*bufp)[i] || '\t' == (*bufp)[i])
-                       i++;
-
-               for (j = 0; r->last->end[j]; j++, i++)
+               for (i = pos, j = 0; r->last->end[j]; j++, i++)

                        if ((*bufp)[i] != r->last->end[j])
                                break;
 
                        if ((*bufp)[i] != r->last->end[j])
                                break;
 


@@ -708,7 +820,11 @@ roff_block_sub(ROFF_ARGS)
                        roffnode_pop(r);
                        roffnode_cleanscope(r);
 
                        roffnode_pop(r);
                        roffnode_cleanscope(r);
 

-                       if (ROFF_MAX != roff_parse(*bufp, &pos))
+                       while (' ' == (*bufp)[i] || '\t' == (*bufp)[i])
+                               i++;
+
+                       pos = i;
+                       if (ROFF_MAX != roff_parse(r, *bufp, &pos))

                                return(ROFF_RERUN);
                        return(ROFF_IGN);
                }
                                return(ROFF_RERUN);
                        return(ROFF_IGN);
                }


@@ -719,12 +835,17 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
         * pulling it out of the hashtable.
         */
 

-       ppos = pos;
-       t = roff_parse(*bufp, &pos);
+       t = roff_parse(r, *bufp, &pos);

 
 

-       /* If we're not a comment-end, then throw it away. */
-       if (ROFF_cblock != t)
+       /*
+        * Macros other than block-end are only significant
+        * in `de' blocks; elsewhere, simply throw them away.
+        */
+       if (ROFF_cblock != t) {
+               if (ROFF_de == tok)
+                       roff_setstr(r, r->last->name, *bufp + ppos, 1);

                return(ROFF_IGN);
                return(ROFF_IGN);

+       }

 
        assert(roffs[t].proc);
        return((*roffs[t].proc)(r, t, bufp, szp, 
 
        assert(roffs[t].proc);
        return((*roffs[t].proc)(r, t, bufp, szp, 


@@ -737,6 +858,9 @@ static enum rofferr
 roff_block_text(ROFF_ARGS)
 {
 
 roff_block_text(ROFF_ARGS)
 {
 

+       if (ROFF_de == tok)
+               roff_setstr(r, r->last->name, *bufp + pos, 1);
+

        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 


@@ -747,30 +871,53 @@ roff_cond_sub(ROFF_ARGS)
 {
        enum rofft       t;
        enum roffrule    rr;
 {
        enum rofft       t;
        enum roffrule    rr;

-       struct roffnode *l;
+       char            *ep;

 
 

-       ppos = pos;

        rr = r->last->rule;
        rr = r->last->rule;

-
-       /* 
-        * Clean out scope.  If we've closed ourselves, then don't
-        * continue. 
-        */
-
-       l = r->last;

        roffnode_cleanscope(r);
 
        roffnode_cleanscope(r);
 

-       if (l != r->last)
-               return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
+       /*
+        * If the macro is unknown, first check if it contains a closing
+        * delimiter `\}'.  If it does, close out our scope and return
+        * the currently-scoped rule (ignore or continue).  Else, drop
+        * into the currently-scoped rule.
+        */

 
 

-       if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
+       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) {
+               ep = &(*bufp)[pos];
+               for ( ; NULL != (ep = strchr(ep, '\\')); ep++) {
+                       ep++;
+                       if ('}' != *ep)
+                               continue;
+
+                       /*
+                        * Make the \} go away.
+                        * This is a little haphazard, as it's not quite
+                        * clear how nroff does this.
+                        * If we're at the end of line, then just chop
+                        * off the \} and resize the buffer.
+                        * If we aren't, then conver it to spaces.
+                        */
+
+                       if ('\0' == *(ep + 1)) {
+                               *--ep = '\0';
+                               *szp -= 2;
+                       } else
+                               *(ep - 1) = *ep = ' ';
+
+                       roff_ccond(r, ROFF_ccond, bufp, szp, 
+                                       ln, pos, pos + 2, offs);
+                       break;
+               }

                return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
                return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);

+       }

 
        /*
         * A denied conditional must evaluate its children if and only
         * if they're either structurally required (such as loops and
         * conditionals) or a closing macro.
         */
 
        /*
         * A denied conditional must evaluate its children if and only
         * if they're either structurally required (such as loops and
         * conditionals) or a closing macro.
         */

+

        if (ROFFRULE_DENY == rr)
                if ( ! (ROFFMAC_STRUCT & roffs[t].flags))
                        if (ROFF_ccond != t)
        if (ROFFRULE_DENY == rr)
                if ( ! (ROFFMAC_STRUCT & roffs[t].flags))
                        if (ROFF_ccond != t)


@@ -781,35 +928,28 @@ roff_cond_sub(ROFF_ARGS)
                                ln, ppos, pos, offs));
 }
 
                                ln, ppos, pos, offs));
 }
 

-

 /* ARGSUSED */
 static enum rofferr
 roff_cond_text(ROFF_ARGS)
 {
 /* ARGSUSED */
 static enum rofferr
 roff_cond_text(ROFF_ARGS)
 {

-       char            *ep, *st;
+       char            *ep;

        enum roffrule    rr;
 
        rr = r->last->rule;
        enum roffrule    rr;
 
        rr = r->last->rule;

+       roffnode_cleanscope(r);

 
 

-       /*
-        * We display the value of the text if out current evaluation
-        * scope permits us to do so.
-        */
-
-       st = &(*bufp)[pos];
-       if (NULL == (ep = strstr(st, "\\}"))) {
-               roffnode_cleanscope(r);
-               return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
+       ep = &(*bufp)[pos];
+       for ( ; NULL != (ep = strchr(ep, '\\')); ep++) {
+               ep++;
+               if ('}' != *ep)
+                       continue;
+               *ep = '&';
+               roff_ccond(r, ROFF_ccond, bufp, szp, 
+                               ln, pos, pos + 2, offs);

        }
        }

-
-       if (ep == st || (ep > st && '\\' != *(ep - 1)))
-               roffnode_pop(r);
-
-       roffnode_cleanscope(r);

        return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 }
 
        return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 }
 

-

 static enum roffrule
 roff_evalcond(const char *v, int *pos)
 {
 static enum roffrule
 roff_evalcond(const char *v, int *pos)
 {


@@ -834,16 +974,17 @@ roff_evalcond(const char *v, int *pos)
        return(ROFFRULE_DENY);
 }
 
        return(ROFFRULE_DENY);
 }
 

-

 /* ARGSUSED */
 static enum rofferr
 /* ARGSUSED */
 static enum rofferr

-roff_line(ROFF_ARGS)
+roff_line_ignore(ROFF_ARGS)

 {
 
 {
 

+       if (ROFF_it == tok)
+               mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, "it");
+

        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-

 /* ARGSUSED */
 static enum rofferr
 roff_cond(ROFF_ARGS)
 /* ARGSUSED */
 static enum rofferr
 roff_cond(ROFF_ARGS)


@@ -851,29 +992,20 @@ roff_cond(ROFF_ARGS)
        int              sv;
        enum roffrule    rule;
 
        int              sv;
        enum roffrule    rule;
 

-       /* Stack overflow! */
-
-       if (ROFF_ie == tok && r->rstackpos == RSTACK_MAX - 1) {
-               (*r->msg)(MANDOCERR_MEM, r->data, ln, ppos, NULL);
-               return(ROFF_ERR);
-       }
-
-       /* First, evaluate the conditional. */
+       /* 
+        * An `.el' has no conditional body: it will consume the value
+        * of the current rstack entry set in prior `ie' calls or
+        * defaults to DENY.  
+        *
+        * If we're not an `el', however, then evaluate the conditional.
+        */

 
 

-       if (ROFF_el == tok) {
-               /* 
-                * An `.el' will get the value of the current rstack
-                * entry set in prior `ie' calls or defaults to DENY.
-                */
-               if (r->rstackpos < 0)
-                       rule = ROFFRULE_DENY;
-               else
-                       rule = r->rstack[r->rstackpos];
-       } else
-               rule = roff_evalcond(*bufp, &pos);
+       rule = ROFF_el == tok ?
+               (r->rstackpos < 0 ? 
+                ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
+               roff_evalcond(*bufp, &pos);

 
        sv = pos;
 
        sv = pos;

-

        while (' ' == (*bufp)[pos])
                pos++;
 
        while (' ' == (*bufp)[pos])
                pos++;
 


@@ -885,37 +1017,34 @@ roff_cond(ROFF_ARGS)
         */
 
        if ('\0' == (*bufp)[pos] && sv != pos) {
         */
 
        if ('\0' == (*bufp)[pos] && sv != pos) {

-               if ((*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL))
-                       return(ROFF_IGN);
-               return(ROFF_ERR);
+               mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
+               return(ROFF_IGN);

        }
 
        }
 

-       roffnode_push(r, tok, ln, ppos);
+       roffnode_push(r, tok, NULL, ln, ppos);

 
        r->last->rule = rule;
 
 
        r->last->rule = rule;
 

-       ROFF_DEBUG("roff: cond: %s -> %s\n", roffs[tok].name, 
-                       ROFFRULE_ALLOW == rule ?  "allow" : "deny");
+       /*
+        * An if-else will put the NEGATION of the current evaluated
+        * conditional into the stack of rules.
+        */

 
        if (ROFF_ie == tok) {
 
        if (ROFF_ie == tok) {

-               /*
-                * An if-else will put the NEGATION of the current
-                * evaluated conditional into the stack.
-                */
-               r->rstackpos++;
-               if (ROFFRULE_DENY == r->last->rule)
-                       r->rstack[r->rstackpos] = ROFFRULE_ALLOW;
-               else
-                       r->rstack[r->rstackpos] = ROFFRULE_DENY;
+               if (r->rstackpos == RSTACK_MAX - 1) {
+                       mandoc_msg(MANDOCERR_MEM, 
+                               r->parse, ln, ppos, NULL);
+                       return(ROFF_ERR);
+               }
+               r->rstack[++r->rstackpos] = 
+                       ROFFRULE_DENY == r->last->rule ?
+                       ROFFRULE_ALLOW : ROFFRULE_DENY;

        }
 
        /* If the parent has false as its rule, then so do we. */
 
        }
 
        /* If the parent has false as its rule, then so do we. */
 

-       if (r->last->parent && ROFFRULE_DENY == r->last->parent->rule) {
+       if (r->last->parent && ROFFRULE_DENY == r->last->parent->rule)

                r->last->rule = ROFFRULE_DENY;
                r->last->rule = ROFFRULE_DENY;

-               ROFF_DEBUG("roff: cond override: %s -> deny\n",
-                               roffs[tok].name);
-       }

 
        /*
         * Determine scope.  If we're invoked with "\{" trailing the
 
        /*
         * Determine scope.  If we're invoked with "\{" trailing the


@@ -928,11 +1057,7 @@ roff_cond(ROFF_ARGS)
        if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) {
                r->last->endspan = -1;
                pos += 2;
        if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) {
                r->last->endspan = -1;
                pos += 2;

-               ROFF_DEBUG("roff: cond-scope: %s, multi-line\n", 
-                               roffs[tok].name);
-       } else
-               ROFF_DEBUG("roff: cond-scope: %s, one-line\n", 
-                               roffs[tok].name);
+       } 

 
        /*
         * If there are no arguments on the line, the next-line scope is
 
        /*
         * If there are no arguments on the line, the next-line scope is


@@ -965,29 +1090,17 @@ roff_ds(ROFF_ARGS)
         * will have `bar  "     ' as its value.
         */
 
         * will have `bar  "     ' as its value.
         */
 

-       name = *bufp + pos;
+       string = *bufp + pos;
+       name = roff_getname(r, &string, ln, pos);

        if ('\0' == *name)
                return(ROFF_IGN);
 
        if ('\0' == *name)
                return(ROFF_IGN);
 

-       string = name;
-       /* Read until end of name. */
-       while (*string && ' ' != *string)
-               string++;
-
-       /* Nil-terminate name. */
-       if (*string)
-               *(string++) = '\0';
-       
-       /* Read past spaces. */
-       while (*string && ' ' == *string)
-               string++;
-
-       /* Read passed initial double-quote. */
-       if (*string && '"' == *string)
+       /* Read past initial double-quote. */
+       if ('"' == *string)

                string++;
 
        /* The rest is the value. */
                string++;
 
        /* The rest is the value. */

-       roff_setstr(r, name, string);
+       roff_setstr(r, name, string, 0);

        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 


@@ -996,68 +1109,299 @@ roff_ds(ROFF_ARGS)
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {

-       const char      *key, *val;
+       const char      *key;
+       char            *val;
+       int              iv;

        struct reg      *rg;
 
        struct reg      *rg;
 

-       key = &(*bufp)[pos];
+       val = *bufp + pos;
+       key = roff_getname(r, &val, ln, pos);

        rg = r->regs->regs;
 
        rg = r->regs->regs;
 

-       /* Parse register request. */
-       while ((*bufp)[pos] && ' ' != (*bufp)[pos])
-               pos++;
+       if (0 == strcmp(key, "nS")) {
+               rg[(int)REG_nS].set = 1;
+               if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
+                       rg[REG_nS].v.u = (unsigned)iv;
+               else
+                       rg[(int)REG_nS].v.u = 0u;
+       }
+
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_rm(ROFF_ARGS)
+{
+       const char       *name;
+       char             *cp;
+
+       cp = *bufp + pos;
+       while ('\0' != *cp) {
+               name = roff_getname(r, &cp, ln, (int)(cp - *bufp));
+               if ('\0' != *name)
+                       roff_setstr(r, name, NULL, 0);
+       }
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_TE(ROFF_ARGS)
+{
+
+       if (NULL == r->tbl)
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+       else
+               tbl_end(r->tbl);
+
+       r->tbl = NULL;
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_T_(ROFF_ARGS)
+{
+
+       if (NULL == r->tbl)
+               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+       else
+               tbl_restart(ppos, ln, r->tbl);
+
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_EQ(ROFF_ARGS)
+{
+       struct eqn_node *e;
+
+       assert(NULL == r->eqn);
+       e = eqn_alloc(ppos, ln);
+
+       if (r->last_eqn)
+               r->last_eqn->next = e;
+       else
+               r->first_eqn = r->last_eqn = e;
+
+       r->eqn = r->last_eqn = e;
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_EN(ROFF_ARGS)
+{
+
+       mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_TS(ROFF_ARGS)
+{
+       struct tbl_node *t;
+
+       if (r->tbl) {
+               mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
+               tbl_end(r->tbl);
+       }
+
+       t = tbl_alloc(ppos, ln, r->parse);
+
+       if (r->last_tbl)
+               r->last_tbl->next = t;
+       else
+               r->first_tbl = r->last_tbl = t;
+
+       r->tbl = r->last_tbl = t;
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_so(ROFF_ARGS)
+{
+       char *name;
+
+       mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL);

 
        /*
 
        /*

-        * Set our nil terminator.  Because this line is going to be
-        * ignored anyway, we can munge it as we please.
+        * Handle `so'.  Be EXTREMELY careful, as we shouldn't be
+        * opening anything that's not in our cwd or anything beneath
+        * it.  Thus, explicitly disallow traversing up the file-system
+        * or using absolute paths.

         */
         */

-       if ((*bufp)[pos])
-               (*bufp)[pos++] = '\0';

 
 

-       /* Skip whitespace to register token. */
-       while ((*bufp)[pos] && ' ' == (*bufp)[pos])
-               pos++;
+       name = *bufp + pos;
+       if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
+               mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL);
+               return(ROFF_ERR);
+       }
+
+       *offs = pos;
+       return(ROFF_SO);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_userdef(ROFF_ARGS)
+{
+       const char       *arg[9];
+       char             *cp, *n1, *n2;
+       int               i;
+
+       /*
+        * Collect pointers to macro argument strings
+        * and null-terminate them.
+        */
+       cp = *bufp + pos;
+       for (i = 0; i < 9; i++)
+               arg[i] = '\0' == *cp ? "" :
+                   mandoc_getarg(r->parse, &cp, ln, &pos);
+
+       /*
+        * Expand macro arguments.
+        */
+       *szp = 0;
+       n1 = cp = mandoc_strdup(r->current_string);
+       while (NULL != (cp = strstr(cp, "\\$"))) {
+               i = cp[2] - '1';
+               if (0 > i || 8 < i) {
+                       /* Not an argument invocation. */
+                       cp += 2;
+                       continue;
+               }

 
 

-       val = &(*bufp)[pos];
+               *szp = strlen(n1) - 3 + strlen(arg[i]) + 1;
+               n2 = mandoc_malloc(*szp);

 
 

-       /* Process register token. */
+               strlcpy(n2, n1, (size_t)(cp - n1 + 1));
+               strlcat(n2, arg[i], *szp);
+               strlcat(n2, cp + 3, *szp);

 
 

-       if (0 == strcmp(key, "nS")) {
-               rg[(int)REG_nS].set = 1;
-               if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u))
-                       rg[(int)REG_nS].v.u = 0;
+               cp = n2 + (cp - n1);
+               free(n1);
+               n1 = n2;
+       }

 
 

-               ROFF_DEBUG("roff: register nS: %u\n", 
-                               rg[(int)REG_nS].v.u);
-       } else
-               ROFF_DEBUG("roff: ignoring register: %s\n", key);
+       /*
+        * Replace the macro invocation
+        * by the expanded macro.
+        */
+       free(*bufp);
+       *bufp = n1;
+       if (0 == *szp)
+               *szp = strlen(*bufp) + 1;

 
 

-       return(ROFF_IGN);
+       return(*szp > 1 && '\n' == (*bufp)[(int)*szp - 2] ?
+          ROFF_REPARSE : ROFF_APPEND);

 }
 
 }
 

+static char *
+roff_getname(struct roff *r, char **cpp, int ln, int pos)
+{
+       char     *name, *cp;
+
+       name = *cpp;
+       if ('\0' == *name)
+               return(name);
+
+       /* Read until end of name. */
+       for (cp = name; '\0' != *cp && ' ' != *cp; cp++) {
+               if ('\\' != *cp)
+                       continue;
+               cp++;
+               if ('\\' == *cp)
+                       continue;
+               mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL);
+               *cp = '\0';
+               name = cp;
+       }
+
+       /* Nil-terminate name. */
+       if ('\0' != *cp)
+               *(cp++) = '\0';
+
+       /* Read past spaces. */
+       while (' ' == *cp)
+               cp++;

 
 

+       *cpp = cp;
+       return(name);
+}
+
+/*
+ * Store *string into the user-defined string called *name.
+ * In multiline mode, append to an existing entry and append '\n';
+ * else replace the existing entry, if there is one.
+ * To clear an existing entry, call with (*r, *name, NULL, 0).
+ */

 static void
 static void

-roff_setstr(struct roff *r, const char *name, const char *string)
+roff_setstr(struct roff *r, const char *name, const char *string,
+       int multiline)

 {
        struct roffstr   *n;
 {
        struct roffstr   *n;

-       char             *namecopy;
+       char             *c;
+       size_t            oldch, newch;

 
 

+       /* Search for an existing string with the same name. */

        n = r->first_string;
        while (n && strcmp(name, n->name))
                n = n->next;
 
        if (NULL == n) {
        n = r->first_string;
        while (n && strcmp(name, n->name))
                n = n->next;
 
        if (NULL == n) {

-               namecopy = mandoc_strdup(name);
+               /* Create a new string table entry. */

                n = mandoc_malloc(sizeof(struct roffstr));
                n = mandoc_malloc(sizeof(struct roffstr));

-               n->name = namecopy;
+               n->name = mandoc_strdup(name);
+               n->string = NULL;

                n->next = r->first_string;
                r->first_string = n;
                n->next = r->first_string;
                r->first_string = n;

-       } else
+       } else if (0 == multiline) {
+               /* In multiline mode, append; else replace. */

                free(n->string);
                free(n->string);

+               n->string = NULL;
+       }

 
 

-       ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, string);
-       n->string = string ? strdup(string) : NULL;
-}
+       if (NULL == string)
+               return;
+
+       /*
+        * One additional byte for the '\n' in multiline mode,
+        * and one for the terminating '\0'.
+        */
+       newch = strlen(string) + (multiline ? 2u : 1u);
+       if (NULL == n->string) {
+               n->string = mandoc_malloc(newch);
+               *n->string = '\0';
+               oldch = 0;
+       } else {
+               oldch = strlen(n->string);
+               n->string = mandoc_realloc(n->string, oldch + newch);
+       }

 
 

+       /* Skip existing content in the destination buffer. */
+       c = n->string + (int)oldch;
+
+       /* Append new content to the destination buffer. */
+       while (*string) {
+               /*
+                * Rudimentary roff copy mode:
+                * Handle escaped backslashes.
+                */
+               if ('\\' == *string && '\\' == *(string + 1))
+                       string++;
+               *c++ = *string++;
+       }
+
+       /* Append terminating bytes. */
+       if (multiline)
+               *c++ = '\n';
+       *c = '\0';
+}

 
 static const char *
 roff_getstrn(const struct roff *r, const char *name, size_t len)
 
 static const char *
 roff_getstrn(const struct roff *r, const char *name, size_t len)


@@ -1071,7 +1415,6 @@ roff_getstrn(const struct roff *r, const char *name, size_t len)
        return(n ? n->string : NULL);
 }
 
        return(n ? n->string : NULL);
 }
 

-

 static void
 roff_freestr(struct roff *r)
 {
 static void
 roff_freestr(struct roff *r)
 {


@@ -1086,3 +1429,17 @@ roff_freestr(struct roff *r)
 
        r->first_string = NULL;
 }
 
        r->first_string = NULL;
 }

+
+const struct tbl_span *
+roff_span(const struct roff *r)
+{
+       
+       return(r->tbl ? tbl_span(r->tbl) : NULL);
+}
+
+const struct eqn *
+roff_eqn(const struct roff *r)
+{
+       
+       return(r->last_eqn ? &r->last_eqn->eqn : NULL);
+}