Some release notes (this isn't signalling an impending release; I just

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 561062280d3ccb94cc83b2846b2be633fa901a64..e36138c830978084b07ca3c02da3fd34d205e149 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.121 2011/01/11 00:11:45 schwarze Exp $ */
+/*     $Id: roff.c,v 1.138 2011/05/14 16:06:08 kristaps Exp $ */

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


@@ -20,23 +20,16 @@
 #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"
 
 #define        RSTACK_MAX      128
 
 #include "libroff.h"
 #include "libmandoc.h"
 
 #define        RSTACK_MAX      128
 

-#define        ROFF_CTL(c) \
-       ('.' == (c) || '\'' == (c))
-

 enum   rofft {
        ROFF_ad,
        ROFF_am,
 enum   rofft {
        ROFF_ad,
        ROFF_am,


@@ -51,15 +44,21 @@ enum        rofft {
        ROFF_ie,
        ROFF_if,
        ROFF_ig,
        ROFF_ie,
        ROFF_if,
        ROFF_ig,

+       ROFF_it,

        ROFF_ne,
        ROFF_nh,
        ROFF_nr,
        ROFF_ne,
        ROFF_nh,
        ROFF_nr,

+       ROFF_ns,
+       ROFF_ps,

        ROFF_rm,
        ROFF_so,
        ROFF_rm,
        ROFF_so,

+       ROFF_ta,

        ROFF_tr,
        ROFF_TS,
        ROFF_TE,
        ROFF_T_,
        ROFF_tr,
        ROFF_TS,
        ROFF_TE,
        ROFF_T_,

+       ROFF_EQ,
+       ROFF_EN,

        ROFF_cblock,
        ROFF_ccond, /* FIXME: remove this. */
        ROFF_USERDEF,
        ROFF_cblock,
        ROFF_ccond, /* FIXME: remove this. */
        ROFF_USERDEF,


@@ -78,9 +77,8 @@ 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 */


@@ -89,6 +87,9 @@ struct        roff {
        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 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 {


@@ -138,15 +139,17 @@ static    char            *roff_getname(struct roff *, char **, int, int);
 static const char      *roff_getstrn(const struct roff *, 
                                const char *, size_t);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);
 static const char      *roff_getstrn(const struct roff *, 
                                const char *, size_t);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);

-static enum rofferr     roff_line_error(ROFF_ARGS);

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

+static enum rofferr     roff_rm(ROFF_ARGS);

 static void             roff_setstr(struct roff *,
                                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 void             roff_setstr(struct roff *,
                                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);
 
 static enum rofferr     roff_T_(ROFF_ARGS);
 static enum rofferr     roff_userdef(ROFF_ARGS);
 


@@ -172,15 +175,21 @@ static    struct roffmac   roffs[ROFF_MAX] = {
        { "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 },

+       { "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 },
        { "ne", roff_line_ignore, NULL, NULL, 0, NULL },
        { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
        { "nr", roff_nr, NULL, NULL, 0, NULL },

-       { "rm", roff_line_error, 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 },
        { "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 },
        { "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 },
        { NULL, roff_userdef, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "\\}", roff_ccond, NULL, NULL, 0, NULL },
        { NULL, roff_userdef, NULL, NULL, 0, NULL },


@@ -194,7 +203,6 @@ static      void             roffnode_push(struct roff *, enum rofft,
                                const char *, int, int);
 static void             roffnode_pop(struct roff *);
 static enum rofft       roff_parse(struct roff *, const char *, int *);
                                const char *, int, int);
 static void             roffnode_pop(struct roff *);
 static enum rofft       roff_parse(struct roff *, const char *, int *);

-static int              roff_parse_nat(const char *, unsigned 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)


@@ -265,10 +273,6 @@ 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;
        free(p->name);
        free(p->end);
        r->last = r->last->parent;
        free(p->name);
        free(p->end);


@@ -303,15 +307,22 @@ static void
 roff_free1(struct roff *r)
 {
        struct tbl_node *t;
 roff_free1(struct roff *r)
 {
        struct tbl_node *t;

+       struct eqn_node *e;

 
 

-       while (r->first_tbl) {
-               t = r->first_tbl;
+       while (NULL != (t = r->first_tbl)) {

                r->first_tbl = t->next;
                tbl_free(t);
        }
 
        r->first_tbl = r->last_tbl = r->tbl = NULL;
 
                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);
 


@@ -337,14 +348,13 @@ 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;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->regs = regs;
 {
        struct roff     *r;
 
        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();


@@ -455,7 +465,7 @@ roff_parseln(struct roff *r, int ln, char **bufp,
 {
        enum rofft       t;
        enum rofferr     e;
 {
        enum rofft       t;
        enum rofferr     e;

-       int              ppos;
+       int              ppos, ctl;

 
        /*
         * Run the reserved-word filter only if we have some reserved
 
        /*
         * Run the reserved-word filter only if we have some reserved


@@ -465,30 +475,43 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->first_string && ! roff_res(r, bufp, szp, pos))
                return(ROFF_REPARSE);
 
        if (r->first_string && ! roff_res(r, bufp, szp, 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);
                e = (*roffs[t].text)
                        (r, t, bufp, szp, ln, pos, pos, offs);
                assert(ROFF_IGN == e || ROFF_CONT == e);
                t = r->last->tok;
                assert(roffs[t].text);
                e = (*roffs[t].text)
                        (r, t, bufp, szp, ln, pos, pos, offs);
                assert(ROFF_IGN == e || ROFF_CONT == e);

-               if (ROFF_CONT == e && r->tbl)
-                       return(tbl_read(r->tbl, ln, *bufp, *offs));
-               return(e);
-       } else if ( ! ROFF_CTL((*bufp)[pos])) {
+               if (ROFF_CONT != e)
+                       return(e);
+               if (r->eqn)
+                       return(eqn_read(&r->eqn, ln, *bufp, pos));

                if (r->tbl)
                if (r->tbl)

-                       return(tbl_read(r->tbl, ln, *bufp, *offs));
+                       return(tbl_read(r->tbl, ln, *bufp, pos));

                return(ROFF_CONT);
                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);
+       } 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) {
         */
 
        if (r->last) {


@@ -496,7 +519,7 @@ roff_parseln(struct roff *r, int ln, char **bufp,
                assert(roffs[t].sub);
                return((*roffs[t].sub)
                                (r, t, bufp, szp, 
                assert(roffs[t].sub);
                return((*roffs[t].sub)
                                (r, t, bufp, szp, 

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

        }
 
        /*
        }
 
        /*


@@ -505,7 +528,6 @@ 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(r, *bufp, &pos)))
                return(ROFF_CONT);
 
        if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos)))
                return(ROFF_CONT);
 


@@ -521,18 +543,24 @@ roff_endparse(struct roff *r)
 {
 
        if (r->last)
 {
 
        if (r->last)

-               (*r->msg)(MANDOCERR_SCOPEEXIT, r->data,
+               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,

                                r->last->line, r->last->col, NULL);
 
                                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) {
        if (r->tbl) {

-               (*r->msg)(MANDOCERR_SCOPEEXIT, r->data, 
+               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 

                                r->tbl->line, r->tbl->pos, NULL);
                tbl_end(r->tbl);
                r->tbl = NULL;
        }
 }
 
                                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.
 /*
  * Parse a roff node's type from the input buffer.  This must be in the
  * form of ".foo xxx" in the usual way.


@@ -544,13 +572,7 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        size_t           maclen;
        enum rofft       t;
 
        size_t           maclen;
        enum rofft       t;
 

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

                return(ROFF_MAX);
 
        mac = buf + *pos;
                return(ROFF_MAX);
 
        mac = buf + *pos;


@@ -559,34 +581,14 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        t = (r->current_string = roff_getstrn(r, mac, maclen))
            ? ROFF_USERDEF : roff_hash_find(mac, maclen);
 
        t = (r->current_string = roff_getstrn(r, mac, maclen))
            ? ROFF_USERDEF : roff_hash_find(mac, maclen);
 

-       *pos += maclen;
+       *pos += (int)maclen;
+

        while (buf[*pos] && ' ' == buf[*pos])
                (*pos)++;
 
        return(t);
 }
 
        while (buf[*pos] && ' ' == buf[*pos])
                (*pos)++;
 
        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)


@@ -598,7 +600,7 @@ roff_cblock(ROFF_ARGS)
         */
 
        if (NULL == r->last) {
         */
 
        if (NULL == r->last) {

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

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


@@ -617,12 +619,12 @@ roff_cblock(ROFF_ARGS)
        case (ROFF_ig):
                break;
        default:
        case (ROFF_ig):
                break;
        default:

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

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

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

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


@@ -649,7 +651,7 @@ roff_ccond(ROFF_ARGS)
 {
 
        if (NULL == r->last) {
 {
 
        if (NULL == r->last) {

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

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


@@ -661,17 +663,17 @@ roff_ccond(ROFF_ARGS)
        case (ROFF_if):
                break;
        default:
        case (ROFF_if):
                break;
        default:

-               (*r->msg)(MANDOCERR_NOSCOPE, r->data, ln, ppos, NULL);
+               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) {

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

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

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

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


@@ -691,7 +693,7 @@ roff_block(ROFF_ARGS)
 
        if (ROFF_ig != tok) {
                if ('\0' == (*bufp)[pos]) {
 
        if (ROFF_ig != tok) {
                if ('\0' == (*bufp)[pos]) {

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

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


@@ -705,13 +707,13 @@ roff_block(ROFF_ARGS)
                if (ROFF_de == tok)
                        name = *bufp + pos;
                else
                if (ROFF_de == tok)
                        name = *bufp + pos;
                else

-                       (*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos,
+                       mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,

                            roffs[tok].name);
 
                            roffs[tok].name);
 

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

                        pos++;
 
                        pos++;
 

-               while (' ' == (*bufp)[pos])
+               while (isspace((unsigned char)(*bufp)[pos]))

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


@@ -732,9 +734,7 @@ roff_block(ROFF_ARGS)
        /* If present, process the custom end-of-line marker. */
 
        sv = pos;
        /* If present, process the custom end-of-line marker. */
 
        sv = pos;

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

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


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

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

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


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


@@ -793,6 +789,10 @@ roff_block_sub(ROFF_ARGS)
                        roffnode_pop(r);
                        roffnode_cleanscope(r);
 
                        roffnode_pop(r);
                        roffnode_cleanscope(r);
 

+                       while (' ' == (*bufp)[i] || '\t' == (*bufp)[i])
+                               i++;
+
+                       pos = i;

                        if (ROFF_MAX != roff_parse(r, *bufp, &pos))
                                return(ROFF_RERUN);
                        return(ROFF_IGN);
                        if (ROFF_MAX != roff_parse(r, *bufp, &pos))
                                return(ROFF_RERUN);
                        return(ROFF_IGN);


@@ -804,7 +804,6 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
         * pulling it out of the hashtable.
         */
 

-       ppos = pos;

        t = roff_parse(r, *bufp, &pos);
 
        /*
        t = roff_parse(r, *bufp, &pos);
 
        /*


@@ -842,7 +841,6 @@ roff_cond_sub(ROFF_ARGS)
        enum rofft       t;
        enum roffrule    rr;
 
        enum rofft       t;
        enum roffrule    rr;
 

-       ppos = pos;

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


@@ -935,15 +933,9 @@ static enum rofferr
 roff_line_ignore(ROFF_ARGS)
 {
 
 roff_line_ignore(ROFF_ARGS)
 {
 

-       return(ROFF_IGN);
-}
-
-/* ARGSUSED */
-static enum rofferr
-roff_line_error(ROFF_ARGS)
-{
+       if (ROFF_it == tok)
+               mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, "it");

 
 

-       (*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos, roffs[tok].name);

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


@@ -954,29 +946,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++;
 


@@ -988,7 +971,7 @@ roff_cond(ROFF_ARGS)
         */
 
        if ('\0' == (*bufp)[pos] && sv != pos) {
         */
 
        if ('\0' == (*bufp)[pos] && sv != pos) {

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

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


@@ -996,16 +979,20 @@ roff_cond(ROFF_ARGS)
 
        r->last->rule = rule;
 
 
        r->last->rule = rule;
 

+       /*
+        * 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. */


@@ -1078,6 +1065,7 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
 {
        const char      *key;
        char            *val;

+       int              iv;

        struct reg      *rg;
 
        val = *bufp + pos;
        struct reg      *rg;
 
        val = *bufp + pos;


@@ -1086,20 +1074,38 @@ roff_nr(ROFF_ARGS)
 
        if (0 == strcmp(key, "nS")) {
                rg[(int)REG_nS].set = 1;
 
        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;
+               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);
 }
 
        }
 
        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)
 /* ARGSUSED */
 static enum rofferr
 roff_TE(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)

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

        else
                tbl_end(r->tbl);
 
        else
                tbl_end(r->tbl);
 


@@ -1113,13 +1119,40 @@ roff_T_(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

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

        else
                tbl_restart(ppos, ln, r->tbl);
 
        return(ROFF_IGN);
 }
 
        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)
 /* ARGSUSED */
 static enum rofferr
 roff_TS(ROFF_ARGS)


@@ -1127,11 +1160,11 @@ roff_TS(ROFF_ARGS)
        struct tbl_node *t;
 
        if (r->tbl) {
        struct tbl_node *t;
 
        if (r->tbl) {

-               (*r->msg)(MANDOCERR_SCOPEBROKEN, r->data, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);

                tbl_end(r->tbl);
        }
 
                tbl_end(r->tbl);
        }
 

-       t = tbl_alloc(ppos, ln, r->data, r->msg);
+       t = tbl_alloc(ppos, ln, r->parse);

 
        if (r->last_tbl)
                r->last_tbl->next = t;
 
        if (r->last_tbl)
                r->last_tbl->next = t;


@@ -1148,7 +1181,7 @@ roff_so(ROFF_ARGS)
 {
        char *name;
 
 {
        char *name;
 

-       (*r->msg)(MANDOCERR_SO, r->data, ln, ppos, NULL);
+       mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL);

 
        /*
         * Handle `so'.  Be EXTREMELY careful, as we shouldn't be
 
        /*
         * Handle `so'.  Be EXTREMELY careful, as we shouldn't be


@@ -1159,7 +1192,7 @@ roff_so(ROFF_ARGS)
 
        name = *bufp + pos;
        if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
 
        name = *bufp + pos;
        if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {

-               (*r->msg)(MANDOCERR_SOPATH, r->data, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL);

                return(ROFF_ERR);
        }
 
                return(ROFF_ERR);
        }
 


@@ -1182,7 +1215,7 @@ roff_userdef(ROFF_ARGS)
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)
                arg[i] = '\0' == *cp ? "" :
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)
                arg[i] = '\0' == *cp ? "" :

-                   mandoc_getarg(&cp, r->msg, r->data, ln, &pos);
+                   mandoc_getarg(r->parse, &cp, ln, &pos);

 
        /*
         * Expand macro arguments.
 
        /*
         * Expand macro arguments.


@@ -1222,7 +1255,6 @@ roff_userdef(ROFF_ARGS)
           ROFF_REPARSE : ROFF_APPEND);
 }
 
           ROFF_REPARSE : ROFF_APPEND);
 }
 

-

 static char *
 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
 static char *
 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {


@@ -1239,7 +1271,7 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
                cp++;
                if ('\\' == *cp)
                        continue;
                cp++;
                if ('\\' == *cp)
                        continue;

-               (*r->msg)(MANDOCERR_NAMESC, r->data, ln, pos, NULL);
+               mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL);

                *cp = '\0';
                name = cp;
        }
                *cp = '\0';
                name = cp;
        }


@@ -1256,7 +1288,6 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
        return(name);
 }
 
        return(name);
 }
 

-

 /*
  * Store *string into the user-defined string called *name.
  * In multiline mode, append to an existing entry and append '\n';
 /*
  * Store *string into the user-defined string called *name.
  * In multiline mode, append to an existing entry and append '\n';


@@ -1296,7 +1327,7 @@ roff_setstr(struct roff *r, const char *name, const char *string,
         * One additional byte for the '\n' in multiline mode,
         * and one for the terminating '\0'.
         */
         * One additional byte for the '\n' in multiline mode,
         * and one for the terminating '\0'.
         */

-       newch = strlen(string) + (multiline ? 2 : 1);
+       newch = strlen(string) + (multiline ? 2u : 1u);

        if (NULL == n->string) {
                n->string = mandoc_malloc(newch);
                *n->string = '\0';
        if (NULL == n->string) {
                n->string = mandoc_malloc(newch);
                *n->string = '\0';


@@ -1307,7 +1338,7 @@ roff_setstr(struct roff *r, const char *name, const char *string,
        }
 
        /* Skip existing content in the destination buffer. */
        }
 
        /* Skip existing content in the destination buffer. */

-       c = n->string + oldch;
+       c = n->string + (int)oldch;

 
        /* Append new content to the destination buffer. */
        while (*string) {
 
        /* Append new content to the destination buffer. */
        while (*string) {


@@ -1326,7 +1357,6 @@ roff_setstr(struct roff *r, const char *name, const char *string,
        *c = '\0';
 }
 
        *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)
 {


@@ -1339,7 +1369,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)
 {


@@ -1361,3 +1390,10 @@ roff_span(const struct roff *r)
        
        return(r->tbl ? tbl_span(r->tbl) : NULL);
 }
        
        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);
+}