Delete five standards that are:

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 5ea64e20acbf2ae3cdd810ab69dbc560edefebd9..f2ee39a3e9ea6cad1692f39275a030b86540291d 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.207 2014/04/20 16:46:05 schwarze Exp $ */
+/*     $Id: roff.c,v 1.238 2014/11/01 06:03:13 schwarze Exp $ */

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


@@ -15,9 +15,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

-#ifdef HAVE_CONFIG_H

 #include "config.h"
 #include "config.h"

-#endif
+
+#include <sys/types.h>

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


@@ -27,8 +27,8 @@
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
 
 #include "mandoc.h"
 #include "mandoc_aux.h"

-#include "libroff.h"

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

+#include "libroff.h"

 
 /* Maximum number of nested if-else conditionals. */
 #define        RSTACK_MAX      128
 
 /* Maximum number of nested if-else conditionals. */
 #define        RSTACK_MAX      128


@@ -60,6 +60,7 @@ enum  rofft {
        ROFF_nh,
        ROFF_nr,
        ROFF_ns,
        ROFF_nh,
        ROFF_nr,
        ROFF_ns,

+       ROFF_pl,

        ROFF_ps,
        ROFF_rm,
        ROFF_rr,
        ROFF_ps,
        ROFF_rm,
        ROFF_rr,


@@ -106,11 +107,9 @@ struct     roffreg {
 
 struct roff {
        struct mparse   *parse; /* parse point */
 
 struct roff {
        struct mparse   *parse; /* parse point */

-       int              options; /* parse options */
+       const struct mchars *mchars; /* character table */

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

-       int              rstack[RSTACK_MAX]; /* stack of !`ie' rules */
-       char             control; /* control character */
-       int              rstackpos; /* position in rstack */
+       int             *rstack; /* stack of inverted `ie' values */

        struct roffreg  *regtab; /* number registers */
        struct roffkv   *strtab; /* user-defined strings & macros */
        struct roffkv   *xmbtab; /* multi-byte trans table (`tr') */
        struct roffreg  *regtab; /* number registers */
        struct roffkv   *strtab; /* user-defined strings & macros */
        struct roffkv   *xmbtab; /* multi-byte trans table (`tr') */


@@ -122,6 +121,12 @@ struct     roff {
        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 eqn_node *last_eqn; /* last equation parsed */
        struct eqn_node *first_eqn; /* first equation parsed */
        struct eqn_node *eqn; /* current equation being parsed */

+       int              eqn_inline; /* current equation is inline */
+       int              options; /* parse options */
+       int              rstacksz; /* current size limit of rstack */
+       int              rstackpos; /* position in rstack */
+       int              format; /* current file in mdoc or man format */
+       char             control; /* control character */

 };
 
 struct roffnode {
 };
 
 struct roffnode {


@@ -137,8 +142,7 @@ struct      roffnode {
 
 #define        ROFF_ARGS        struct roff *r, /* parse ctx */ \
                         enum rofft tok, /* tok of macro */ \
 
 #define        ROFF_ARGS        struct roff *r, /* parse ctx */ \
                         enum rofft tok, /* tok of macro */ \

-                        char **bufp, /* input buffer */ \
-                        size_t *szp, /* size of input buffer */ \
+                        struct buf *buf, /* input buffer */ \

                         int ln, /* parse line */ \
                         int ppos, /* original pos in buffer */ \
                         int pos, /* current pos in buffer */ \
                         int ln, /* parse line */ \
                         int ppos, /* original pos in buffer */ \
                         int pos, /* current pos in buffer */ \


@@ -180,14 +184,18 @@ static    enum rofferr     roff_cond(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);

-static int              roff_evalcond(const char *, int *);
-static int              roff_evalnum(const char *, int *, int *, int);
-static int              roff_evalpar(const char *, int *, int *);
+static enum rofferr     roff_eqndelim(struct roff *, struct buf *, int);
+static int              roff_evalcond(struct roff *r, int,
+                               const char *, int *);
+static int              roff_evalnum(struct roff *, int,
+                               const char *, int *, int *, int);
+static int              roff_evalpar(struct roff *, int,
+                               const char *, int *, int *);

 static int              roff_evalstrcond(const char *, int *);
 static void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static int              roff_evalstrcond(const char *, int *);
 static void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);

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

 static int              roff_getnum(const char *, int *, int *);
 static int              roff_getop(const char *, int *, char *);
 static int              roff_getregn(const struct roff *,
 static int              roff_getnum(const char *, int *, int *);
 static int              roff_getop(const char *, int *, char *);
 static int              roff_getregn(const struct roff *,


@@ -198,12 +206,10 @@ static    const char      *roff_getstrn(const struct roff *,
 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);
 static enum rofferr     roff_nr(ROFF_ARGS);
 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);
 static enum rofferr     roff_nr(ROFF_ARGS);

-static void             roff_openeqn(struct roff *, const char *,
-                               int, int, const char *);
-static enum rofft       roff_parse(struct roff *, const char *, int *);
-static enum rofferr     roff_parsetext(char **, size_t *, int, int *);
-static enum rofferr     roff_res(struct roff *,
-                               char **, size_t *, int, int);
+static enum rofft       roff_parse(struct roff *, char *, int *,
+                               int, int);
+static enum rofferr     roff_parsetext(struct buf *, int, int *);
+static enum rofferr     roff_res(struct roff *, struct buf *, int, int);

 static enum rofferr     roff_rm(ROFF_ARGS);
 static enum rofferr     roff_rr(ROFF_ARGS);
 static void             roff_setstr(struct roff *,
 static enum rofferr     roff_rm(ROFF_ARGS);
 static enum rofferr     roff_rr(ROFF_ARGS);
 static void             roff_setstr(struct roff *,


@@ -253,6 +259,7 @@ static      struct roffmac   roffs[ROFF_MAX] = {
        { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
        { "nr", roff_nr, NULL, NULL, 0, NULL },
        { "ns", 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 },

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

        { "ps", roff_line_ignore, NULL, NULL, 0, NULL },
        { "rm", roff_rm, NULL, NULL, 0, NULL },
        { "rr", roff_rr, NULL, NULL, 0, NULL },
        { "ps", roff_line_ignore, NULL, NULL, 0, NULL },
        { "rm", roff_rm, NULL, NULL, 0, NULL },
        { "rr", roff_rr, NULL, NULL, 0, NULL },


@@ -419,32 +426,32 @@ roff_free1(struct roff *r)
                r->first_tbl = tbl->next;
                tbl_free(tbl);
        }
                r->first_tbl = tbl->next;
                tbl_free(tbl);
        }

-

        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_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);
 
        r->first_eqn = r->last_eqn = r->eqn = NULL;
 
        while (r->last)
                roffnode_pop(r);
 

-       roff_freestr(r->strtab);
-       roff_freestr(r->xmbtab);
-
-       r->strtab = r->xmbtab = NULL;
+       free (r->rstack);
+       r->rstack = NULL;
+       r->rstacksz = 0;
+       r->rstackpos = -1;

 
        roff_freereg(r->regtab);
 
        roff_freereg(r->regtab);

-

        r->regtab = NULL;
 
        r->regtab = NULL;
 

+       roff_freestr(r->strtab);
+       roff_freestr(r->xmbtab);
+       r->strtab = r->xmbtab = NULL;
+

        if (r->xtab)
                for (i = 0; i < 128; i++)
                        free(r->xtab[i].p);
        if (r->xtab)
                for (i = 0; i < 128; i++)
                        free(r->xtab[i].p);

-

        free(r->xtab);
        r->xtab = NULL;
 }
        free(r->xtab);
        r->xtab = NULL;
 }


@@ -454,6 +461,7 @@ roff_reset(struct roff *r)
 {
 
        roff_free1(r);
 {
 
        roff_free1(r);

+       r->format = r->options & (MPARSE_MDOC | MPARSE_MAN);

        r->control = 0;
 }
 
        r->control = 0;
 }
 


@@ -466,13 +474,15 @@ roff_free(struct roff *r)
 }
 
 struct roff *
 }
 
 struct roff *

-roff_alloc(struct mparse *parse, int options)
+roff_alloc(struct mparse *parse, const struct mchars *mchars, int options)

 {
        struct roff     *r;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->parse = parse;
 {
        struct roff     *r;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->parse = parse;

+       r->mchars = mchars;

        r->options = options;
        r->options = options;

+       r->format = options & (MPARSE_MDOC | MPARSE_MAN);

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


@@ -486,41 +496,42 @@ roff_alloc(struct mparse *parse, int options)
  * Also check the syntax of the remaining escape sequences.
  */
 static enum rofferr
  * Also check the syntax of the remaining escape sequences.
  */
 static enum rofferr

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

 {
 {

-       char             ubuf[12]; /* buffer to print the number */
+       char             ubuf[24]; /* buffer to print the number */

        const char      *start; /* start of the string to process */
        const char      *start; /* start of the string to process */

-       const char      *stesc; /* start of an escape sequence ('\\') */
+       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 */
        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 */

-       char            *nbuf;  /* new buffer to copy bufp to */
+       char            *nbuf;  /* new buffer to copy buf->buf to */

        size_t           maxl;  /* expected length of the escape name */
        size_t           naml;  /* actual length of the escape name */
        size_t           maxl;  /* expected length of the escape name */
        size_t           naml;  /* actual length of the escape name */

-       size_t           ressz; /* size of the replacement string */
+       enum mandoc_esc  esc;   /* type of the escape sequence */
+       int              inaml; /* length returned from mandoc_escape() */

        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */

-       int              irc;   /* return code from roff_evalnum() */
+       int              arg_complete; /* argument not interrupted by eol */

        char             term;  /* character terminating the escape */
 
        expand_count = 0;
        char             term;  /* character terminating the escape */
 
        expand_count = 0;

-       start = *bufp + pos;
+       start = buf->buf + pos;

        stesc = strchr(start, '\0') - 1;
        while (stesc-- > start) {
 
                /* Search backwards for the next backslash. */
 
        stesc = strchr(start, '\0') - 1;
        while (stesc-- > start) {
 
                /* Search backwards for the next backslash. */
 

-               if ('\\' != *stesc)
+               if (*stesc != '\\')

                        continue;
 
                /* If it is escaped, skip it. */
 
                for (cp = stesc - 1; cp >= start; cp--)
                        continue;
 
                /* If it is escaped, skip it. */
 
                for (cp = stesc - 1; cp >= start; cp--)

-                       if ('\\' != *cp)
+                       if (*cp != '\\')

                                break;
 
                                break;
 

-               if (0 == (stesc - cp) % 2) {
-                       stesc = cp;
+               if ((stesc - cp) % 2 == 0) {
+                       stesc = (char *)cp;

                        continue;
                }
 
                        continue;
                }
 


@@ -541,15 +552,19 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
                        res = ubuf;
                        break;
                default:
                        res = ubuf;
                        break;
                default:

-                       if (ESCAPE_ERROR == mandoc_escape(&cp, NULL, NULL))
-                               mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
-                                   ln, (int)(stesc - *bufp), NULL);
+                       esc = mandoc_escape(&cp, &stnam, &inaml);
+                       if (esc == ESCAPE_ERROR ||
+                           (esc == ESCAPE_SPECIAL &&
+                            mchars_spec2cp(r->mchars, stnam, inaml) < 0))
+                               mandoc_vmsg(MANDOCERR_ESC_BAD,
+                                   r->parse, ln, (int)(stesc - buf->buf),
+                                   "%.*s", (int)(cp - stesc), stesc);

                        continue;
                }
 
                if (EXPAND_LIMIT < ++expand_count) {
                        mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
                        continue;
                }
 
                if (EXPAND_LIMIT < ++expand_count) {
                        mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,

-                           ln, (int)(stesc - *bufp), NULL);
+                           ln, (int)(stesc - buf->buf), NULL);

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


@@ -559,7 +574,7 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
                 * Save a pointer to the name.
                 */
 
                 * Save a pointer to the name.
                 */
 

-               if ('\0' == term) {
+               if (term == '\0') {

                        switch (*++cp) {
                        case '\0':
                                maxl = 0;
                        switch (*++cp) {
                        case '\0':
                                maxl = 0;


@@ -585,13 +600,15 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 
                /* Advance to the end of the name. */
 
 
                /* Advance to the end of the name. */
 

-               for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) {
-                       if ('\0' == *cp) {
-                               mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
-                                   ln, (int)(stesc - *bufp), NULL);
+               arg_complete = 1;
+               for (naml = 0; maxl == 0 || naml < maxl; naml++, cp++) {
+                       if (*cp == '\0') {
+                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
+                                   ln, (int)(stesc - buf->buf), stesc);
+                               arg_complete = 0;

                                break;
                        }
                                break;
                        }

-                       if (0 == maxl && *cp == term) {
+                       if (maxl == 0 && *cp == term) {

                                cp++;
                                break;
                        }
                                cp++;
                                break;
                        }


@@ -604,47 +621,49 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
 
                switch (stesc[1]) {
                case '*':
 
                switch (stesc[1]) {
                case '*':

-                       res = roff_getstrn(r, stnam, naml);
+                       if (arg_complete)
+                               res = roff_getstrn(r, stnam, naml);

                        break;
                case 'B':
                        npos = 0;
                        break;
                case 'B':
                        npos = 0;

-                       irc = roff_evalnum(stnam, &npos, NULL, 0);
-                       ubuf[0] = irc && stnam + npos + 1 == cp
-                           ? '1' : '0';
+                       ubuf[0] = arg_complete &&
+                           roff_evalnum(r, ln, stnam, &npos, NULL, 0) &&
+                           stnam + npos + 1 == cp ? '1' : '0';

                        ubuf[1] = '\0';
                        break;
                case 'n':
                        ubuf[1] = '\0';
                        break;
                case 'n':

-                       snprintf(ubuf, sizeof(ubuf), "%d",
-                           roff_getregn(r, stnam, naml));
+                       if (arg_complete)
+                               (void)snprintf(ubuf, sizeof(ubuf), "%d",
+                                   roff_getregn(r, stnam, naml));
+                       else
+                               ubuf[0] = '\0';

                        break;
                case 'w':
                        break;
                case 'w':

-                       snprintf(ubuf, sizeof(ubuf), "%d",
+                       /* use even incomplete args */
+                       (void)snprintf(ubuf, sizeof(ubuf), "%d",

                            24 * (int)naml);
                        break;
                }
 
                            24 * (int)naml);
                        break;
                }
 

-               if (NULL == res) {
-                       mandoc_msg(MANDOCERR_BADESCAPE, r->parse,
-                           ln, (int)(stesc - *bufp), NULL);
+               if (res == NULL) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(stesc - buf->buf),
+                           "%.*s", (int)naml, stnam);

                        res = "";
                }
                        res = "";
                }

-               ressz = strlen(res);

 
                /* Replace the escape sequence by the string. */
 
 
                /* Replace the escape sequence by the string. */
 

-               *szp += ressz + 1;
-               nbuf = mandoc_malloc(*szp);
-
-               strlcpy(nbuf, *bufp, (size_t)(stesc - *bufp + 1));
-               strlcat(nbuf, res, *szp);
-               strlcat(nbuf, cp, *szp);
+               *stesc = '\0';
+               buf->sz = mandoc_asprintf(&nbuf, "%s%s%s",
+                   buf->buf, res, cp) + 1;

 
                /* Prepare for the next replacement. */
 
                start = nbuf + pos;
 
                /* Prepare for the next replacement. */
 
                start = nbuf + pos;

-               stesc = nbuf + (stesc - *bufp) + ressz;
-               free(*bufp);
-               *bufp = nbuf;
+               stesc = nbuf + (stesc - buf->buf) + strlen(res);
+               free(buf->buf);
+               buf->buf = nbuf;

        }
        return(ROFF_CONT);
 }
        }
        return(ROFF_CONT);
 }


@@ -655,7 +674,7 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
  * Decrement and spring input line trap.
  */
 static enum rofferr
  * Decrement and spring input line trap.
  */
 static enum rofferr

-roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
+roff_parsetext(struct buf *buf, int pos, int *offs)

 {
        size_t           sz;
        const char      *start;
 {
        size_t           sz;
        const char      *start;


@@ -663,20 +682,20 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
        int              isz;
        enum mandoc_esc  esc;
 
        int              isz;
        enum mandoc_esc  esc;
 

-       start = p = *bufp + pos;
+       start = p = buf->buf + pos;

 
 

-       while ('\0' != *p) {
+       while (*p != '\0') {

                sz = strcspn(p, "-\\");
                p += sz;
 
                sz = strcspn(p, "-\\");
                p += sz;
 

-               if ('\0' == *p)
+               if (*p == '\0')

                        break;
 
                        break;
 

-               if ('\\' == *p) {
+               if (*p == '\\') {

                        /* Skip over escapes. */
                        p++;
                        esc = mandoc_escape((const char **)&p, NULL, NULL);
                        /* Skip over escapes. */
                        p++;
                        esc = mandoc_escape((const char **)&p, NULL, NULL);

-                       if (ESCAPE_ERROR == esc)
+                       if (esc == ESCAPE_ERROR)

                                break;
                        continue;
                } else if (p == start) {
                                break;
                        continue;
                } else if (p == start) {


@@ -691,40 +710,50 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
        }
 
        /* Spring the input line trap. */
        }
 
        /* Spring the input line trap. */

-       if (1 == roffit_lines) {
-               isz = mandoc_asprintf(&p, "%s\n.%s", *bufp, roffit_macro);
-               free(*bufp);
-               *bufp = p;
-               *szp = isz + 1;
+       if (roffit_lines == 1) {
+               isz = mandoc_asprintf(&p, "%s\n.%s", buf->buf, roffit_macro);
+               free(buf->buf);
+               buf->buf = p;
+               buf->sz = isz + 1;

                *offs = 0;
                free(roffit_macro);
                roffit_lines = 0;
                return(ROFF_REPARSE);
                *offs = 0;
                free(roffit_macro);
                roffit_lines = 0;
                return(ROFF_REPARSE);

-       } else if (1 < roffit_lines)
+       } else if (roffit_lines > 1)

                --roffit_lines;
        return(ROFF_CONT);
 }
 
 enum rofferr
                --roffit_lines;
        return(ROFF_CONT);
 }
 
 enum rofferr

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

 {
        enum rofft       t;
        enum rofferr     e;
 {
        enum rofft       t;
        enum rofferr     e;

-       int              ppos, ctl;
+       int              pos;   /* parse point */
+       int              ppos;  /* original offset in buf->buf */
+       int              ctl;   /* macro line (boolean) */

 
 

-       /*
-        * Run the reserved-word filter only if we have some reserved
-        * words to fill in.
-        */
+       ppos = pos = *offs;

 
 

-       e = roff_res(r, bufp, szp, ln, pos);
-       if (ROFF_IGN == e)
+       /* Handle in-line equation delimiters. */
+
+       if (r->tbl == NULL &&
+           r->last_eqn != NULL && r->last_eqn->delim &&
+           (r->eqn == NULL || r->eqn_inline)) {
+               e = roff_eqndelim(r, buf, pos);
+               if (e == ROFF_REPARSE)
+                       return(e);
+               assert(e == ROFF_CONT);
+       }
+
+       /* Expand some escape sequences. */
+
+       e = roff_res(r, buf, ln, pos);
+       if (e == ROFF_IGN)

                return(e);
                return(e);

-       assert(ROFF_CONT == e);
+       assert(e == ROFF_CONT);

 
 

-       ppos = pos;
-       ctl = roff_getcontrol(r, *bufp, &pos);
+       ctl = roff_getcontrol(r, buf->buf, &pos);

 
        /*
         * First, if a scope is open and we're not a macro, pass the
 
        /*
         * First, if a scope is open and we're not a macro, pass the


@@ -737,19 +766,28 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->last && ! ctl) {
                t = r->last->tok;
                assert(roffs[t].text);
        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);
-               if (ROFF_CONT != e)
+               e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);
+               assert(e == ROFF_IGN || e == ROFF_CONT);
+               if (e != ROFF_CONT)

                        return(e);
        }
        if (r->eqn)
                        return(e);
        }
        if (r->eqn)

-               return(eqn_read(&r->eqn, ln, *bufp, ppos, offs));
+               return(eqn_read(&r->eqn, ln, buf->buf, ppos, offs));

        if ( ! ctl) {
                if (r->tbl)
        if ( ! ctl) {
                if (r->tbl)

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

        }
 
        }
 

+       /* Skip empty request lines. */
+
+       if (buf->buf[pos] == '"') {
+               mandoc_msg(MANDOCERR_COMMENT_BAD, r->parse,
+                   ln, pos, NULL);
+               return(ROFF_IGN);
+       } else if (buf->buf[pos] == '\0')
+               return(ROFF_IGN);
+

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


@@ -759,8 +797,7 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);

-               return((*roffs[t].sub)(r, t, bufp, szp,
-                   ln, ppos, pos, offs));
+               return((*roffs[t].sub)(r, t, buf, ln, ppos, pos, offs));

        }
 
        /*
        }
 
        /*


@@ -769,11 +806,11 @@ roff_parseln(struct roff *r, int ln, char **bufp,
         * the compilers handle it.
         */
 
         * the compilers handle it.
         */
 

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

                return(ROFF_CONT);
 
        assert(roffs[t].proc);
                return(ROFF_CONT);
 
        assert(roffs[t].proc);

-       return((*roffs[t].proc)(r, t, bufp, szp, ln, ppos, pos, offs));
+       return((*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs));

 }
 
 void
 }
 
 void


@@ -781,18 +818,19 @@ roff_endparse(struct roff *r)
 {
 
        if (r->last)
 {
 
        if (r->last)

-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
-                   r->last->line, r->last->col, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
+                   r->last->line, r->last->col,
+                   roffs[r->last->tok].name);

 
        if (r->eqn) {
 
        if (r->eqn) {

-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
-                   r->eqn->eqn.ln, r->eqn->eqn.pos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
+                   r->eqn->eqn.ln, r->eqn->eqn.pos, "EQ");

                eqn_end(&r->eqn);
        }
 
        if (r->tbl) {
                eqn_end(&r->eqn);
        }
 
        if (r->tbl) {

-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
-                   r->tbl->line, r->tbl->pos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
+                   r->tbl->line, r->tbl->pos, "TS");

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


@@ -802,28 +840,26 @@ roff_endparse(struct roff *r)
  * form of ".foo xxx" in the usual way.
  */
 static enum rofft
  * form of ".foo xxx" in the usual way.
  */
 static enum rofft

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

 {
 {

+       char            *cp;

        const char      *mac;
        size_t           maclen;
        enum rofft       t;
 
        const char      *mac;
        size_t           maclen;
        enum rofft       t;
 

-       if ('\0' == buf[*pos] || '"' == buf[*pos] ||
-           '\t' == buf[*pos] || ' ' == buf[*pos])
-               return(ROFF_MAX);
+       cp = buf + *pos;

 
 

-       /* We stop the macro parse at an escape, tab, space, or nil. */
+       if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)
+               return(ROFF_MAX);

 
 

-       mac = buf + *pos;
-       maclen = strcspn(mac, " \\\t\0");
+       mac = cp;
+       maclen = roff_getname(r, &cp, ln, ppos);

 
        t = (r->current_string = roff_getstrn(r, mac, maclen))
            ? ROFF_USERDEF : roffhash_find(mac, maclen);
 
 
        t = (r->current_string = roff_getstrn(r, mac, maclen))
            ? ROFF_USERDEF : roffhash_find(mac, maclen);
 

-       *pos += (int)maclen;
-
-       while (buf[*pos] && ' ' == buf[*pos])
-               (*pos)++;
+       if (ROFF_MAX != t)
+               *pos = cp - buf;

 
        return(t);
 }
 
        return(t);
 }


@@ -837,18 +873,18 @@ roff_cblock(ROFF_ARGS)
         * ignore macro, otherwise raise a warning and just ignore it.
         */
 
         * ignore macro, otherwise raise a warning and just ignore it.
         */
 

-       if (NULL == r->last) {
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+       if (r->last == NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "..");

                return(ROFF_IGN);
        }
 
        switch (r->last->tok) {
        case ROFF_am:
                return(ROFF_IGN);
        }
 
        switch (r->last->tok) {
        case ROFF_am:

+               /* ROFF_am1 is remapped to ROFF_am in roff_block(). */

                /* FALLTHROUGH */
        case ROFF_ami:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
        case ROFF_ami:
                /* FALLTHROUGH */

-       case ROFF_am1:
-               /* FALLTHROUGH */

        case ROFF_de:
                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
                /* FALLTHROUGH */
        case ROFF_de:
                /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
                /* FALLTHROUGH */


@@ -857,12 +893,14 @@ roff_cblock(ROFF_ARGS)
        case ROFF_ig:
                break;
        default:
        case ROFF_ig:
                break;
        default:

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "..");

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

-       if ((*bufp)[pos])
-               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
+       if (buf->buf[pos] != '\0')
+               mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
+                   ".. %s", buf->buf + pos);

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


@@ -886,7 +924,8 @@ roff_ccond(struct roff *r, int ln, int ppos)
 {
 
        if (NULL == r->last) {
 {
 
        if (NULL == r->last) {

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "\\}");

                return;
        }
 
                return;
        }
 


@@ -898,12 +937,14 @@ roff_ccond(struct roff *r, int ln, int ppos)
        case ROFF_if:
                break;
        default:
        case ROFF_if:
                break;
        default:

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "\\}");

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

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "\\}");

                return;
        }
 
                return;
        }
 


@@ -915,36 +956,46 @@ roff_ccond(struct roff *r, int ln, int ppos)
 static enum rofferr
 roff_block(ROFF_ARGS)
 {
 static enum rofferr
 roff_block(ROFF_ARGS)
 {

-       int             sv;
-       size_t          sz;
-       char            *name;
+       const char      *name;
+       char            *iname, *cp;
+       size_t           namesz;

 
 

-       name = NULL;
+       /* Ignore groff compatibility mode for now. */

 
 

-       if (ROFF_ig != tok) {
-               if ('\0' == (*bufp)[pos]) {
-                       mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
-                       return(ROFF_IGN);
-               }
+       if (tok == ROFF_de1)
+               tok = ROFF_de;
+       else if (tok == ROFF_am1)
+               tok = ROFF_am;

 
 

-               /*
-                * Re-write `de1', since we don't really care about
-                * groff's strange compatibility mode, into `de'.
-                */
+       /* Parse the macro name argument. */

 
 

-               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);
+       cp = buf->buf + pos;
+       if (tok == ROFF_ig) {
+               iname = NULL;
+               namesz = 0;
+       } else {
+               iname = cp;
+               namesz = roff_getname(r, &cp, ln, ppos);
+               iname[namesz] = '\0';
+       }

 
 

-               while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
-                       pos++;
+       /* Resolve the macro name argument if it is indirect. */

 
 

-               while (isspace((unsigned char)(*bufp)[pos]))
-                       (*bufp)[pos++] = '\0';
+       if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
+               if ((name = roff_getstrn(r, iname, namesz)) == NULL) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(iname - buf->buf),
+                           "%.*s", (int)namesz, iname);
+                       namesz = 0;
+               } else
+                       namesz = strlen(name);
+       } else
+               name = iname;
+
+       if (namesz == 0 && tok != ROFF_ig) {
+               mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
+                   ln, ppos, roffs[tok].name);
+               return(ROFF_IGN);

        }
 
        roffnode_push(r, tok, name, ln, ppos);
        }
 
        roffnode_push(r, tok, name, ln, ppos);


@@ -955,37 +1006,36 @@ roff_block(ROFF_ARGS)
         * appended from roff_block_text() in multiline mode.
         */
 
         * appended from roff_block_text() in multiline mode.
         */
 

-       if (ROFF_de == tok)
-               roff_setstr(r, name, "", 0);
+       if (tok == ROFF_de || tok == ROFF_dei)
+               roff_setstrn(&r->strtab, name, namesz, "", 0, 0);

 
 

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

                return(ROFF_IGN);
 
                return(ROFF_IGN);
 

-       /* If present, process the custom end-of-line marker. */
-
-       sv = pos;
-       while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
-               pos++;
-
-       /*
-        * Note: groff does NOT like escape characters in the input.
-        * Instead of detecting this, we're just going to let it fly and
-        * to hell with it.
-        */
+       /* Get the custom end marker. */

 
 

-       assert(pos > sv);
-       sz = (size_t)(pos - sv);
+       iname = cp;
+       namesz = roff_getname(r, &cp, ln, ppos);

 
 

-       if (1 == sz && '.' == (*bufp)[sv])
-               return(ROFF_IGN);
+       /* Resolve the end marker if it is indirect. */

 
 

-       r->last->end = mandoc_malloc(sz + 1);
+       if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
+               if ((name = roff_getstrn(r, iname, namesz)) == NULL) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(iname - buf->buf),
+                           "%.*s", (int)namesz, iname);
+                       namesz = 0;
+               } else
+                       namesz = strlen(name);
+       } else
+               name = iname;

 
 

-       memcpy(r->last->end, *bufp + sv, sz);
-       r->last->end[(int)sz] = '\0';
+       if (namesz)
+               r->last->end = mandoc_strndup(name, namesz);

 
 

-       if ((*bufp)[pos])
-               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
+       if (*cp != '\0')
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
+                   ln, pos, ".%s ... %s", roffs[tok].name, cp);

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


@@ -1007,21 +1057,22 @@ roff_block_sub(ROFF_ARGS)
 
        if (r->last->end) {
                for (i = pos, j = 0; r->last->end[j]; j++, i++)
 
        if (r->last->end) {
                for (i = pos, j = 0; r->last->end[j]; j++, i++)

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

                                break;
 
                                break;
 

-               if ('\0' == r->last->end[j] &&
-                   ('\0' == (*bufp)[i] ||
-                    ' '  == (*bufp)[i] ||
-                    '\t' == (*bufp)[i])) {
+               if (r->last->end[j] == '\0' &&
+                   (buf->buf[i] == '\0' ||
+                    buf->buf[i] == ' ' ||
+                    buf->buf[i] == '\t')) {

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

-                       while (' ' == (*bufp)[i] || '\t' == (*bufp)[i])
+                       while (buf->buf[i] == ' ' || buf->buf[i] == '\t')

                                i++;
 
                        pos = i;
                                i++;
 
                        pos = i;

-                       if (ROFF_MAX != roff_parse(r, *bufp, &pos))
+                       if (roff_parse(r, buf->buf, &pos, ln, ppos) !=
+                           ROFF_MAX)

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


@@ -1032,28 +1083,24 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
         * pulling it out of the hashtable.
         */
 

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

 
 

-       /*
-        * 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, 2);
+       if (t != ROFF_cblock) {
+               if (tok != ROFF_ig)
+                       roff_setstr(r, r->last->name, buf->buf + ppos, 2);

                return(ROFF_IGN);
        }
 
        assert(roffs[t].proc);
                return(ROFF_IGN);
        }
 
        assert(roffs[t].proc);

-       return((*roffs[t].proc)(r, t, bufp, szp, ln, ppos, pos, offs));
+       return((*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs));

 }
 
 static enum rofferr
 roff_block_text(ROFF_ARGS)
 {
 
 }
 
 static enum rofferr
 roff_block_text(ROFF_ARGS)
 {
 

-       if (ROFF_de == tok)
-               roff_setstr(r, r->last->name, *bufp + pos, 2);
+       if (tok != ROFF_ig)
+               roff_setstr(r, r->last->name, buf->buf + pos, 2);

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


@@ -1067,18 +1114,17 @@ roff_cond_sub(ROFF_ARGS)
 
        rr = r->last->rule;
        roffnode_cleanscope(r);
 
        rr = r->last->rule;
        roffnode_cleanscope(r);

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

 
        /*
         * Fully handle known macros when they are structurally
         * required or when the conditional evaluated to true.
         */
 
 
        /*
         * Fully handle known macros when they are structurally
         * required or when the conditional evaluated to true.
         */
 

-       if ((ROFF_MAX != t) &&
-           (rr || ROFFMAC_STRUCT & roffs[t].flags)) {
+       if ((t != ROFF_MAX) &&
+           (rr || roffs[t].flags & ROFFMAC_STRUCT)) {

                assert(roffs[t].proc);
                assert(roffs[t].proc);

-               return((*roffs[t].proc)(r, t, bufp, szp,
-                   ln, ppos, pos, offs));
+               return((*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs));

        }
 
        /*
        }
 
        /*


@@ -1086,16 +1132,16 @@ roff_cond_sub(ROFF_ARGS)
         * drop the line completely.
         */
 
         * drop the line completely.
         */
 

-       ep = *bufp + pos;
-       if ('\\' == ep[0] && '}' == ep[1])
+       ep = buf->buf + pos;
+       if (ep[0] == '\\' && ep[1] == '}')

                rr = 0;
 
        /* Always check for the closing delimiter `\}'. */
 
                rr = 0;
 
        /* Always check for the closing delimiter `\}'. */
 

-       while (NULL != (ep = strchr(ep, '\\'))) {
-               if ('}' == *(++ep)) {
+       while ((ep = strchr(ep, '\\')) != NULL) {
+               if (*(++ep) == '}') {

                        *ep = '&';
                        *ep = '&';

-                       roff_ccond(r, ln, ep - *bufp - 1);
+                       roff_ccond(r, ln, ep - buf->buf - 1);

                }
                ++ep;
        }
                }
                ++ep;
        }


@@ -1111,11 +1157,11 @@ roff_cond_text(ROFF_ARGS)
        rr = r->last->rule;
        roffnode_cleanscope(r);
 
        rr = r->last->rule;
        roffnode_cleanscope(r);
 

-       ep = *bufp + pos;
-       while (NULL != (ep = strchr(ep, '\\'))) {
-               if ('}' == *(++ep)) {
+       ep = buf->buf + pos;
+       while ((ep = strchr(ep, '\\')) != NULL) {
+               if (*(++ep) == '}') {

                        *ep = '&';
                        *ep = '&';

-                       roff_ccond(r, ln, ep - *bufp - 1);
+                       roff_ccond(r, ln, ep - buf->buf - 1);

                }
                ++ep;
        }
                }
                ++ep;
        }


@@ -1201,7 +1247,7 @@ out:
  * or string condition.
  */
 static int
  * or string condition.
  */
 static int

-roff_evalcond(const char *v, int *pos)
+roff_evalcond(struct roff *r, int ln, const char *v, int *pos)

 {
        int      wanttrue, number;
 
 {
        int      wanttrue, number;
 


@@ -1232,7 +1278,7 @@ roff_evalcond(const char *v, int *pos)
                break;
        }
 
                break;
        }
 

-       if (roff_evalnum(v, pos, &number, 0))
+       if (roff_evalnum(r, ln, v, pos, &number, 0))

                return((number > 0) == wanttrue);
        else
                return(roff_evalstrcond(v, pos) == wanttrue);
                return((number > 0) == wanttrue);
        else
                return(roff_evalstrcond(v, pos) == wanttrue);


@@ -1259,20 +1305,20 @@ roff_cond(ROFF_ARGS)
         * If we're not an `el', however, then evaluate the conditional.
         */
 
         * If we're not an `el', however, then evaluate the conditional.
         */
 

-       r->last->rule = ROFF_el == tok ?
+       r->last->rule = tok == ROFF_el ?

            (r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) :
            (r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) :

-           roff_evalcond(*bufp, &pos);
+           roff_evalcond(r, ln, buf->buf, &pos);

 
        /*
         * An if-else will put the NEGATION of the current evaluated
         * conditional into the stack of rules.
         */
 
 
        /*
         * An if-else will put the NEGATION of the current evaluated
         * conditional into the stack of rules.
         */
 

-       if (ROFF_ie == tok) {
-               if (r->rstackpos == RSTACK_MAX - 1) {
-                       mandoc_msg(MANDOCERR_MEM,
-                           r->parse, ln, ppos, NULL);
-                       return(ROFF_ERR);
+       if (tok == ROFF_ie) {
+               if (r->rstackpos + 1 == r->rstacksz) {
+                       r->rstacksz += 16;
+                       r->rstack = mandoc_reallocarray(r->rstack,
+                           r->rstacksz, sizeof(int));

                }
                r->rstack[++r->rstackpos] = !r->last->rule;
        }
                }
                r->rstack[++r->rstackpos] = !r->last->rule;
        }


@@ -1288,17 +1334,17 @@ roff_cond(ROFF_ARGS)
         * not even whitespace, use next-line scope.
         */
 
         * not even whitespace, use next-line scope.
         */
 

-       if ('\0' == (*bufp)[pos]) {
+       if (buf->buf[pos] == '\0') {

                r->last->endspan = 2;
                goto out;
        }
 
                r->last->endspan = 2;
                goto out;
        }
 

-       while (' ' == (*bufp)[pos])
+       while (buf->buf[pos] == ' ')

                pos++;
 
        /* An opening brace requests multiline scope. */
 
                pos++;
 
        /* An opening brace requests multiline scope. */
 

-       if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) {
+       if (buf->buf[pos] == '\\' && buf->buf[pos + 1] == '{') {

                r->last->endspan = -1;
                pos += 2;
                goto out;
                r->last->endspan = -1;
                pos += 2;
                goto out;


@@ -1310,8 +1356,9 @@ roff_cond(ROFF_ARGS)
         * nothing but trailing whitespace.
         */
 
         * nothing but trailing whitespace.
         */
 

-       if ('\0' == (*bufp)[pos])
-               mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
+       if (buf->buf[pos] == '\0')
+               mandoc_msg(MANDOCERR_COND_EMPTY, r->parse,
+                   ln, ppos, roffs[tok].name);

 
        r->last->endspan = 1;
 
 
        r->last->endspan = 1;
 


@@ -1323,29 +1370,31 @@ out:
 static enum rofferr
 roff_ds(ROFF_ARGS)
 {
 static enum rofferr
 roff_ds(ROFF_ARGS)
 {

-       char            *name, *string;
+       char            *string;
+       const char      *name;
+       size_t           namesz;

 
        /*
 
        /*

-        * A symbol is named by the first word following the macro
-        * invocation up to a space.  Its value is anything after the
-        * name's trailing whitespace and optional double-quote.  Thus,
-        *
-        *  [.ds foo "bar  "     ]
-        *
-        * will have `bar  "     ' as its value.
+        * The first word is the name of the string.
+        * If it is empty or terminated by an escape sequence,
+        * abort the `ds' request without defining anything.

         */
 
         */
 

-       string = *bufp + pos;
-       name = roff_getname(r, &string, ln, pos);
-       if ('\0' == *name)
+       name = string = buf->buf + pos;
+       if (*name == '\0')

                return(ROFF_IGN);
 
                return(ROFF_IGN);
 

-       /* Read past initial double-quote. */
-       if ('"' == *string)
+       namesz = roff_getname(r, &string, ln, pos);
+       if (name[namesz] == '\\')
+               return(ROFF_IGN);
+
+       /* Read past the initial double-quote, if any. */
+       if (*string == '"')

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

-       roff_setstr(r, name, string, ROFF_as == tok);
+       roff_setstrn(&r->strtab, name, namesz, string, strlen(string),
+           ROFF_as == tok);

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


@@ -1424,14 +1473,15 @@ roff_getop(const char *v, int *pos, char *res)
  * or a single signed integer number.
  */
 static int
  * or a single signed integer number.
  */
 static int

-roff_evalpar(const char *v, int *pos, int *res)
+roff_evalpar(struct roff *r, int ln,
+       const char *v, int *pos, int *res)

 {
 
        if ('(' != v[*pos])
                return(roff_getnum(v, pos, res));
 
        (*pos)++;
 {
 
        if ('(' != v[*pos])
                return(roff_getnum(v, pos, res));
 
        (*pos)++;

-       if ( ! roff_evalnum(v, pos, res, 1))
+       if ( ! roff_evalnum(r, ln, v, pos, res, 1))

                return(0);
 
        /*
                return(0);
 
        /*


@@ -1453,7 +1503,8 @@ roff_evalpar(const char *v, int *pos, int *res)
  * Proceed left to right, there is no concept of precedence.
  */
 static int
  * Proceed left to right, there is no concept of precedence.
  */
 static int

-roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
+roff_evalnum(struct roff *r, int ln, const char *v,
+       int *pos, int *res, int skipwhite)

 {
        int              mypos, operand2;
        char             operator;
 {
        int              mypos, operand2;
        char             operator;


@@ -1467,7 +1518,7 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                while (isspace((unsigned char)v[*pos]))
                        (*pos)++;
 
                while (isspace((unsigned char)v[*pos]))
                        (*pos)++;
 

-       if ( ! roff_evalpar(v, pos, res))
+       if ( ! roff_evalpar(r, ln, v, pos, res))

                return(0);
 
        while (1) {
                return(0);
 
        while (1) {


@@ -1482,7 +1533,7 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 

-               if ( ! roff_evalpar(v, pos, &operand2))
+               if ( ! roff_evalpar(r, ln, v, pos, &operand2))

                        return(0);
 
                if (skipwhite)
                        return(0);
 
                if (skipwhite)


@@ -1503,6 +1554,12 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                        *res *= operand2;
                        break;
                case '/':
                        *res *= operand2;
                        break;
                case '/':

+                       if (0 == operand2) {
+                               mandoc_msg(MANDOCERR_DIVZERO,
+                                       r->parse, ln, *pos, v);
+                               *res = 0;
+                               break;
+                       }

                        *res /= operand2;
                        break;
                case '%':
                        *res /= operand2;
                        break;
                case '%':


@@ -1659,19 +1716,25 @@ roff_freereg(struct roffreg *reg)
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {

-       const char      *key;
-       char            *val;
+       char            *key, *val;
+       size_t           keysz;

        int              iv;
        char             sign;
 
        int              iv;
        char             sign;
 

-       val = *bufp + pos;
-       key = roff_getname(r, &val, ln, pos);
+       key = val = buf->buf + pos;
+       if (*key == '\0')
+               return(ROFF_IGN);
+
+       keysz = roff_getname(r, &val, ln, pos);
+       if (key[keysz] == '\\')
+               return(ROFF_IGN);
+       key[keysz] = '\0';

 
        sign = *val;
 
        sign = *val;

-       if ('+' == sign || '-' == sign)
+       if (sign == '+' || sign == '-')

                val++;
 
                val++;
 

-       if (roff_evalnum(val, NULL, &iv, 0))
+       if (roff_evalnum(r, ln, val, NULL, &iv, 0))

                roff_setreg(r, key, iv, sign);
 
        return(ROFF_IGN);
                roff_setreg(r, key, iv, sign);
 
        return(ROFF_IGN);


@@ -1681,20 +1744,23 @@ static enum rofferr
 roff_rr(ROFF_ARGS)
 {
        struct roffreg  *reg, **prev;
 roff_rr(ROFF_ARGS)
 {
        struct roffreg  *reg, **prev;

-       const char      *name;
-       char            *cp;
+       char            *name, *cp;
+       size_t           namesz;

 
 

-       cp = *bufp + pos;
-       name = roff_getname(r, &cp, ln, pos);
+       name = cp = buf->buf + pos;
+       if (*name == '\0')
+               return(ROFF_IGN);
+       namesz = roff_getname(r, &cp, ln, pos);
+       name[namesz] = '\0';

 
        prev = &r->regtab;
        while (1) {
                reg = *prev;
 
        prev = &r->regtab;
        while (1) {
                reg = *prev;

-               if (NULL == reg || !strcmp(name, reg->key.p))
+               if (reg == NULL || !strcmp(name, reg->key.p))

                        break;
                prev = &reg->next;
        }
                        break;
                prev = &reg->next;
        }

-       if (NULL != reg) {
+       if (reg != NULL) {

                *prev = reg->next;
                free(reg->key.p);
                free(reg);
                *prev = reg->next;
                free(reg->key.p);
                free(reg);


@@ -1707,12 +1773,15 @@ roff_rm(ROFF_ARGS)
 {
        const char       *name;
        char             *cp;
 {
        const char       *name;
        char             *cp;

+       size_t            namesz;

 
 

-       cp = *bufp + pos;
-       while ('\0' != *cp) {
-               name = roff_getname(r, &cp, ln, (int)(cp - *bufp));
-               if ('\0' != *name)
-                       roff_setstr(r, name, NULL, 0);
+       cp = buf->buf + pos;
+       while (*cp != '\0') {
+               name = cp;
+               namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
+               roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);
+               if (name[namesz] == '\\')
+                       break;

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


@@ -1725,12 +1794,12 @@ roff_it(ROFF_ARGS)
        int              iv;
 
        /* Parse the number of lines. */
        int              iv;
 
        /* Parse the number of lines. */

-       cp = *bufp + pos;
+       cp = buf->buf + pos;

        len = strcspn(cp, " \t");
        cp[len] = '\0';
        if ((iv = mandoc_strntoi(cp, len, 10)) <= 0) {
        len = strcspn(cp, " \t");
        cp[len] = '\0';
        if ((iv = mandoc_strntoi(cp, len, 10)) <= 0) {

-               mandoc_msg(MANDOCERR_NUMERIC, r->parse,
-                   ln, ppos, *bufp + 1);
+               mandoc_msg(MANDOCERR_IT_NONUM, r->parse,
+                   ln, ppos, buf->buf + 1);

                return(ROFF_IGN);
        }
        cp += len + 1;
                return(ROFF_IGN);
        }
        cp += len + 1;


@@ -1746,10 +1815,13 @@ roff_Dd(ROFF_ARGS)
 {
        const char *const       *cp;
 
 {
        const char *const       *cp;
 

-       if (0 == ((MPARSE_MDOC | MPARSE_QUICK) & r->options))
+       if ((r->options & (MPARSE_MDOC | MPARSE_QUICK)) == 0)

                for (cp = __mdoc_reserved; *cp; cp++)
                        roff_setstr(r, *cp, NULL, 0);
 
                for (cp = __mdoc_reserved; *cp; cp++)
                        roff_setstr(r, *cp, NULL, 0);
 

+       if (r->format == 0)
+               r->format = MPARSE_MDOC;
+

        return(ROFF_CONT);
 }
 
        return(ROFF_CONT);
 }
 


@@ -1758,10 +1830,13 @@ roff_TH(ROFF_ARGS)
 {
        const char *const       *cp;
 
 {
        const char *const       *cp;
 

-       if (0 == (MPARSE_QUICK & r->options))
+       if ((r->options & MPARSE_QUICK) == 0)

                for (cp = __man_reserved; *cp; cp++)
                        roff_setstr(r, *cp, NULL, 0);
 
                for (cp = __man_reserved; *cp; cp++)
                        roff_setstr(r, *cp, NULL, 0);
 

+       if (r->format == 0)
+               r->format = MPARSE_MAN;
+

        return(ROFF_CONT);
 }
 
        return(ROFF_CONT);
 }
 


@@ -1770,7 +1845,8 @@ roff_TE(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "TE");

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


@@ -1782,50 +1858,102 @@ roff_T_(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "T&");

        else
                tbl_restart(ppos, ln, r->tbl);
 
        return(ROFF_IGN);
 }
 
        else
                tbl_restart(ppos, ln, r->tbl);
 
        return(ROFF_IGN);
 }
 

-#if 0
-static int
-roff_closeeqn(struct roff *r)
+/*
+ * Handle in-line equation delimiters.
+ */
+static enum rofferr
+roff_eqndelim(struct roff *r, struct buf *buf, int pos)

 {
 {

+       char            *cp1, *cp2;
+       const char      *bef_pr, *bef_nl, *mac, *aft_nl, *aft_pr;

 
 

-       return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0);
-}
-#endif
+       /*
+        * Outside equations, look for an opening delimiter.
+        * If we are inside an equation, we already know it is
+        * in-line, or this function wouldn't have been called;
+        * so look for a closing delimiter.
+        */

 
 

-static void
-roff_openeqn(struct roff *r, const char *name, int line,
-               int offs, const char *buf)
-{
-       struct eqn_node *e;
-       int              poff;
+       cp1 = buf->buf + pos;
+       cp2 = strchr(cp1, r->eqn == NULL ?
+           r->last_eqn->odelim : r->last_eqn->cdelim);
+       if (cp2 == NULL)
+               return(ROFF_CONT);

 
 

-       assert(NULL == r->eqn);
-       e = eqn_alloc(name, offs, line, r->parse);
+       *cp2++ = '\0';
+       bef_pr = bef_nl = aft_nl = aft_pr = "";

 
 

-       if (r->last_eqn)
-               r->last_eqn->next = e;
-       else
-               r->first_eqn = r->last_eqn = e;
+       /* Handle preceding text, protecting whitespace. */

 
 

-       r->eqn = r->last_eqn = e;
+       if (*buf->buf != '\0') {
+               if (r->eqn == NULL)
+                       bef_pr = "\\&";
+               bef_nl = "\n";
+       }

 
 

-       if (buf) {
-               poff = 0;
-               eqn_read(&r->eqn, line, buf, offs, &poff);
+       /*
+        * Prepare replacing the delimiter with an equation macro
+        * and drop leading white space from the equation.
+        */
+
+       if (r->eqn == NULL) {
+               while (*cp2 == ' ')
+                       cp2++;
+               mac = ".EQ";
+       } else
+               mac = ".EN";
+
+       /* Handle following text, protecting whitespace. */
+
+       if (*cp2 != '\0') {
+               aft_nl = "\n";
+               if (r->eqn != NULL)
+                       aft_pr = "\\&";

        }
        }

+
+       /* Do the actual replacement. */
+
+       buf->sz = mandoc_asprintf(&cp1, "%s%s%s%s%s%s%s", buf->buf,
+           bef_pr, bef_nl, mac, aft_nl, aft_pr, cp2) + 1;
+       free(buf->buf);
+       buf->buf = cp1;
+
+       /* Toggle the in-line state of the eqn subsystem. */
+
+       r->eqn_inline = r->eqn == NULL;
+       return(ROFF_REPARSE);

 }
 
 static enum rofferr
 roff_EQ(ROFF_ARGS)
 {
 }
 
 static enum rofferr
 roff_EQ(ROFF_ARGS)
 {

+       struct eqn_node *e;
+
+       assert(r->eqn == NULL);
+       e = eqn_alloc(ppos, ln, r->parse);
+
+       if (r->last_eqn) {
+               r->last_eqn->next = e;
+               e->delim = r->last_eqn->delim;
+               e->odelim = r->last_eqn->odelim;
+               e->cdelim = r->last_eqn->cdelim;
+       } else
+               r->first_eqn = r->last_eqn = e;
+
+       r->eqn = r->last_eqn = e;
+
+       if (buf->buf[pos] != '\0')
+               mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
+                   ".EQ %s", buf->buf + pos);

 
 

-       roff_openeqn(r, *bufp + pos, ln, ppos, NULL);

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


@@ -1833,7 +1961,7 @@ static enum rofferr
 roff_EN(ROFF_ARGS)
 {
 
 roff_EN(ROFF_ARGS)
 {
 

-       mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
+       mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN");

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


@@ -1843,7 +1971,8 @@ roff_TS(ROFF_ARGS)
        struct tbl_node *tbl;
 
        if (r->tbl) {
        struct tbl_node *tbl;
 
        if (r->tbl) {

-               mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
+               mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse,
+                   ln, ppos, "TS breaks TS");

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


@@ -1863,12 +1992,12 @@ roff_cc(ROFF_ARGS)
 {
        const char      *p;
 
 {
        const char      *p;
 

-       p = *bufp + pos;
+       p = buf->buf + pos;

 
 

-       if ('\0' == *p || '.' == (r->control = *p++))
+       if (*p == '\0' || (r->control = *p++) == '.')

                r->control = 0;
 
                r->control = 0;
 

-       if ('\0' != *p)
+       if (*p != '\0')

                mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
 
        return(ROFF_IGN);
                mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
 
        return(ROFF_IGN);


@@ -1881,41 +2010,39 @@ roff_tr(ROFF_ARGS)
        size_t           fsz, ssz;
        enum mandoc_esc  esc;
 
        size_t           fsz, ssz;
        enum mandoc_esc  esc;
 

-       p = *bufp + pos;
+       p = buf->buf + pos;

 
 

-       if ('\0' == *p) {
+       if (*p == '\0') {

                mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
                return(ROFF_IGN);
        }
 
                mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
                return(ROFF_IGN);
        }
 

-       while ('\0' != *p) {
+       while (*p != '\0') {

                fsz = ssz = 1;
 
                first = p++;
                fsz = ssz = 1;
 
                first = p++;

-               if ('\\' == *first) {
+               if (*first == '\\') {

                        esc = mandoc_escape(&p, NULL, NULL);
                        esc = mandoc_escape(&p, NULL, NULL);

-                       if (ESCAPE_ERROR == esc) {
-                               mandoc_msg(MANDOCERR_BADESCAPE,
-                                   r->parse, ln,
-                                   (int)(p - *bufp), NULL);
+                       if (esc == ESCAPE_ERROR) {
+                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
+                                   ln, (int)(p - buf->buf), first);

                                return(ROFF_IGN);
                        }
                        fsz = (size_t)(p - first);
                }
 
                second = p++;
                                return(ROFF_IGN);
                        }
                        fsz = (size_t)(p - first);
                }
 
                second = p++;

-               if ('\\' == *second) {
+               if (*second == '\\') {

                        esc = mandoc_escape(&p, NULL, NULL);
                        esc = mandoc_escape(&p, NULL, NULL);

-                       if (ESCAPE_ERROR == esc) {
-                               mandoc_msg(MANDOCERR_BADESCAPE,
-                                   r->parse, ln,
-                                   (int)(p - *bufp), NULL);
+                       if (esc == ESCAPE_ERROR) {
+                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
+                                   ln, (int)(p - buf->buf), second);

                                return(ROFF_IGN);
                        }
                        ssz = (size_t)(p - second);
                                return(ROFF_IGN);
                        }
                        ssz = (size_t)(p - second);

-               } else if ('\0' == *second) {
+               } else if (*second == '\0') {

                        mandoc_msg(MANDOCERR_ARGCOUNT, r->parse,
                        mandoc_msg(MANDOCERR_ARGCOUNT, r->parse,

-                           ln, (int)(p - *bufp), NULL);
+                           ln, (int)(p - buf->buf), NULL);

                        second = " ";
                        p--;
                }
                        second = " ";
                        p--;
                }


@@ -1926,7 +2053,7 @@ roff_tr(ROFF_ARGS)
                        continue;
                }
 
                        continue;
                }
 

-               if (NULL == r->xtab)
+               if (r->xtab == NULL)

                        r->xtab = mandoc_calloc(128,
                            sizeof(struct roffstr));
 
                        r->xtab = mandoc_calloc(128,
                            sizeof(struct roffstr));
 


@@ -1943,7 +2070,8 @@ roff_so(ROFF_ARGS)
 {
        char *name;
 
 {
        char *name;
 

-       mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL);
+       name = buf->buf + pos;
+       mandoc_vmsg(MANDOCERR_SO, r->parse, ln, ppos, "so %s", name);

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


@@ -1952,9 +2080,9 @@ roff_so(ROFF_ARGS)
         * or using absolute paths.
         */
 
         * or using absolute paths.
         */
 

-       name = *bufp + pos;
-       if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
-               mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL);
+       if (*name == '/' || strstr(name, "../") || strstr(name, "/..")) {
+               mandoc_vmsg(MANDOCERR_SO_PATH, r->parse, ln, ppos,
+                   ".so %s", name);

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


@@ -1973,31 +2101,26 @@ roff_userdef(ROFF_ARGS)
         * Collect pointers to macro argument strings
         * and NUL-terminate them.
         */
         * Collect pointers to macro argument strings
         * and NUL-terminate them.
         */

-       cp = *bufp + pos;
+       cp = buf->buf + pos;

        for (i = 0; i < 9; i++)
        for (i = 0; i < 9; i++)

-               arg[i] = '\0' == *cp ? "" :
+               arg[i] = *cp == '\0' ? "" :

                    mandoc_getarg(r->parse, &cp, ln, &pos);
 
        /*
         * Expand macro arguments.
         */
                    mandoc_getarg(r->parse, &cp, ln, &pos);
 
        /*
         * Expand macro arguments.
         */

-       *szp = 0;
+       buf->sz = 0;

        n1 = cp = mandoc_strdup(r->current_string);
        n1 = cp = mandoc_strdup(r->current_string);

-       while (NULL != (cp = strstr(cp, "\\$"))) {
+       while ((cp = strstr(cp, "\\$")) != NULL) {

                i = cp[2] - '1';
                if (0 > i || 8 < i) {
                        /* Not an argument invocation. */
                        cp += 2;
                        continue;
                }
                i = cp[2] - '1';
                if (0 > i || 8 < i) {
                        /* Not an argument invocation. */
                        cp += 2;
                        continue;
                }

-
-               *szp = strlen(n1) - 3 + strlen(arg[i]) + 1;
-               n2 = mandoc_malloc(*szp);
-
-               strlcpy(n2, n1, (size_t)(cp - n1 + 1));
-               strlcat(n2, arg[i], *szp);
-               strlcat(n2, cp + 3, *szp);
-
+               *cp = '\0';
+               buf->sz = mandoc_asprintf(&n2, "%s%s%s",
+                   n1, arg[i], cp + 3) + 1;

                cp = n2 + (cp - n1);
                free(n1);
                n1 = n2;
                cp = n2 + (cp - n1);
                free(n1);
                n1 = n2;


@@ -2007,46 +2130,51 @@ roff_userdef(ROFF_ARGS)
         * Replace the macro invocation
         * by the expanded macro.
         */
         * Replace the macro invocation
         * by the expanded macro.
         */

-       free(*bufp);
-       *bufp = n1;
-       if (0 == *szp)
-               *szp = strlen(*bufp) + 1;
+       free(buf->buf);
+       buf->buf = n1;
+       if (buf->sz == 0)
+               buf->sz = strlen(buf->buf) + 1;

 
 

-       return(*szp > 1 && '\n' == (*bufp)[(int)*szp - 2] ?
+       return(buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?

           ROFF_REPARSE : ROFF_APPEND);
 }
 
           ROFF_REPARSE : ROFF_APPEND);
 }
 

-static char *
+static size_t

 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
        char     *name, *cp;
 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
        char     *name, *cp;

+       size_t    namesz;

 
        name = *cpp;
        if ('\0' == *name)
 
        name = *cpp;
        if ('\0' == *name)

-               return(name);
+               return(0);

 
 

-       /* Read until end of name. */
-       for (cp = name; '\0' != *cp && ' ' != *cp; cp++) {
+       /* Read until end of name and terminate it with NUL. */
+       for (cp = name; 1; cp++) {
+               if ('\0' == *cp || ' ' == *cp) {
+                       namesz = cp - name;
+                       break;
+               }

                if ('\\' != *cp)
                        continue;
                if ('\\' != *cp)
                        continue;

+               namesz = cp - name;
+               if ('{' == cp[1] || '}' == cp[1])
+                       break;

                cp++;
                if ('\\' == *cp)
                        continue;
                cp++;
                if ('\\' == *cp)
                        continue;

-               mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL);
-               *cp = '\0';
-               name = cp;
+               mandoc_vmsg(MANDOCERR_NAMESC, r->parse, ln, pos,
+                   "%.*s", (int)(cp - name + 1), name);
+               mandoc_escape((const char **)&cp, NULL, NULL);
+               break;

        }
 
        }
 

-       /* Nil-terminate name. */
-       if ('\0' != *cp)
-               *(cp++) = '\0';
-

        /* Read past spaces. */
        while (' ' == *cp)
                cp++;
 
        *cpp = cp;
        /* Read past spaces. */
        while (' ' == *cp)
                cp++;
 
        *cpp = cp;

-       return(name);
+       return(namesz);

 }
 
 /*
 }
 
 /*


@@ -2077,7 +2205,8 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
        /* Search for an existing string with the same name. */
        n = *r;
 
        /* Search for an existing string with the same name. */
        n = *r;
 

-       while (n && strcmp(name, n->key.p))
+       while (n && (namesz != n->key.sz ||
+                       strncmp(n->key.p, name, namesz)))

                n = n->next;
 
        if (NULL == n) {
                n = n->next;
 
        if (NULL == n) {


@@ -2274,6 +2403,13 @@ roff_strdup(const struct roff *r, const char *p)
        return(res);
 }
 
        return(res);
 }
 

+int
+roff_getformat(const struct roff *r)
+{
+
+       return(r->format);
+}
+

 /*
  * Find out whether a line is a macro line or not.
  * If it is, adjust the current position and return one; if it isn't,
 /*
  * Find out whether a line is a macro line or not.
  * If it is, adjust the current position and return one; if it isn't,