tagging issues from weerd@ regarding hyphens

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index abb1ff5fc43aae17162d147df93d34dd1c7c25a4..de75a260f5a769a571c5b077e14aea8ebe590b0f 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.314 2017/06/17 23:07:00 schwarze Exp $ */
+/* $Id: roff.c,v 1.378 2021/08/10 12:55:04 schwarze Exp $ */

 /*
 /*

+ * Copyright (c) 2010-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

+ *
+ * Implementation of the roff(7) parser for mandoc(1).

  */
 #include "config.h"
 
  */
 #include "config.h"
 


@@ -28,17 +30,36 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_ohash.h"
 #include "mandoc_aux.h"
 #include "mandoc_ohash.h"

+#include "mandoc.h"

 #include "roff.h"
 #include "roff.h"

+#include "mandoc_parse.h"

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

-#include "libroff.h"
+#include "tbl_parse.h"
+#include "eqn_parse.h"
+
+/*
+ * ASCII_ESC is used to signal from roff_getarg() to roff_expand()
+ * that an escape sequence resulted from copy-in processing and
+ * needs to be checked or interpolated.  As it is used nowhere
+ * else, it is defined here rather than in a header file.
+ */
+#define        ASCII_ESC       27

 
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 
 
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 

+/* Types of definitions of macros and strings. */
+#define        ROFFDEF_USER    (1 << 1)  /* User-defined. */
+#define        ROFFDEF_PRE     (1 << 2)  /* Predefined. */
+#define        ROFFDEF_REN     (1 << 3)  /* Renamed standard macro. */
+#define        ROFFDEF_STD     (1 << 4)  /* mdoc(7) or man(7) macro. */
+#define        ROFFDEF_ANY     (ROFFDEF_USER | ROFFDEF_PRE | \
+                        ROFFDEF_REN | ROFFDEF_STD)
+#define        ROFFDEF_UNDEF   (1 << 5)  /* Completely undefined. */
+

 /* --- data types --------------------------------------------------------- */
 
 /*
 /* --- data types --------------------------------------------------------- */
 
 /*


@@ -64,6 +85,7 @@ struct        roffkv {
 struct roffreg {
        struct roffstr   key;
        int              val;
 struct roffreg {
        struct roffstr   key;
        int              val;

+       int              step;

        struct roffreg  *next;
 };
 
        struct roffreg  *next;
 };
 


@@ -75,10 +97,20 @@ struct      roffreq {
        char             name[];
 };
 
        char             name[];
 };
 

+/*
+ * A macro processing context.
+ * More than one is needed when macro calls are nested.
+ */
+struct mctx {
+       char            **argv;
+       int              argc;
+       int              argsz;
+};
+

 struct roff {
 struct roff {

-       struct mparse   *parse; /* parse point */

        struct roff_man *man; /* mdoc or man parser */
        struct roffnode *last; /* leaf of stack */
        struct roff_man *man; /* mdoc or man parser */
        struct roffnode *last; /* leaf of stack */

+       struct mctx     *mstack; /* stack of macro contexts */

        int             *rstack; /* stack of inverted `ie' values */
        struct ohash    *reqtab; /* request lookup table */
        struct roffreg  *regtab; /* number registers */
        int             *rstack; /* stack of inverted `ie' values */
        struct ohash    *reqtab; /* request lookup table */
        struct roffreg  *regtab; /* number registers */


@@ -90,28 +122,31 @@ 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 eqn_node *last_eqn; /* equation parser */
+       struct eqn_node *eqn; /* active equation parser */

        int              eqn_inline; /* current equation is inline */
        int              options; /* parse options */
        int              eqn_inline; /* current equation is inline */
        int              options; /* parse options */

+       int              mstacksz; /* current size of mstack */
+       int              mstackpos; /* position in mstack */

        int              rstacksz; /* current size limit of rstack */
        int              rstackpos; /* position in rstack */
        int              format; /* current file in mdoc or man format */
        int              rstacksz; /* current size limit of rstack */
        int              rstackpos; /* position in rstack */
        int              format; /* current file in mdoc or man format */

-       int              argc; /* number of args of the last macro */

        char             control; /* control character */
        char             escape; /* escape character */
 };
 
        char             control; /* control character */
        char             escape; /* escape character */
 };
 

+/*
+ * A macro definition, condition, or ignored block.
+ */

 struct roffnode {
        enum roff_tok    tok; /* type of node */
        struct roffnode *parent; /* up one in stack */
        int              line; /* parse line */
        int              col; /* parse col */
        char            *name; /* node name, e.g. macro name */
 struct roffnode {
        enum roff_tok    tok; /* type of node */
        struct roffnode *parent; /* up one in stack */
        int              line; /* parse line */
        int              col; /* parse col */
        char            *name; /* node name, e.g. macro name */

-       char            *end; /* end-rules: custom token */
-       int              endspan; /* end-rules: next-line or infty */
-       int              rule; /* current evaluation rule */
+       char            *end; /* custom end macro of the block */
+       int              endspan; /* scope to: 1=eol 2=next line -1=\} */
+       int              rule; /* content is: 1=evaluated 0=skipped */

 };
 
 #define        ROFF_ARGS        struct roff *r, /* parse ctx */ \
 };
 
 #define        ROFF_ARGS        struct roff *r, /* parse ctx */ \


@@ -122,7 +157,7 @@ struct      roffnode {
                         int pos, /* current pos in buffer */ \
                         int *offs /* reset offset of buffer data */
 
                         int pos, /* current pos in buffer */ \
                         int *offs /* reset offset of buffer data */
 

-typedef        enum rofferr (*roffproc)(ROFF_ARGS);
+typedef        int (*roffproc)(ROFF_ARGS);

 
 struct roffmac {
        roffproc         proc; /* process new macro */
 
 struct roffmac {
        roffproc         proc; /* process new macro */


@@ -142,79 +177,86 @@ struct    predef {
 
 /* --- function prototypes ------------------------------------------------ */
 
 
 /* --- function prototypes ------------------------------------------------ */
 

-static void             roffnode_cleanscope(struct roff *);
-static void             roffnode_pop(struct roff *);
+static int              roffnode_cleanscope(struct roff *);
+static int              roffnode_pop(struct roff *);

 static void             roffnode_push(struct roff *, enum roff_tok,
                                const char *, int, int);
 static void             roffnode_push(struct roff *, enum roff_tok,
                                const char *, int, int);

-static enum rofferr     roff_als(ROFF_ARGS);
-static enum rofferr     roff_block(ROFF_ARGS);
-static enum rofferr     roff_block_text(ROFF_ARGS);
-static enum rofferr     roff_block_sub(ROFF_ARGS);
-static enum rofferr     roff_br(ROFF_ARGS);
-static enum rofferr     roff_cblock(ROFF_ARGS);
-static enum rofferr     roff_cc(ROFF_ARGS);
-static void             roff_ccond(struct roff *, int, int);
-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_ec(ROFF_ARGS);
-static enum rofferr     roff_eo(ROFF_ARGS);
-static enum rofferr     roff_eqndelim(struct roff *, struct buf *, int);
-static int              roff_evalcond(struct roff *r, int, char *, int *);
+static void             roff_addtbl(struct roff_man *, int, struct tbl_node *);
+static int              roff_als(ROFF_ARGS);
+static int              roff_block(ROFF_ARGS);
+static int              roff_block_text(ROFF_ARGS);
+static int              roff_block_sub(ROFF_ARGS);
+static int              roff_break(ROFF_ARGS);
+static int              roff_cblock(ROFF_ARGS);
+static int              roff_cc(ROFF_ARGS);
+static int              roff_ccond(struct roff *, int, int);
+static int              roff_char(ROFF_ARGS);
+static int              roff_cond(ROFF_ARGS);
+static int              roff_cond_checkend(ROFF_ARGS);
+static int              roff_cond_text(ROFF_ARGS);
+static int              roff_cond_sub(ROFF_ARGS);
+static int              roff_ds(ROFF_ARGS);
+static int              roff_ec(ROFF_ARGS);
+static int              roff_eo(ROFF_ARGS);
+static int              roff_eqndelim(struct roff *, struct buf *, int);
+static int              roff_evalcond(struct roff *, int, 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 *, int);
 static int              roff_evalstrcond(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 *, int);
 static int              roff_evalstrcond(const char *, int *);

+static int              roff_expand(struct roff *, struct buf *,
+                               int, int, char);

 static void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static size_t           roff_getname(struct roff *, char **, int, int);
 static int              roff_getnum(const char *, int *, int *, int);
 static int              roff_getop(const char *, int *, char *);
 static void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static size_t           roff_getname(struct roff *, char **, int, int);
 static int              roff_getnum(const char *, int *, int *, int);
 static int              roff_getop(const char *, int *, char *);

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

 static int              roff_getregro(const struct roff *,
                                const char *name);
 static int              roff_getregro(const struct roff *,
                                const char *name);

-static const char      *roff_getrenn(const struct roff *,
-                               const char *, size_t);
-static const char      *roff_getstrn(const struct roff *,
-                               const char *, size_t);
+static const char      *roff_getstrn(struct roff *,
+                               const char *, size_t, int *);

 static int              roff_hasregn(const struct roff *,
                                const char *, size_t);
 static int              roff_hasregn(const struct roff *,
                                const char *, size_t);

-static enum rofferr     roff_insec(ROFF_ARGS);
-static enum rofferr     roff_it(ROFF_ARGS);
-static enum rofferr     roff_line_ignore(ROFF_ARGS);
+static int              roff_insec(ROFF_ARGS);
+static int              roff_it(ROFF_ARGS);
+static int              roff_line_ignore(ROFF_ARGS);

 static void             roff_man_alloc1(struct roff_man *);
 static void             roff_man_free1(struct roff_man *);
 static void             roff_man_alloc1(struct roff_man *);
 static void             roff_man_free1(struct roff_man *);

-static enum rofferr     roff_manyarg(ROFF_ARGS);
-static enum rofferr     roff_nr(ROFF_ARGS);
-static enum rofferr     roff_onearg(ROFF_ARGS);
+static int              roff_manyarg(ROFF_ARGS);
+static int              roff_noarg(ROFF_ARGS);
+static int              roff_nop(ROFF_ARGS);
+static int              roff_nr(ROFF_ARGS);
+static int              roff_onearg(ROFF_ARGS);

 static enum roff_tok    roff_parse(struct roff *, char *, int *,
                                int, int);
 static enum roff_tok    roff_parse(struct roff *, char *, int *,
                                int, int);

-static enum rofferr     roff_parsetext(struct roff *, struct buf *,
+static int              roff_parsetext(struct roff *, struct buf *,

                                int, int *);
                                int, int *);

-static enum rofferr     roff_renamed(ROFF_ARGS);
-static enum rofferr     roff_res(struct roff *, struct buf *, int, int);
-static enum rofferr     roff_rm(ROFF_ARGS);
-static enum rofferr     roff_rn(ROFF_ARGS);
-static enum rofferr     roff_rr(ROFF_ARGS);
+static int              roff_renamed(ROFF_ARGS);
+static int              roff_return(ROFF_ARGS);
+static int              roff_rm(ROFF_ARGS);
+static int              roff_rn(ROFF_ARGS);
+static int              roff_rr(ROFF_ARGS);
+static void             roff_setregn(struct roff *, const char *,
+                               size_t, int, char, int);

 static void             roff_setstr(struct roff *,
                                const char *, const char *, int);
 static void             roff_setstrn(struct roffkv **, const char *,
                                size_t, const char *, size_t, int);
 static void             roff_setstr(struct roff *,
                                const char *, const char *, int);
 static void             roff_setstrn(struct roffkv **, const char *,
                                size_t, const char *, size_t, int);

-static enum rofferr     roff_so(ROFF_ARGS);
-static enum rofferr     roff_tr(ROFF_ARGS);
-static enum rofferr     roff_Dd(ROFF_ARGS);
-static enum rofferr     roff_TH(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_unsupp(ROFF_ARGS);
-static enum rofferr     roff_userdef(ROFF_ARGS);
+static int              roff_shift(ROFF_ARGS);
+static int              roff_so(ROFF_ARGS);
+static int              roff_tr(ROFF_ARGS);
+static int              roff_Dd(ROFF_ARGS);
+static int              roff_TE(ROFF_ARGS);
+static int              roff_TS(ROFF_ARGS);
+static int              roff_EQ(ROFF_ARGS);
+static int              roff_EN(ROFF_ARGS);
+static int              roff_T_(ROFF_ARGS);
+static int              roff_unsupp(ROFF_ARGS);
+static int              roff_userdef(ROFF_ARGS);

 
 /* --- constant data ------------------------------------------------------ */
 
 
 /* --- constant data ------------------------------------------------------ */
 


@@ -222,8 +264,9 @@ static      enum rofferr     roff_userdef(ROFF_ARGS);
 #define        ROFFNUM_WHITE   (1 << 1)  /* Skip whitespace in roff_evalnum(). */
 
 const char *__roff_name[MAN_MAX + 1] = {
 #define        ROFFNUM_WHITE   (1 << 1)  /* Skip whitespace in roff_evalnum(). */
 
 const char *__roff_name[MAN_MAX + 1] = {

-       "br",           "ce",           "ft",           "ll",
-       "mc",           "po",           "rj",           "sp",
+       "br",           "ce",           "fi",           "ft",
+       "ll",           "mc",           "nf",
+       "po",           "rj",           "sp",

        "ta",           "ti",           NULL,
        "ab",           "ad",           "af",           "aln",
        "als",          "am",           "am1",          "ami",
        "ta",           "ti",           NULL,
        "ab",           "ad",           "af",           "aln",
        "als",          "am",           "am1",          "ami",


@@ -315,26 +358,29 @@ const char *__roff_name[MAN_MAX + 1] = {
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "%U",           "Ta",
        "Lk",           "Mt",           "Brq",          "Bro",
        "Brc",          "%C",           "Es",           "En",
        "Dx",           "%Q",           "%U",           "Ta",

-       NULL,
+       "Tg",           NULL,

        "TH",           "SH",           "SS",           "TP",
        "TH",           "SH",           "SS",           "TP",

+       "TQ",

        "LP",           "PP",           "P",            "IP",
        "HP",           "SM",           "SB",           "BI",
        "IB",           "BR",           "RB",           "R",
        "B",            "I",            "IR",           "RI",
        "LP",           "PP",           "P",            "IP",
        "HP",           "SM",           "SB",           "BI",
        "IB",           "BR",           "RB",           "R",
        "B",            "I",            "IR",           "RI",

-       "nf",           "fi",

        "RE",           "RS",           "DT",           "UC",
        "PD",           "AT",           "in",
        "RE",           "RS",           "DT",           "UC",
        "PD",           "AT",           "in",

-       "OP",           "EX",           "EE",           "UR",
-       "UE",           NULL
+       "SY",           "YS",           "OP",
+       "EX",           "EE",           "UR",
+       "UE",           "MT",           "ME",           NULL

 };
 const  char *const *roff_name = __roff_name;
 
 static struct roffmac   roffs[TOKEN_NONE] = {
 };
 const  char *const *roff_name = __roff_name;
 
 static struct roffmac   roffs[TOKEN_NONE] = {

-       { roff_br, NULL, NULL, 0 },  /* br */
+       { roff_noarg, NULL, NULL, 0 },  /* br */

        { roff_onearg, NULL, NULL, 0 },  /* ce */
        { roff_onearg, NULL, NULL, 0 },  /* ce */

+       { roff_noarg, NULL, NULL, 0 },  /* fi */

        { roff_onearg, NULL, NULL, 0 },  /* ft */
        { roff_onearg, NULL, NULL, 0 },  /* ll */
        { roff_onearg, NULL, NULL, 0 },  /* mc */
        { roff_onearg, NULL, NULL, 0 },  /* ft */
        { roff_onearg, NULL, NULL, 0 },  /* ll */
        { roff_onearg, NULL, NULL, 0 },  /* mc */

+       { roff_noarg, NULL, NULL, 0 },  /* nf */

        { roff_onearg, NULL, NULL, 0 },  /* po */
        { roff_onearg, NULL, NULL, 0 },  /* rj */
        { roff_onearg, NULL, NULL, 0 },  /* sp */
        { roff_onearg, NULL, NULL, 0 },  /* po */
        { roff_onearg, NULL, NULL, 0 },  /* rj */
        { roff_onearg, NULL, NULL, 0 },  /* sp */


@@ -361,17 +407,17 @@ static    struct roffmac   roffs[TOKEN_NONE] = {
        { roff_unsupp, NULL, NULL, 0 },  /* boxa */
        { roff_line_ignore, NULL, NULL, 0 },  /* bp */
        { roff_unsupp, NULL, NULL, 0 },  /* BP */
        { roff_unsupp, NULL, NULL, 0 },  /* boxa */
        { roff_line_ignore, NULL, NULL, 0 },  /* bp */
        { roff_unsupp, NULL, NULL, 0 },  /* BP */

-       { roff_unsupp, NULL, NULL, 0 },  /* break */
+       { roff_break, NULL, NULL, 0 },  /* break */

        { roff_line_ignore, NULL, NULL, 0 },  /* breakchar */
        { roff_line_ignore, NULL, NULL, 0 },  /* brnl */
        { roff_line_ignore, NULL, NULL, 0 },  /* breakchar */
        { roff_line_ignore, NULL, NULL, 0 },  /* brnl */

-       { roff_br, NULL, NULL, 0 },  /* brp */
+       { roff_noarg, NULL, NULL, 0 },  /* brp */

        { roff_line_ignore, NULL, NULL, 0 },  /* brpnl */
        { roff_unsupp, NULL, NULL, 0 },  /* c2 */
        { roff_cc, NULL, NULL, 0 },  /* cc */
        { roff_insec, NULL, NULL, 0 },  /* cf */
        { roff_line_ignore, NULL, NULL, 0 },  /* cflags */
        { roff_line_ignore, NULL, NULL, 0 },  /* ch */
        { roff_line_ignore, NULL, NULL, 0 },  /* brpnl */
        { roff_unsupp, NULL, NULL, 0 },  /* c2 */
        { roff_cc, NULL, NULL, 0 },  /* cc */
        { roff_insec, NULL, NULL, 0 },  /* cf */
        { roff_line_ignore, NULL, NULL, 0 },  /* cflags */
        { roff_line_ignore, NULL, NULL, 0 },  /* ch */

-       { roff_unsupp, NULL, NULL, 0 },  /* char */
+       { roff_char, NULL, NULL, 0 },  /* char */

        { roff_unsupp, NULL, NULL, 0 },  /* chop */
        { roff_line_ignore, NULL, NULL, 0 },  /* class */
        { roff_insec, NULL, NULL, 0 },  /* close */
        { roff_unsupp, NULL, NULL, 0 },  /* chop */
        { roff_line_ignore, NULL, NULL, 0 },  /* class */
        { roff_insec, NULL, NULL, 0 },  /* close */


@@ -481,7 +527,7 @@ static      struct roffmac   roffs[TOKEN_NONE] = {
        { roff_line_ignore, NULL, NULL, 0 },  /* nhychar */
        { roff_unsupp, NULL, NULL, 0 },  /* nm */
        { roff_unsupp, NULL, NULL, 0 },  /* nn */
        { roff_line_ignore, NULL, NULL, 0 },  /* nhychar */
        { roff_unsupp, NULL, NULL, 0 },  /* nm */
        { roff_unsupp, NULL, NULL, 0 },  /* nn */

-       { roff_unsupp, NULL, NULL, 0 },  /* nop */
+       { roff_nop, NULL, NULL, 0 },  /* nop */

        { roff_nr, NULL, NULL, 0 },  /* nr */
        { roff_unsupp, NULL, NULL, 0 },  /* nrf */
        { roff_line_ignore, NULL, NULL, 0 },  /* nroff */
        { roff_nr, NULL, NULL, 0 },  /* nr */
        { roff_unsupp, NULL, NULL, 0 },  /* nrf */
        { roff_line_ignore, NULL, NULL, 0 },  /* nroff */


@@ -510,7 +556,7 @@ static      struct roffmac   roffs[TOKEN_NONE] = {
        { roff_unsupp, NULL, NULL, 0 },  /* rchar */
        { roff_line_ignore, NULL, NULL, 0 },  /* rd */
        { roff_line_ignore, NULL, NULL, 0 },  /* recursionlimit */
        { roff_unsupp, NULL, NULL, 0 },  /* rchar */
        { roff_line_ignore, NULL, NULL, 0 },  /* rd */
        { roff_line_ignore, NULL, NULL, 0 },  /* recursionlimit */

-       { roff_unsupp, NULL, NULL, 0 },  /* return */
+       { roff_return, NULL, NULL, 0 },  /* return */

        { roff_unsupp, NULL, NULL, 0 },  /* rfschar */
        { roff_line_ignore, NULL, NULL, 0 },  /* rhang */
        { roff_rm, NULL, NULL, 0 },  /* rm */
        { roff_unsupp, NULL, NULL, 0 },  /* rfschar */
        { roff_line_ignore, NULL, NULL, 0 },  /* rhang */
        { roff_rm, NULL, NULL, 0 },  /* rm */


@@ -522,7 +568,7 @@ static      struct roffmac   roffs[TOKEN_NONE] = {
        { roff_unsupp, NULL, NULL, 0 },  /* schar */
        { roff_line_ignore, NULL, NULL, 0 },  /* sentchar */
        { roff_line_ignore, NULL, NULL, 0 },  /* shc */
        { roff_unsupp, NULL, NULL, 0 },  /* schar */
        { roff_line_ignore, NULL, NULL, 0 },  /* sentchar */
        { roff_line_ignore, NULL, NULL, 0 },  /* shc */

-       { roff_unsupp, NULL, NULL, 0 },  /* shift */
+       { roff_shift, NULL, NULL, 0 },  /* shift */

        { roff_line_ignore, NULL, NULL, 0 },  /* sizes */
        { roff_so, NULL, NULL, 0 },  /* so */
        { roff_line_ignore, NULL, NULL, 0 },  /* spacewidth */
        { roff_line_ignore, NULL, NULL, 0 },  /* sizes */
        { roff_so, NULL, NULL, 0 },  /* so */
        { roff_line_ignore, NULL, NULL, 0 },  /* spacewidth */


@@ -536,7 +582,7 @@ static      struct roffmac   roffs[TOKEN_NONE] = {
        { roff_T_, NULL, NULL, 0 },  /* T& */
        { roff_unsupp, NULL, NULL, 0 },  /* tc */
        { roff_TE, NULL, NULL, 0 },  /* TE */
        { roff_T_, NULL, NULL, 0 },  /* T& */
        { roff_unsupp, NULL, NULL, 0 },  /* tc */
        { roff_TE, NULL, NULL, 0 },  /* TE */

-       { roff_TH, NULL, NULL, 0 },  /* TH */
+       { roff_Dd, NULL, NULL, 0 },  /* TH */

        { roff_line_ignore, NULL, NULL, 0 },  /* tkf */
        { roff_unsupp, NULL, NULL, 0 },  /* tl */
        { roff_line_ignore, NULL, NULL, 0 },  /* tm */
        { roff_line_ignore, NULL, NULL, 0 },  /* tkf */
        { roff_unsupp, NULL, NULL, 0 },  /* tl */
        { roff_line_ignore, NULL, NULL, 0 },  /* tm */


@@ -564,7 +610,7 @@ static      struct roffmac   roffs[TOKEN_NONE] = {
        { roff_line_ignore, NULL, NULL, 0 },  /* watchlength */
        { roff_line_ignore, NULL, NULL, 0 },  /* watchn */
        { roff_unsupp, NULL, NULL, 0 },  /* wh */
        { roff_line_ignore, NULL, NULL, 0 },  /* watchlength */
        { roff_line_ignore, NULL, NULL, 0 },  /* watchn */
        { roff_unsupp, NULL, NULL, 0 },  /* wh */

-       { roff_unsupp, NULL, NULL, 0 },  /* while */
+       { roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT }, /*while*/

        { roff_insec, NULL, NULL, 0 },  /* write */
        { roff_insec, NULL, NULL, 0 },  /* writec */
        { roff_insec, NULL, NULL, 0 },  /* writem */
        { roff_insec, NULL, NULL, 0 },  /* write */
        { roff_insec, NULL, NULL, 0 },  /* writec */
        { roff_insec, NULL, NULL, 0 },  /* writem */


@@ -574,39 +620,6 @@ static     struct roffmac   roffs[TOKEN_NONE] = {
        { roff_userdef, NULL, NULL, 0 }
 };
 
        { roff_userdef, NULL, NULL, 0 }
 };
 

-/* not currently implemented: Ds em Eq LP Me PP pp Or Rd Sf SH */
-const  char *const __mdoc_reserved[] = {
-       "Ac", "Ad", "An", "Ao", "Ap", "Aq", "Ar", "At",
-       "Bc", "Bd", "Bf", "Bk", "Bl", "Bo", "Bq",
-       "Brc", "Bro", "Brq", "Bsx", "Bt", "Bx",
-       "Cd", "Cm", "Db", "Dc", "Dd", "Dl", "Do", "Dq",
-       "Dt", "Dv", "Dx", "D1",
-       "Ec", "Ed", "Ef", "Ek", "El", "Em",
-       "En", "Eo", "Er", "Es", "Ev", "Ex",
-       "Fa", "Fc", "Fd", "Fl", "Fn", "Fo", "Fr", "Ft", "Fx",
-       "Hf", "Ic", "In", "It", "Lb", "Li", "Lk", "Lp",
-       "Ms", "Mt", "Nd", "Nm", "No", "Ns", "Nx",
-       "Oc", "Oo", "Op", "Os", "Ot", "Ox",
-       "Pa", "Pc", "Pf", "Po", "Pp", "Pq",
-       "Qc", "Ql", "Qo", "Qq", "Re", "Rs", "Rv",
-       "Sc", "Sh", "Sm", "So", "Sq",
-       "Ss", "St", "Sx", "Sy",
-       "Ta", "Tn", "Ud", "Ux", "Va", "Vt", "Xc", "Xo", "Xr",
-       "%A", "%B", "%C", "%D", "%I", "%J", "%N", "%O",
-       "%P", "%Q", "%R", "%T", "%U", "%V",
-       NULL
-};
-
-/* not currently implemented: BT DE DS ME MT PT SY TQ YS */
-const  char *const __man_reserved[] = {
-       "AT", "B", "BI", "BR", "DT",
-       "EE", "EN", "EQ", "EX", "HP", "I", "IB", "IP", "IR",
-       "LP", "OP", "P", "PD", "PP",
-       "R", "RB", "RE", "RI", "RS", "SB", "SH", "SM", "SS",
-       "TE", "TH", "TP", "TS", "T&", "UC", "UE", "UR",
-       NULL
-};
-

 /* Array of injected predefined strings. */
 #define        PREDEFS_MAX      38
 static const struct predef predefs[PREDEFS_MAX] = {
 /* Array of injected predefined strings. */
 #define        PREDEFS_MAX      38
 static const struct predef predefs[PREDEFS_MAX] = {


@@ -679,20 +692,21 @@ roffhash_find(struct ohash *htab, const char *name, size_t sz)
 
 /*
  * Pop the current node off of the stack of roff instructions currently
 
 /*
  * Pop the current node off of the stack of roff instructions currently

- * pending.
+ * pending.  Return 1 if it is a loop or 0 otherwise.

  */
  */

-static void
+static int

 roffnode_pop(struct roff *r)
 {
        struct roffnode *p;
 roffnode_pop(struct roff *r)
 {
        struct roffnode *p;

+       int              inloop;

 
 

-       assert(r->last);

        p = r->last;
        p = r->last;

-
-       r->last = r->last->parent;
+       inloop = p->tok == ROFF_while;
+       r->last = p->parent;

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

+       return inloop;

 }
 
 /*
 }
 
 /*


@@ -722,21 +736,16 @@ roffnode_push(struct roff *r, enum roff_tok tok, const char *name,
 static void
 roff_free1(struct roff *r)
 {
 static void
 roff_free1(struct roff *r)
 {

-       struct tbl_node *tbl;
-       struct eqn_node *e;

        int              i;
 
        int              i;
 

-       while (NULL != (tbl = r->first_tbl)) {
-               r->first_tbl = tbl->next;
-               tbl_free(tbl);
-       }
+       tbl_free(r->first_tbl);

        r->first_tbl = r->last_tbl = r->tbl = NULL;
 
        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;
+       eqn_free(r->last_eqn);
+       r->last_eqn = r->eqn = NULL;
+
+       while (r->mstackpos >= 0)
+               roff_userret(r);

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


@@ -765,6 +774,7 @@ void
 roff_reset(struct roff *r)
 {
        roff_free1(r);
 roff_reset(struct roff *r)
 {
        roff_free1(r);

+       r->options |= MPARSE_COMMENT;

        r->format = r->options & (MPARSE_MDOC | MPARSE_MAN);
        r->control = '\0';
        r->escape = '\\';
        r->format = r->options & (MPARSE_MDOC | MPARSE_MAN);
        r->control = '\0';
        r->escape = '\\';


@@ -777,21 +787,26 @@ roff_reset(struct roff *r)
 void
 roff_free(struct roff *r)
 {
 void
 roff_free(struct roff *r)
 {

+       int              i;
+

        roff_free1(r);
        roff_free1(r);

+       for (i = 0; i < r->mstacksz; i++)
+               free(r->mstack[i].argv);
+       free(r->mstack);

        roffhash_free(r->reqtab);
        free(r);
 }
 
 struct roff *
        roffhash_free(r->reqtab);
        free(r);
 }
 
 struct roff *

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

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

-       r->parse = parse;
-       r->reqtab = roffhash_alloc(0, ROFF_USERDEF);
-       r->options = options;
+       r->reqtab = roffhash_alloc(0, ROFF_RENAMED);
+       r->options = options | MPARSE_COMMENT;

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

+       r->mstackpos = -1;

        r->rstackpos = -1;
        r->escape = '\\';
        return r;
        r->rstackpos = -1;
        r->escape = '\\';
        return r;


@@ -802,9 +817,8 @@ roff_alloc(struct mparse *parse, int options)
 static void
 roff_man_free1(struct roff_man *man)
 {
 static void
 roff_man_free1(struct roff_man *man)
 {

-
-       if (man->first != NULL)
-               roff_node_delete(man, man->first);
+       if (man->meta.first != NULL)
+               roff_node_delete(man, man->meta.first);

        free(man->meta.msec);
        free(man->meta.vol);
        free(man->meta.os);
        free(man->meta.msec);
        free(man->meta.vol);
        free(man->meta.os);


@@ -812,27 +826,33 @@ roff_man_free1(struct roff_man *man)
        free(man->meta.title);
        free(man->meta.name);
        free(man->meta.date);
        free(man->meta.title);
        free(man->meta.name);
        free(man->meta.date);

+       free(man->meta.sodest);

 }
 
 }
 

-static void
-roff_man_alloc1(struct roff_man *man)
+void
+roff_state_reset(struct roff_man *man)

 {
 {

-
-       memset(&man->meta, 0, sizeof(man->meta));
-       man->first = mandoc_calloc(1, sizeof(*man->first));
-       man->first->type = ROFFT_ROOT;
-       man->last = man->first;
+       man->last = man->meta.first;

        man->last_es = NULL;
        man->flags = 0;
        man->last_es = NULL;
        man->flags = 0;

-       man->macroset = MACROSET_NONE;

        man->lastsec = man->lastnamed = SEC_NONE;
        man->next = ROFF_NEXT_CHILD;
        man->lastsec = man->lastnamed = SEC_NONE;
        man->next = ROFF_NEXT_CHILD;

+       roff_setreg(man->roff, "nS", 0, '=');
+}
+
+static void
+roff_man_alloc1(struct roff_man *man)
+{
+       memset(&man->meta, 0, sizeof(man->meta));
+       man->meta.first = mandoc_calloc(1, sizeof(*man->meta.first));
+       man->meta.first->type = ROFFT_ROOT;
+       man->meta.macroset = MACROSET_NONE;
+       roff_state_reset(man);

 }
 
 void
 roff_man_reset(struct roff_man *man)
 {
 }
 
 void
 roff_man_reset(struct roff_man *man)
 {

-

        roff_man_free1(man);
        roff_man_alloc1(man);
 }
        roff_man_free1(man);
        roff_man_alloc1(man);
 }


@@ -840,21 +860,18 @@ roff_man_reset(struct roff_man *man)
 void
 roff_man_free(struct roff_man *man)
 {
 void
 roff_man_free(struct roff_man *man)
 {

-

        roff_man_free1(man);
        free(man);
 }
 
 struct roff_man *
        roff_man_free1(man);
        free(man);
 }
 
 struct roff_man *

-roff_man_alloc(struct roff *roff, struct mparse *parse,
-       const char *defos, int quick)
+roff_man_alloc(struct roff *roff, const char *os_s, int quick)

 {
        struct roff_man *man;
 
        man = mandoc_calloc(1, sizeof(*man));
 {
        struct roff_man *man;
 
        man = mandoc_calloc(1, sizeof(*man));

-       man->parse = parse;

        man->roff = roff;
        man->roff = roff;

-       man->defos = defos;
+       man->os_s = os_s;

        man->quick = quick;
        roff_man_alloc1(man);
        roff->man = man;
        man->quick = quick;
        roff_man_alloc1(man);
        roff->man = man;


@@ -880,6 +897,10 @@ roff_node_alloc(struct roff_man *man, int line, int pos,
                n->flags |= NODE_SYNPRETTY;
        else
                n->flags &= ~NODE_SYNPRETTY;
                n->flags |= NODE_SYNPRETTY;
        else
                n->flags &= ~NODE_SYNPRETTY;

+       if ((man->flags & (ROFF_NOFILL | ROFF_NONOFILL)) == ROFF_NOFILL)
+               n->flags |= NODE_NOFILL;
+       else
+               n->flags &= ~NODE_NOFILL;

        if (man->flags & MDOC_NEWLINE)
                n->flags |= NODE_LINE;
        man->flags &= ~MDOC_NEWLINE;
        if (man->flags & MDOC_NEWLINE)
                n->flags |= NODE_LINE;
        man->flags &= ~MDOC_NEWLINE;


@@ -1011,31 +1032,21 @@ roff_body_alloc(struct roff_man *man, int line, int pos, int tok)
        return n;
 }
 
        return n;
 }
 

-void
-roff_addeqn(struct roff_man *man, const struct eqn *eqn)
-{
-       struct roff_node        *n;
-
-       n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE);
-       n->eqn = eqn;
-       if (eqn->ln > man->last->line)
-               n->flags |= NODE_LINE;
-       roff_node_append(man, n);
-       man->next = ROFF_NEXT_SIBLING;
-}
-
-void
-roff_addtbl(struct roff_man *man, const struct tbl_span *tbl)
+static void
+roff_addtbl(struct roff_man *man, int line, struct tbl_node *tbl)

 {
        struct roff_node        *n;
 {
        struct roff_node        *n;

+       struct tbl_span         *span;

 
 

-       if (man->macroset == MACROSET_MAN)
+       if (man->meta.macroset == MACROSET_MAN)

                man_breakscope(man, ROFF_TS);
                man_breakscope(man, ROFF_TS);

-       n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);
-       n->span = tbl;
-       roff_node_append(man, n);
-       n->flags |= NODE_VALID | NODE_ENDED;
-       man->next = ROFF_NEXT_SIBLING;
+       while ((span = tbl_span(tbl)) != NULL) {
+               n = roff_node_alloc(man, line, 0, ROFFT_TBL, TOKEN_NONE);
+               n->span = span;
+               roff_node_append(man, n);
+               n->flags |= NODE_VALID | NODE_ENDED;
+               man->next = ROFF_NEXT_SIBLING;
+       }

 }
 
 void
 }
 
 void


@@ -1071,8 +1082,16 @@ roff_node_unlink(struct roff_man *man, struct roff_node *n)
                        man->next = ROFF_NEXT_SIBLING;
                }
        }
                        man->next = ROFF_NEXT_SIBLING;
                }
        }

-       if (man->first == n)
-               man->first = NULL;
+       if (man->meta.first == n)
+               man->meta.first = NULL;
+}
+
+void
+roff_node_relink(struct roff_man *man, struct roff_node *n)
+{
+       roff_node_unlink(man, n);
+       n->prev = n->next = NULL;
+       roff_node_append(man, n);

 }
 
 void
 }
 
 void


@@ -1083,7 +1102,9 @@ roff_node_free(struct roff_node *n)
                mdoc_argv_free(n->args);
        if (n->type == ROFFT_BLOCK || n->type == ROFFT_ELEM)
                free(n->norm);
                mdoc_argv_free(n->args);
        if (n->type == ROFFT_BLOCK || n->type == ROFFT_ELEM)
                free(n->norm);

+       eqn_box_free(n->eqn);

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

+       free(n->tag);

        free(n);
 }
 
        free(n);
 }
 


@@ -1097,13 +1118,72 @@ roff_node_delete(struct roff_man *man, struct roff_node *n)
        roff_node_free(n);
 }
 
        roff_node_free(n);
 }
 

+int
+roff_node_transparent(struct roff_node *n)
+{
+       if (n == NULL)
+               return 0;
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
+               return 1;
+       return roff_tok_transparent(n->tok);
+}
+
+int
+roff_tok_transparent(enum roff_tok tok)
+{
+       switch (tok) {
+       case ROFF_ft:
+       case ROFF_ll:
+       case ROFF_mc:
+       case ROFF_po:
+       case ROFF_ta:
+       case MDOC_Db:
+       case MDOC_Es:
+       case MDOC_Sm:
+       case MDOC_Tg:
+       case MAN_DT:
+       case MAN_UC:
+       case MAN_PD:
+       case MAN_AT:
+               return 1;
+       default:
+               return 0;
+       }
+}
+
+struct roff_node *
+roff_node_child(struct roff_node *n)
+{
+       for (n = n->child; roff_node_transparent(n); n = n->next)
+               continue;
+       return n;
+}
+
+struct roff_node *
+roff_node_prev(struct roff_node *n)
+{
+       do {
+               n = n->prev;
+       } while (roff_node_transparent(n));
+       return n;
+}
+
+struct roff_node *
+roff_node_next(struct roff_node *n)
+{
+       do {
+               n = n->next;
+       } while (roff_node_transparent(n));
+       return n;
+}
+

 void
 deroff(char **dest, const struct roff_node *n)
 {
        char    *cp;
        size_t   sz;
 
 void
 deroff(char **dest, const struct roff_node *n)
 {
        char    *cp;
        size_t   sz;
 

-       if (n->type != ROFFT_TEXT) {
+       if (n->string == NULL) {

                for (n = n->child; n != NULL; n = n->next)
                        deroff(dest, n);
                return;
                for (n = n->child; n != NULL; n = n->next)
                        deroff(dest, n);
                return;


@@ -1149,29 +1229,38 @@ deroff(char **dest, const struct roff_node *n)
 /* --- main functions of the roff parser ---------------------------------- */
 
 /*
 /* --- main functions of the roff parser ---------------------------------- */
 
 /*

- * In the current line, expand escape sequences that tend to get
- * used in numerical expressions and conditional requests.
- * Also check the syntax of the remaining escape sequences.
+ * In the current line, expand escape sequences that produce parsable
+ * input text.  Also check the syntax of the remaining escape sequences,
+ * which typically produce output glyphs or change formatter state.

  */
  */

-static enum rofferr
-roff_res(struct roff *r, struct buf *buf, int ln, int pos)
+static int
+roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char newesc)

 {
 {

+       struct mctx     *ctx;   /* current macro call context */

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

+       struct roff_node *n;    /* used for header comments */

        const char      *start; /* start of the string to process */
        char            *stesc; /* start of an escape sequence ('\\') */
        const char      *start; /* start of the string to process */
        char            *stesc; /* start of an escape sequence ('\\') */

+       const char      *esct;  /* type of esccape sequence */
+       char            *ep;    /* end of comment string */

        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 buf->buf to */
        size_t           maxl;  /* expected length of the escape name */
        size_t           naml;  /* actual length of the escape name */
        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 buf->buf to */
        size_t           maxl;  /* expected length of the escape name */
        size_t           naml;  /* actual length of the escape name */

-       enum mandoc_esc  esc;   /* type of the escape sequence */
-       enum mdoc_os     os_e;  /* kind of RCS id seen */
+       size_t           asz;   /* length of the replacement */
+       size_t           rsz;   /* length of the rest of the string */

        int              inaml; /* length returned from mandoc_escape() */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */
        int              arg_complete; /* argument not interrupted by eol */
        int              inaml; /* length returned from mandoc_escape() */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */
        int              arg_complete; /* argument not interrupted by eol */

+       int              quote_args; /* true for \\$@, false for \\$* */

        int              done;  /* no more input available */
        int              done;  /* no more input available */

+       int              deftype; /* type of definition to paste */
+       int              rcsid; /* kind of RCS id seen */
+       enum mandocerr   err;   /* for escape sequence problems */
+       char             sign;  /* increment number register */

        char             term;  /* character terminating the escape */
 
        /* Search forward for comments. */
        char             term;  /* character terminating the escape */
 
        /* Search forward for comments. */


@@ -1179,7 +1268,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
        done = 0;
        start = buf->buf + pos;
        for (stesc = buf->buf + pos; *stesc != '\0'; stesc++) {
        done = 0;
        start = buf->buf + pos;
        for (stesc = buf->buf + pos; *stesc != '\0'; stesc++) {

-               if (stesc[0] != r->escape || stesc[1] == '\0')
+               if (stesc[0] != newesc || stesc[1] == '\0')

                        continue;
                stesc++;
                if (*stesc != '"' && *stesc != '#')
                        continue;
                stesc++;
                if (*stesc != '"' && *stesc != '#')


@@ -1187,33 +1276,64 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
 
                /* Comment found, look for RCS id. */
 
 
                /* Comment found, look for RCS id. */
 

+               rcsid = 0;

                if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
                if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {

-                       os_e = MDOC_OS_OPENBSD;
+                       rcsid = 1 << MANDOC_OS_OPENBSD;

                        cp += 8;
                } else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
                        cp += 8;
                } else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {

-                       os_e = MDOC_OS_NETBSD;
+                       rcsid = 1 << MANDOC_OS_NETBSD;

                        cp += 7;
                }
                if (cp != NULL &&
                    isalnum((unsigned char)*cp) == 0 &&
                    strchr(cp, '$') != NULL) {
                        cp += 7;
                }
                if (cp != NULL &&
                    isalnum((unsigned char)*cp) == 0 &&
                    strchr(cp, '$') != NULL) {

-                       if (r->man->meta.rcsids & (1 << os_e))
-                               mandoc_msg(MANDOCERR_RCS_REP, r->parse,
-                                   ln, stesc + 1 - buf->buf, stesc + 1);
-                       r->man->meta.rcsids |= 1 << os_e;
+                       if (r->man->meta.rcsids & rcsid)
+                               mandoc_msg(MANDOCERR_RCS_REP, ln,
+                                   (int)(stesc - buf->buf) + 1,
+                                   "%s", stesc + 1);
+                       r->man->meta.rcsids |= rcsid;

                }
 
                /* Handle trailing whitespace. */
 
                }
 
                /* Handle trailing whitespace. */
 

-               cp = strchr(stesc--, '\0') - 1;
-               if (*cp == '\n') {
+               ep = strchr(stesc--, '\0') - 1;
+               if (*ep == '\n') {

                        done = 1;
                        done = 1;

-                       cp--;
+                       ep--;

                }
                }

-               if (*cp == ' ' || *cp == '\t')
-                       mandoc_msg(MANDOCERR_SPACE_EOL, r->parse,
-                           ln, cp - buf->buf, NULL);
-               while (stesc > start && stesc[-1] == ' ')
+               if (*ep == ' ' || *ep == '\t')
+                       mandoc_msg(MANDOCERR_SPACE_EOL,
+                           ln, (int)(ep - buf->buf), NULL);
+
+               /*
+                * Save comments preceding the title macro
+                * in the syntax tree.
+                */
+
+               if (newesc != ASCII_ESC && r->options & MPARSE_COMMENT) {
+                       while (*ep == ' ' || *ep == '\t')
+                               ep--;
+                       ep[1] = '\0';
+                       n = roff_node_alloc(r->man,
+                           ln, stesc + 1 - buf->buf,
+                           ROFFT_COMMENT, TOKEN_NONE);
+                       n->string = mandoc_strdup(stesc + 2);
+                       roff_node_append(r->man, n);
+                       n->flags |= NODE_VALID | NODE_ENDED;
+                       r->man->next = ROFF_NEXT_SIBLING;
+               }
+
+               /* Line continuation with comment. */
+
+               if (stesc[1] == '#') {
+                       *stesc = '\0';
+                       return ROFF_IGN | ROFF_APPEND;
+               }
+
+               /* Discard normal comments. */
+
+               while (stesc > start && stesc[-1] == ' ' &&
+                   (stesc == start + 1 || stesc[-2] != '\\'))

                        stesc--;
                *stesc = '\0';
                break;
                        stesc--;
                *stesc = '\0';
                break;


@@ -1231,11 +1351,16 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
 
        expand_count = 0;
        while (stesc >= start) {
 
        expand_count = 0;
        while (stesc >= start) {

+               if (*stesc != newesc) {

 
 

-               /* Search backwards for the next backslash. */
+                       /*
+                        * If we have a non-standard escape character,
+                        * escape literal backslashes because all
+                        * processing in subsequent functions uses
+                        * the standard escaping rules.
+                        */

 
 

-               if (*stesc != r->escape) {
-                       if (*stesc == '\\') {
+                       if (newesc != ASCII_ESC && *stesc == '\\') {

                                *stesc = '\0';
                                buf->sz = mandoc_asprintf(&nbuf, "%s\\e%s",
                                    buf->buf, stesc + 1) + 1;
                                *stesc = '\0';
                                buf->sz = mandoc_asprintf(&nbuf, "%s\\e%s",
                                    buf->buf, stesc + 1) + 1;


@@ -1244,6 +1369,9 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                                free(buf->buf);
                                buf->buf = nbuf;
                        }
                                free(buf->buf);
                                buf->buf = nbuf;
                        }

+
+                       /* Search backwards for the next escape. */
+

                        stesc--;
                        continue;
                }
                        stesc--;
                        continue;
                }


@@ -1265,15 +1393,19 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        if (done)
                                continue;
                        else
                        if (done)
                                continue;
                        else

-                               return ROFF_APPEND;
+                               return ROFF_IGN | ROFF_APPEND;

                }
 
                /* Decide whether to expand or to check only. */
 
                term = '\0';
                cp = stesc + 1;
                }
 
                /* Decide whether to expand or to check only. */
 
                term = '\0';
                cp = stesc + 1;

-               switch (*cp) {
+               if (*cp == 'E')
+                       cp++;
+               esct = cp;
+               switch (*esct) {

                case '*':
                case '*':

+               case '$':

                        res = NULL;
                        break;
                case 'B':
                        res = NULL;
                        break;
                case 'B':


@@ -1281,22 +1413,39 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        term = cp[1];
                        /* FALLTHROUGH */
                case 'n':
                        term = cp[1];
                        /* FALLTHROUGH */
                case 'n':

+                       sign = cp[1];
+                       if (sign == '+' || sign == '-')
+                               cp++;

                        res = ubuf;
                        break;
                default:
                        res = ubuf;
                        break;
                default:

-                       esc = mandoc_escape(&cp, &stnam, &inaml);
-                       if (esc == ESCAPE_ERROR ||
-                           (esc == ESCAPE_SPECIAL &&
-                            mchars_spec2cp(stnam, inaml) < 0))
-                               mandoc_vmsg(MANDOCERR_ESC_BAD,
-                                   r->parse, ln, (int)(stesc - buf->buf),
+                       err = MANDOCERR_OK;
+                       switch(mandoc_escape(&cp, &stnam, &inaml)) {
+                       case ESCAPE_SPECIAL:
+                               if (mchars_spec2cp(stnam, inaml) >= 0)
+                                       break;
+                               /* FALLTHROUGH */
+                       case ESCAPE_ERROR:
+                               err = MANDOCERR_ESC_BAD;
+                               break;
+                       case ESCAPE_UNDEF:
+                               err = MANDOCERR_ESC_UNDEF;
+                               break;
+                       case ESCAPE_UNSUPP:
+                               err = MANDOCERR_ESC_UNSUPP;
+                               break;
+                       default:
+                               break;
+                       }
+                       if (err != MANDOCERR_OK)
+                               mandoc_msg(err, ln, (int)(stesc - buf->buf),

                                    "%.*s", (int)(cp - stesc), stesc);
                        stesc--;
                        continue;
                }
 
                if (EXPAND_LIMIT < ++expand_count) {
                                    "%.*s", (int)(cp - stesc), stesc);
                        stesc--;
                        continue;
                }
 
                if (EXPAND_LIMIT < ++expand_count) {

-                       mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
+                       mandoc_msg(MANDOCERR_ROFFLOOP,

                            ln, (int)(stesc - buf->buf), NULL);
                        return ROFF_IGN;
                }
                            ln, (int)(stesc - buf->buf), NULL);
                        return ROFF_IGN;
                }


@@ -1337,8 +1486,8 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                arg_complete = 1;
                while (maxl == 0 || naml < maxl) {
                        if (*cp == '\0') {
                arg_complete = 1;
                while (maxl == 0 || naml < maxl) {
                        if (*cp == '\0') {

-                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
-                                   ln, (int)(stesc - buf->buf), stesc);
+                               mandoc_msg(MANDOCERR_ESC_BAD, ln,
+                                   (int)(stesc - buf->buf), "%s", stesc);

                                arg_complete = 0;
                                break;
                        }
                                arg_complete = 0;
                                break;
                        }


@@ -1346,7 +1495,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                                cp++;
                                break;
                        }
                                cp++;
                                break;
                        }

-                       if (*cp++ != '\\' || stesc[1] != 'w') {
+                       if (*cp++ != '\\' || *esct != 'w') {

                                naml++;
                                continue;
                        }
                                naml++;
                                continue;
                        }


@@ -1354,6 +1503,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        case ESCAPE_SPECIAL:
                        case ESCAPE_UNICODE:
                        case ESCAPE_NUMBERED:
                        case ESCAPE_SPECIAL:
                        case ESCAPE_UNICODE:
                        case ESCAPE_NUMBERED:

+                       case ESCAPE_UNDEF:

                        case ESCAPE_OVERSTRIKE:
                                naml++;
                                break;
                        case ESCAPE_OVERSTRIKE:
                                naml++;
                                break;


@@ -1367,11 +1517,80 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                 * undefined, resume searching for escapes.
                 */
 
                 * undefined, resume searching for escapes.
                 */
 

-               switch (stesc[1]) {
+               switch (*esct) {

                case '*':
                case '*':

-                       if (arg_complete)
-                               res = roff_getstrn(r, stnam, naml);
+                       if (arg_complete) {
+                               deftype = ROFFDEF_USER | ROFFDEF_PRE;
+                               res = roff_getstrn(r, stnam, naml, &deftype);
+
+                               /*
+                                * If not overriden, let \*(.T
+                                * through to the formatters.
+                                */
+
+                               if (res == NULL && naml == 2 &&
+                                   stnam[0] == '.' && stnam[1] == 'T') {
+                                       roff_setstrn(&r->strtab,
+                                           ".T", 2, NULL, 0, 0);
+                                       stesc--;
+                                       continue;
+                               }
+                       }

                        break;
                        break;

+               case '$':
+                       if (r->mstackpos < 0) {
+                               mandoc_msg(MANDOCERR_ARG_UNDEF, ln,
+                                   (int)(stesc - buf->buf), "%.3s", stesc);
+                               break;
+                       }
+                       ctx = r->mstack + r->mstackpos;
+                       npos = esct[1] - '1';
+                       if (npos >= 0 && npos <= 8) {
+                               res = npos < ctx->argc ?
+                                   ctx->argv[npos] : "";
+                               break;
+                       }
+                       if (esct[1] == '*')
+                               quote_args = 0;
+                       else if (esct[1] == '@')
+                               quote_args = 1;
+                       else {
+                               mandoc_msg(MANDOCERR_ARG_NONUM, ln,
+                                   (int)(stesc - buf->buf), "%.3s", stesc);
+                               break;
+                       }
+                       asz = 0;
+                       for (npos = 0; npos < ctx->argc; npos++) {
+                               if (npos)
+                                       asz++;  /* blank */
+                               if (quote_args)
+                                       asz += 2;  /* quotes */
+                               asz += strlen(ctx->argv[npos]);
+                       }
+                       if (asz != 3) {
+                               rsz = buf->sz - (stesc - buf->buf) - 3;
+                               if (asz < 3)
+                                       memmove(stesc + asz, stesc + 3, rsz);
+                               buf->sz += asz - 3;
+                               nbuf = mandoc_realloc(buf->buf, buf->sz);
+                               start = nbuf + pos;
+                               stesc = nbuf + (stesc - buf->buf);
+                               buf->buf = nbuf;
+                               if (asz > 3)
+                                       memmove(stesc + asz, stesc + 3, rsz);
+                       }
+                       for (npos = 0; npos < ctx->argc; npos++) {
+                               if (npos)
+                                       *stesc++ = ' ';
+                               if (quote_args)
+                                       *stesc++ = '"';
+                               cp = ctx->argv[npos];
+                               while (*cp != '\0')
+                                       *stesc++ = *cp++;
+                               if (quote_args)
+                                       *stesc++ = '"';
+                       }
+                       continue;

                case 'B':
                        npos = 0;
                        ubuf[0] = arg_complete &&
                case 'B':
                        npos = 0;
                        ubuf[0] = arg_complete &&


@@ -1383,7 +1602,7 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                case 'n':
                        if (arg_complete)
                                (void)snprintf(ubuf, sizeof(ubuf), "%d",
                case 'n':
                        if (arg_complete)
                                (void)snprintf(ubuf, sizeof(ubuf), "%d",

-                                   roff_getregn(r, stnam, naml));
+                                   roff_getregn(r, stnam, naml, sign));

                        else
                                ubuf[0] = '\0';
                        break;
                        else
                                ubuf[0] = '\0';
                        break;


@@ -1395,12 +1614,13 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                }
 
                if (res == NULL) {
                }
 
                if (res == NULL) {

-                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
-                           r->parse, ln, (int)(stesc - buf->buf),
-                           "%.*s", (int)naml, stnam);
+                       if (*esct == '*')
+                               mandoc_msg(MANDOCERR_STR_UNDEF,
+                                   ln, (int)(stesc - buf->buf),
+                                   "%.*s", (int)naml, stnam);

                        res = "";
                } else if (buf->sz + strlen(res) > SHRT_MAX) {
                        res = "";
                } else if (buf->sz + strlen(res) > SHRT_MAX) {

-                       mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
+                       mandoc_msg(MANDOCERR_ROFFLOOP,

                            ln, (int)(stesc - buf->buf), NULL);
                        return ROFF_IGN;
                }
                            ln, (int)(stesc - buf->buf), NULL);
                        return ROFF_IGN;
                }


@@ -1421,10 +1641,122 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
        return ROFF_CONT;
 }
 
        return ROFF_CONT;
 }
 

+/*
+ * Parse a quoted or unquoted roff-style request or macro argument.
+ * Return a pointer to the parsed argument, which is either the original
+ * pointer or advanced by one byte in case the argument is quoted.
+ * NUL-terminate the argument in place.
+ * Collapse pairs of quotes inside quoted arguments.
+ * Advance the argument pointer to the next argument,
+ * or to the NUL byte terminating the argument line.
+ */
+char *
+roff_getarg(struct roff *r, char **cpp, int ln, int *pos)
+{
+       struct buf       buf;
+       char            *cp, *start;
+       int              newesc, pairs, quoted, white;
+
+       /* Quoting can only start with a new word. */
+       start = *cpp;
+       quoted = 0;
+       if ('"' == *start) {
+               quoted = 1;
+               start++;
+       }
+
+       newesc = pairs = white = 0;
+       for (cp = start; '\0' != *cp; cp++) {
+
+               /*
+                * Move the following text left
+                * after quoted quotes and after "\\" and "\t".
+                */
+               if (pairs)
+                       cp[-pairs] = cp[0];
+
+               if ('\\' == cp[0]) {
+                       /*
+                        * In copy mode, translate double to single
+                        * backslashes and backslash-t to literal tabs.
+                        */
+                       switch (cp[1]) {
+                       case 'a':
+                       case 't':
+                               cp[-pairs] = '\t';
+                               pairs++;
+                               cp++;
+                               break;
+                       case '\\':
+                               newesc = 1;
+                               cp[-pairs] = ASCII_ESC;
+                               pairs++;
+                               cp++;
+                               break;
+                       case ' ':
+                               /* Skip escaped blanks. */
+                               if (0 == quoted)
+                                       cp++;
+                               break;
+                       default:
+                               break;
+                       }
+               } else if (0 == quoted) {
+                       if (' ' == cp[0]) {
+                               /* Unescaped blanks end unquoted args. */
+                               white = 1;
+                               break;
+                       }
+               } else if ('"' == cp[0]) {
+                       if ('"' == cp[1]) {
+                               /* Quoted quotes collapse. */
+                               pairs++;
+                               cp++;
+                       } else {
+                               /* Unquoted quotes end quoted args. */
+                               quoted = 2;
+                               break;
+                       }
+               }
+       }
+
+       /* Quoted argument without a closing quote. */
+       if (1 == quoted)
+               mandoc_msg(MANDOCERR_ARG_QUOTE, ln, *pos, NULL);
+
+       /* NUL-terminate this argument and move to the next one. */
+       if (pairs)
+               cp[-pairs] = '\0';
+       if ('\0' != *cp) {
+               *cp++ = '\0';
+               while (' ' == *cp)
+                       cp++;
+       }
+       *pos += (int)(cp - start) + (quoted ? 1 : 0);
+       *cpp = cp;
+
+       if ('\0' == *cp && (white || ' ' == cp[-1]))
+               mandoc_msg(MANDOCERR_SPACE_EOL, ln, *pos, NULL);
+
+       start = mandoc_strdup(start);
+       if (newesc == 0)
+               return start;
+
+       buf.buf = start;
+       buf.sz = strlen(start) + 1;
+       buf.next = NULL;
+       if (roff_expand(r, &buf, ln, 0, ASCII_ESC) & ROFF_IGN) {
+               free(buf.buf);
+               buf.buf = mandoc_strdup("");
+       }
+       return buf.buf;
+}
+
+

 /*
  * Process text streams.
  */
 /*
  * Process text streams.
  */

-static enum rofferr
+static int

 roff_parsetext(struct roff *r, struct buf *buf, int pos, int *offs)
 {
        size_t           sz;
 roff_parsetext(struct roff *r, struct buf *buf, int pos, int *offs)
 {
        size_t           sz;


@@ -1490,11 +1822,11 @@ roff_parsetext(struct roff *r, struct buf *buf, int pos, int *offs)
        return ROFF_CONT;
 }
 
        return ROFF_CONT;
 }
 

-enum rofferr
-roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
+int
+roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs, size_t len)

 {
        enum roff_tok    t;
 {
        enum roff_tok    t;

-       enum rofferr     e;
+       int              e;

        int              pos;   /* parse point */
        int              spos;  /* saved parse point for messages */
        int              ppos;  /* original offset in buf->buf */
        int              pos;   /* parse point */
        int              spos;  /* saved parse point for messages */
        int              ppos;  /* original offset in buf->buf */


@@ -1502,6 +1834,14 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 
        ppos = pos = *offs;
 
 
        ppos = pos = *offs;
 

+       if (len > 80 && r->tbl == NULL && r->eqn == NULL &&
+           (r->man->flags & ROFF_NOFILL) == 0 &&
+           strchr(" .\\", buf->buf[pos]) == NULL &&
+           buf->buf[pos] != r->control &&
+           strcspn(buf->buf, " ") < 80)
+               mandoc_msg(MANDOCERR_TEXT_LONG, ln, (int)len - 1,
+                   "%.20s...", buf->buf + pos);
+

        /* Handle in-line equation delimiters. */
 
        if (r->tbl == NULL &&
        /* Handle in-line equation delimiters. */
 
        if (r->tbl == NULL &&


@@ -1515,8 +1855,8 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 
        /* Expand some escape sequences. */
 
 
        /* Expand some escape sequences. */
 

-       e = roff_res(r, buf, ln, pos);
-       if (e == ROFF_IGN || e == ROFF_APPEND)
+       e = roff_expand(r, buf, ln, pos, r->escape);
+       if ((e & ROFF_MASK) == ROFF_IGN)

                return e;
        assert(e == ROFF_CONT);
 
                return e;
        assert(e == ROFF_CONT);
 


@@ -1533,22 +1873,29 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
        if (r->last != NULL && ! ctl) {
                t = r->last->tok;
                e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);
        if (r->last != NULL && ! ctl) {
                t = r->last->tok;
                e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);

-               if (e == ROFF_IGN)
+               if ((e & ROFF_MASK) == ROFF_IGN)

                        return e;
                        return e;

-               assert(e == ROFF_CONT);
+               e &= ~ROFF_MASK;
+       } else
+               e = ROFF_IGN;
+       if (r->eqn != NULL && strncmp(buf->buf + ppos, ".EN", 3)) {
+               eqn_read(r->eqn, buf->buf + ppos);
+               return e;
+       }
+       if (r->tbl != NULL && (ctl == 0 || buf->buf[pos] == '\0')) {
+               tbl_read(r->tbl, ln, buf->buf, ppos);
+               roff_addtbl(r->man, ln, r->tbl);
+               return e;
+       }
+       if ( ! ctl) {
+               r->options &= ~MPARSE_COMMENT;
+               return roff_parsetext(r, buf, pos, offs) | e;

        }
        }

-       if (r->eqn != NULL)
-               return eqn_read(&r->eqn, ln, buf->buf, ppos, offs);
-       if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0'))
-               return tbl_read(r->tbl, ln, buf->buf, ppos);
-       if ( ! ctl)
-               return roff_parsetext(r, buf, pos, offs);

 
        /* Skip empty request lines. */
 
        if (buf->buf[pos] == '"') {
 
        /* Skip empty request lines. */
 
        if (buf->buf[pos] == '"') {

-               mandoc_msg(MANDOCERR_COMMENT_BAD, r->parse,
-                   ln, pos, NULL);
+               mandoc_msg(MANDOCERR_COMMENT_BAD, ln, pos, NULL);

                return ROFF_IGN;
        } else if (buf->buf[pos] == '\0')
                return ROFF_IGN;
                return ROFF_IGN;
        } else if (buf->buf[pos] == '\0')
                return ROFF_IGN;


@@ -1566,6 +1913,7 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 
        /* No scope is open.  This is a new request or macro. */
 
 
        /* No scope is open.  This is a new request or macro. */
 

+       r->options &= ~MPARSE_COMMENT;

        spos = pos;
        t = roff_parse(r, buf->buf, &pos, ln, ppos);
 
        spos = pos;
        t = roff_parse(r, buf->buf, &pos, ln, ppos);
 


@@ -1573,21 +1921,24 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 
        if (r->tbl != NULL && (t == TOKEN_NONE || t == ROFF_TS ||
            t == ROFF_br || t == ROFF_ce || t == ROFF_rj || t == ROFF_sp)) {
 
        if (r->tbl != NULL && (t == TOKEN_NONE || t == ROFF_TS ||
            t == ROFF_br || t == ROFF_ce || t == ROFF_rj || t == ROFF_sp)) {

-               mandoc_msg(MANDOCERR_TBLMACRO, r->parse,
-                   ln, pos, buf->buf + spos);
+               mandoc_msg(MANDOCERR_TBLMACRO,
+                   ln, pos, "%s", buf->buf + spos);

                if (t != TOKEN_NONE)
                        return ROFF_IGN;
                while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
                        pos++;
                while (buf->buf[pos] == ' ')
                        pos++;
                if (t != TOKEN_NONE)
                        return ROFF_IGN;
                while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
                        pos++;
                while (buf->buf[pos] == ' ')
                        pos++;

-               return tbl_read(r->tbl, ln, buf->buf, pos);
+               tbl_read(r->tbl, ln, buf->buf, pos);
+               roff_addtbl(r->man, ln, r->tbl);
+               return ROFF_IGN;

        }
 
        /* For now, let high level macros abort .ce mode. */
 
        if (ctl && roffce_node != NULL &&
        }
 
        /* For now, let high level macros abort .ce mode. */
 
        if (ctl && roffce_node != NULL &&

-           (t == TOKEN_NONE || t == ROFF_EQ || t == ROFF_TS)) {
+           (t == TOKEN_NONE || t == ROFF_Dd || t == ROFF_EQ ||
+            t == ROFF_TH || t == ROFF_TS)) {

                r->man->last = roffce_node;
                r->man->next = ROFF_NEXT_SIBLING;
                roffce_lines = 0;
                r->man->last = roffce_node;
                r->man->next = ROFF_NEXT_SIBLING;
                roffce_lines = 0;


@@ -1607,25 +1958,42 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
        return (*roffs[t].proc)(r, t, buf, ln, spos, pos, offs);
 }
 
        return (*roffs[t].proc)(r, t, buf, ln, spos, pos, offs);
 }
 

+/*
+ * Internal interface function to tell the roff parser that execution
+ * of the current macro ended.  This is required because macro
+ * definitions usually do not end with a .return request.
+ */

 void
 void

-roff_endparse(struct roff *r)
+roff_userret(struct roff *r)

 {
 {

+       struct mctx     *ctx;
+       int              i;

 
 

-       if (r->last)
-               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
-                   r->last->line, r->last->col,
-                   roff_name[r->last->tok]);
+       assert(r->mstackpos >= 0);
+       ctx = r->mstack + r->mstackpos;
+       for (i = 0; i < ctx->argc; i++)
+               free(ctx->argv[i]);
+       ctx->argc = 0;
+       r->mstackpos--;
+}

 
 

-       if (r->eqn) {
-               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
-                   r->eqn->eqn.ln, r->eqn->eqn.pos, "EQ");
-               eqn_end(&r->eqn);
+void
+roff_endparse(struct roff *r)
+{
+       if (r->last != NULL)
+               mandoc_msg(MANDOCERR_BLK_NOEND, r->last->line,
+                   r->last->col, "%s", roff_name[r->last->tok]);
+
+       if (r->eqn != NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOEND,
+                   r->eqn->node->line, r->eqn->node->pos, "EQ");
+               eqn_parse(r->eqn);
+               r->eqn = NULL;

        }
 
        }
 

-       if (r->tbl) {
-               mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
-                   r->tbl->line, r->tbl->pos, "TS");
-               tbl_end(&r->tbl);
+       if (r->tbl != NULL) {
+               tbl_end(r->tbl, 1);
+               r->tbl = NULL;

        }
 }
 
        }
 }
 


@@ -1639,6 +2007,7 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        char            *cp;
        const char      *mac;
        size_t           maclen;
        char            *cp;
        const char      *mac;
        size_t           maclen;

+       int              deftype;

        enum roff_tok    t;
 
        cp = buf + *pos;
        enum roff_tok    t;
 
        cp = buf + *pos;


@@ -1649,108 +2018,137 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        mac = cp;
        maclen = roff_getname(r, &cp, ln, ppos);
 
        mac = cp;
        maclen = roff_getname(r, &cp, ln, ppos);
 

-       t = (r->current_string = roff_getstrn(r, mac, maclen)) ?
-           ROFF_USERDEF :
-           (r->current_string = roff_getrenn(r, mac, maclen)) ?
-           ROFF_RENAMED : roffhash_find(r->reqtab, mac, maclen);
-
+       deftype = ROFFDEF_USER | ROFFDEF_REN;
+       r->current_string = roff_getstrn(r, mac, maclen, &deftype);
+       switch (deftype) {
+       case ROFFDEF_USER:
+               t = ROFF_USERDEF;
+               break;
+       case ROFFDEF_REN:
+               t = ROFF_RENAMED;
+               break;
+       default:
+               t = roffhash_find(r->reqtab, mac, maclen);
+               break;
+       }

        if (t != TOKEN_NONE)
                *pos = cp - buf;
        if (t != TOKEN_NONE)
                *pos = cp - buf;

-
+       else if (deftype == ROFFDEF_UNDEF) {
+               /* Using an undefined macro defines it to be empty. */
+               roff_setstrn(&r->strtab, mac, maclen, "", 0, 0);
+               roff_setstrn(&r->rentab, mac, maclen, NULL, 0, 0);
+       }

        return t;
 }
 
 /* --- handling of request blocks ----------------------------------------- */
 
        return t;
 }
 
 /* --- handling of request blocks ----------------------------------------- */
 

-static enum rofferr
+/*
+ * Close a macro definition block or an "ignore" block.
+ */
+static int

 roff_cblock(ROFF_ARGS)
 {
 roff_cblock(ROFF_ARGS)
 {

-
-       /*
-        * A block-close `..' should only be invoked as a child of an
-        * ignore macro, otherwise raise a warning and just ignore it.
-        */
+       int      rr;

 
        if (r->last == NULL) {
 
        if (r->last == NULL) {

-               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
-                   ln, ppos, "..");
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, 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(). */

        case ROFF_ami:
        case ROFF_de:
        case ROFF_ami:
        case ROFF_de:

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

        case ROFF_dei:
        case ROFF_ig:
                break;
        case ROFF_dei:
        case ROFF_ig:
                break;

+       case ROFF_am1:
+       case ROFF_de1:
+               /* Remapped in roff_block(). */
+               abort();

        default:
        default:

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

                return ROFF_IGN;
        }
 
                return ROFF_IGN;
        }
 

+       roffnode_pop(r);
+       roffnode_cleanscope(r);
+
+       /*
+        * If a conditional block with braces is still open,
+        * check for "\}" block end markers.
+        */
+
+       if (r->last != NULL && r->last->endspan < 0) {
+               rr = 1;  /* If arguments follow "\}", warn about them. */
+               roff_cond_checkend(r, tok, buf, ln, ppos, pos, &rr);
+       }
+

        if (buf->buf[pos] != '\0')
        if (buf->buf[pos] != '\0')

-               mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
+               mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

                    ".. %s", buf->buf + pos);
 
                    ".. %s", buf->buf + pos);
 

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

        return ROFF_IGN;
        return ROFF_IGN;

-

 }
 
 }
 

-static void
+/*
+ * Pop all nodes ending at the end of the current input line.
+ * Return the number of loops ended.
+ */
+static int

 roffnode_cleanscope(struct roff *r)
 {
 roffnode_cleanscope(struct roff *r)
 {

+       int inloop;

 
 

-       while (r->last) {
+       inloop = 0;
+       while (r->last != NULL && r->last->endspan > 0) {

                if (--r->last->endspan != 0)
                        break;
                if (--r->last->endspan != 0)
                        break;

-               roffnode_pop(r);
+               inloop += roffnode_pop(r);

        }
        }

+       return inloop;

 }
 
 }
 

-static void
+/*
+ * Handle the closing "\}" of a conditional block.
+ * Apart from generating warnings, this only pops nodes.
+ * Return the number of loops ended.
+ */
+static int

 roff_ccond(struct roff *r, int ln, int ppos)
 {
 roff_ccond(struct roff *r, int ln, int ppos)
 {

-

        if (NULL == r->last) {
        if (NULL == r->last) {

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

        }
 
        switch (r->last->tok) {
        case ROFF_el:
        case ROFF_ie:
        case ROFF_if:
        }
 
        switch (r->last->tok) {
        case ROFF_el:
        case ROFF_ie:
        case ROFF_if:

+       case ROFF_while:

                break;
        default:
                break;
        default:

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

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

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

        }
 
        }
 

-       roffnode_pop(r);
-       roffnode_cleanscope(r);
-       return;
+       return roffnode_pop(r) + roffnode_cleanscope(r);

 }
 
 }
 

-static enum rofferr
+static int

 roff_block(ROFF_ARGS)
 {
 roff_block(ROFF_ARGS)
 {

-       const char      *name;
-       char            *iname, *cp;
-       size_t           namesz;
+       const char      *name, *value;
+       char            *call, *cp, *iname, *rname;
+       size_t           csz, namesz, rsz;
+       int              deftype;

 
        /* Ignore groff compatibility mode for now. */
 
 
        /* Ignore groff compatibility mode for now. */
 


@@ -1778,9 +2176,11 @@ roff_block(ROFF_ARGS)
        /* Resolve the macro name argument if it is indirect. */
 
        if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
        /* Resolve the macro name argument if it is indirect. */
 
        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),
+               deftype = ROFFDEF_USER;
+               name = roff_getstrn(r, iname, namesz, &deftype);
+               if (name == NULL) {
+                       mandoc_msg(MANDOCERR_STR_UNDEF,
+                           ln, (int)(iname - buf->buf),

                            "%.*s", (int)namesz, iname);
                        namesz = 0;
                } else
                            "%.*s", (int)namesz, iname);
                        namesz = 0;
                } else


@@ -1789,8 +2189,8 @@ roff_block(ROFF_ARGS)
                name = iname;
 
        if (namesz == 0 && tok != ROFF_ig) {
                name = iname;
 
        if (namesz == 0 && tok != ROFF_ig) {

-               mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
-                   ln, ppos, roff_name[tok]);
+               mandoc_msg(MANDOCERR_REQ_EMPTY,
+                   ln, ppos, "%s", roff_name[tok]);

                return ROFF_IGN;
        }
 
                return ROFF_IGN;
        }
 


@@ -1805,6 +2205,33 @@ roff_block(ROFF_ARGS)
        if (tok == ROFF_de || tok == ROFF_dei) {
                roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
                roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
        if (tok == ROFF_de || tok == ROFF_dei) {
                roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
                roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);

+       } else if (tok == ROFF_am || tok == ROFF_ami) {
+               deftype = ROFFDEF_ANY;
+               value = roff_getstrn(r, iname, namesz, &deftype);
+               switch (deftype) {  /* Before appending, ... */
+               case ROFFDEF_PRE: /* copy predefined to user-defined. */
+                       roff_setstrn(&r->strtab, name, namesz,
+                           value, strlen(value), 0);
+                       break;
+               case ROFFDEF_REN: /* call original standard macro. */
+                       csz = mandoc_asprintf(&call, ".%.*s \\$* \\\"\n",
+                           (int)strlen(value), value);
+                       roff_setstrn(&r->strtab, name, namesz, call, csz, 0);
+                       roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
+                       free(call);
+                       break;
+               case ROFFDEF_STD:  /* rename and call standard macro. */
+                       rsz = mandoc_asprintf(&rname, "__%s_renamed", name);
+                       roff_setstrn(&r->rentab, rname, rsz, name, namesz, 0);
+                       csz = mandoc_asprintf(&call, ".%.*s \\$* \\\"\n",
+                           (int)rsz, rname);
+                       roff_setstrn(&r->strtab, name, namesz, call, csz, 0);
+                       free(call);
+                       free(rname);
+                       break;
+               default:
+                       break;
+               }

        }
 
        if (*cp == '\0')
        }
 
        if (*cp == '\0')


@@ -1818,9 +2245,11 @@ roff_block(ROFF_ARGS)
        /* Resolve the end marker if it is indirect. */
 
        if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
        /* Resolve the end marker if it is indirect. */
 
        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),
+               deftype = ROFFDEF_USER;
+               name = roff_getstrn(r, iname, namesz, &deftype);
+               if (name == NULL) {
+                       mandoc_msg(MANDOCERR_STR_UNDEF,
+                           ln, (int)(iname - buf->buf),

                            "%.*s", (int)namesz, iname);
                        namesz = 0;
                } else
                            "%.*s", (int)namesz, iname);
                        namesz = 0;
                } else


@@ -1832,13 +2261,13 @@ roff_block(ROFF_ARGS)
                r->last->end = mandoc_strndup(name, namesz);
 
        if (*cp != '\0')
                r->last->end = mandoc_strndup(name, namesz);
 
        if (*cp != '\0')

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

                    ln, pos, ".%s ... %s", roff_name[tok], cp);
 
        return ROFF_IGN;
 }
 
                    ln, pos, ".%s ... %s", roff_name[tok], cp);
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_block_sub(ROFF_ARGS)
 {
        enum roff_tok   t;
 roff_block_sub(ROFF_ARGS)
 {
        enum roff_tok   t;


@@ -1892,7 +2321,7 @@ roff_block_sub(ROFF_ARGS)
        return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);
 }
 
        return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);
 }
 

-static enum rofferr
+static int

 roff_block_text(ROFF_ARGS)
 {
 
 roff_block_text(ROFF_ARGS)
 {
 


@@ -1902,66 +2331,127 @@ roff_block_text(ROFF_ARGS)
        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
-roff_cond_sub(ROFF_ARGS)
+/*
+ * Check for a closing "\}" and handle it.
+ * In this function, the final "int *offs" argument is used for
+ * different purposes than elsewhere:
+ * Input: *offs == 0: caller wants to discard arguments following \}
+ *        *offs == 1: caller wants to preserve text following \}
+ * Output: *offs = 0: tell caller to discard input line
+ *         *offs = 1: tell caller to use input line
+ */
+static int
+roff_cond_checkend(ROFF_ARGS)

 {
 {

-       enum roff_tok    t;

        char            *ep;
        char            *ep;

-       int              rr;
+       int              endloop, irc, rr;

 
 

+       irc = ROFF_IGN;

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

-       roffnode_cleanscope(r);
-       t = roff_parse(r, buf->buf, &pos, ln, ppos);
+       endloop = tok != ROFF_while ? ROFF_IGN :
+           rr ? ROFF_LOOPCONT : ROFF_LOOPEXIT;
+       if (roffnode_cleanscope(r))
+               irc |= endloop;

 
        /*
 
        /*

-        * Fully handle known macros when they are structurally
-        * required or when the conditional evaluated to true.
-        */
-
-       if (t != TOKEN_NONE && (rr || roffs[t].flags & ROFFMAC_STRUCT))
-               return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);
-
-       /*
-        * If `\}' occurs on a macro line without a preceding macro,
-        * drop the line completely.
+        * If "\}" occurs on a macro line without a preceding macro or
+        * a text line contains nothing else, drop the line completely.

         */
 
        ep = buf->buf + pos;
         */
 
        ep = buf->buf + pos;

-       if (ep[0] == '\\' && ep[1] == '}')
+       if (ep[0] == '\\' && ep[1] == '}' && (ep[2] == '\0' || *offs == 0))

                rr = 0;
 
                rr = 0;
 

-       /* Always check for the closing delimiter `\}'. */
+       /*
+        * The closing delimiter "\}" rewinds the conditional scope
+        * but is otherwise ignored when interpreting the line.
+        */

 
        while ((ep = strchr(ep, '\\')) != NULL) {
 
        while ((ep = strchr(ep, '\\')) != NULL) {

-               if (*(++ep) == '}') {
-                       *ep = '&';
-                       roff_ccond(r, ln, ep - buf->buf - 1);
-               }
-               if (*ep != '\0')
+               switch (ep[1]) {
+               case '}':
+                       if (ep[2] == '\0')
+                               ep[0] = '\0';
+                       else if (rr)
+                               ep[1] = '&';
+                       else
+                               memmove(ep, ep + 2, strlen(ep + 2) + 1);
+                       if (roff_ccond(r, ln, ep - buf->buf))
+                               irc |= endloop;
+                       break;
+               case '\0':

                        ++ep;
                        ++ep;

+                       break;
+               default:
+                       ep += 2;
+                       break;
+               }

        }
        }

-       return rr ? ROFF_CONT : ROFF_IGN;
+       *offs = rr;
+       return irc;

 }
 
 }
 

-static enum rofferr
-roff_cond_text(ROFF_ARGS)
+/*
+ * Parse and process a request or macro line in conditional scope.
+ */
+static int
+roff_cond_sub(ROFF_ARGS)

 {
 {

-       char            *ep;
-       int              rr;
+       struct roffnode *bl;
+       int              irc, rr;
+       enum roff_tok    t;

 
 

-       rr = r->last->rule;
-       roffnode_cleanscope(r);
+       rr = 0;  /* If arguments follow "\}", skip them. */
+       irc = roff_cond_checkend(r, tok, buf, ln, ppos, pos, &rr);
+       t = roff_parse(r, buf->buf, &pos, ln, ppos);

 
 

-       ep = buf->buf + pos;
-       while ((ep = strchr(ep, '\\')) != NULL) {
-               if (*(++ep) == '}') {
-                       *ep = '&';
-                       roff_ccond(r, ln, ep - buf->buf - 1);
-               }
-               if (*ep != '\0')
-                       ++ep;
+       /* For now, let high level macros abort .ce mode. */
+
+       if (roffce_node != NULL &&
+           (t == TOKEN_NONE || t == ROFF_Dd || t == ROFF_EQ ||
+             t == ROFF_TH || t == ROFF_TS)) {
+               r->man->last = roffce_node;
+               r->man->next = ROFF_NEXT_SIBLING;
+               roffce_lines = 0;
+               roffce_node = NULL;

        }
        }

-       return rr ? ROFF_CONT : ROFF_IGN;
+
+       /*
+        * Fully handle known macros when they are structurally
+        * required or when the conditional evaluated to true.
+        */
+
+       if (t == ROFF_break) {
+               if (irc & ROFF_LOOPMASK)
+                       irc = ROFF_IGN | ROFF_LOOPEXIT;
+               else if (rr) {
+                       for (bl = r->last; bl != NULL; bl = bl->parent) {
+                               bl->rule = 0;
+                               if (bl->tok == ROFF_while)
+                                       break;
+                       }
+               }
+       } else if (t != TOKEN_NONE &&
+           (rr || roffs[t].flags & ROFFMAC_STRUCT))
+               irc |= (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);
+       else
+               irc |= rr ? ROFF_CONT : ROFF_IGN;
+       return irc;
+}
+
+/*
+ * Parse and process a text line in conditional scope.
+ */
+static int
+roff_cond_text(ROFF_ARGS)
+{
+       int      irc, rr;
+
+       rr = 1;  /* If arguments follow "\}", preserve them. */
+       irc = roff_cond_checkend(r, tok, buf, ln, ppos, pos, &rr);
+       if (rr)
+               irc |= ROFF_CONT;
+       return irc;

 }
 
 /* --- handling of numeric and conditional expressions -------------------- */
 }
 
 /* --- handling of numeric and conditional expressions -------------------- */


@@ -2088,9 +2578,10 @@ out:
 static int
 roff_evalcond(struct roff *r, int ln, char *v, int *pos)
 {
 static int
 roff_evalcond(struct roff *r, int ln, char *v, int *pos)
 {

-       char    *cp, *name;
-       size_t   sz;
-       int      number, savepos, istrue, wanttrue;
+       const char      *start, *end;
+       char            *cp, *name;
+       size_t           sz;
+       int              deftype, len, number, savepos, istrue, wanttrue;

 
        if ('!' == v[*pos]) {
                wanttrue = 0;
 
        if ('!' == v[*pos]) {
                wanttrue = 0;


@@ -2105,12 +2596,50 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
        case 'o':
                (*pos)++;
                return wanttrue;
        case 'o':
                (*pos)++;
                return wanttrue;

-       case 'c':

        case 'e':
        case 't':
        case 'v':
                (*pos)++;
                return !wanttrue;
        case 'e':
        case 't':
        case 'v':
                (*pos)++;
                return !wanttrue;

+       case 'c':
+               do {
+                       (*pos)++;
+               } while (v[*pos] == ' ');
+
+               /*
+                * Quirk for groff compatibility:
+                * The horizontal tab is neither available nor unavailable.
+                */
+
+               if (v[*pos] == '\t') {
+                       (*pos)++;
+                       return 0;
+               }
+
+               /* Printable ASCII characters are available. */
+
+               if (v[*pos] != '\\') {
+                       (*pos)++;
+                       return wanttrue;
+               }
+
+               end = v + ++*pos;
+               switch (mandoc_escape(&end, &start, &len)) {
+               case ESCAPE_SPECIAL:
+                       istrue = mchars_spec2cp(start, len) != -1;
+                       break;
+               case ESCAPE_UNICODE:
+                       istrue = 1;
+                       break;
+               case ESCAPE_NUMBERED:
+                       istrue = mchars_num2char(start, len) != -1;
+                       break;
+               default:
+                       istrue = !wanttrue;
+                       break;
+               }
+               *pos = end - v;
+               return istrue == wanttrue;

        case 'd':
        case 'r':
                cp = v + *pos + 1;
        case 'd':
        case 'r':
                cp = v + *pos + 1;


@@ -2118,10 +2647,16 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
                        cp++;
                name = cp;
                sz = roff_getname(r, &cp, ln, cp - v);
                        cp++;
                name = cp;
                sz = roff_getname(r, &cp, ln, cp - v);

-               istrue = sz && (v[*pos] == 'r' ? roff_hasregn(r, name, sz) :
-                   (roff_getstrn(r, name, sz) != NULL ||
-                    roff_getrenn(r, name, sz) != NULL));
-               *pos = cp - v;
+               if (sz == 0)
+                       istrue = 0;
+               else if (v[*pos] == 'r')
+                       istrue = roff_hasregn(r, name, sz);
+               else {
+                       deftype = ROFFDEF_ANY;
+                       roff_getstrn(r, name, sz, &deftype);
+                       istrue = !!deftype;
+               }
+               *pos = (name + sz) - v;

                return istrue == wanttrue;
        default:
                break;
                return istrue == wanttrue;
        default:
                break;


@@ -2136,34 +2671,33 @@ roff_evalcond(struct roff *r, int ln, char *v, int *pos)
                return 0;
 }
 
                return 0;
 }
 

-static enum rofferr
+static int

 roff_line_ignore(ROFF_ARGS)
 {
 
        return ROFF_IGN;
 }
 
 roff_line_ignore(ROFF_ARGS)
 {
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_insec(ROFF_ARGS)
 {
 
 roff_insec(ROFF_ARGS)
 {
 

-       mandoc_msg(MANDOCERR_REQ_INSEC, r->parse,
-           ln, ppos, roff_name[tok]);
+       mandoc_msg(MANDOCERR_REQ_INSEC, ln, ppos, "%s", roff_name[tok]);

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_unsupp(ROFF_ARGS)
 {
 
 roff_unsupp(ROFF_ARGS)
 {
 

-       mandoc_msg(MANDOCERR_REQ_UNSUPP, r->parse,
-           ln, ppos, roff_name[tok]);
+       mandoc_msg(MANDOCERR_REQ_UNSUPP, ln, ppos, "%s", roff_name[tok]);

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_cond(ROFF_ARGS)
 {
 roff_cond(ROFF_ARGS)
 {

+       int      irc;

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


@@ -2202,9 +2736,10 @@ roff_cond(ROFF_ARGS)
         * Determine scope.
         * If there is nothing on the line after the conditional,
         * not even whitespace, use next-line scope.
         * Determine scope.
         * If there is nothing on the line after the conditional,
         * not even whitespace, use next-line scope.

+        * Except that .while does not support next-line scope.

         */
 
         */
 

-       if (buf->buf[pos] == '\0') {
+       if (buf->buf[pos] == '\0' && tok != ROFF_while) {

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


@@ -2229,17 +2764,20 @@ roff_cond(ROFF_ARGS)
         */
 
        if (buf->buf[pos] == '\0')
         */
 
        if (buf->buf[pos] == '\0')

-               mandoc_msg(MANDOCERR_COND_EMPTY, r->parse,
-                   ln, ppos, roff_name[tok]);
+               mandoc_msg(MANDOCERR_COND_EMPTY,
+                   ln, ppos, "%s", roff_name[tok]);

 
        r->last->endspan = 1;
 
 out:
        *offs = pos;
 
        r->last->endspan = 1;
 
 out:
        *offs = pos;

-       return ROFF_RERUN;
+       irc = ROFF_RERUN;
+       if (tok == ROFF_while)
+               irc |= ROFF_WHILE;
+       return irc;

 }
 
 }
 

-static enum rofferr
+static int

 roff_ds(ROFF_ARGS)
 {
        char            *string;
 roff_ds(ROFF_ARGS)
 {
        char            *string;


@@ -2264,8 +2802,15 @@ roff_ds(ROFF_ARGS)
                return ROFF_IGN;
 
        namesz = roff_getname(r, &string, ln, pos);
                return ROFF_IGN;
 
        namesz = roff_getname(r, &string, ln, pos);

-       if (name[namesz] == '\\')
+       switch (name[namesz]) {
+       case '\\':

                return ROFF_IGN;
                return ROFF_IGN;

+       case '\t':
+               string = buf->buf + pos + namesz;
+               break;
+       default:
+               break;
+       }

 
        /* Read past the initial double-quote, if any. */
        if (*string == '"')
 
        /* Read past the initial double-quote, if any. */
        if (*string == '"')


@@ -2430,7 +2975,7 @@ roff_evalnum(struct roff *r, int ln, const char *v,
                case '/':
                        if (operand2 == 0) {
                                mandoc_msg(MANDOCERR_DIVZERO,
                case '/':
                        if (operand2 == 0) {
                                mandoc_msg(MANDOCERR_DIVZERO,

-                                       r->parse, ln, *pos, v);
+                                       ln, *pos, "%s", v);

                                *res = 0;
                                break;
                        }
                                *res = 0;
                                break;
                        }


@@ -2439,7 +2984,7 @@ roff_evalnum(struct roff *r, int ln, const char *v,
                case '%':
                        if (operand2 == 0) {
                                mandoc_msg(MANDOCERR_DIVZERO,
                case '%':
                        if (operand2 == 0) {
                                mandoc_msg(MANDOCERR_DIVZERO,

-                                       r->parse, ln, *pos, v);
+                                       ln, *pos, "%s", v);

                                *res = 0;
                                break;
                        }
                                *res = 0;
                                break;
                        }


@@ -2488,21 +3033,30 @@ roff_evalnum(struct roff *r, int ln, const char *v,
 
 void
 roff_setreg(struct roff *r, const char *name, int val, char sign)
 
 void
 roff_setreg(struct roff *r, const char *name, int val, char sign)

+{
+       roff_setregn(r, name, strlen(name), val, sign, INT_MIN);
+}
+
+static void
+roff_setregn(struct roff *r, const char *name, size_t len,
+    int val, char sign, int step)

 {
        struct roffreg  *reg;
 
        /* Search for an existing register with the same name. */
        reg = r->regtab;
 
 {
        struct roffreg  *reg;
 
        /* Search for an existing register with the same name. */
        reg = r->regtab;
 

-       while (reg && strcmp(name, reg->key.p))
+       while (reg != NULL && (reg->key.sz != len ||
+           strncmp(reg->key.p, name, len) != 0))

                reg = reg->next;
 
        if (NULL == reg) {
                /* Create a new register. */
                reg = mandoc_malloc(sizeof(struct roffreg));
                reg = reg->next;
 
        if (NULL == reg) {
                /* Create a new register. */
                reg = mandoc_malloc(sizeof(struct roffreg));

-               reg->key.p = mandoc_strdup(name);
-               reg->key.sz = strlen(name);
+               reg->key.p = mandoc_strndup(name, len);
+               reg->key.sz = len;

                reg->val = 0;
                reg->val = 0;

+               reg->step = 0;

                reg->next = r->regtab;
                r->regtab = reg;
        }
                reg->next = r->regtab;
                r->regtab = reg;
        }


@@ -2513,6 +3067,8 @@ roff_setreg(struct roff *r, const char *name, int val, char sign)
                reg->val -= val;
        else
                reg->val = val;
                reg->val -= val;
        else
                reg->val = val;

+       if (step != INT_MIN)
+               reg->step = step;

 }
 
 /*
 }
 
 /*


@@ -2527,7 +3083,7 @@ roff_getregro(const struct roff *r, const char *name)
 
        switch (*name) {
        case '$':  /* Number of arguments of the last macro evaluated. */
 
        switch (*name) {
        case '$':  /* Number of arguments of the last macro evaluated. */

-               return r->argc;
+               return r->mstackpos < 0 ? 0 : r->mstack[r->mstackpos].argc;

        case 'A':  /* ASCII approximation mode is always off. */
                return 0;
        case 'g':  /* Groff compatibility mode is always on. */
        case 'A':  /* ASCII approximation mode is always off. */
                return 0;
        case 'g':  /* Groff compatibility mode is always on. */


@@ -2546,26 +3102,13 @@ roff_getregro(const struct roff *r, const char *name)
 }
 
 int
 }
 
 int

-roff_getreg(const struct roff *r, const char *name)
+roff_getreg(struct roff *r, const char *name)

 {
 {

-       struct roffreg  *reg;
-       int              val;
-
-       if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {
-               val = roff_getregro(r, name + 1);
-               if (-1 != val)
-                       return val;
-       }
-
-       for (reg = r->regtab; reg; reg = reg->next)
-               if (0 == strcmp(name, reg->key.p))
-                       return reg->val;
-
-       return 0;
+       return roff_getregn(r, name, strlen(name), '\0');

 }
 
 static int
 }
 
 static int

-roff_getregn(const struct roff *r, const char *name, size_t len)
+roff_getregn(struct roff *r, const char *name, size_t len, char sign)

 {
        struct roffreg  *reg;
        int              val;
 {
        struct roffreg  *reg;
        int              val;


@@ -2576,11 +3119,24 @@ roff_getregn(const struct roff *r, const char *name, size_t len)
                        return val;
        }
 
                        return val;
        }
 

-       for (reg = r->regtab; reg; reg = reg->next)
+       for (reg = r->regtab; reg; reg = reg->next) {

                if (len == reg->key.sz &&
                if (len == reg->key.sz &&

-                   0 == strncmp(name, reg->key.p, len))
+                   0 == strncmp(name, reg->key.p, len)) {
+                       switch (sign) {
+                       case '+':
+                               reg->val += reg->step;
+                               break;
+                       case '-':
+                               reg->val -= reg->step;
+                               break;
+                       default:
+                               break;
+                       }

                        return reg->val;
                        return reg->val;

+               }
+       }

 
 

+       roff_setregn(r, name, len, 0, '\0', INT_MIN);

        return 0;
 }
 
        return 0;
 }
 


@@ -2617,12 +3173,12 @@ roff_freereg(struct roffreg *reg)
        }
 }
 
        }
 }
 

-static enum rofferr
+static int

 roff_nr(ROFF_ARGS)
 {
 roff_nr(ROFF_ARGS)
 {

-       char            *key, *val;
+       char            *key, *val, *step;

        size_t           keysz;
        size_t           keysz;

-       int              iv;
+       int              iv, is, len;

        char             sign;
 
        key = val = buf->buf + pos;
        char             sign;
 
        key = val = buf->buf + pos;


@@ -2630,21 +3186,28 @@ roff_nr(ROFF_ARGS)
                return ROFF_IGN;
 
        keysz = roff_getname(r, &val, ln, pos);
                return ROFF_IGN;
 
        keysz = roff_getname(r, &val, ln, pos);

-       if (key[keysz] == '\\')
+       if (key[keysz] == '\\' || key[keysz] == '\t')

                return ROFF_IGN;
                return ROFF_IGN;

-       key[keysz] = '\0';

 
        sign = *val;
        if (sign == '+' || sign == '-')
                val++;
 
 
        sign = *val;
        if (sign == '+' || sign == '-')
                val++;
 

-       if (roff_evalnum(r, ln, val, NULL, &iv, ROFFNUM_SCALE))
-               roff_setreg(r, key, iv, sign);
+       len = 0;
+       if (roff_evalnum(r, ln, val, &len, &iv, ROFFNUM_SCALE) == 0)
+               return ROFF_IGN;

 
 

+       step = val + len;
+       while (isspace((unsigned char)*step))
+               step++;
+       if (roff_evalnum(r, ln, step, NULL, &is, 0) == 0)
+               is = INT_MIN;
+
+       roff_setregn(r, key, keysz, iv, sign, is);

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_rr(ROFF_ARGS)
 {
        struct roffreg  *reg, **prev;
 roff_rr(ROFF_ARGS)
 {
        struct roffreg  *reg, **prev;


@@ -2674,7 +3237,7 @@ roff_rr(ROFF_ARGS)
 
 /* --- handler functions for roff requests -------------------------------- */
 
 
 /* --- handler functions for roff requests -------------------------------- */
 

-static enum rofferr
+static int

 roff_rm(ROFF_ARGS)
 {
        const char       *name;
 roff_rm(ROFF_ARGS)
 {
        const char       *name;


@@ -2687,13 +3250,13 @@ roff_rm(ROFF_ARGS)
                namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
                roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);
                roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
                namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
                roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);
                roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);

-               if (name[namesz] == '\\')
+               if (name[namesz] == '\\' || name[namesz] == '\t')

                        break;
        }
        return ROFF_IGN;
 }
 
                        break;
        }
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_it(ROFF_ARGS)
 {
        int              iv;
 roff_it(ROFF_ARGS)
 {
        int              iv;


@@ -2701,8 +3264,8 @@ roff_it(ROFF_ARGS)
        /* Parse the number of lines. */
 
        if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {
        /* Parse the number of lines. */
 
        if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {

-               mandoc_msg(MANDOCERR_IT_NONUM, r->parse,
-                   ln, ppos, buf->buf + 1);
+               mandoc_msg(MANDOCERR_IT_NONUM,
+                   ln, ppos, "%s", buf->buf + 1);

                return ROFF_IGN;
        }
 
                return ROFF_IGN;
        }
 


@@ -2722,59 +3285,62 @@ roff_it(ROFF_ARGS)
        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_Dd(ROFF_ARGS)
 {
 roff_Dd(ROFF_ARGS)
 {

-       const char *const       *cp;
-
-       if ((r->options & (MPARSE_MDOC | MPARSE_QUICK)) == 0)
-               for (cp = __mdoc_reserved; *cp; cp++)
-                       roff_setstr(r, *cp, NULL, 0);
-
-       if (r->format == 0)
-               r->format = MPARSE_MDOC;
-
-       return ROFF_CONT;
-}
-
-static enum rofferr
-roff_TH(ROFF_ARGS)
-{
-       const char *const       *cp;
-
-       if ((r->options & MPARSE_QUICK) == 0)
-               for (cp = __man_reserved; *cp; cp++)
-                       roff_setstr(r, *cp, NULL, 0);
-
-       if (r->format == 0)
-               r->format = MPARSE_MAN;
-
+       int              mask;
+       enum roff_tok    t, te;
+
+       switch (tok) {
+       case ROFF_Dd:
+               tok = MDOC_Dd;
+               te = MDOC_MAX;
+               if (r->format == 0)
+                       r->format = MPARSE_MDOC;
+               mask = MPARSE_MDOC | MPARSE_QUICK;
+               break;
+       case ROFF_TH:
+               tok = MAN_TH;
+               te = MAN_MAX;
+               if (r->format == 0)
+                       r->format = MPARSE_MAN;
+               mask = MPARSE_QUICK;
+               break;
+       default:
+               abort();
+       }
+       if ((r->options & mask) == 0)
+               for (t = tok; t < te; t++)
+                       roff_setstr(r, roff_name[t], NULL, 0);

        return ROFF_CONT;
 }
 
        return ROFF_CONT;
 }
 

-static enum rofferr
+static int

 roff_TE(ROFF_ARGS)
 {
 roff_TE(ROFF_ARGS)
 {

-
-       if (NULL == r->tbl)
-               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
-                   ln, ppos, "TE");
-       else if ( ! tbl_end(&r->tbl)) {
+       r->man->flags &= ~ROFF_NONOFILL;
+       if (r->tbl == NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "TE");
+               return ROFF_IGN;
+       }
+       if (tbl_end(r->tbl, 0) == 0) {
+               r->tbl = NULL;

                free(buf->buf);
                buf->buf = mandoc_strdup(".sp");
                buf->sz = 4;
                free(buf->buf);
                buf->buf = mandoc_strdup(".sp");
                buf->sz = 4;

+               *offs = 0;

                return ROFF_REPARSE;
        }
                return ROFF_REPARSE;
        }

+       r->tbl = NULL;

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_T_(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 roff_T_(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)

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

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


@@ -2784,7 +3350,7 @@ roff_T_(ROFF_ARGS)
 /*
  * Handle in-line equation delimiters.
  */
 /*
  * Handle in-line equation delimiters.
  */

-static enum rofferr
+static int

 roff_eqndelim(struct roff *r, struct buf *buf, int pos)
 {
        char            *cp1, *cp2;
 roff_eqndelim(struct roff *r, struct buf *buf, int pos)
 {
        char            *cp1, *cp2;


@@ -2847,62 +3413,85 @@ roff_eqndelim(struct roff *r, struct buf *buf, int pos)
        return ROFF_REPARSE;
 }
 
        return ROFF_REPARSE;
 }
 

-static enum rofferr
+static int

 roff_EQ(ROFF_ARGS)
 {
 roff_EQ(ROFF_ARGS)
 {

-       struct eqn_node *e;
-
-       assert(r->eqn == NULL);
-       e = eqn_alloc(ppos, ln, r->parse);
+       struct roff_node        *n;

 
 

-       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;
+       if (r->man->meta.macroset == MACROSET_MAN)
+               man_breakscope(r->man, ROFF_EQ);
+       n = roff_node_alloc(r->man, ln, ppos, ROFFT_EQN, TOKEN_NONE);
+       if (ln > r->man->last->line)
+               n->flags |= NODE_LINE;
+       n->eqn = eqn_box_new();
+       roff_node_append(r->man, n);
+       r->man->next = ROFF_NEXT_SIBLING;

 
 

-       r->eqn = r->last_eqn = e;
+       assert(r->eqn == NULL);
+       if (r->last_eqn == NULL)
+               r->last_eqn = eqn_alloc();
+       else
+               eqn_reset(r->last_eqn);
+       r->eqn = r->last_eqn;
+       r->eqn->node = n;

 
        if (buf->buf[pos] != '\0')
 
        if (buf->buf[pos] != '\0')

-               mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
+               mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,

                    ".EQ %s", buf->buf + pos);
 
        return ROFF_IGN;
 }
 
                    ".EQ %s", buf->buf + pos);
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_EN(ROFF_ARGS)
 {
 roff_EN(ROFF_ARGS)
 {

-
-       mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse, ln, ppos, "EN");
+       if (r->eqn != NULL) {
+               eqn_parse(r->eqn);
+               r->eqn = NULL;
+       } else
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "EN");
+       if (buf->buf[pos] != '\0')
+               mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,
+                   "EN %s", buf->buf + pos);

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_TS(ROFF_ARGS)
 {
 roff_TS(ROFF_ARGS)
 {

-       struct tbl_node *tbl;
-
-       if (r->tbl) {
-               mandoc_msg(MANDOCERR_BLK_BROKEN, r->parse,
-                   ln, ppos, "TS breaks TS");
-               tbl_end(&r->tbl);
+       if (r->tbl != NULL) {
+               mandoc_msg(MANDOCERR_BLK_BROKEN, ln, ppos, "TS breaks TS");
+               tbl_end(r->tbl, 0);

        }
        }

+       r->man->flags |= ROFF_NONOFILL;
+       r->tbl = tbl_alloc(ppos, ln, r->last_tbl);
+       if (r->last_tbl == NULL)
+               r->first_tbl = r->tbl;
+       r->last_tbl = r->tbl;
+       return ROFF_IGN;
+}

 
 

-       tbl = tbl_alloc(ppos, ln, r->parse);
-
-       if (r->last_tbl)
-               r->last_tbl->next = tbl;
-       else
-               r->first_tbl = r->last_tbl = tbl;
-
-       r->tbl = r->last_tbl = tbl;
+static int
+roff_noarg(ROFF_ARGS)
+{
+       if (r->man->flags & (MAN_BLINE | MAN_ELINE))
+               man_breakscope(r->man, tok);
+       if (tok == ROFF_brp)
+               tok = ROFF_br;
+       roff_elem_alloc(r->man, ln, ppos, tok);
+       if (buf->buf[pos] != '\0')
+               mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,
+                  "%s %s", roff_name[tok], buf->buf + pos);
+       if (tok == ROFF_nf)
+               r->man->flags |= ROFF_NOFILL;
+       else if (tok == ROFF_fi)
+               r->man->flags &= ~ROFF_NOFILL;
+       r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;
+       r->man->next = ROFF_NEXT_SIBLING;

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_onearg(ROFF_ARGS)
 {
        struct roff_node        *n;
 roff_onearg(ROFF_ARGS)
 {
        struct roff_node        *n;


@@ -2910,7 +3499,8 @@ roff_onearg(ROFF_ARGS)
        int                      npos;
 
        if (r->man->flags & (MAN_BLINE | MAN_ELINE) &&
        int                      npos;
 
        if (r->man->flags & (MAN_BLINE | MAN_ELINE) &&

-           (tok == ROFF_sp || tok == ROFF_ti))
+           (tok == ROFF_ce || tok == ROFF_rj || tok == ROFF_sp ||
+            tok == ROFF_ti))

                man_breakscope(r->man, tok);
 
        if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) {
                man_breakscope(r->man, tok);
 
        if (roffce_node != NULL && (tok == ROFF_ce || tok == ROFF_rj)) {


@@ -2928,8 +3518,8 @@ roff_onearg(ROFF_ARGS)
                while (*cp == ' ')
                        *cp++ = '\0';
                if (*cp != '\0')
                while (*cp == ' ')
                        *cp++ = '\0';
                if (*cp != '\0')

-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
-                           r->parse, ln, cp - buf->buf,
+                       mandoc_msg(MANDOCERR_ARG_EXCESS,
+                           ln, (int)(cp - buf->buf),

                            "%s ... %s", roff_name[tok], cp);
                roff_word_alloc(r->man, ln, pos, buf->buf + pos);
        }
                            "%s ... %s", roff_name[tok], cp);
                roff_word_alloc(r->man, ln, pos, buf->buf + pos);
        }


@@ -2942,8 +3532,8 @@ roff_onearg(ROFF_ARGS)
                npos = 0;
                if (roff_evalnum(r, ln, r->man->last->string, &npos,
                    &roffce_lines, 0) == 0) {
                npos = 0;
                if (roff_evalnum(r, ln, r->man->last->string, &npos,
                    &roffce_lines, 0) == 0) {

-                       mandoc_vmsg(MANDOCERR_CE_NONUM,
-                           r->parse, ln, pos, "ce %s", buf->buf + pos);
+                       mandoc_msg(MANDOCERR_CE_NONUM,
+                           ln, pos, "ce %s", buf->buf + pos);

                        roffce_lines = 1;
                }
                if (roffce_lines < 1) {
                        roffce_lines = 1;
                }
                if (roffce_lines < 1) {


@@ -2961,7 +3551,7 @@ roff_onearg(ROFF_ARGS)
        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_manyarg(ROFF_ARGS)
 {
        struct roff_node        *n;
 roff_manyarg(ROFF_ARGS)
 {
        struct roff_node        *n;


@@ -2984,7 +3574,7 @@ roff_manyarg(ROFF_ARGS)
        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_als(ROFF_ARGS)
 {
        char            *oldn, *newn, *end, *value;
 roff_als(ROFF_ARGS)
 {
        char            *oldn, *newn, *end, *value;


@@ -2995,7 +3585,7 @@ roff_als(ROFF_ARGS)
                return ROFF_IGN;
 
        newsz = roff_getname(r, &oldn, ln, pos);
                return ROFF_IGN;
 
        newsz = roff_getname(r, &oldn, ln, pos);

-       if (newn[newsz] == '\\' || *oldn == '\0')
+       if (newn[newsz] == '\\' || newn[newsz] == '\t' || *oldn == '\0')

                return ROFF_IGN;
 
        end = oldn;
                return ROFF_IGN;
 
        end = oldn;


@@ -3003,28 +3593,26 @@ roff_als(ROFF_ARGS)
        if (oldsz == 0)
                return ROFF_IGN;
 
        if (oldsz == 0)
                return ROFF_IGN;
 

-       valsz = mandoc_asprintf(&value, ".%.*s \\$*\n", (int)oldsz, oldn);
+       valsz = mandoc_asprintf(&value, ".%.*s \\$@\\\"\n",
+           (int)oldsz, oldn);

        roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0);
        roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);
        free(value);
        return ROFF_IGN;
 }
 
        roff_setstrn(&r->strtab, newn, newsz, value, valsz, 0);
        roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);
        free(value);
        return ROFF_IGN;
 }
 

-static enum rofferr
-roff_br(ROFF_ARGS)
+/*
+ * The .break request only makes sense inside conditionals,
+ * and that case is already handled in roff_cond_sub().
+ */
+static int
+roff_break(ROFF_ARGS)

 {
 {

-       if (r->man->flags & (MAN_BLINE | MAN_ELINE))
-               man_breakscope(r->man, ROFF_br);
-       roff_elem_alloc(r->man, ln, ppos, ROFF_br);
-       if (buf->buf[pos] != '\0')
-               mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse, ln, pos,
-                   "%s %s", roff_name[tok], buf->buf + pos);
-       r->man->last->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;
-       r->man->next = ROFF_NEXT_SIBLING;
+       mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, pos, "break");

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_cc(ROFF_ARGS)
 {
        const char      *p;
 roff_cc(ROFF_ARGS)
 {
        const char      *p;


@@ -3035,13 +3623,85 @@ roff_cc(ROFF_ARGS)
                r->control = '\0';
 
        if (*p != '\0')
                r->control = '\0';
 
        if (*p != '\0')

-               mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
+               mandoc_msg(MANDOCERR_ARG_EXCESS,

                    ln, p - buf->buf, "cc ... %s", p);
 
        return ROFF_IGN;
 }
 
                    ln, p - buf->buf, "cc ... %s", p);
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int
+roff_char(ROFF_ARGS)
+{
+       const char      *p, *kp, *vp;
+       size_t           ksz, vsz;
+       int              font;
+
+       /* Parse the character to be replaced. */
+
+       kp = buf->buf + pos;
+       p = kp + 1;
+       if (*kp == '\0' || (*kp == '\\' &&
+            mandoc_escape(&p, NULL, NULL) != ESCAPE_SPECIAL) ||
+           (*p != ' ' && *p != '\0')) {
+               mandoc_msg(MANDOCERR_CHAR_ARG, ln, pos, "char %s", kp);
+               return ROFF_IGN;
+       }
+       ksz = p - kp;
+       while (*p == ' ')
+               p++;
+
+       /*
+        * If the replacement string contains a font escape sequence,
+        * we have to restore the font at the end.
+        */
+
+       vp = p;
+       vsz = strlen(p);
+       font = 0;
+       while (*p != '\0') {
+               if (*p++ != '\\')
+                       continue;
+               switch (mandoc_escape(&p, NULL, NULL)) {
+               case ESCAPE_FONT:
+               case ESCAPE_FONTROMAN:
+               case ESCAPE_FONTITALIC:
+               case ESCAPE_FONTBOLD:
+               case ESCAPE_FONTBI:
+               case ESCAPE_FONTCR:
+               case ESCAPE_FONTCB:
+               case ESCAPE_FONTCI:
+               case ESCAPE_FONTPREV:
+                       font++;
+                       break;
+               default:
+                       break;
+               }
+       }
+       if (font > 1)
+               mandoc_msg(MANDOCERR_CHAR_FONT,
+                   ln, (int)(vp - buf->buf), "%s", vp);
+
+       /*
+        * Approximate the effect of .char using the .tr tables.
+        * XXX In groff, .char and .tr interact differently.
+        */
+
+       if (ksz == 1) {
+               if (r->xtab == NULL)
+                       r->xtab = mandoc_calloc(128, sizeof(*r->xtab));
+               assert((unsigned int)*kp < 128);
+               free(r->xtab[(int)*kp].p);
+               r->xtab[(int)*kp].sz = mandoc_asprintf(&r->xtab[(int)*kp].p,
+                   "%s%s", vp, font ? "\fP" : "");
+       } else {
+               roff_setstrn(&r->xmbtab, kp, ksz, vp, vsz, 0);
+               if (font)
+                       roff_setstrn(&r->xmbtab, kp, ksz, "\\fP", 3, 1);
+       }
+       return ROFF_IGN;
+}
+
+static int

 roff_ec(ROFF_ARGS)
 {
        const char      *p;
 roff_ec(ROFF_ARGS)
 {
        const char      *p;


@@ -3052,23 +3712,32 @@ roff_ec(ROFF_ARGS)
        else {
                r->escape = *p;
                if (*++p != '\0')
        else {
                r->escape = *p;
                if (*++p != '\0')

-                       mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
-                           ln, p - buf->buf, "ec ... %s", p);
+                       mandoc_msg(MANDOCERR_ARG_EXCESS, ln,
+                           (int)(p - buf->buf), "ec ... %s", p);

        }
        return ROFF_IGN;
 }
 
        }
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_eo(ROFF_ARGS)
 {
        r->escape = '\0';
        if (buf->buf[pos] != '\0')
 roff_eo(ROFF_ARGS)
 {
        r->escape = '\0';
        if (buf->buf[pos] != '\0')

-               mandoc_vmsg(MANDOCERR_ARG_SKIP, r->parse,
+               mandoc_msg(MANDOCERR_ARG_SKIP,

                    ln, pos, "eo %s", buf->buf + pos);
        return ROFF_IGN;
 }
 
                    ln, pos, "eo %s", buf->buf + pos);
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int
+roff_nop(ROFF_ARGS)
+{
+       while (buf->buf[pos] == ' ')
+               pos++;
+       *offs = pos;
+       return ROFF_RERUN;
+}
+
+static int

 roff_tr(ROFF_ARGS)
 {
        const char      *p, *first, *second;
 roff_tr(ROFF_ARGS)
 {
        const char      *p, *first, *second;


@@ -3078,7 +3747,7 @@ roff_tr(ROFF_ARGS)
        p = buf->buf + pos;
 
        if (*p == '\0') {
        p = buf->buf + pos;
 
        if (*p == '\0') {

-               mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, ln, ppos, "tr");
+               mandoc_msg(MANDOCERR_REQ_EMPTY, ln, ppos, "tr");

                return ROFF_IGN;
        }
 
                return ROFF_IGN;
        }
 


@@ -3089,8 +3758,8 @@ roff_tr(ROFF_ARGS)
                if (*first == '\\') {
                        esc = mandoc_escape(&p, NULL, NULL);
                        if (esc == ESCAPE_ERROR) {
                if (*first == '\\') {
                        esc = mandoc_escape(&p, NULL, NULL);
                        if (esc == ESCAPE_ERROR) {

-                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
-                                   ln, (int)(p - buf->buf), first);
+                               mandoc_msg(MANDOCERR_ESC_BAD, ln,
+                                   (int)(p - buf->buf), "%s", first);

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


@@ -3100,14 +3769,14 @@ roff_tr(ROFF_ARGS)
                if (*second == '\\') {
                        esc = mandoc_escape(&p, NULL, NULL);
                        if (esc == ESCAPE_ERROR) {
                if (*second == '\\') {
                        esc = mandoc_escape(&p, NULL, NULL);
                        if (esc == ESCAPE_ERROR) {

-                               mandoc_msg(MANDOCERR_ESC_BAD, r->parse,
-                                   ln, (int)(p - buf->buf), second);
+                               mandoc_msg(MANDOCERR_ESC_BAD, ln,
+                                   (int)(p - buf->buf), "%s", second);

                                return ROFF_IGN;
                        }
                        ssz = (size_t)(p - second);
                } else if (*second == '\0') {
                                return ROFF_IGN;
                        }
                        ssz = (size_t)(p - second);
                } else if (*second == '\0') {

-                       mandoc_vmsg(MANDOCERR_TR_ODD, r->parse,
-                           ln, first - buf->buf, "tr %s", first);
+                       mandoc_msg(MANDOCERR_TR_ODD, ln,
+                           (int)(first - buf->buf), "tr %s", first);

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


@@ -3130,19 +3799,36 @@ roff_tr(ROFF_ARGS)
        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+/*
+ * Implementation of the .return request.
+ * There is no need to call roff_userret() from here.
+ * The read module will call that after rewinding the reader stack
+ * to the place from where the current macro was called.
+ */
+static int
+roff_return(ROFF_ARGS)
+{
+       if (r->mstackpos >= 0)
+               return ROFF_IGN | ROFF_USERRET;
+
+       mandoc_msg(MANDOCERR_REQ_NOMAC, ln, ppos, "return");
+       return ROFF_IGN;
+}
+
+static int

 roff_rn(ROFF_ARGS)
 {
        const char      *value;
        char            *oldn, *newn, *end;
        size_t           oldsz, newsz;
 roff_rn(ROFF_ARGS)
 {
        const char      *value;
        char            *oldn, *newn, *end;
        size_t           oldsz, newsz;

+       int              deftype;

 
        oldn = newn = buf->buf + pos;
        if (*oldn == '\0')
                return ROFF_IGN;
 
        oldsz = roff_getname(r, &newn, ln, pos);
 
        oldn = newn = buf->buf + pos;
        if (*oldn == '\0')
                return ROFF_IGN;
 
        oldsz = roff_getname(r, &newn, ln, pos);

-       if (oldn[oldsz] == '\\' || *newn == '\0')
+       if (oldn[oldsz] == '\\' || oldn[oldsz] == '\t' || *newn == '\0')

                return ROFF_IGN;
 
        end = newn;
                return ROFF_IGN;
 
        end = newn;


@@ -3150,43 +3836,75 @@ roff_rn(ROFF_ARGS)
        if (newsz == 0)
                return ROFF_IGN;
 
        if (newsz == 0)
                return ROFF_IGN;
 

-       /*
-        * Rename a user-defined macro bearing the old name,
-        * overriding an existing renamed high-level macro
-        * bearing the new name, if that exists.
-        */
-
-       if ((value = roff_getstrn(r, oldn, oldsz)) != NULL) {
+       deftype = ROFFDEF_ANY;
+       value = roff_getstrn(r, oldn, oldsz, &deftype);
+       switch (deftype) {
+       case ROFFDEF_USER:

                roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0);
                roff_setstrn(&r->strtab, oldn, oldsz, NULL, 0, 0);
                roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);
                roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0);
                roff_setstrn(&r->strtab, oldn, oldsz, NULL, 0, 0);
                roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);

-               return ROFF_IGN;
-       }
-
-       /*
-        * Rename a high-level macro bearing the old name,
-        * either renaming it a second time if it was already
-        * renamed before, or renaming it for the first time.
-        * In both cases, override an existing user-defined
-        * macro bearing the new name, if that exists.
-        */
-
-       if ((value = roff_getrenn(r, oldn, oldsz)) != NULL) {
+               break;
+       case ROFFDEF_PRE:
+               roff_setstrn(&r->strtab, newn, newsz, value, strlen(value), 0);
+               roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);
+               break;
+       case ROFFDEF_REN:

                roff_setstrn(&r->rentab, newn, newsz, value, strlen(value), 0);
                roff_setstrn(&r->rentab, oldn, oldsz, NULL, 0, 0);
                roff_setstrn(&r->rentab, newn, newsz, value, strlen(value), 0);
                roff_setstrn(&r->rentab, oldn, oldsz, NULL, 0, 0);

-       } else
+               roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0);
+               break;
+       case ROFFDEF_STD:

                roff_setstrn(&r->rentab, newn, newsz, oldn, oldsz, 0);
                roff_setstrn(&r->rentab, newn, newsz, oldn, oldsz, 0);

-       roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0);
+               roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0);
+               break;
+       default:
+               roff_setstrn(&r->strtab, newn, newsz, NULL, 0, 0);
+               roff_setstrn(&r->rentab, newn, newsz, NULL, 0, 0);
+               break;
+       }
+       return ROFF_IGN;
+}
+
+static int
+roff_shift(ROFF_ARGS)
+{
+       struct mctx     *ctx;
+       int              levels, i;
+
+       levels = 1;
+       if (buf->buf[pos] != '\0' &&
+           roff_evalnum(r, ln, buf->buf, &pos, &levels, 0) == 0) {
+               mandoc_msg(MANDOCERR_CE_NONUM,
+                   ln, pos, "shift %s", buf->buf + pos);
+               levels = 1;
+       }
+       if (r->mstackpos < 0) {
+               mandoc_msg(MANDOCERR_REQ_NOMAC, ln, ppos, "shift");
+               return ROFF_IGN;
+       }
+       ctx = r->mstack + r->mstackpos;
+       if (levels > ctx->argc) {
+               mandoc_msg(MANDOCERR_SHIFT,
+                   ln, pos, "%d, but max is %d", levels, ctx->argc);
+               levels = ctx->argc;
+       }
+       if (levels == 0)
+               return ROFF_IGN;
+       for (i = 0; i < levels; i++)
+               free(ctx->argv[i]);
+       ctx->argc -= levels;
+       for (i = 0; i < ctx->argc; i++)
+               ctx->argv[i] = ctx->argv[i + levels];

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 

-static enum rofferr
+static int

 roff_so(ROFF_ARGS)
 {
        char *name, *cp;
 
        name = buf->buf + pos;
 roff_so(ROFF_ARGS)
 {
        char *name, *cp;
 
        name = buf->buf + pos;

-       mandoc_vmsg(MANDOCERR_SO, r->parse, ln, ppos, "so %s", name);
+       mandoc_msg(MANDOCERR_SO, 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


@@ -3196,8 +3914,7 @@ roff_so(ROFF_ARGS)
         */
 
        if (*name == '/' || strstr(name, "../") || strstr(name, "/..")) {
         */
 
        if (*name == '/' || strstr(name, "../") || strstr(name, "/..")) {

-               mandoc_vmsg(MANDOCERR_SO_PATH, r->parse, ln, ppos,
-                   ".so %s", name);
+               mandoc_msg(MANDOCERR_SO_PATH, ln, ppos, ".so %s", name);

                buf->sz = mandoc_asprintf(&cp,
                    ".sp\nSee the file %s.\n.sp", name) + 1;
                free(buf->buf);
                buf->sz = mandoc_asprintf(&cp,
                    ".sp\nSee the file %s.\n.sp", name) + 1;
                free(buf->buf);


@@ -3212,164 +3929,90 @@ roff_so(ROFF_ARGS)
 
 /* --- user defined strings and macros ------------------------------------ */
 
 
 /* --- user defined strings and macros ------------------------------------ */
 

-static enum rofferr
+static int

 roff_userdef(ROFF_ARGS)
 {
 roff_userdef(ROFF_ARGS)
 {

-       const char       *arg[16], *ap;
-       char             *cp, *n1, *n2;
-       int               expand_count, i, ib, ie;
-       size_t            asz, rsz;
+       struct mctx      *ctx;
+       char             *arg, *ap, *dst, *src;
+       size_t            sz;

 
 

-       /*
-        * Collect pointers to macro argument strings
-        * and NUL-terminate them.
-        */
+       /* If the macro is empty, ignore it altogether. */

 
 

-       r->argc = 0;
-       cp = buf->buf + pos;
-       for (i = 0; i < 16; i++) {
-               if (*cp == '\0')
-                       arg[i] = "";
-               else {
-                       arg[i] = mandoc_getarg(r->parse, &cp, ln, &pos);
-                       r->argc = i + 1;
-               }
+       if (*r->current_string == '\0')
+               return ROFF_IGN;
+
+       /* Initialize a new macro stack context. */
+
+       if (++r->mstackpos == r->mstacksz) {
+               r->mstack = mandoc_recallocarray(r->mstack,
+                   r->mstacksz, r->mstacksz + 8, sizeof(*r->mstack));
+               r->mstacksz += 8;

        }
        }

+       ctx = r->mstack + r->mstackpos;
+       ctx->argsz = 0;
+       ctx->argc = 0;
+       ctx->argv = NULL;

 
        /*
 
        /*

-        * Expand macro arguments.
+        * Collect pointers to macro argument strings,
+        * NUL-terminating them and escaping quotes.

         */
 
         */
 

-       buf->sz = strlen(r->current_string) + 1;
-       n1 = n2 = cp = mandoc_malloc(buf->sz);
-       memcpy(n1, r->current_string, buf->sz);
-       expand_count = 0;
-       while (*cp != '\0') {
-
-               /* Scan ahead for the next argument invocation. */
-
-               if (*cp++ != '\\')
-                       continue;
-               if (*cp++ != '$')
-                       continue;
-               if (*cp == '*') {  /* \\$* inserts all arguments */
-                       ib = 0;
-                       ie = r->argc - 1;
-               } else {  /* \\$1 .. \\$9 insert one argument */
-                       ib = ie = *cp - '1';
-                       if (ib < 0 || ib > 8)
-                               continue;
+       src = buf->buf + pos;
+       while (*src != '\0') {
+               if (ctx->argc == ctx->argsz) {
+                       ctx->argsz += 8;
+                       ctx->argv = mandoc_reallocarray(ctx->argv,
+                           ctx->argsz, sizeof(*ctx->argv));

                }
                }

-               cp -= 2;
-
-               /*
-                * Prevent infinite recursion.
-                */
-
-               if (cp >= n2)
-                       expand_count = 1;
-               else if (++expand_count > EXPAND_LIMIT) {
-                       mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
-                           ln, (int)(cp - n1), NULL);
-                       free(buf->buf);
-                       buf->buf = n1;
-                       return ROFF_IGN;
-               }
-
-               /*
-                * Determine the size of the expanded argument,
-                * taking escaping of quotes into account.
-                */
-
-               asz = ie > ib ? ie - ib : 0;  /* for blanks */
-               for (i = ib; i <= ie; i++) {
-                       for (ap = arg[i]; *ap != '\0'; ap++) {
-                               asz++;
-                               if (*ap == '"')
-                                       asz += 3;
-                       }
-               }
-               if (asz != 3) {
-
-                       /*
-                        * Determine the size of the rest of the
-                        * unexpanded macro, including the NUL.
-                        */
-
-                       rsz = buf->sz - (cp - n1) - 3;
-
-                       /*
-                        * When shrinking, move before
-                        * releasing the storage.
-                        */
-
-                       if (asz < 3)
-                               memmove(cp + asz, cp + 3, rsz);
-
-                       /*
-                        * Resize the storage for the macro
-                        * and readjust the parse pointer.
-                        */
-
-                       buf->sz += asz - 3;
-                       n2 = mandoc_realloc(n1, buf->sz);
-                       cp = n2 + (cp - n1);
-                       n1 = n2;
-
-                       /*
-                        * When growing, make room
-                        * for the expanded argument.
-                        */
-
-                       if (asz > 3)
-                               memmove(cp + asz, cp + 3, rsz);
-               }
-
-               /* Copy the expanded argument, escaping quotes. */
-
-               n2 = cp;
-               for (i = ib; i <= ie; i++) {
-                       for (ap = arg[i]; *ap != '\0'; ap++) {
-                               if (*ap == '"') {
-                                       memcpy(n2, "\\(dq", 4);
-                                       n2 += 4;
-                               } else
-                                       *n2++ = *ap;
-                       }
-                       if (i < ie)
-                               *n2++ = ' ';
+               arg = roff_getarg(r, &src, ln, &pos);
+               sz = 1;  /* For the terminating NUL. */
+               for (ap = arg; *ap != '\0'; ap++)
+                       sz += *ap == '"' ? 4 : 1;
+               ctx->argv[ctx->argc++] = dst = mandoc_malloc(sz);
+               for (ap = arg; *ap != '\0'; ap++) {
+                       if (*ap == '"') {
+                               memcpy(dst, "\\(dq", 4);
+                               dst += 4;
+                       } else
+                               *dst++ = *ap;

                }
                }

+               *dst = '\0';
+               free(arg);

        }
 
        }
 

-       /*
-        * Replace the macro invocation
-        * by the expanded macro.
-        */
+       /* Replace the macro invocation by the macro definition. */

 
        free(buf->buf);
 
        free(buf->buf);

-       buf->buf = n1;
+       buf->buf = mandoc_strdup(r->current_string);
+       buf->sz = strlen(buf->buf) + 1;

        *offs = 0;
 
        *offs = 0;
 

-       return buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?
-          ROFF_REPARSE : ROFF_APPEND;
+       return buf->buf[buf->sz - 2] == '\n' ?
+           ROFF_REPARSE | ROFF_USERCALL : ROFF_IGN | ROFF_APPEND;

 }
 
 /*
  * Calling a high-level macro that was renamed with .rn.
  * r->current_string has already been set up by roff_parse().
  */
 }
 
 /*
  * Calling a high-level macro that was renamed with .rn.
  * r->current_string has already been set up by roff_parse().
  */

-static enum rofferr
+static int

 roff_renamed(ROFF_ARGS)
 {
        char    *nbuf;
 
 roff_renamed(ROFF_ARGS)
 {
        char    *nbuf;
 

-       buf->sz = mandoc_asprintf(&nbuf, ".%s %s", r->current_string,
-           buf->buf + pos) + 1;
+       buf->sz = mandoc_asprintf(&nbuf, ".%s%s%s", r->current_string,
+           buf->buf[pos] == '\0' ? "" : " ", buf->buf + pos) + 1;

        free(buf->buf);
        buf->buf = nbuf;
        free(buf->buf);
        buf->buf = nbuf;

+       *offs = 0;

        return ROFF_CONT;
 }
 
        return ROFF_CONT;
 }
 

+/*
+ * Measure the length in bytes of the roff identifier at *cpp
+ * and advance the pointer to the next word.
+ */

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


@@ -3377,31 +4020,34 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
        size_t    namesz;
 
        name = *cpp;
        size_t    namesz;
 
        name = *cpp;

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

                return 0;
 
                return 0;
 

-       /* Read until end of name and terminate it with NUL. */
+       /* Advance cp to the byte after the end of the name. */
+

        for (cp = name; 1; cp++) {
        for (cp = name; 1; cp++) {

-               if ('\0' == *cp || ' ' == *cp) {
-                       namesz = cp - name;
+               namesz = cp - name;
+               if (*cp == '\0')
+                       break;
+               if (*cp == ' ' || *cp == '\t') {
+                       cp++;

                        break;
                }
                        break;
                }

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

                        continue;
                        continue;

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

                        break;
                        break;

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

                        continue;
                        continue;

-               mandoc_vmsg(MANDOCERR_NAMESC, r->parse, ln, pos,
+               mandoc_msg(MANDOCERR_NAMESC, ln, pos,

                    "%.*s", (int)(cp - name + 1), name);
                mandoc_escape((const char **)&cp, NULL, NULL);
                break;
        }
 
        /* Read past spaces. */
                    "%.*s", (int)(cp - name + 1), name);
                mandoc_escape((const char **)&cp, NULL, NULL);
                break;
        }
 
        /* Read past spaces. */

-       while (' ' == *cp)
+
+       while (*cp == ' ')

                cp++;
 
        *cpp = cp;
                cp++;
 
        *cpp = cp;


@@ -3419,9 +4065,12 @@ static void
 roff_setstr(struct roff *r, const char *name, const char *string,
        int append)
 {
 roff_setstr(struct roff *r, const char *name, const char *string,
        int append)
 {

+       size_t   namesz;

 
 

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

            string ? strlen(string) : 0, append);
            string ? strlen(string) : 0, append);

+       roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);

 }
 
 static void
 }
 
 static void


@@ -3497,38 +4146,96 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
 }
 
 static const char *
 }
 
 static const char *

-roff_getstrn(const struct roff *r, const char *name, size_t len)
+roff_getstrn(struct roff *r, const char *name, size_t len,
+    int *deftype)

 {
 {

-       const struct roffkv *n;
-       int i;
-
-       for (n = r->strtab; n; n = n->next)
-               if (0 == strncmp(name, n->key.p, len) &&
-                   '\0' == n->key.p[(int)len])
+       const struct roffkv     *n;
+       int                      found, i;
+       enum roff_tok            tok;
+
+       found = 0;
+       for (n = r->strtab; n != NULL; n = n->next) {
+               if (strncmp(name, n->key.p, len) != 0 ||
+                   n->key.p[len] != '\0' || n->val.p == NULL)
+                       continue;
+               if (*deftype & ROFFDEF_USER) {
+                       *deftype = ROFFDEF_USER;

                        return n->val.p;
                        return n->val.p;

-
-       for (i = 0; i < PREDEFS_MAX; i++)
-               if (0 == strncmp(name, predefs[i].name, len) &&
-                               '\0' == predefs[i].name[(int)len])
+               } else {
+                       found = 1;
+                       break;
+               }
+       }
+       for (n = r->rentab; n != NULL; n = n->next) {
+               if (strncmp(name, n->key.p, len) != 0 ||
+                   n->key.p[len] != '\0' || n->val.p == NULL)
+                       continue;
+               if (*deftype & ROFFDEF_REN) {
+                       *deftype = ROFFDEF_REN;
+                       return n->val.p;
+               } else {
+                       found = 1;
+                       break;
+               }
+       }
+       for (i = 0; i < PREDEFS_MAX; i++) {
+               if (strncmp(name, predefs[i].name, len) != 0 ||
+                   predefs[i].name[len] != '\0')
+                       continue;
+               if (*deftype & ROFFDEF_PRE) {
+                       *deftype = ROFFDEF_PRE;

                        return predefs[i].str;
                        return predefs[i].str;

+               } else {
+                       found = 1;
+                       break;
+               }
+       }
+       if (r->man->meta.macroset != MACROSET_MAN) {
+               for (tok = MDOC_Dd; tok < MDOC_MAX; tok++) {
+                       if (strncmp(name, roff_name[tok], len) != 0 ||
+                           roff_name[tok][len] != '\0')
+                               continue;
+                       if (*deftype & ROFFDEF_STD) {
+                               *deftype = ROFFDEF_STD;
+                               return NULL;
+                       } else {
+                               found = 1;
+                               break;
+                       }
+               }
+       }
+       if (r->man->meta.macroset != MACROSET_MDOC) {
+               for (tok = MAN_TH; tok < MAN_MAX; tok++) {
+                       if (strncmp(name, roff_name[tok], len) != 0 ||
+                           roff_name[tok][len] != '\0')
+                               continue;
+                       if (*deftype & ROFFDEF_STD) {
+                               *deftype = ROFFDEF_STD;
+                               return NULL;
+                       } else {
+                               found = 1;
+                               break;
+                       }
+               }
+       }

 
 

-       return NULL;
-}
+       if (found == 0 && *deftype != ROFFDEF_ANY) {
+               if (*deftype & ROFFDEF_REN) {
+                       /*
+                        * This might still be a request,
+                        * so do not treat it as undefined yet.
+                        */
+                       *deftype = ROFFDEF_UNDEF;
+                       return NULL;
+               }

 
 

-/*
- * Check whether *name is the renamed name of a high-level macro.
- * Return the standard name, or NULL if it is not.
- */
-static const char *
-roff_getrenn(const struct roff *r, const char *name, size_t len)
-{
-       const struct roffkv *n;
+               /* Using an undefined string defines it to be empty. */

 
 

-       for (n = r->rentab; n; n = n->next)
-               if (0 == strncmp(name, n->key.p, len) &&
-                   '\0' == n->key.p[(int)len])
-                       return n->val.p;
+               roff_setstrn(&r->strtab, name, len, "", 0, 0);
+               roff_setstrn(&r->rentab, name, len, NULL, 0, 0);
+       }

 
 

+       *deftype = 0;

        return NULL;
 }
 
        return NULL;
 }
 


@@ -3547,20 +4254,6 @@ roff_freestr(struct roffkv *r)
 
 /* --- accessors and utility functions ------------------------------------ */
 
 
 /* --- accessors and utility functions ------------------------------------ */
 

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

 /*
  * Duplicate an input string, making the appropriate character
  * conversations (as stipulated by `tr') along the way.
 /*
  * Duplicate an input string, making the appropriate character
  * conversations (as stipulated by `tr') along the way.


@@ -3642,7 +4335,7 @@ roff_strdup(const struct roff *r, const char *p)
                /*
                 * We bail out on bad escapes.
                 * No need to warn: we already did so when
                /*
                 * We bail out on bad escapes.
                 * No need to warn: we already did so when

-                * roff_res() was called.
+                * roff_expand() was called.

                 */
                sz = (int)(p - pp);
                res = mandoc_realloc(res, ssz + sz + 1);
                 */
                sz = (int)(p - pp);
                res = mandoc_realloc(res, ssz + sz + 1);