this file needs to #include "config.h" because it calls getprogname();

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 0c3deefe7b33ab3c22fe92818f1aa21994ed6632..2b07352b90a3e91bcc98f2f47ffd508f81072f80 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.168 2011/08/16 12:30:12 kristaps Exp $ */
+/*     $Id: roff.c,v 1.363 2019/02/06 21:11:43 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2015, 2017-2019 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


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

-#ifdef HAVE_CONFIG_H

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

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

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

+#include <limits.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>

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

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

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

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

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

-
-/* Maximum number of nested if-else conditionals. */
-#define        RSTACK_MAX      128
-
-enum   rofft {
-       ROFF_ad,
-       ROFF_am,
-       ROFF_ami,
-       ROFF_am1,
-       ROFF_de,
-       ROFF_dei,
-       ROFF_de1,
-       ROFF_ds,
-       ROFF_el,
-       ROFF_hy,
-       ROFF_ie,
-       ROFF_if,
-       ROFF_ig,
-       ROFF_it,
-       ROFF_ne,
-       ROFF_nh,
-       ROFF_nr,
-       ROFF_ns,
-       ROFF_ps,
-       ROFF_rm,
-       ROFF_so,
-       ROFF_ta,
-       ROFF_tr,
-       ROFF_TS,
-       ROFF_TE,
-       ROFF_T_,
-       ROFF_EQ,
-       ROFF_EN,
-       ROFF_cblock,
-       ROFF_ccond,
-       ROFF_USERDEF,
-       ROFF_MAX
-};
-
-enum   roffrule {
-       ROFFRULE_ALLOW,
-       ROFFRULE_DENY
-};
+#include "roff_int.h"
+#include "tbl_parse.h"
+#include "eqn_parse.h"

 
 /*
 
 /*

- * A single register entity.  If "set" is zero, the value of the
- * register should be the default one, which is per-register.
- * Registers are assumed to be unsigned ints for now.
+ * 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.

  */
  */

-struct reg {
-       int              set; /* whether set or not */
-       unsigned int     u; /* unsigned integer */
-};
+#define        ASCII_ESC       27
+
+/* 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 --------------------------------------------------------- */

 
 /*
  * An incredibly-simple string buffer.
 
 /*
  * An incredibly-simple string buffer.


@@ -98,54 +77,89 @@ struct      roffkv {
        struct roffkv   *next; /* next in list */
 };
 
        struct roffkv   *next; /* next in list */
 };
 

+/*
+ * A single number register as part of a singly-linked list.
+ */
+struct roffreg {
+       struct roffstr   key;
+       int              val;
+       int              step;
+       struct roffreg  *next;
+};
+
+/*
+ * Association of request and macro names with token IDs.
+ */
+struct roffreq {
+       enum roff_tok    tok;
+       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 roffnode *last; /* leaf of stack */

-       enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */
-       int              rstackpos; /* position in rstack */
-       struct reg       regs[REG__MAX];
+       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 */

        struct roffkv   *strtab; /* user-defined strings & macros */
        struct roffkv   *strtab; /* user-defined strings & macros */

+       struct roffkv   *rentab; /* renamed strings & macros */

        struct roffkv   *xmbtab; /* multi-byte trans table (`tr') */
        struct roffstr  *xtab; /* single-byte trans table (`tr') */
        const char      *current_string; /* value of last called user macro */
        struct tbl_node *first_tbl; /* first table parsed */
        struct tbl_node *last_tbl; /* last table parsed */
        struct tbl_node *tbl; /* current table being parsed */
        struct roffkv   *xmbtab; /* multi-byte trans table (`tr') */
        struct roffstr  *xtab; /* single-byte trans table (`tr') */
        const char      *current_string; /* value of last called user macro */
        struct tbl_node *first_tbl; /* first table parsed */
        struct tbl_node *last_tbl; /* last table parsed */
        struct tbl_node *tbl; /* current table being parsed */

-       struct eqn_node *last_eqn; /* last equation parsed */
-       struct eqn_node *first_eqn; /* first equation parsed */
-       struct eqn_node *eqn; /* current equation being parsed */
+       struct 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              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 */
+       char             control; /* control character */
+       char             escape; /* escape character */

 };
 
 struct roffnode {
 };
 
 struct roffnode {

-       enum rofft       tok; /* type of node */
+       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 */
        struct roffnode *parent; /* up one in stack */
        int              line; /* parse line */
        int              col; /* parse col */
        char            *name; /* node name, e.g. macro name */
        char            *end; /* end-rules: custom token */
        int              endspan; /* end-rules: next-line or infty */

-       enum roffrule    rule; /* current evaluation rule */
+       int              rule; /* current evaluation rule */

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

-                        enum rofft tok, /* tok of macro */ \
-                        char **bufp, /* input buffer */ \
-                        size_t *szp, /* size of input buffer */ \
+                        enum roff_tok tok, /* tok of macro */ \
+                        struct buf *buf, /* input buffer */ \

                         int ln, /* parse line */ \
                         int ppos, /* original pos in buffer */ \
                         int pos, /* current pos in buffer */ \
                         int *offs /* reset offset of buffer data */
 
                         int ln, /* parse line */ \
                         int ppos, /* original pos in buffer */ \
                         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 {
 
 struct roffmac {

-       const char      *name; /* macro name */

        roffproc         proc; /* process new macro */
        roffproc         text; /* process as child text of macro */
        roffproc         sub; /* process as child of macro */
        int              flags;
 #define        ROFFMAC_STRUCT  (1 << 0) /* always interpret */
        roffproc         proc; /* process new macro */
        roffproc         text; /* process as child text of macro */
        roffproc         sub; /* process as child of macro */
        int              flags;
 #define        ROFFMAC_STRUCT  (1 << 0) /* always interpret */

-       struct roffmac  *next;

 };
 
 struct predef {
 };
 
 struct predef {


@@ -156,89 +170,447 @@ struct   predef {
 #define        PREDEF(__name, __str) \
        { (__name), (__str) },
 
 #define        PREDEF(__name, __str) \
        { (__name), (__str) },
 

-static enum rofft       roffhash_find(const char *, size_t);
-static void             roffhash_init(void);
-static void             roffnode_cleanscope(struct roff *);
-static void             roffnode_pop(struct roff *);
-static void             roffnode_push(struct roff *, enum rofft,
+/* --- function prototypes ------------------------------------------------ */
+
+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);
                                const char *, int, int);

-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_cblock(ROFF_ARGS);
-static enum rofferr     roff_ccond(ROFF_ARGS);
-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 roffrule    roff_evalcond(const 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_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_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 *r, 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_expand(struct roff *, struct buf *,
+                               int, int, char);

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

+static void             roff_freereg(struct roffreg *);

 static void             roff_freestr(struct roffkv *);
 static void             roff_freestr(struct roffkv *);

-static char            *roff_getname(struct roff *, char **, int, int);
-static const char      *roff_getstrn(const struct roff *, 
+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(struct roff *,
+                               const char *, size_t, char);
+static int              roff_getregro(const struct roff *,
+                               const char *name);
+static const char      *roff_getstrn(struct roff *,
+                               const char *, size_t, int *);
+static int              roff_hasregn(const struct roff *,

                                const char *, size_t);
                                const char *, size_t);

-static enum rofferr     roff_line_ignore(ROFF_ARGS);
-static enum rofferr     roff_nr(ROFF_ARGS);
-static void             roff_openeqn(struct roff *, const char *, 
-                               int, int, const char *);
-static enum rofft       roff_parse(struct roff *, const char *, int *);
-static enum rofferr     roff_parsetext(char *);
-static void             roff_res(struct roff *, 
-                               char **, size_t *, int, int);
-static enum rofferr     roff_rm(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 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 int              roff_parsetext(struct roff *, struct buf *,
+                               int, int *);
+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_setstr(struct roff *,
                                const char *, const char *, int);

-static void             roff_setstrn(struct roffkv **, const char *, 
+static void             roff_setstrn(struct roffkv **, const char *,

                                size_t, const char *, size_t, int);
                                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_TE(ROFF_ARGS);
-static enum rofferr     roff_TS(ROFF_ARGS);
-static enum rofferr     roff_EQ(ROFF_ARGS);
-static enum rofferr     roff_EN(ROFF_ARGS);
-static enum rofferr     roff_T_(ROFF_ARGS);
-static enum rofferr     roff_userdef(ROFF_ARGS);
-
-/* See roffhash_find() */
-
-#define        ASCII_HI         126
-#define        ASCII_LO         33
-#define        HASHWIDTH       (ASCII_HI - ASCII_LO + 1)
-
-static struct roffmac  *hash[HASHWIDTH];
-
-static struct roffmac   roffs[ROFF_MAX] = {
-       { "ad", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "am", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "am1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "de", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "ds", roff_ds, NULL, NULL, 0, NULL },
-       { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
-       { "hy", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "ie", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
-       { "if", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
-       { "ig", roff_block, roff_block_text, roff_block_sub, 0, NULL },
-       { "it", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "ne", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "nr", roff_nr, NULL, NULL, 0, NULL },
-       { "ns", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "ps", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "rm", roff_rm, NULL, NULL, 0, NULL },
-       { "so", roff_so, NULL, NULL, 0, NULL },
-       { "ta", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "tr", roff_tr, NULL, NULL, 0, NULL },
-       { "TS", roff_TS, NULL, NULL, 0, NULL },
-       { "TE", roff_TE, NULL, NULL, 0, NULL },
-       { "T&", roff_T_, NULL, NULL, 0, NULL },
-       { "EQ", roff_EQ, NULL, NULL, 0, NULL },
-       { "EN", roff_EN, NULL, NULL, 0, NULL },
-       { ".", roff_cblock, NULL, NULL, 0, NULL },
-       { "\\}", roff_ccond, NULL, NULL, 0, NULL },
-       { NULL, roff_userdef, NULL, NULL, 0, NULL },
+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 ------------------------------------------------------ */
+
+#define        ROFFNUM_SCALE   (1 << 0)  /* Honour scaling in roff_getnum(). */
+#define        ROFFNUM_WHITE   (1 << 1)  /* Skip whitespace in roff_evalnum(). */
+
+const char *__roff_name[MAN_MAX + 1] = {
+       "br",           "ce",           "fi",           "ft",
+       "ll",           "mc",           "nf",
+       "po",           "rj",           "sp",
+       "ta",           "ti",           NULL,
+       "ab",           "ad",           "af",           "aln",
+       "als",          "am",           "am1",          "ami",
+       "ami1",         "as",           "as1",          "asciify",
+       "backtrace",    "bd",           "bleedat",      "blm",
+        "box",         "boxa",         "bp",           "BP",
+       "break",        "breakchar",    "brnl",         "brp",
+       "brpnl",        "c2",           "cc",
+       "cf",           "cflags",       "ch",           "char",
+       "chop",         "class",        "close",        "CL",
+       "color",        "composite",    "continue",     "cp",
+       "cropat",       "cs",           "cu",           "da",
+       "dch",          "Dd",           "de",           "de1",
+       "defcolor",     "dei",          "dei1",         "device",
+       "devicem",      "di",           "do",           "ds",
+       "ds1",          "dwh",          "dt",           "ec",
+       "ecr",          "ecs",          "el",           "em",
+       "EN",           "eo",           "EP",           "EQ",
+       "errprint",     "ev",           "evc",          "ex",
+       "fallback",     "fam",          "fc",           "fchar",
+       "fcolor",       "fdeferlig",    "feature",      "fkern",
+       "fl",           "flig",         "fp",           "fps",
+       "fschar",       "fspacewidth",  "fspecial",     "ftr",
+       "fzoom",        "gcolor",       "hc",           "hcode",
+       "hidechar",     "hla",          "hlm",          "hpf",
+       "hpfa",         "hpfcode",      "hw",           "hy",
+       "hylang",       "hylen",        "hym",          "hypp",
+       "hys",          "ie",           "if",           "ig",
+       "index",        "it",           "itc",          "IX",
+       "kern",         "kernafter",    "kernbefore",   "kernpair",
+       "lc",           "lc_ctype",     "lds",          "length",
+       "letadj",       "lf",           "lg",           "lhang",
+       "linetabs",     "lnr",          "lnrf",         "lpfx",
+       "ls",           "lsm",          "lt",
+       "mediasize",    "minss",        "mk",           "mso",
+       "na",           "ne",           "nh",           "nhychar",
+       "nm",           "nn",           "nop",          "nr",
+       "nrf",          "nroff",        "ns",           "nx",
+       "open",         "opena",        "os",           "output",
+       "padj",         "papersize",    "pc",           "pev",
+       "pi",           "PI",           "pl",           "pm",
+       "pn",           "pnr",          "ps",
+       "psbb",         "pshape",       "pso",          "ptr",
+       "pvs",          "rchar",        "rd",           "recursionlimit",
+       "return",       "rfschar",      "rhang",
+       "rm",           "rn",           "rnn",          "rr",
+       "rs",           "rt",           "schar",        "sentchar",
+       "shc",          "shift",        "sizes",        "so",
+       "spacewidth",   "special",      "spreadwarn",   "ss",
+       "sty",          "substring",    "sv",           "sy",
+       "T&",           "tc",           "TE",
+       "TH",           "tkf",          "tl",
+       "tm",           "tm1",          "tmc",          "tr",
+       "track",        "transchar",    "trf",          "trimat",
+       "trin",         "trnt",         "troff",        "TS",
+       "uf",           "ul",           "unformat",     "unwatch",
+       "unwatchn",     "vpt",          "vs",           "warn",
+       "warnscale",    "watch",        "watchlength",  "watchn",
+       "wh",           "while",        "write",        "writec",
+       "writem",       "xflag",        ".",            NULL,
+       NULL,           "text",
+       "Dd",           "Dt",           "Os",           "Sh",
+       "Ss",           "Pp",           "D1",           "Dl",
+       "Bd",           "Ed",           "Bl",           "El",
+       "It",           "Ad",           "An",           "Ap",
+       "Ar",           "Cd",           "Cm",           "Dv",
+       "Er",           "Ev",           "Ex",           "Fa",
+       "Fd",           "Fl",           "Fn",           "Ft",
+       "Ic",           "In",           "Li",           "Nd",
+       "Nm",           "Op",           "Ot",           "Pa",
+       "Rv",           "St",           "Va",           "Vt",
+       "Xr",           "%A",           "%B",           "%D",
+       "%I",           "%J",           "%N",           "%O",
+       "%P",           "%R",           "%T",           "%V",
+       "Ac",           "Ao",           "Aq",           "At",
+       "Bc",           "Bf",           "Bo",           "Bq",
+       "Bsx",          "Bx",           "Db",           "Dc",
+       "Do",           "Dq",           "Ec",           "Ef",
+       "Em",           "Eo",           "Fx",           "Ms",
+       "No",           "Ns",           "Nx",           "Ox",
+       "Pc",           "Pf",           "Po",           "Pq",
+       "Qc",           "Ql",           "Qo",           "Qq",
+       "Re",           "Rs",           "Sc",           "So",
+       "Sq",           "Sm",           "Sx",           "Sy",
+       "Tn",           "Ux",           "Xc",           "Xo",
+       "Fo",           "Fc",           "Oo",           "Oc",
+       "Bk",           "Ek",           "Bt",           "Hf",
+       "Fr",           "Ud",           "Lb",           "Lp",
+       "Lk",           "Mt",           "Brq",          "Bro",
+       "Brc",          "%C",           "Es",           "En",
+       "Dx",           "%Q",           "%U",           "Ta",
+       NULL,
+       "TH",           "SH",           "SS",           "TP",
+       "TQ",
+       "LP",           "PP",           "P",            "IP",
+       "HP",           "SM",           "SB",           "BI",
+       "IB",           "BR",           "RB",           "R",
+       "B",            "I",            "IR",           "RI",
+       "RE",           "RS",           "DT",           "UC",
+       "PD",           "AT",           "in",
+       "SY",           "YS",           "OP",
+       "EX",           "EE",           "UR",
+       "UE",           "MT",           "ME",           NULL
+};
+const  char *const *roff_name = __roff_name;
+
+static struct roffmac   roffs[TOKEN_NONE] = {
+       { roff_noarg, NULL, NULL, 0 },  /* br */
+       { 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_noarg, NULL, NULL, 0 },  /* nf */
+       { roff_onearg, NULL, NULL, 0 },  /* po */
+       { roff_onearg, NULL, NULL, 0 },  /* rj */
+       { roff_onearg, NULL, NULL, 0 },  /* sp */
+       { roff_manyarg, NULL, NULL, 0 },  /* ta */
+       { roff_onearg, NULL, NULL, 0 },  /* ti */
+       { NULL, NULL, NULL, 0 },  /* ROFF_MAX */
+       { roff_unsupp, NULL, NULL, 0 },  /* ab */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ad */
+       { roff_line_ignore, NULL, NULL, 0 },  /* af */
+       { roff_unsupp, NULL, NULL, 0 },  /* aln */
+       { roff_als, NULL, NULL, 0 },  /* als */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* am */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* am1 */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* ami */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* ami1 */
+       { roff_ds, NULL, NULL, 0 },  /* as */
+       { roff_ds, NULL, NULL, 0 },  /* as1 */
+       { roff_unsupp, NULL, NULL, 0 },  /* asciify */
+       { roff_line_ignore, NULL, NULL, 0 },  /* backtrace */
+       { roff_line_ignore, NULL, NULL, 0 },  /* bd */
+       { roff_line_ignore, NULL, NULL, 0 },  /* bleedat */
+       { roff_unsupp, NULL, NULL, 0 },  /* blm */
+       { roff_unsupp, NULL, NULL, 0 },  /* box */
+       { 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_line_ignore, NULL, NULL, 0 },  /* breakchar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* brnl */
+       { 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_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 },  /* CL */
+       { roff_line_ignore, NULL, NULL, 0 },  /* color */
+       { roff_unsupp, NULL, NULL, 0 },  /* composite */
+       { roff_unsupp, NULL, NULL, 0 },  /* continue */
+       { roff_line_ignore, NULL, NULL, 0 },  /* cp */
+       { roff_line_ignore, NULL, NULL, 0 },  /* cropat */
+       { roff_line_ignore, NULL, NULL, 0 },  /* cs */
+       { roff_line_ignore, NULL, NULL, 0 },  /* cu */
+       { roff_unsupp, NULL, NULL, 0 },  /* da */
+       { roff_unsupp, NULL, NULL, 0 },  /* dch */
+       { roff_Dd, NULL, NULL, 0 },  /* Dd */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* de */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* de1 */
+       { roff_line_ignore, NULL, NULL, 0 },  /* defcolor */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* dei */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* dei1 */
+       { roff_unsupp, NULL, NULL, 0 },  /* device */
+       { roff_unsupp, NULL, NULL, 0 },  /* devicem */
+       { roff_unsupp, NULL, NULL, 0 },  /* di */
+       { roff_unsupp, NULL, NULL, 0 },  /* do */
+       { roff_ds, NULL, NULL, 0 },  /* ds */
+       { roff_ds, NULL, NULL, 0 },  /* ds1 */
+       { roff_unsupp, NULL, NULL, 0 },  /* dwh */
+       { roff_unsupp, NULL, NULL, 0 },  /* dt */
+       { roff_ec, NULL, NULL, 0 },  /* ec */
+       { roff_unsupp, NULL, NULL, 0 },  /* ecr */
+       { roff_unsupp, NULL, NULL, 0 },  /* ecs */
+       { roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT },  /* el */
+       { roff_unsupp, NULL, NULL, 0 },  /* em */
+       { roff_EN, NULL, NULL, 0 },  /* EN */
+       { roff_eo, NULL, NULL, 0 },  /* eo */
+       { roff_unsupp, NULL, NULL, 0 },  /* EP */
+       { roff_EQ, NULL, NULL, 0 },  /* EQ */
+       { roff_line_ignore, NULL, NULL, 0 },  /* errprint */
+       { roff_unsupp, NULL, NULL, 0 },  /* ev */
+       { roff_unsupp, NULL, NULL, 0 },  /* evc */
+       { roff_unsupp, NULL, NULL, 0 },  /* ex */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fallback */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fam */
+       { roff_unsupp, NULL, NULL, 0 },  /* fc */
+       { roff_unsupp, NULL, NULL, 0 },  /* fchar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fcolor */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fdeferlig */
+       { roff_line_ignore, NULL, NULL, 0 },  /* feature */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fkern */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fl */
+       { roff_line_ignore, NULL, NULL, 0 },  /* flig */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fp */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fps */
+       { roff_unsupp, NULL, NULL, 0 },  /* fschar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fspacewidth */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fspecial */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ftr */
+       { roff_line_ignore, NULL, NULL, 0 },  /* fzoom */
+       { roff_line_ignore, NULL, NULL, 0 },  /* gcolor */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hc */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hcode */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hidechar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hla */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hlm */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hpf */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hpfa */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hpfcode */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hw */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hy */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hylang */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hylen */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hym */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hypp */
+       { roff_line_ignore, NULL, NULL, 0 },  /* hys */
+       { roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT },  /* ie */
+       { roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT },  /* if */
+       { roff_block, roff_block_text, roff_block_sub, 0 },  /* ig */
+       { roff_unsupp, NULL, NULL, 0 },  /* index */
+       { roff_it, NULL, NULL, 0 },  /* it */
+       { roff_unsupp, NULL, NULL, 0 },  /* itc */
+       { roff_line_ignore, NULL, NULL, 0 },  /* IX */
+       { roff_line_ignore, NULL, NULL, 0 },  /* kern */
+       { roff_line_ignore, NULL, NULL, 0 },  /* kernafter */
+       { roff_line_ignore, NULL, NULL, 0 },  /* kernbefore */
+       { roff_line_ignore, NULL, NULL, 0 },  /* kernpair */
+       { roff_unsupp, NULL, NULL, 0 },  /* lc */
+       { roff_unsupp, NULL, NULL, 0 },  /* lc_ctype */
+       { roff_unsupp, NULL, NULL, 0 },  /* lds */
+       { roff_unsupp, NULL, NULL, 0 },  /* length */
+       { roff_line_ignore, NULL, NULL, 0 },  /* letadj */
+       { roff_insec, NULL, NULL, 0 },  /* lf */
+       { roff_line_ignore, NULL, NULL, 0 },  /* lg */
+       { roff_line_ignore, NULL, NULL, 0 },  /* lhang */
+       { roff_unsupp, NULL, NULL, 0 },  /* linetabs */
+       { roff_unsupp, NULL, NULL, 0 },  /* lnr */
+       { roff_unsupp, NULL, NULL, 0 },  /* lnrf */
+       { roff_unsupp, NULL, NULL, 0 },  /* lpfx */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ls */
+       { roff_unsupp, NULL, NULL, 0 },  /* lsm */
+       { roff_line_ignore, NULL, NULL, 0 },  /* lt */
+       { roff_line_ignore, NULL, NULL, 0 },  /* mediasize */
+       { roff_line_ignore, NULL, NULL, 0 },  /* minss */
+       { roff_line_ignore, NULL, NULL, 0 },  /* mk */
+       { roff_insec, NULL, NULL, 0 },  /* mso */
+       { roff_line_ignore, NULL, NULL, 0 },  /* na */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ne */
+       { roff_line_ignore, NULL, NULL, 0 },  /* nh */
+       { roff_line_ignore, NULL, NULL, 0 },  /* nhychar */
+       { roff_unsupp, NULL, NULL, 0 },  /* nm */
+       { roff_unsupp, NULL, NULL, 0 },  /* nn */
+       { 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_line_ignore, NULL, NULL, 0 },  /* ns */
+       { roff_insec, NULL, NULL, 0 },  /* nx */
+       { roff_insec, NULL, NULL, 0 },  /* open */
+       { roff_insec, NULL, NULL, 0 },  /* opena */
+       { roff_line_ignore, NULL, NULL, 0 },  /* os */
+       { roff_unsupp, NULL, NULL, 0 },  /* output */
+       { roff_line_ignore, NULL, NULL, 0 },  /* padj */
+       { roff_line_ignore, NULL, NULL, 0 },  /* papersize */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pc */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pev */
+       { roff_insec, NULL, NULL, 0 },  /* pi */
+       { roff_unsupp, NULL, NULL, 0 },  /* PI */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pl */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pm */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pn */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pnr */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ps */
+       { roff_unsupp, NULL, NULL, 0 },  /* psbb */
+       { roff_unsupp, NULL, NULL, 0 },  /* pshape */
+       { roff_insec, NULL, NULL, 0 },  /* pso */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ptr */
+       { roff_line_ignore, NULL, NULL, 0 },  /* pvs */
+       { roff_unsupp, NULL, NULL, 0 },  /* rchar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* rd */
+       { roff_line_ignore, NULL, NULL, 0 },  /* recursionlimit */
+       { 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_rn, NULL, NULL, 0 },  /* rn */
+       { roff_unsupp, NULL, NULL, 0 },  /* rnn */
+       { roff_rr, NULL, NULL, 0 },  /* rr */
+       { roff_line_ignore, NULL, NULL, 0 },  /* rs */
+       { roff_line_ignore, NULL, NULL, 0 },  /* rt */
+       { roff_unsupp, NULL, NULL, 0 },  /* schar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* sentchar */
+       { roff_line_ignore, NULL, NULL, 0 },  /* shc */
+       { 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 },  /* special */
+       { roff_line_ignore, NULL, NULL, 0 },  /* spreadwarn */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ss */
+       { roff_line_ignore, NULL, NULL, 0 },  /* sty */
+       { roff_unsupp, NULL, NULL, 0 },  /* substring */
+       { roff_line_ignore, NULL, NULL, 0 },  /* sv */
+       { roff_insec, NULL, NULL, 0 },  /* sy */
+       { roff_T_, NULL, NULL, 0 },  /* T& */
+       { roff_unsupp, NULL, NULL, 0 },  /* tc */
+       { roff_TE, NULL, NULL, 0 },  /* TE */
+       { 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 },  /* tm1 */
+       { roff_line_ignore, NULL, NULL, 0 },  /* tmc */
+       { roff_tr, NULL, NULL, 0 },  /* tr */
+       { roff_line_ignore, NULL, NULL, 0 },  /* track */
+       { roff_line_ignore, NULL, NULL, 0 },  /* transchar */
+       { roff_insec, NULL, NULL, 0 },  /* trf */
+       { roff_line_ignore, NULL, NULL, 0 },  /* trimat */
+       { roff_unsupp, NULL, NULL, 0 },  /* trin */
+       { roff_unsupp, NULL, NULL, 0 },  /* trnt */
+       { roff_line_ignore, NULL, NULL, 0 },  /* troff */
+       { roff_TS, NULL, NULL, 0 },  /* TS */
+       { roff_line_ignore, NULL, NULL, 0 },  /* uf */
+       { roff_line_ignore, NULL, NULL, 0 },  /* ul */
+       { roff_unsupp, NULL, NULL, 0 },  /* unformat */
+       { roff_line_ignore, NULL, NULL, 0 },  /* unwatch */
+       { roff_line_ignore, NULL, NULL, 0 },  /* unwatchn */
+       { roff_line_ignore, NULL, NULL, 0 },  /* vpt */
+       { roff_line_ignore, NULL, NULL, 0 },  /* vs */
+       { roff_line_ignore, NULL, NULL, 0 },  /* warn */
+       { roff_line_ignore, NULL, NULL, 0 },  /* warnscale */
+       { roff_line_ignore, NULL, NULL, 0 },  /* watch */
+       { roff_line_ignore, NULL, NULL, 0 },  /* watchlength */
+       { roff_line_ignore, NULL, NULL, 0 },  /* watchn */
+       { roff_unsupp, NULL, NULL, 0 },  /* wh */
+       { 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_line_ignore, NULL, NULL, 0 },  /* xflag */
+       { roff_cblock, NULL, NULL, 0 },  /* . */
+       { roff_renamed, NULL, NULL, 0 },
+       { roff_userdef, NULL, NULL, 0 }

 };
 
 /* Array of injected predefined strings. */
 };
 
 /* Array of injected predefined strings. */


@@ -247,87 +619,95 @@ static    const struct predef predefs[PREDEFS_MAX] = {
 #include "predefs.in"
 };
 
 #include "predefs.in"
 };
 

-/* See roffhash_find() */
-#define        ROFF_HASH(p)    (p[0] - ASCII_LO)
+static int      roffce_lines;  /* number of input lines to center */
+static struct roff_node *roffce_node;  /* active request */
+static int      roffit_lines;  /* number of lines to delay */
+static char    *roffit_macro;  /* nil-terminated macro line */

 
 

-static void
-roffhash_init(void)
-{
-       struct roffmac   *n;
-       int               buc, i;

 
 

-       for (i = 0; i < (int)ROFF_USERDEF; i++) {
-               assert(roffs[i].name[0] >= ASCII_LO);
-               assert(roffs[i].name[0] <= ASCII_HI);
+/* --- request table ------------------------------------------------------ */

 
 

-               buc = ROFF_HASH(roffs[i].name);
+struct ohash *
+roffhash_alloc(enum roff_tok mintok, enum roff_tok maxtok)
+{
+       struct ohash    *htab;
+       struct roffreq  *req;
+       enum roff_tok    tok;
+       size_t           sz;
+       unsigned int     slot;

 
 

-               if (NULL != (n = hash[buc])) {
-                       for ( ; n->next; n = n->next)
-                               /* Do nothing. */ ;
-                       n->next = &roffs[i];
-               } else
-                       hash[buc] = &roffs[i];
+       htab = mandoc_malloc(sizeof(*htab));
+       mandoc_ohash_init(htab, 8, offsetof(struct roffreq, name));
+
+       for (tok = mintok; tok < maxtok; tok++) {
+               if (roff_name[tok] == NULL)
+                       continue;
+               sz = strlen(roff_name[tok]);
+               req = mandoc_malloc(sizeof(*req) + sz + 1);
+               req->tok = tok;
+               memcpy(req->name, roff_name[tok], sz + 1);
+               slot = ohash_qlookup(htab, req->name);
+               ohash_insert(htab, slot, req);

        }
        }

+       return htab;

 }
 
 }
 

-/*
- * Look up a roff token by its name.  Returns ROFF_MAX if no macro by
- * the nil-terminated string name could be found.
- */
-static enum rofft
-roffhash_find(const char *p, size_t s)
+void
+roffhash_free(struct ohash *htab)

 {
 {

-       int              buc;
-       struct roffmac  *n;
-
-       /*
-        * libroff has an extremely simple hashtable, for the time
-        * being, which simply keys on the first character, which must
-        * be printable, then walks a chain.  It works well enough until
-        * optimised.
-        */
-
-       if (p[0] < ASCII_LO || p[0] > ASCII_HI)
-               return(ROFF_MAX);
+       struct roffreq  *req;
+       unsigned int     slot;

 
 

-       buc = ROFF_HASH(p);
-
-       if (NULL == (n = hash[buc]))
-               return(ROFF_MAX);
-       for ( ; n; n = n->next)
-               if (0 == strncmp(n->name, p, s) && '\0' == n->name[(int)s])
-                       return((enum rofft)(n - roffs));
+       if (htab == NULL)
+               return;
+       for (req = ohash_first(htab, &slot); req != NULL;
+            req = ohash_next(htab, &slot))
+               free(req);
+       ohash_delete(htab);
+       free(htab);
+}

 
 

-       return(ROFF_MAX);
+enum roff_tok
+roffhash_find(struct ohash *htab, const char *name, size_t sz)
+{
+       struct roffreq  *req;
+       const char      *end;
+
+       if (sz) {
+               end = name + sz;
+               req = ohash_find(htab, ohash_qlookupi(htab, name, &end));
+       } else
+               req = ohash_find(htab, ohash_qlookup(htab, name));
+       return req == NULL ? TOKEN_NONE : req->tok;

 }
 
 }
 

+/* --- stack of request blocks -------------------------------------------- */

 
 /*
  * Pop the current node off of the stack of roff instructions currently
  * pending.
  */
 
 /*
  * Pop the current node off of the stack of roff instructions currently
  * pending.
  */

-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; 
-
-       r->last = r->last->parent;
+       p = r->last;
+       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;

 }
 
 }
 

-

 /*
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().
  */
 static void
 /*
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().
  */
 static void

-roffnode_push(struct roff *r, enum rofft tok, const char *name,
+roffnode_push(struct roff *r, enum roff_tok tok, const char *name,

                int line, int col)
 {
        struct roffnode *p;
                int line, int col)
 {
        struct roffnode *p;


@@ -339,45 +719,46 @@ roffnode_push(struct roff *r, enum rofft tok, const char *name,
        p->parent = r->last;
        p->line = line;
        p->col = col;
        p->parent = r->last;
        p->line = line;
        p->col = col;

-       p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY;
+       p->rule = p->parent ? p->parent->rule : 0;

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

+/* --- roff parser state data management ---------------------------------- */

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

-       struct tbl_node *t;
-       struct eqn_node *e;

        int              i;
 
        int              i;
 

-       while (NULL != (t = r->first_tbl)) {
-               r->first_tbl = t->next;
-               tbl_free(t);
-       }
-
+       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);
-       }
+       eqn_free(r->last_eqn);
+       r->last_eqn = r->eqn = NULL;

 
 

-       r->first_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);
 

+       free (r->rstack);
+       r->rstack = NULL;
+       r->rstacksz = 0;
+       r->rstackpos = -1;
+
+       roff_freereg(r->regtab);
+       r->regtab = NULL;
+

        roff_freestr(r->strtab);
        roff_freestr(r->strtab);

+       roff_freestr(r->rentab);

        roff_freestr(r->xmbtab);
        roff_freestr(r->xmbtab);

-
-       r->strtab = r->xmbtab = NULL;
+       r->strtab = r->rentab = r->xmbtab = NULL;

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

-

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


@@ -385,1055 +766,3013 @@ roff_free1(struct roff *r)
 void
 roff_reset(struct roff *r)
 {
 void
 roff_reset(struct roff *r)
 {

-       int              i;
-

        roff_free1(r);
        roff_free1(r);

-
-       memset(&r->regs, 0, sizeof(struct reg) * REG__MAX);
-
-       for (i = 0; i < PREDEFS_MAX; i++) 
-               roff_setstr(r, predefs[i].name, predefs[i].str, 0);
+       r->format = r->options & (MPARSE_MDOC | MPARSE_MAN);
+       r->control = '\0';
+       r->escape = '\\';
+       roffce_lines = 0;
+       roffce_node = NULL;
+       roffit_lines = 0;
+       roffit_macro = NULL;

 }
 
 }
 

-

 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);
 }
 
        free(r);
 }
 

-

 struct roff *
 struct roff *

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

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

-       int              i;

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

-       r->parse = parse;
+       r->reqtab = roffhash_alloc(0, ROFF_RENAMED);
+       r->options = options;
+       r->format = options & (MPARSE_MDOC | MPARSE_MAN);
+       r->mstackpos = -1;

        r->rstackpos = -1;
        r->rstackpos = -1;

-       
-       roffhash_init();
+       r->escape = '\\';
+       return r;
+}

 
 

-       for (i = 0; i < PREDEFS_MAX; i++) 
-               roff_setstr(r, predefs[i].name, predefs[i].str, 0);
+/* --- syntax tree state data management ---------------------------------- */

 
 

-       return(r);
+static void
+roff_man_free1(struct roff_man *man)
+{
+       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.arch);
+       free(man->meta.title);
+       free(man->meta.name);
+       free(man->meta.date);
+       free(man->meta.sodest);
+}
+
+void
+roff_state_reset(struct roff_man *man)
+{
+       man->last = man->meta.first;
+       man->last_es = NULL;
+       man->flags = 0;
+       man->lastsec = man->lastnamed = SEC_NONE;
+       man->next = ROFF_NEXT_CHILD;
+       roff_setreg(man->roff, "nS", 0, '=');

 }
 
 }
 

-/*
- * Pre-filter each and every line for reserved words (one beginning with
- * `\*', e.g., `\*(ab').  These must be handled before the actual line
- * is processed. 
- * This also checks the syntax of regular escapes.
- */

 static void
 static void

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

 {
 {

-       enum mandoc_esc  esc;
-       const char      *stesc; /* start of an escape sequence ('\\') */
-       const char      *stnam; /* start of the name, after "[(*" */
-       const char      *cp;    /* end of the name, e.g. before ']' */
-       const char      *res;   /* the string to be substituted */
-       int              i, maxl;
-       size_t           nsz;
-       char            *n;
+       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);
+}

 
 

-again:
-       cp = *bufp + pos;
-       while (NULL != (cp = strchr(cp, '\\'))) {
-               stesc = cp++;
+void
+roff_man_reset(struct roff_man *man)
+{
+       roff_man_free1(man);
+       roff_man_alloc1(man);
+}

 
 

-               /*
-                * The second character must be an asterisk.
-                * If it isn't, skip it anyway:  It is escaped,
-                * so it can't start another escape sequence.
-                */
+void
+roff_man_free(struct roff_man *man)
+{
+       roff_man_free1(man);
+       free(man);
+}

 
 

-               if ('\0' == *cp)
-                       return;
+struct roff_man *
+roff_man_alloc(struct roff *roff, const char *os_s, int quick)
+{
+       struct roff_man *man;
+
+       man = mandoc_calloc(1, sizeof(*man));
+       man->roff = roff;
+       man->os_s = os_s;
+       man->quick = quick;
+       roff_man_alloc1(man);
+       roff->man = man;
+       return man;
+}

 
 

-               if ('*' != *cp) {
-                       res = cp;
-                       esc = mandoc_escape(&cp, NULL, NULL);
-                       if (ESCAPE_ERROR != esc)
-                               continue;
-                       cp = res;
-                       mandoc_msg
-                               (MANDOCERR_BADESCAPE, r->parse, 
-                                ln, (int)(stesc - *bufp), NULL);
-                       return;
-               }
+/* --- syntax tree handling ----------------------------------------------- */

 
 

-               cp++;
+struct roff_node *
+roff_node_alloc(struct roff_man *man, int line, int pos,
+       enum roff_type type, int tok)
+{
+       struct roff_node        *n;

 
 

-               /*
-                * The third character decides the length
-                * of the name of the string.
-                * Save a pointer to the name.
-                */
+       n = mandoc_calloc(1, sizeof(*n));
+       n->line = line;
+       n->pos = pos;
+       n->tok = tok;
+       n->type = type;
+       n->sec = man->lastsec;

 
 

-               switch (*cp) {
-               case ('\0'):
-                       return;
-               case ('('):
-                       cp++;
-                       maxl = 2;
-                       break;
-               case ('['):
-                       cp++;
-                       maxl = 0;
-                       break;
-               default:
-                       maxl = 1;
-                       break;
-               }
-               stnam = cp;
+       if (man->flags & MDOC_SYNOPSIS)
+               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;

 
 

-               /* Advance to the end of the name. */
+       return n;
+}

 
 

-               for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
-                       if ('\0' == *cp) {
-                               mandoc_msg
-                                       (MANDOCERR_BADESCAPE, 
-                                        r->parse, ln, 
-                                        (int)(stesc - *bufp), NULL);
-                               return;
-                       }
-                       if (0 == maxl && ']' == *cp)
-                               break;
-               }
+void
+roff_node_append(struct roff_man *man, struct roff_node *n)
+{

 
 

-               /*
-                * Retrieve the replacement string; if it is
-                * undefined, resume searching for escapes.
-                */
+       switch (man->next) {
+       case ROFF_NEXT_SIBLING:
+               if (man->last->next != NULL) {
+                       n->next = man->last->next;
+                       man->last->next->prev = n;
+               } else
+                       man->last->parent->last = n;
+               man->last->next = n;
+               n->prev = man->last;
+               n->parent = man->last->parent;
+               break;
+       case ROFF_NEXT_CHILD:
+               if (man->last->child != NULL) {
+                       n->next = man->last->child;
+                       man->last->child->prev = n;
+               } else
+                       man->last->last = n;
+               man->last->child = n;
+               n->parent = man->last;
+               break;
+       default:
+               abort();
+       }
+       man->last = n;

 
 

-               res = roff_getstrn(r, stnam, (size_t)i);
+       switch (n->type) {
+       case ROFFT_HEAD:
+               n->parent->head = n;
+               break;
+       case ROFFT_BODY:
+               if (n->end != ENDBODY_NOT)
+                       return;
+               n->parent->body = n;
+               break;
+       case ROFFT_TAIL:
+               n->parent->tail = n;
+               break;
+       default:
+               return;
+       }

 
 

-               if (NULL == res) {
-                       mandoc_msg
-                               (MANDOCERR_BADESCAPE, r->parse, 
-                                ln, (int)(stesc - *bufp), NULL);
-                       res = "";
-               }
+       /*
+        * Copy over the normalised-data pointer of our parent.  Not
+        * everybody has one, but copying a null pointer is fine.
+        */

 
 

-               /* Replace the escape sequence by the string. */
+       n->norm = n->parent->norm;
+       assert(n->parent->type == ROFFT_BLOCK);
+}

 
 

-               pos = stesc - *bufp;
+void
+roff_word_alloc(struct roff_man *man, int line, int pos, const char *word)
+{
+       struct roff_node        *n;

 
 

-               nsz = *szp + strlen(res) + 1;
-               n = mandoc_malloc(nsz);
+       n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE);
+       n->string = roff_strdup(man->roff, word);
+       roff_node_append(man, n);
+       n->flags |= NODE_VALID | NODE_ENDED;
+       man->next = ROFF_NEXT_SIBLING;
+}

 
 

-               strlcpy(n, *bufp, (size_t)(stesc - *bufp + 1));
-               strlcat(n, res, nsz);
-               strlcat(n, cp + (maxl ? 0 : 1), nsz);
+void
+roff_word_append(struct roff_man *man, const char *word)
+{
+       struct roff_node        *n;
+       char                    *addstr, *newstr;
+
+       n = man->last;
+       addstr = roff_strdup(man->roff, word);
+       mandoc_asprintf(&newstr, "%s %s", n->string, addstr);
+       free(addstr);
+       free(n->string);
+       n->string = newstr;
+       man->next = ROFF_NEXT_SIBLING;
+}

 
 

-               free(*bufp);
+void
+roff_elem_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;

 
 

-               *bufp = n;
-               *szp = nsz;
-               goto again;
-       }
+       n = roff_node_alloc(man, line, pos, ROFFT_ELEM, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;

 }
 
 }
 

-/*
- * Process text streams: convert all breakable hyphens into ASCII_HYPH.
- */
-static enum rofferr
-roff_parsetext(char *p)
+struct roff_node *
+roff_block_alloc(struct roff_man *man, int line, int pos, int tok)

 {
 {

-       char             l, r;
-       size_t           sz;
-       const char      *start;
-       enum mandoc_esc  esc;
-
-       start = p;
+       struct roff_node        *n;

 
 

-       while ('\0' != *p) {
-               sz = strcspn(p, "-\\");
-               p += sz;
+       n = roff_node_alloc(man, line, pos, ROFFT_BLOCK, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+       return n;
+}

 
 

-               if ('\0' == *p)
-                       break;
+struct roff_node *
+roff_head_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;

 
 

-               if ('\\' == *p) {
-                       /* Skip over escapes. */
-                       p++;
-                       esc = mandoc_escape
-                               ((const char **)&p, NULL, NULL);
-                       if (ESCAPE_ERROR == esc)
-                               break;
-                       continue;
-               } else if (p == start) {
-                       p++;
-                       continue;
-               }
+       n = roff_node_alloc(man, line, pos, ROFFT_HEAD, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+       return n;
+}

 
 

-               l = *(p - 1);
-               r = *(p + 1);
-               if ('\\' != l &&
-                               '\t' != r && '\t' != l &&
-                               ' ' != r && ' ' != l &&
-                               '-' != r && '-' != l &&
-                               ! isdigit((unsigned char)l) &&
-                               ! isdigit((unsigned char)r))
-                       *p = ASCII_HYPH;
-               p++;
-       }
+struct roff_node *
+roff_body_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;

 
 

-       return(ROFF_CONT);
+       n = roff_node_alloc(man, line, pos, ROFFT_BODY, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+       return n;

 }
 
 }
 

-enum rofferr
-roff_parseln(struct roff *r, int ln, char **bufp, 
-               size_t *szp, int pos, int *offs)
+static void
+roff_addtbl(struct roff_man *man, int line, struct tbl_node *tbl)

 {
 {

-       enum rofft       t;
-       enum rofferr     e;
-       int              ppos, ctl;
+       struct roff_node        *n;
+       struct tbl_span         *span;
+
+       if (man->meta.macroset == MACROSET_MAN)
+               man_breakscope(man, ROFF_TS);
+       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;
+       }
+}

 
 

-       /*
-        * Run the reserved-word filter only if we have some reserved
-        * words to fill in.
-        */
+void
+roff_node_unlink(struct roff_man *man, struct roff_node *n)
+{

 
 

-       roff_res(r, bufp, szp, ln, pos);
+       /* Adjust siblings. */

 
 

-       ppos = pos;
-       ctl = mandoc_getcontrol(*bufp, &pos);
+       if (n->prev)
+               n->prev->next = n->next;
+       if (n->next)
+               n->next->prev = n->prev;

 
 

-       /*
-        * First, if a scope is open and we're not a macro, pass the
-        * text through the macro's filter.  If a scope isn't open and
-        * we're not a macro, just let it through.
-        * Finally, if there's an equation scope open, divert it into it
-        * no matter our state.
-        */
+       /* Adjust parent. */

 
 

-       if (r->last && ! ctl) {
-               t = r->last->tok;
-               assert(roffs[t].text);
-               e = (*roffs[t].text)
-                       (r, t, bufp, szp, ln, pos, pos, offs);
-               assert(ROFF_IGN == e || ROFF_CONT == e);
-               if (ROFF_CONT != e)
-                       return(e);
-               if (r->eqn)
-                       return(eqn_read(&r->eqn, ln, *bufp, pos, offs));
-               if (r->tbl)
-                       return(tbl_read(r->tbl, ln, *bufp, pos));
-               return(roff_parsetext(*bufp + pos));
-       } else if ( ! ctl) {
-               if (r->eqn)
-                       return(eqn_read(&r->eqn, ln, *bufp, pos, offs));
-               if (r->tbl)
-                       return(tbl_read(r->tbl, ln, *bufp, pos));
-               return(roff_parsetext(*bufp + pos));
-       } else if (r->eqn)
-               return(eqn_read(&r->eqn, ln, *bufp, ppos, offs));
+       if (n->parent != NULL) {
+               if (n->parent->child == n)
+                       n->parent->child = n->next;
+               if (n->parent->last == n)
+                       n->parent->last = n->prev;
+       }

 
 

-       /*
-        * If a scope is open, go to the child handler for that macro,
-        * as it may want to preprocess before doing anything with it.
-        * Don't do so if an equation is open.
-        */
+       /* Adjust parse point. */

 
 

-       if (r->last) {
-               t = r->last->tok;
-               assert(roffs[t].sub);
-               return((*roffs[t].sub)
-                               (r, t, bufp, szp, 
-                                ln, ppos, pos, offs));
+       if (man == NULL)
+               return;
+       if (man->last == n) {
+               if (n->prev == NULL) {
+                       man->last = n->parent;
+                       man->next = ROFF_NEXT_CHILD;
+               } else {
+                       man->last = n->prev;
+                       man->next = ROFF_NEXT_SIBLING;
+               }

        }
        }

+       if (man->meta.first == n)
+               man->meta.first = NULL;
+}

 
 

-       /*
-        * Lastly, as we've no scope open, try to look up and execute
-        * the new macro.  If no macro is found, simply return and let
-        * the compilers handle it.
-        */
+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);
+}

 
 

-       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos)))
-               return(ROFF_CONT);
+void
+roff_node_free(struct roff_node *n)
+{

 
 

-       assert(roffs[t].proc);
-       return((*roffs[t].proc)
-                       (r, t, bufp, szp, 
-                        ln, ppos, pos, offs));
+       if (n->args != NULL)
+               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);

 }
 
 }
 

+void
+roff_node_delete(struct roff_man *man, struct roff_node *n)
+{
+
+       while (n->child != NULL)
+               roff_node_delete(man, n->child);
+       roff_node_unlink(man, n);
+       roff_node_free(n);
+}

 
 void
 
 void

-roff_endparse(struct roff *r)
+deroff(char **dest, const struct roff_node *n)

 {
 {

+       char    *cp;
+       size_t   sz;
+
+       if (n->type != ROFFT_TEXT) {
+               for (n = n->child; n != NULL; n = n->next)
+                       deroff(dest, n);
+               return;
+       }

 
 

-       if (r->last)
-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse,
-                               r->last->line, r->last->col, NULL);
+       /* Skip leading whitespace. */

 
 

-       if (r->eqn) {
-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
-                               r->eqn->eqn.ln, r->eqn->eqn.pos, NULL);
-               eqn_end(&r->eqn);
+       for (cp = n->string; *cp != '\0'; cp++) {
+               if (cp[0] == '\\' && cp[1] != '\0' &&
+                   strchr(" %&0^|~", cp[1]) != NULL)
+                       cp++;
+               else if ( ! isspace((unsigned char)*cp))
+                       break;

        }
 
        }
 

-       if (r->tbl) {
-               mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
-                               r->tbl->line, r->tbl->pos, NULL);
-               tbl_end(&r->tbl);
+       /* Skip trailing backslash. */
+
+       sz = strlen(cp);
+       if (sz > 0 && cp[sz - 1] == '\\')
+               sz--;
+
+       /* Skip trailing whitespace. */
+
+       for (; sz; sz--)
+               if ( ! isspace((unsigned char)cp[sz-1]))
+                       break;
+
+       /* Skip empty strings. */
+
+       if (sz == 0)
+               return;
+
+       if (*dest == NULL) {
+               *dest = mandoc_strndup(cp, sz);
+               return;

        }
        }

+
+       mandoc_asprintf(&cp, "%s %*s", *dest, (int)sz, cp);
+       free(*dest);
+       *dest = cp;

 }
 
 }
 

+/* --- main functions of the roff parser ---------------------------------- */
+

 /*
 /*

- * Parse a roff node's type from the input buffer.  This must be in the
- * form of ".foo xxx" in the usual way.
+ * 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 rofft
-roff_parse(struct roff *r, const char *buf, int *pos)
+static int
+roff_expand(struct roff *r, struct buf *buf, int ln, int pos, char newesc)

 {
 {

-       const char      *mac;
-       size_t           maclen;
-       enum rofft       t;
-
-       if ('\0' == buf[*pos] || '"' == buf[*pos] || 
-                       '\t' == buf[*pos] || ' ' == buf[*pos])
-               return(ROFF_MAX);
+       struct mctx     *ctx;   /* current macro call context */
+       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      *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 */
+       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              quote_args; /* true for \\$@, false for \\$* */
+       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. */
+
+       done = 0;
+       start = buf->buf + pos;
+       for (stesc = buf->buf + pos; *stesc != '\0'; stesc++) {
+               if (stesc[0] != newesc || stesc[1] == '\0')
+                       continue;
+               stesc++;
+               if (*stesc != '"' && *stesc != '#')
+                       continue;

 
 

-       /*
-        * We stop the macro parse at an escape, tab, space, or nil.
-        * However, `\}' is also a valid macro, so make sure we don't
-        * clobber it by seeing the `\' as the end of token.
-        */
+               /* Comment found, look for RCS id. */

 
 

-       mac = buf + *pos;
-       maclen = strcspn(mac + 1, " \\\t\0") + 1;
+               rcsid = 0;
+               if ((cp = strstr(stesc, "$" "OpenBSD")) != NULL) {
+                       rcsid = 1 << MANDOC_OS_OPENBSD;
+                       cp += 8;
+               } else if ((cp = strstr(stesc, "$" "NetBSD")) != NULL) {
+                       rcsid = 1 << MANDOC_OS_NETBSD;
+                       cp += 7;
+               }
+               if (cp != NULL &&
+                   isalnum((unsigned char)*cp) == 0 &&
+                   strchr(cp, '$') != NULL) {
+                       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;
+               }

 
 

-       t = (r->current_string = roff_getstrn(r, mac, maclen))
-           ? ROFF_USERDEF : roffhash_find(mac, maclen);
+               /* Handle trailing whitespace. */

 
 

-       *pos += (int)maclen;
+               ep = strchr(stesc--, '\0') - 1;
+               if (*ep == '\n') {
+                       done = 1;
+                       ep--;
+               }
+               if (*ep == ' ' || *ep == '\t')
+                       mandoc_msg(MANDOCERR_SPACE_EOL,
+                           ln, (int)(ep - buf->buf), NULL);

 
 

-       while (buf[*pos] && ' ' == buf[*pos])
-               (*pos)++;
+               /*
+                * Save comments preceding the title macro
+                * in the syntax tree.
+                */

 
 

-       return(t);
-}
+               if (newesc != ASCII_ESC && r->format == 0) {
+                       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;
+               }

 
 

-/* ARGSUSED */
-static enum rofferr
-roff_cblock(ROFF_ARGS)
-{
+               /* Line continuation with comment. */

 
 

-       /*
-        * A block-close `..' should only be invoked as a child of an
-        * ignore macro, otherwise raise a warning and just ignore it.
-        */
+               if (stesc[1] == '#') {
+                       *stesc = '\0';
+                       return ROFF_IGN | ROFF_APPEND;
+               }

 
 

-       if (NULL == r->last) {
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
-       }
+               /* Discard normal comments. */

 
 

-       switch (r->last->tok) {
-       case (ROFF_am):
-               /* FALLTHROUGH */
-       case (ROFF_ami):
-               /* FALLTHROUGH */
-       case (ROFF_am1):
-               /* FALLTHROUGH */
-       case (ROFF_de):
-               /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
-               /* FALLTHROUGH */
-       case (ROFF_dei):
-               /* FALLTHROUGH */
-       case (ROFF_ig):
+               while (stesc > start && stesc[-1] == ' ' &&
+                   (stesc == start + 1 || stesc[-2] != '\\'))
+                       stesc--;
+               *stesc = '\0';

                break;
                break;

-       default:
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);

        }
        }

+       if (stesc == start)
+               return ROFF_CONT;
+       stesc--;

 
 

-       if ((*bufp)[pos])
-               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
+       /* Notice the end of the input. */
+
+       if (*stesc == '\n') {
+               *stesc-- = '\0';
+               done = 1;
+       }
+
+       expand_count = 0;
+       while (stesc >= start) {
+               if (*stesc != newesc) {
+
+                       /*
+                        * If we have a non-standard escape character,
+                        * escape literal backslashes because all
+                        * processing in subsequent functions uses
+                        * the standard escaping rules.
+                        */
+
+                       if (newesc != ASCII_ESC && *stesc == '\\') {
+                               *stesc = '\0';
+                               buf->sz = mandoc_asprintf(&nbuf, "%s\\e%s",
+                                   buf->buf, stesc + 1) + 1;
+                               start = nbuf + pos;
+                               stesc = nbuf + (stesc - buf->buf);
+                               free(buf->buf);
+                               buf->buf = nbuf;
+                       }
+
+                       /* Search backwards for the next escape. */
+
+                       stesc--;
+                       continue;
+               }
+
+               /* If it is escaped, skip it. */
+
+               for (cp = stesc - 1; cp >= start; cp--)
+                       if (*cp != r->escape)
+                               break;
+
+               if ((stesc - cp) % 2 == 0) {
+                       while (stesc > cp)
+                               *stesc-- = '\\';
+                       continue;
+               } else if (stesc[1] != '\0') {
+                       *stesc = '\\';
+               } else {
+                       *stesc-- = '\0';
+                       if (done)
+                               continue;
+                       else
+                               return ROFF_IGN | ROFF_APPEND;
+               }
+
+               /* Decide whether to expand or to check only. */
+
+               term = '\0';
+               cp = stesc + 1;
+               if (*cp == 'E')
+                       cp++;
+               esct = cp;
+               switch (*esct) {
+               case '*':
+               case '$':
+                       res = NULL;
+                       break;
+               case 'B':
+               case 'w':
+                       term = cp[1];
+                       /* FALLTHROUGH */
+               case 'n':
+                       sign = cp[1];
+                       if (sign == '+' || sign == '-')
+                               cp++;
+                       res = ubuf;
+                       break;
+               default:
+                       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) {
+                       mandoc_msg(MANDOCERR_ROFFLOOP,
+                           ln, (int)(stesc - buf->buf), NULL);
+                       return ROFF_IGN;
+               }
+
+               /*
+                * The third character decides the length
+                * of the name of the string or register.
+                * Save a pointer to the name.
+                */
+
+               if (term == '\0') {
+                       switch (*++cp) {
+                       case '\0':
+                               maxl = 0;
+                               break;
+                       case '(':
+                               cp++;
+                               maxl = 2;
+                               break;
+                       case '[':
+                               cp++;
+                               term = ']';
+                               maxl = 0;
+                               break;
+                       default:
+                               maxl = 1;
+                               break;
+                       }
+               } else {
+                       cp += 2;
+                       maxl = 0;
+               }
+               stnam = cp;
+
+               /* Advance to the end of the name. */
+
+               naml = 0;
+               arg_complete = 1;
+               while (maxl == 0 || naml < maxl) {
+                       if (*cp == '\0') {
+                               mandoc_msg(MANDOCERR_ESC_BAD, ln,
+                                   (int)(stesc - buf->buf), "%s", stesc);
+                               arg_complete = 0;
+                               break;
+                       }
+                       if (maxl == 0 && *cp == term) {
+                               cp++;
+                               break;
+                       }
+                       if (*cp++ != '\\' || *esct != 'w') {
+                               naml++;
+                               continue;
+                       }
+                       switch (mandoc_escape(&cp, NULL, NULL)) {
+                       case ESCAPE_SPECIAL:
+                       case ESCAPE_UNICODE:
+                       case ESCAPE_NUMBERED:
+                       case ESCAPE_UNDEF:
+                       case ESCAPE_OVERSTRIKE:
+                               naml++;
+                               break;
+                       default:
+                               break;
+                       }
+               }
+
+               /*
+                * Retrieve the replacement string; if it is
+                * undefined, resume searching for escapes.
+                */
+
+               switch (*esct) {
+               case '*':
+                       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;
+               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 &&
+                           roff_evalnum(r, ln, stnam, &npos,
+                             NULL, ROFFNUM_SCALE) &&
+                           stnam + npos + 1 == cp ? '1' : '0';
+                       ubuf[1] = '\0';
+                       break;
+               case 'n':
+                       if (arg_complete)
+                               (void)snprintf(ubuf, sizeof(ubuf), "%d",
+                                   roff_getregn(r, stnam, naml, sign));
+                       else
+                               ubuf[0] = '\0';
+                       break;
+               case 'w':
+                       /* use even incomplete args */
+                       (void)snprintf(ubuf, sizeof(ubuf), "%d",
+                           24 * (int)naml);
+                       break;
+               }
+
+               if (res == NULL) {
+                       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) {
+                       mandoc_msg(MANDOCERR_ROFFLOOP,
+                           ln, (int)(stesc - buf->buf), NULL);
+                       return ROFF_IGN;
+               }
+
+               /* Replace the escape sequence by the string. */
+
+               *stesc = '\0';
+               buf->sz = mandoc_asprintf(&nbuf, "%s%s%s",
+                   buf->buf, res, cp) + 1;
+
+               /* Prepare for the next replacement. */
+
+               start = nbuf + pos;
+               stesc = nbuf + (stesc - buf->buf) + strlen(res);
+               free(buf->buf);
+               buf->buf = nbuf;
+       }
+       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.
+ */
+static int
+roff_parsetext(struct roff *r, struct buf *buf, int pos, int *offs)
+{
+       size_t           sz;
+       const char      *start;
+       char            *p;
+       int              isz;
+       enum mandoc_esc  esc;
+
+       /* Spring the input line trap. */
+
+       if (roffit_lines == 1) {
+               isz = mandoc_asprintf(&p, "%s\n.%s", buf->buf, roffit_macro);
+               free(buf->buf);
+               buf->buf = p;
+               buf->sz = isz + 1;
+               *offs = 0;
+               free(roffit_macro);
+               roffit_lines = 0;
+               return ROFF_REPARSE;
+       } else if (roffit_lines > 1)
+               --roffit_lines;
+
+       if (roffce_node != NULL && buf->buf[pos] != '\0') {
+               if (roffce_lines < 1) {
+                       r->man->last = roffce_node;
+                       r->man->next = ROFF_NEXT_SIBLING;
+                       roffce_lines = 0;
+                       roffce_node = NULL;
+               } else
+                       roffce_lines--;
+       }
+
+       /* Convert all breakable hyphens into ASCII_HYPH. */
+
+       start = p = buf->buf + pos;
+
+       while (*p != '\0') {
+               sz = strcspn(p, "-\\");
+               p += sz;
+
+               if (*p == '\0')
+                       break;
+
+               if (*p == '\\') {
+                       /* Skip over escapes. */
+                       p++;
+                       esc = mandoc_escape((const char **)&p, NULL, NULL);
+                       if (esc == ESCAPE_ERROR)
+                               break;
+                       while (*p == '-')
+                               p++;
+                       continue;
+               } else if (p == start) {
+                       p++;
+                       continue;
+               }
+
+               if (isalpha((unsigned char)p[-1]) &&
+                   isalpha((unsigned char)p[1]))
+                       *p = ASCII_HYPH;
+               p++;
+       }
+       return ROFF_CONT;
+}
+
+int
+roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
+{
+       enum roff_tok    t;
+       int              e;
+       int              pos;   /* parse point */
+       int              spos;  /* saved parse point for messages */
+       int              ppos;  /* original offset in buf->buf */
+       int              ctl;   /* macro line (boolean) */
+
+       ppos = pos = *offs;
+
+       /* Handle in-line equation delimiters. */
+
+       if (r->tbl == NULL &&
+           r->last_eqn != NULL && r->last_eqn->delim &&
+           (r->eqn == NULL || r->eqn_inline)) {
+               e = roff_eqndelim(r, buf, pos);
+               if (e == ROFF_REPARSE)
+                       return e;
+               assert(e == ROFF_CONT);
+       }
+
+       /* Expand some escape sequences. */
+
+       e = roff_expand(r, buf, ln, pos, r->escape);
+       if ((e & ROFF_MASK) == ROFF_IGN)
+               return e;
+       assert(e == ROFF_CONT);
+
+       ctl = roff_getcontrol(r, buf->buf, &pos);
+
+       /*
+        * First, if a scope is open and we're not a macro, pass the
+        * text through the macro's filter.
+        * Equations process all content themselves.
+        * Tables process almost all content themselves, but we want
+        * to warn about macros before passing it there.
+        */
+
+       if (r->last != NULL && ! ctl) {
+               t = r->last->tok;
+               e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);
+               if ((e & ROFF_MASK) == ROFF_IGN)
+                       return e;
+               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)
+               return roff_parsetext(r, buf, pos, offs) | e;
+
+       /* Skip empty request lines. */
+
+       if (buf->buf[pos] == '"') {
+               mandoc_msg(MANDOCERR_COMMENT_BAD, ln, pos, NULL);
+               return ROFF_IGN;
+       } else if (buf->buf[pos] == '\0')
+               return ROFF_IGN;
+
+       /*
+        * If a scope is open, go to the child handler for that macro,
+        * as it may want to preprocess before doing anything with it.
+        * Don't do so if an equation is open.
+        */
+
+       if (r->last) {
+               t = r->last->tok;
+               return (*roffs[t].sub)(r, t, buf, ln, ppos, pos, offs);
+       }
+
+       /* No scope is open.  This is a new request or macro. */
+
+       spos = pos;
+       t = roff_parse(r, buf->buf, &pos, ln, ppos);
+
+       /* Tables ignore most macros. */
+
+       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,
+                   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++;
+               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 &&
+           (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;
+       }
+
+       /*
+        * This is neither a roff request nor a user-defined macro.
+        * Let the standard macro set parsers handle it.
+        */
+
+       if (t == TOKEN_NONE)
+               return ROFF_CONT;
+
+       /* Execute a roff request or a user defined macro. */
+
+       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
+roff_userret(struct roff *r)
+{
+       struct mctx     *ctx;
+       int              i;
+
+       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--;
+}
+
+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 != NULL) {
+               tbl_end(r->tbl, 1);
+               r->tbl = NULL;
+       }
+}
+
+/*
+ * Parse a roff node's type from the input buffer.  This must be in the
+ * form of ".foo xxx" in the usual way.
+ */
+static enum roff_tok
+roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
+{
+       char            *cp;
+       const char      *mac;
+       size_t           maclen;
+       int              deftype;
+       enum roff_tok    t;
+
+       cp = buf + *pos;
+
+       if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)
+               return TOKEN_NONE;
+
+       mac = cp;
+       maclen = roff_getname(r, &cp, ln, ppos);
+
+       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;
+       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 ----------------------------------------- */
+
+static int
+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.
+        */
+
+       if (r->last == NULL) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "..");
+               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:
+               /* ROFF_de1 is remapped to ROFF_de in roff_block(). */
+       case ROFF_dei:
+       case ROFF_ig:
+               break;
+       default:
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "..");
+               return ROFF_IGN;
+       }
+
+       if (buf->buf[pos] != '\0')
+               mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,
+                   ".. %s", buf->buf + pos);

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

-       return(ROFF_IGN);
+       return ROFF_IGN;
+
+}
+
+static int
+roffnode_cleanscope(struct roff *r)
+{
+       int inloop;
+
+       inloop = 0;
+       while (r->last != NULL) {
+               if (--r->last->endspan != 0)
+                       break;
+               inloop += roffnode_pop(r);
+       }
+       return inloop;
+}
+
+static int
+roff_ccond(struct roff *r, int ln, int ppos)
+{
+       if (NULL == r->last) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "\\}");
+               return 0;
+       }
+
+       switch (r->last->tok) {
+       case ROFF_el:
+       case ROFF_ie:
+       case ROFF_if:
+       case ROFF_while:
+               break;
+       default:
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "\\}");
+               return 0;
+       }
+
+       if (r->last->endspan > -1) {
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "\\}");
+               return 0;
+       }
+
+       return roffnode_pop(r) + roffnode_cleanscope(r);
+}
+
+static int
+roff_block(ROFF_ARGS)
+{
+       const char      *name, *value;
+       char            *call, *cp, *iname, *rname;
+       size_t           csz, namesz, rsz;
+       int              deftype;
+
+       /* Ignore groff compatibility mode for now. */
+
+       if (tok == ROFF_de1)
+               tok = ROFF_de;
+       else if (tok == ROFF_dei1)
+               tok = ROFF_dei;
+       else if (tok == ROFF_am1)
+               tok = ROFF_am;
+       else if (tok == ROFF_ami1)
+               tok = ROFF_ami;
+
+       /* Parse the macro name argument. */
+
+       cp = buf->buf + pos;
+       if (tok == ROFF_ig) {
+               iname = NULL;
+               namesz = 0;
+       } else {
+               iname = cp;
+               namesz = roff_getname(r, &cp, ln, ppos);
+               iname[namesz] = '\0';
+       }
+
+       /* Resolve the macro name argument if it is indirect. */
+
+       if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
+               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
+                       namesz = strlen(name);
+       } else
+               name = iname;
+
+       if (namesz == 0 && tok != ROFF_ig) {
+               mandoc_msg(MANDOCERR_REQ_EMPTY,
+                   ln, ppos, "%s", roff_name[tok]);
+               return ROFF_IGN;
+       }
+
+       roffnode_push(r, tok, name, ln, ppos);
+
+       /*
+        * At the beginning of a `de' macro, clear the existing string
+        * with the same name, if there is one.  New content will be
+        * appended from roff_block_text() in multiline mode.
+        */
+
+       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')
+               return ROFF_IGN;
+
+       /* Get the custom end marker. */
+
+       iname = cp;
+       namesz = roff_getname(r, &cp, ln, ppos);
+
+       /* Resolve the end marker if it is indirect. */
+
+       if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
+               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
+                       namesz = strlen(name);
+       } else
+               name = iname;
+
+       if (namesz)
+               r->last->end = mandoc_strndup(name, namesz);
+
+       if (*cp != '\0')
+               mandoc_msg(MANDOCERR_ARG_EXCESS,
+                   ln, pos, ".%s ... %s", roff_name[tok], cp);
+
+       return ROFF_IGN;
+}
+
+static int
+roff_block_sub(ROFF_ARGS)
+{
+       enum roff_tok   t;
+       int             i, j;
+
+       /*
+        * First check whether a custom macro exists at this level.  If
+        * it does, then check against it.  This is some of groff's
+        * stranger behaviours.  If we encountered a custom end-scope
+        * tag and that tag also happens to be a "real" macro, then we
+        * need to try interpreting it again as a real macro.  If it's
+        * not, then return ignore.  Else continue.
+        */
+
+       if (r->last->end) {
+               for (i = pos, j = 0; r->last->end[j]; j++, i++)
+                       if (buf->buf[i] != r->last->end[j])
+                               break;
+
+               if (r->last->end[j] == '\0' &&
+                   (buf->buf[i] == '\0' ||
+                    buf->buf[i] == ' ' ||
+                    buf->buf[i] == '\t')) {
+                       roffnode_pop(r);
+                       roffnode_cleanscope(r);
+
+                       while (buf->buf[i] == ' ' || buf->buf[i] == '\t')
+                               i++;
+
+                       pos = i;
+                       if (roff_parse(r, buf->buf, &pos, ln, ppos) !=
+                           TOKEN_NONE)
+                               return ROFF_RERUN;
+                       return ROFF_IGN;
+               }
+       }
+
+       /*
+        * If we have no custom end-query or lookup failed, then try
+        * pulling it out of the hashtable.
+        */

 
 

+       t = roff_parse(r, buf->buf, &pos, ln, ppos);
+
+       if (t != ROFF_cblock) {
+               if (tok != ROFF_ig)
+                       roff_setstr(r, r->last->name, buf->buf + ppos, 2);
+               return ROFF_IGN;
+       }
+
+       return (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs);

 }
 
 }
 

+static int
+roff_block_text(ROFF_ARGS)
+{
+
+       if (tok != ROFF_ig)
+               roff_setstr(r, r->last->name, buf->buf + pos, 2);
+
+       return ROFF_IGN;
+}
+
+static int
+roff_cond_sub(ROFF_ARGS)
+{
+       char            *ep;
+       int              endloop, irc, rr;
+       enum roff_tok    t;
+
+       irc = ROFF_IGN;
+       rr = r->last->rule;
+       endloop = tok != ROFF_while ? ROFF_IGN :
+           rr ? ROFF_LOOPCONT : ROFF_LOOPEXIT;
+       if (roffnode_cleanscope(r))
+               irc |= endloop;
+
+       /*
+        * If `\}' occurs on a macro line without a preceding macro,
+        * drop the line completely.
+        */
+
+       ep = buf->buf + pos;
+       if (ep[0] == '\\' && ep[1] == '}')
+               rr = 0;
+
+       /*
+        * The closing delimiter `\}' rewinds the conditional scope
+        * but is otherwise ignored when interpreting the line.
+        */
+
+       while ((ep = strchr(ep, '\\')) != NULL) {
+               switch (ep[1]) {
+               case '}':
+                       memmove(ep, ep + 2, strlen(ep + 2) + 1);
+                       if (roff_ccond(r, ln, ep - buf->buf))
+                               irc |= endloop;
+                       break;
+               case '\0':
+                       ++ep;
+                       break;
+               default:
+                       ep += 2;
+                       break;
+               }
+       }
+
+       /*
+        * Fully handle known macros when they are structurally
+        * required or when the conditional evaluated to true.
+        */
+
+       t = roff_parse(r, buf->buf, &pos, ln, ppos);
+       irc |= t != TOKEN_NONE && (rr || roffs[t].flags & ROFFMAC_STRUCT) ?
+           (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs) :
+           rr ? ROFF_CONT : ROFF_IGN;
+       return irc;
+}
+
+static int
+roff_cond_text(ROFF_ARGS)
+{
+       char            *ep;
+       int              endloop, irc, rr;
+
+       irc = ROFF_IGN;
+       rr = r->last->rule;
+       endloop = tok != ROFF_while ? ROFF_IGN :
+           rr ? ROFF_LOOPCONT : ROFF_LOOPEXIT;
+       if (roffnode_cleanscope(r))
+               irc |= endloop;
+
+       /*
+        * If `\}' occurs on a text line with neither preceding
+        * nor following characters, drop the line completely.
+        */
+
+       ep = buf->buf + pos;
+       if (strcmp(ep, "\\}") == 0)
+               rr = 0;
+
+       /*
+        * The closing delimiter `\}' rewinds the conditional scope
+        * but is otherwise ignored when interpreting the line.
+        */
+
+       while ((ep = strchr(ep, '\\')) != NULL) {
+               switch (ep[1]) {
+               case '}':
+                       memmove(ep, ep + 2, strlen(ep + 2) + 1);
+                       if (roff_ccond(r, ln, ep - buf->buf))
+                               irc |= endloop;
+                       break;
+               case '\0':
+                       ++ep;
+                       break;
+               default:
+                       ep += 2;
+                       break;
+               }
+       }
+       if (rr)
+               irc |= ROFF_CONT;
+       return irc;
+}
+
+/* --- handling of numeric and conditional expressions -------------------- */
+
+/*
+ * Parse a single signed integer number.  Stop at the first non-digit.
+ * If there is at least one digit, return success and advance the
+ * parse point, else return failure and let the parse point unchanged.
+ * Ignore overflows, treat them just like the C language.
+ */
+static int
+roff_getnum(const char *v, int *pos, int *res, int flags)
+{
+       int      myres, scaled, n, p;
+
+       if (NULL == res)
+               res = &myres;
+
+       p = *pos;
+       n = v[p] == '-';
+       if (n || v[p] == '+')
+               p++;
+
+       if (flags & ROFFNUM_WHITE)
+               while (isspace((unsigned char)v[p]))
+                       p++;
+
+       for (*res = 0; isdigit((unsigned char)v[p]); p++)
+               *res = 10 * *res + v[p] - '0';
+       if (p == *pos + n)
+               return 0;
+
+       if (n)
+               *res = -*res;
+
+       /* Each number may be followed by one optional scaling unit. */
+
+       switch (v[p]) {
+       case 'f':
+               scaled = *res * 65536;
+               break;
+       case 'i':
+               scaled = *res * 240;
+               break;
+       case 'c':
+               scaled = *res * 240 / 2.54;
+               break;
+       case 'v':
+       case 'P':
+               scaled = *res * 40;
+               break;
+       case 'm':
+       case 'n':
+               scaled = *res * 24;
+               break;
+       case 'p':
+               scaled = *res * 10 / 3;
+               break;
+       case 'u':
+               scaled = *res;
+               break;
+       case 'M':
+               scaled = *res * 6 / 25;
+               break;
+       default:
+               scaled = *res;
+               p--;
+               break;
+       }
+       if (flags & ROFFNUM_SCALE)
+               *res = scaled;
+
+       *pos = p + 1;
+       return 1;
+}
+
+/*
+ * Evaluate a string comparison condition.
+ * The first character is the delimiter.
+ * Succeed if the string up to its second occurrence
+ * matches the string up to its third occurence.
+ * Advance the cursor after the third occurrence
+ * or lacking that, to the end of the line.
+ */
+static int
+roff_evalstrcond(const char *v, int *pos)
+{
+       const char      *s1, *s2, *s3;
+       int              match;
+
+       match = 0;
+       s1 = v + *pos;          /* initial delimiter */
+       s2 = s1 + 1;            /* for scanning the first string */
+       s3 = strchr(s2, *s1);   /* for scanning the second string */
+
+       if (NULL == s3)         /* found no middle delimiter */
+               goto out;
+
+       while ('\0' != *++s3) {
+               if (*s2 != *s3) {  /* mismatch */
+                       s3 = strchr(s3, *s1);
+                       break;
+               }
+               if (*s3 == *s1) {  /* found the final delimiter */
+                       match = 1;
+                       break;
+               }
+               s2++;
+       }
+
+out:
+       if (NULL == s3)
+               s3 = strchr(s2, '\0');
+       else if (*s3 != '\0')
+               s3++;
+       *pos = s3 - v;
+       return match;
+}
+
+/*
+ * Evaluate an optionally negated single character, numerical,
+ * or string condition.
+ */
+static int
+roff_evalcond(struct roff *r, int ln, char *v, int *pos)
+{
+       const char      *start, *end;
+       char            *cp, *name;
+       size_t           sz;
+       int              deftype, len, number, savepos, istrue, wanttrue;
+
+       if ('!' == v[*pos]) {
+               wanttrue = 0;
+               (*pos)++;
+       } else
+               wanttrue = 1;
+
+       switch (v[*pos]) {
+       case '\0':
+               return 0;
+       case 'n':
+       case 'o':
+               (*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. */

 
 

-static void
-roffnode_cleanscope(struct roff *r)
-{
+               if (v[*pos] != '\\') {
+                       (*pos)++;
+                       return wanttrue;
+               }

 
 

-       while (r->last) {
-               if (--r->last->endspan < 0)
+               end = v + ++*pos;
+               switch (mandoc_escape(&end, &start, &len)) {
+               case ESCAPE_SPECIAL:
+                       istrue = mchars_spec2cp(start, len) != -1;

                        break;
                        break;

-               roffnode_pop(r);
+               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;
+               while (*cp == ' ')
+                       cp++;
+               name = cp;
+               sz = roff_getname(r, &cp, ln, 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;

        }
        }

-}

 
 

+       savepos = *pos;
+       if (roff_evalnum(r, ln, v, pos, &number, ROFFNUM_SCALE))
+               return (number > 0) == wanttrue;
+       else if (*pos == savepos)
+               return roff_evalstrcond(v, pos) == wanttrue;
+       else
+               return 0;
+}

 
 

-/* ARGSUSED */
-static enum rofferr
-roff_ccond(ROFF_ARGS)
+static int
+roff_line_ignore(ROFF_ARGS)

 {
 
 {
 

-       if (NULL == r->last) {
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
-       }
+       return ROFF_IGN;
+}

 
 

-       switch (r->last->tok) {
-       case (ROFF_el):
-               /* FALLTHROUGH */
-       case (ROFF_ie):
-               /* FALLTHROUGH */
-       case (ROFF_if):
-               break;
-       default:
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
-       }
+static int
+roff_insec(ROFF_ARGS)
+{

 
 

-       if (r->last->endspan > -1) {
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
-       }
+       mandoc_msg(MANDOCERR_REQ_INSEC, ln, ppos, "%s", roff_name[tok]);
+       return ROFF_IGN;
+}

 
 

-       if ((*bufp)[pos])
-               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
+static int
+roff_unsupp(ROFF_ARGS)
+{

 
 

-       roffnode_pop(r);
-       roffnode_cleanscope(r);
-       return(ROFF_IGN);
+       mandoc_msg(MANDOCERR_REQ_UNSUPP, ln, ppos, "%s", roff_name[tok]);
+       return ROFF_IGN;

 }
 
 }
 

-
-/* ARGSUSED */
-static enum rofferr
-roff_block(ROFF_ARGS)
+static int
+roff_cond(ROFF_ARGS)

 {
 {

-       int             sv;
-       size_t          sz;
-       char            *name;
+       int      irc;
+
+       roffnode_push(r, tok, NULL, ln, ppos);
+
+       /*
+        * An `.el' has no conditional body: it will consume the value
+        * of the current rstack entry set in prior `ie' calls or
+        * defaults to DENY.
+        *
+        * If we're not an `el', however, then evaluate the conditional.
+        */

 
 

-       name = NULL;
+       r->last->rule = tok == ROFF_el ?
+           (r->rstackpos < 0 ? 0 : r->rstack[r->rstackpos--]) :
+           roff_evalcond(r, ln, buf->buf, &pos);
+
+       /*
+        * An if-else will put the NEGATION of the current evaluated
+        * conditional into the stack of rules.
+        */

 
 

-       if (ROFF_ig != tok) {
-               if ('\0' == (*bufp)[pos]) {
-                       mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
-                       return(ROFF_IGN);
+       if (tok == ROFF_ie) {
+               if (r->rstackpos + 1 == r->rstacksz) {
+                       r->rstacksz += 16;
+                       r->rstack = mandoc_reallocarray(r->rstack,
+                           r->rstacksz, sizeof(int));

                }
                }

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

 
 

-               /*
-                * Re-write `de1', since we don't really care about
-                * groff's strange compatibility mode, into `de'.
-                */
+       /* If the parent has false as its rule, then so do we. */

 
 

-               if (ROFF_de1 == tok)
-                       tok = ROFF_de;
-               if (ROFF_de == tok)
-                       name = *bufp + pos;
-               else
-                       mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,
-                           roffs[tok].name);
+       if (r->last->parent && !r->last->parent->rule)
+               r->last->rule = 0;

 
 

-               while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
-                       pos++;
+       /*
+        * 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.
+        */

 
 

-               while (isspace((unsigned char)(*bufp)[pos]))
-                       (*bufp)[pos++] = '\0';
+       if (buf->buf[pos] == '\0' && tok != ROFF_while) {
+               r->last->endspan = 2;
+               goto out;

        }
 
        }
 

-       roffnode_push(r, tok, name, ln, ppos);
+       while (buf->buf[pos] == ' ')
+               pos++;
+
+       /* An opening brace requests multiline scope. */
+
+       if (buf->buf[pos] == '\\' && buf->buf[pos + 1] == '{') {
+               r->last->endspan = -1;
+               pos += 2;
+               while (buf->buf[pos] == ' ')
+                       pos++;
+               goto out;
+       }

 
        /*
 
        /*

-        * At the beginning of a `de' macro, clear the existing string
-        * with the same name, if there is one.  New content will be
-        * added from roff_block_text() in multiline mode.
+        * Anything else following the conditional causes
+        * single-line scope.  Warn if the scope contains
+        * nothing but trailing whitespace.

         */
 
         */
 

-       if (ROFF_de == tok)
-               roff_setstr(r, name, "", 0);
+       if (buf->buf[pos] == '\0')
+               mandoc_msg(MANDOCERR_COND_EMPTY,
+                   ln, ppos, "%s", roff_name[tok]);

 
 

-       if ('\0' == (*bufp)[pos])
-               return(ROFF_IGN);
+       r->last->endspan = 1;

 
 

-       /* If present, process the custom end-of-line marker. */
+out:
+       *offs = pos;
+       irc = ROFF_RERUN;
+       if (tok == ROFF_while)
+               irc |= ROFF_WHILE;
+       return irc;
+}

 
 

-       sv = pos;
-       while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
-               pos++;
+static int
+roff_ds(ROFF_ARGS)
+{
+       char            *string;
+       const char      *name;
+       size_t           namesz;
+
+       /* Ignore groff compatibility mode for now. */
+
+       if (tok == ROFF_ds1)
+               tok = ROFF_ds;
+       else if (tok == ROFF_as1)
+               tok = ROFF_as;

 
        /*
 
        /*

-        * Note: groff does NOT like escape characters in the input.
-        * Instead of detecting this, we're just going to let it fly and
-        * to hell with it.
+        * The first word is the name of the string.
+        * If it is empty or terminated by an escape sequence,
+        * abort the `ds' request without defining anything.

         */
 
         */
 

-       assert(pos > sv);
-       sz = (size_t)(pos - sv);
+       name = string = buf->buf + pos;
+       if (*name == '\0')
+               return ROFF_IGN;
+
+       namesz = roff_getname(r, &string, ln, pos);
+       switch (name[namesz]) {
+       case '\\':
+               return ROFF_IGN;
+       case '\t':
+               string = buf->buf + pos + namesz;
+               break;
+       default:
+               break;
+       }

 
 

-       if (1 == sz && '.' == (*bufp)[sv])
-               return(ROFF_IGN);
+       /* Read past the initial double-quote, if any. */
+       if (*string == '"')
+               string++;

 
 

-       r->last->end = mandoc_malloc(sz + 1);
+       /* The rest is the value. */
+       roff_setstrn(&r->strtab, name, namesz, string, strlen(string),
+           ROFF_as == tok);
+       roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
+       return ROFF_IGN;
+}

 
 

-       memcpy(r->last->end, *bufp + sv, sz);
-       r->last->end[(int)sz] = '\0';
+/*
+ * Parse a single operator, one or two characters long.
+ * If the operator is recognized, return success and advance the
+ * parse point, else return failure and let the parse point unchanged.
+ */
+static int
+roff_getop(const char *v, int *pos, char *res)
+{

 
 

-       if ((*bufp)[pos])
-               mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
+       *res = v[*pos];

 
 

-       return(ROFF_IGN);
-}
+       switch (*res) {
+       case '+':
+       case '-':
+       case '*':
+       case '/':
+       case '%':
+       case '&':
+       case ':':
+               break;
+       case '<':
+               switch (v[*pos + 1]) {
+               case '=':
+                       *res = 'l';
+                       (*pos)++;
+                       break;
+               case '>':
+                       *res = '!';
+                       (*pos)++;
+                       break;
+               case '?':
+                       *res = 'i';
+                       (*pos)++;
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case '>':
+               switch (v[*pos + 1]) {
+               case '=':
+                       *res = 'g';
+                       (*pos)++;
+                       break;
+               case '?':
+                       *res = 'a';
+                       (*pos)++;
+                       break;
+               default:
+                       break;
+               }
+               break;
+       case '=':
+               if ('=' == v[*pos + 1])
+                       (*pos)++;
+               break;
+       default:
+               return 0;
+       }
+       (*pos)++;

 
 

+       return *res;
+}

 
 

-/* ARGSUSED */
-static enum rofferr
-roff_block_sub(ROFF_ARGS)
+/*
+ * Evaluate either a parenthesized numeric expression
+ * or a single signed integer number.
+ */
+static int
+roff_evalpar(struct roff *r, int ln,
+       const char *v, int *pos, int *res, int flags)

 {
 {

-       enum rofft      t;
-       int             i, j;
+
+       if ('(' != v[*pos])
+               return roff_getnum(v, pos, res, flags);
+
+       (*pos)++;
+       if ( ! roff_evalnum(r, ln, v, pos, res, flags | ROFFNUM_WHITE))
+               return 0;

 
        /*
 
        /*

-        * First check whether a custom macro exists at this level.  If
-        * it does, then check against it.  This is some of groff's
-        * stranger behaviours.  If we encountered a custom end-scope
-        * tag and that tag also happens to be a "real" macro, then we
-        * need to try interpreting it again as a real macro.  If it's
-        * not, then return ignore.  Else continue.
+        * Omission of the closing parenthesis
+        * is an error in validation mode,
+        * but ignored in evaluation mode.

         */
 
         */
 

-       if (r->last->end) {
-               for (i = pos, j = 0; r->last->end[j]; j++, i++)
-                       if ((*bufp)[i] != r->last->end[j])
-                               break;
+       if (')' == v[*pos])
+               (*pos)++;
+       else if (NULL == res)
+               return 0;

 
 

-               if ('\0' == r->last->end[j] && 
-                               ('\0' == (*bufp)[i] ||
-                                ' ' == (*bufp)[i] ||
-                                '\t' == (*bufp)[i])) {
-                       roffnode_pop(r);
-                       roffnode_cleanscope(r);
+       return 1;
+}

 
 

-                       while (' ' == (*bufp)[i] || '\t' == (*bufp)[i])
-                               i++;
+/*
+ * Evaluate a complete numeric expression.
+ * Proceed left to right, there is no concept of precedence.
+ */
+static int
+roff_evalnum(struct roff *r, int ln, const char *v,
+       int *pos, int *res, int flags)
+{
+       int              mypos, operand2;
+       char             operator;

 
 

-                       pos = i;
-                       if (ROFF_MAX != roff_parse(r, *bufp, &pos))
-                               return(ROFF_RERUN);
-                       return(ROFF_IGN);
-               }
+       if (NULL == pos) {
+               mypos = 0;
+               pos = &mypos;

        }
 
        }
 

-       /*
-        * If we have no custom end-query or lookup failed, then try
-        * pulling it out of the hashtable.
-        */
+       if (flags & ROFFNUM_WHITE)
+               while (isspace((unsigned char)v[*pos]))
+                       (*pos)++;

 
 

-       t = roff_parse(r, *bufp, &pos);
+       if ( ! roff_evalpar(r, ln, v, pos, res, flags))
+               return 0;

 
 

-       /*
-        * Macros other than block-end are only significant
-        * in `de' blocks; elsewhere, simply throw them away.
-        */
-       if (ROFF_cblock != t) {
-               if (ROFF_de == tok)
-                       roff_setstr(r, r->last->name, *bufp + ppos, 1);
-               return(ROFF_IGN);
+       while (1) {
+               if (flags & ROFFNUM_WHITE)
+                       while (isspace((unsigned char)v[*pos]))
+                               (*pos)++;
+
+               if ( ! roff_getop(v, pos, &operator))
+                       break;
+
+               if (flags & ROFFNUM_WHITE)
+                       while (isspace((unsigned char)v[*pos]))
+                               (*pos)++;
+
+               if ( ! roff_evalpar(r, ln, v, pos, &operand2, flags))
+                       return 0;
+
+               if (flags & ROFFNUM_WHITE)
+                       while (isspace((unsigned char)v[*pos]))
+                               (*pos)++;
+
+               if (NULL == res)
+                       continue;
+
+               switch (operator) {
+               case '+':
+                       *res += operand2;
+                       break;
+               case '-':
+                       *res -= operand2;
+                       break;
+               case '*':
+                       *res *= operand2;
+                       break;
+               case '/':
+                       if (operand2 == 0) {
+                               mandoc_msg(MANDOCERR_DIVZERO,
+                                       ln, *pos, "%s", v);
+                               *res = 0;
+                               break;
+                       }
+                       *res /= operand2;
+                       break;
+               case '%':
+                       if (operand2 == 0) {
+                               mandoc_msg(MANDOCERR_DIVZERO,
+                                       ln, *pos, "%s", v);
+                               *res = 0;
+                               break;
+                       }
+                       *res %= operand2;
+                       break;
+               case '<':
+                       *res = *res < operand2;
+                       break;
+               case '>':
+                       *res = *res > operand2;
+                       break;
+               case 'l':
+                       *res = *res <= operand2;
+                       break;
+               case 'g':
+                       *res = *res >= operand2;
+                       break;
+               case '=':
+                       *res = *res == operand2;
+                       break;
+               case '!':
+                       *res = *res != operand2;
+                       break;
+               case '&':
+                       *res = *res && operand2;
+                       break;
+               case ':':
+                       *res = *res || operand2;
+                       break;
+               case 'i':
+                       if (operand2 < *res)
+                               *res = operand2;
+                       break;
+               case 'a':
+                       if (operand2 > *res)
+                               *res = operand2;
+                       break;
+               default:
+                       abort();
+               }

        }
        }

+       return 1;
+}
+
+/* --- register management ------------------------------------------------ */

 
 

-       assert(roffs[t].proc);
-       return((*roffs[t].proc)(r, t, bufp, szp, 
-                               ln, ppos, pos, offs));
+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;
+
+       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->key.p = mandoc_strndup(name, len);
+               reg->key.sz = len;
+               reg->val = 0;
+               reg->step = 0;
+               reg->next = r->regtab;
+               r->regtab = reg;
+       }

 
 

-/* ARGSUSED */
-static enum rofferr
-roff_block_text(ROFF_ARGS)
+       if ('+' == sign)
+               reg->val += val;
+       else if ('-' == sign)
+               reg->val -= val;
+       else
+               reg->val = val;
+       if (step != INT_MIN)
+               reg->step = step;
+}
+
+/*
+ * Handle some predefined read-only number registers.
+ * For now, return -1 if the requested register is not predefined;
+ * in case a predefined read-only register having the value -1
+ * were to turn up, another special value would have to be chosen.
+ */
+static int
+roff_getregro(const struct roff *r, const char *name)

 {
 
 {
 

-       if (ROFF_de == tok)
-               roff_setstr(r, r->last->name, *bufp + pos, 1);
+       switch (*name) {
+       case '$':  /* Number of arguments of the last macro evaluated. */
+               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. */
+               return 1;
+       case 'H':  /* Fixed horizontal resolution. */
+               return 24;
+       case 'j':  /* Always adjust left margin only. */
+               return 0;
+       case 'T':  /* Some output device is always defined. */
+               return 1;
+       case 'V':  /* Fixed vertical resolution. */
+               return 40;
+       default:
+               return -1;
+       }
+}

 
 

-       return(ROFF_IGN);
+int
+roff_getreg(struct roff *r, const char *name)
+{
+       return roff_getregn(r, name, strlen(name), '\0');

 }
 
 }
 

+static int
+roff_getregn(struct roff *r, const char *name, size_t len, char sign)
+{
+       struct roffreg  *reg;
+       int              val;

 
 

-/* ARGSUSED */
-static enum rofferr
-roff_cond_sub(ROFF_ARGS)
+       if ('.' == name[0] && 2 == len) {
+               val = roff_getregro(r, name + 1);
+               if (-1 != val)
+                       return val;
+       }
+
+       for (reg = r->regtab; reg; reg = reg->next) {
+               if (len == reg->key.sz &&
+                   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;
+               }
+       }
+
+       roff_setregn(r, name, len, 0, '\0', INT_MIN);
+       return 0;
+}
+
+static int
+roff_hasregn(const struct roff *r, const char *name, size_t len)

 {
 {

-       enum rofft       t;
-       enum roffrule    rr;
-       char            *ep;
+       struct roffreg  *reg;
+       int              val;

 
 

-       rr = r->last->rule;
-       roffnode_cleanscope(r);
+       if ('.' == name[0] && 2 == len) {
+               val = roff_getregro(r, name + 1);
+               if (-1 != val)
+                       return 1;
+       }

 
 

-       /*
-        * If the macro is unknown, first check if it contains a closing
-        * delimiter `\}'.  If it does, close out our scope and return
-        * the currently-scoped rule (ignore or continue).  Else, drop
-        * into the currently-scoped rule.
-        */
+       for (reg = r->regtab; reg; reg = reg->next)
+               if (len == reg->key.sz &&
+                   0 == strncmp(name, reg->key.p, len))
+                       return 1;

 
 

-       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) {
-               ep = &(*bufp)[pos];
-               for ( ; NULL != (ep = strchr(ep, '\\')); ep++) {
-                       ep++;
-                       if ('}' != *ep)
-                               continue;
+       return 0;
+}

 
 

-                       /*
-                        * Make the \} go away.
-                        * This is a little haphazard, as it's not quite
-                        * clear how nroff does this.
-                        * If we're at the end of line, then just chop
-                        * off the \} and resize the buffer.
-                        * If we aren't, then conver it to spaces.
-                        */
+static void
+roff_freereg(struct roffreg *reg)
+{
+       struct roffreg  *old_reg;

 
 

-                       if ('\0' == *(ep + 1)) {
-                               *--ep = '\0';
-                               *szp -= 2;
-                       } else
-                               *(ep - 1) = *ep = ' ';
+       while (NULL != reg) {
+               free(reg->key.p);
+               old_reg = reg;
+               reg = reg->next;
+               free(old_reg);
+       }
+}

 
 

-                       roff_ccond(r, ROFF_ccond, bufp, szp, 
-                                       ln, pos, pos + 2, offs);
+static int
+roff_nr(ROFF_ARGS)
+{
+       char            *key, *val, *step;
+       size_t           keysz;
+       int              iv, is, len;
+       char             sign;
+
+       key = val = buf->buf + pos;
+       if (*key == '\0')
+               return ROFF_IGN;
+
+       keysz = roff_getname(r, &val, ln, pos);
+       if (key[keysz] == '\\' || key[keysz] == '\t')
+               return ROFF_IGN;
+
+       sign = *val;
+       if (sign == '+' || sign == '-')
+               val++;
+
+       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;
+}
+
+static int
+roff_rr(ROFF_ARGS)
+{
+       struct roffreg  *reg, **prev;
+       char            *name, *cp;
+       size_t           namesz;
+
+       name = cp = buf->buf + pos;
+       if (*name == '\0')
+               return ROFF_IGN;
+       namesz = roff_getname(r, &cp, ln, pos);
+       name[namesz] = '\0';
+
+       prev = &r->regtab;
+       while (1) {
+               reg = *prev;
+               if (reg == NULL || !strcmp(name, reg->key.p))

                        break;
                        break;

-               }
-               return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
+               prev = &reg->next;

        }
        }

+       if (reg != NULL) {
+               *prev = reg->next;
+               free(reg->key.p);
+               free(reg);
+       }
+       return ROFF_IGN;
+}

 
 

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

 
 

-       if (ROFFRULE_DENY == rr)
-               if ( ! (ROFFMAC_STRUCT & roffs[t].flags))
-                       if (ROFF_ccond != t)
-                               return(ROFF_IGN);
+static int
+roff_rm(ROFF_ARGS)
+{
+       const char       *name;
+       char             *cp;
+       size_t            namesz;

 
 

-       assert(roffs[t].proc);
-       return((*roffs[t].proc)(r, t, bufp, szp, 
-                               ln, ppos, pos, offs));
+       cp = buf->buf + pos;
+       while (*cp != '\0') {
+               name = cp;
+               namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));
+               roff_setstrn(&r->strtab, name, namesz, NULL, 0, 0);
+               roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);
+               if (name[namesz] == '\\' || name[namesz] == '\t')
+                       break;
+       }
+       return ROFF_IGN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_cond_text(ROFF_ARGS)
+static int
+roff_it(ROFF_ARGS)

 {
 {

-       char            *ep;
-       enum roffrule    rr;
+       int              iv;

 
 

-       rr = r->last->rule;
-       roffnode_cleanscope(r);
+       /* Parse the number of lines. */

 
 

-       ep = &(*bufp)[pos];
-       for ( ; NULL != (ep = strchr(ep, '\\')); ep++) {
-               ep++;
-               if ('}' != *ep)
-                       continue;
-               *ep = '&';
-               roff_ccond(r, ROFF_ccond, bufp, szp, 
-                               ln, pos, pos + 2, offs);
+       if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {
+               mandoc_msg(MANDOCERR_IT_NONUM,
+                   ln, ppos, "%s", buf->buf + 1);
+               return ROFF_IGN;

        }
        }

-       return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
+
+       while (isspace((unsigned char)buf->buf[pos]))
+               pos++;
+
+       /*
+        * Arm the input line trap.
+        * Special-casing "an-trap" is an ugly workaround to cope
+        * with DocBook stupidly fiddling with man(7) internals.
+        */
+
+       roffit_lines = iv;
+       roffit_macro = mandoc_strdup(iv != 1 ||
+           strcmp(buf->buf + pos, "an-trap") ?
+           buf->buf + pos : "br");
+       return ROFF_IGN;

 }
 
 }
 

-static enum roffrule
-roff_evalcond(const char *v, int *pos)
+static int
+roff_Dd(ROFF_ARGS)

 {
 {

-
-       switch (v[*pos]) {
-       case ('n'):
-               (*pos)++;
-               return(ROFFRULE_ALLOW);
-       case ('e'):
-               /* FALLTHROUGH */
-       case ('o'):
-               /* FALLTHROUGH */
-       case ('t'):
-               (*pos)++;
-               return(ROFFRULE_DENY);
-       default:
+       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;
                break;

+       default:
+               abort();

        }
        }

-
-       while (v[*pos] && ' ' != v[*pos])
-               (*pos)++;
-       return(ROFFRULE_DENY);
+       if ((r->options & mask) == 0)
+               for (t = tok; t < te; t++)
+                       roff_setstr(r, roff_name[t], NULL, 0);
+       return ROFF_CONT;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_line_ignore(ROFF_ARGS)
+static int
+roff_TE(ROFF_ARGS)

 {
 {

-
-       if (ROFF_it == tok)
-               mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, "it");
-
-       return(ROFF_IGN);
+       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;
+               *offs = 0;
+               return ROFF_REPARSE;
+       }
+       r->tbl = NULL;
+       return ROFF_IGN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_cond(ROFF_ARGS)
+static int
+roff_T_(ROFF_ARGS)

 {
 {

-       int              sv;
-       enum roffrule    rule;

 
 

-       /* 
-        * An `.el' has no conditional body: it will consume the value
-        * of the current rstack entry set in prior `ie' calls or
-        * defaults to DENY.  
-        *
-        * If we're not an `el', however, then evaluate the conditional.
-        */
+       if (NULL == r->tbl)
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, ln, ppos, "T&");
+       else
+               tbl_restart(ln, ppos, r->tbl);

 
 

-       rule = ROFF_el == tok ?
-               (r->rstackpos < 0 ? 
-                ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
-               roff_evalcond(*bufp, &pos);
+       return ROFF_IGN;
+}

 
 

-       sv = pos;
-       while (' ' == (*bufp)[pos])
-               pos++;
+/*
+ * Handle in-line equation delimiters.
+ */
+static int
+roff_eqndelim(struct roff *r, struct buf *buf, int pos)
+{
+       char            *cp1, *cp2;
+       const char      *bef_pr, *bef_nl, *mac, *aft_nl, *aft_pr;

 
        /*
 
        /*

-        * Roff is weird.  If we have just white-space after the
-        * conditional, it's considered the BODY and we exit without
-        * really doing anything.  Warn about this.  It's probably
-        * wrong.
+        * Outside equations, look for an opening delimiter.
+        * If we are inside an equation, we already know it is
+        * in-line, or this function wouldn't have been called;
+        * so look for a closing delimiter.

         */
 
         */
 

-       if ('\0' == (*bufp)[pos] && sv != pos) {
-               mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
-       }
-
-       roffnode_push(r, tok, NULL, ln, ppos);
+       cp1 = buf->buf + pos;
+       cp2 = strchr(cp1, r->eqn == NULL ?
+           r->last_eqn->odelim : r->last_eqn->cdelim);
+       if (cp2 == NULL)
+               return ROFF_CONT;

 
 

-       r->last->rule = rule;
+       *cp2++ = '\0';
+       bef_pr = bef_nl = aft_nl = aft_pr = "";

 
 

-       /*
-        * An if-else will put the NEGATION of the current evaluated
-        * conditional into the stack of rules.
-        */
+       /* Handle preceding text, protecting whitespace. */

 
 

-       if (ROFF_ie == tok) {
-               if (r->rstackpos == RSTACK_MAX - 1) {
-                       mandoc_msg(MANDOCERR_MEM, 
-                               r->parse, ln, ppos, NULL);
-                       return(ROFF_ERR);
-               }
-               r->rstack[++r->rstackpos] = 
-                       ROFFRULE_DENY == r->last->rule ?
-                       ROFFRULE_ALLOW : ROFFRULE_DENY;
+       if (*buf->buf != '\0') {
+               if (r->eqn == NULL)
+                       bef_pr = "\\&";
+               bef_nl = "\n";

        }
 
        }
 

-       /* If the parent has false as its rule, then so do we. */
-
-       if (r->last->parent && ROFFRULE_DENY == r->last->parent->rule)
-               r->last->rule = ROFFRULE_DENY;
-

        /*
        /*

-        * Determine scope.  If we're invoked with "\{" trailing the
-        * conditional, then we're in a multiline scope.  Else our scope
-        * expires on the next line.
+        * Prepare replacing the delimiter with an equation macro
+        * and drop leading white space from the equation.

         */
 
         */
 

-       r->last->endspan = 1;
+       if (r->eqn == NULL) {
+               while (*cp2 == ' ')
+                       cp2++;
+               mac = ".EQ";
+       } else
+               mac = ".EN";

 
 

-       if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) {
-               r->last->endspan = -1;
-               pos += 2;
-       } 
+       /* Handle following text, protecting whitespace. */

 
 

-       /*
-        * If there are no arguments on the line, the next-line scope is
-        * assumed.
-        */
+       if (*cp2 != '\0') {
+               aft_nl = "\n";
+               if (r->eqn != NULL)
+                       aft_pr = "\\&";
+       }

 
 

-       if ('\0' == (*bufp)[pos])
-               return(ROFF_IGN);
+       /* Do the actual replacement. */

 
 

-       /* Otherwise re-run the roff parser after recalculating. */
+       buf->sz = mandoc_asprintf(&cp1, "%s%s%s%s%s%s%s", buf->buf,
+           bef_pr, bef_nl, mac, aft_nl, aft_pr, cp2) + 1;
+       free(buf->buf);
+       buf->buf = cp1;

 
 

-       *offs = pos;
-       return(ROFF_RERUN);
-}
+       /* Toggle the in-line state of the eqn subsystem. */

 
 

+       r->eqn_inline = r->eqn == NULL;
+       return ROFF_REPARSE;
+}

 
 

-/* ARGSUSED */
-static enum rofferr
-roff_ds(ROFF_ARGS)
+static int
+roff_EQ(ROFF_ARGS)

 {
 {

-       char            *name, *string;
-
-       /*
-        * A symbol is named by the first word following the macro
-        * invocation up to a space.  Its value is anything after the
-        * name's trailing whitespace and optional double-quote.  Thus,
-        *
-        *  [.ds foo "bar  "     ]
-        *
-        * will have `bar  "     ' as its value.
-        */
-
-       string = *bufp + pos;
-       name = roff_getname(r, &string, ln, pos);
-       if ('\0' == *name)
-               return(ROFF_IGN);
+       struct roff_node        *n;
+
+       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;
+
+       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;

 
 

-       /* Read past initial double-quote. */
-       if ('"' == *string)
-               string++;
+       if (buf->buf[pos] != '\0')
+               mandoc_msg(MANDOCERR_ARG_SKIP, ln, pos,
+                   ".EQ %s", buf->buf + pos);

 
 

-       /* The rest is the value. */
-       roff_setstr(r, name, string, 0);
-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 }
 

-int
-roff_regisset(const struct roff *r, enum regs reg)
+static int
+roff_EN(ROFF_ARGS)

 {
 {

-
-       return(r->regs[(int)reg].set);
+       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;

 }
 
 }
 

-unsigned int
-roff_regget(const struct roff *r, enum regs reg)
+static int
+roff_TS(ROFF_ARGS)

 {
 {

-
-       return(r->regs[(int)reg].u);
+       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;

 }
 
 }
 

-void
-roff_regunset(struct roff *r, enum regs reg)
+static int
+roff_noarg(ROFF_ARGS)

 {
 {

-
-       r->regs[(int)reg].set = 0;
+       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;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_nr(ROFF_ARGS)
+static int
+roff_onearg(ROFF_ARGS)

 {
 {

-       const char      *key;
-       char            *val;
-       int              iv;
+       struct roff_node        *n;
+       char                    *cp;
+       int                      npos;
+
+       if (r->man->flags & (MAN_BLINE | MAN_ELINE) &&
+           (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)) {
+               r->man->last = roffce_node;
+               r->man->next = ROFF_NEXT_SIBLING;
+       }

 
 

-       val = *bufp + pos;
-       key = roff_getname(r, &val, ln, pos);
+       roff_elem_alloc(r->man, ln, ppos, tok);
+       n = r->man->last;

 
 

-       if (0 == strcmp(key, "nS")) {
-               r->regs[(int)REG_nS].set = 1;
-               if ((iv = mandoc_strntoi(val, strlen(val), 10)) >= 0)
-                       r->regs[(int)REG_nS].u = (unsigned)iv;
-               else
-                       r->regs[(int)REG_nS].u = 0u;
+       cp = buf->buf + pos;
+       if (*cp != '\0') {
+               while (*cp != '\0' && *cp != ' ')
+                       cp++;
+               while (*cp == ' ')
+                       *cp++ = '\0';
+               if (*cp != '\0')
+                       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);

        }
 
        }
 

-       return(ROFF_IGN);
+       if (tok == ROFF_ce || tok == ROFF_rj) {
+               if (r->man->last->type == ROFFT_ELEM) {
+                       roff_word_alloc(r->man, ln, pos, "1");
+                       r->man->last->flags |= NODE_NOSRC;
+               }
+               npos = 0;
+               if (roff_evalnum(r, ln, r->man->last->string, &npos,
+                   &roffce_lines, 0) == 0) {
+                       mandoc_msg(MANDOCERR_CE_NONUM,
+                           ln, pos, "ce %s", buf->buf + pos);
+                       roffce_lines = 1;
+               }
+               if (roffce_lines < 1) {
+                       r->man->last = r->man->last->parent;
+                       roffce_node = NULL;
+                       roffce_lines = 0;
+               } else
+                       roffce_node = r->man->last->parent;
+       } else {
+               n->flags |= NODE_VALID | NODE_ENDED;
+               r->man->last = n;
+       }
+       n->flags |= NODE_LINE;
+       r->man->next = ROFF_NEXT_SIBLING;
+       return ROFF_IGN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_rm(ROFF_ARGS)
+static int
+roff_manyarg(ROFF_ARGS)

 {
 {

-       const char       *name;
-       char             *cp;
+       struct roff_node        *n;
+       char                    *sp, *ep;
+
+       roff_elem_alloc(r->man, ln, ppos, tok);
+       n = r->man->last;

 
 

-       cp = *bufp + pos;
-       while ('\0' != *cp) {
-               name = roff_getname(r, &cp, ln, (int)(cp - *bufp));
-               if ('\0' != *name)
-                       roff_setstr(r, name, NULL, 0);
+       for (sp = ep = buf->buf + pos; *sp != '\0'; sp = ep) {
+               while (*ep != '\0' && *ep != ' ')
+                       ep++;
+               while (*ep == ' ')
+                       *ep++ = '\0';
+               roff_word_alloc(r->man, ln, sp - buf->buf, sp);

        }
        }

-       return(ROFF_IGN);
+
+       n->flags |= NODE_LINE | NODE_VALID | NODE_ENDED;
+       r->man->last = n;
+       r->man->next = ROFF_NEXT_SIBLING;
+       return ROFF_IGN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_TE(ROFF_ARGS)
+static int
+roff_als(ROFF_ARGS)

 {
 {

-
-       if (NULL == r->tbl)
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-       else
-               tbl_end(&r->tbl);
-
-       return(ROFF_IGN);
+       char            *oldn, *newn, *end, *value;
+       size_t           oldsz, newsz, valsz;
+
+       newn = oldn = buf->buf + pos;
+       if (*newn == '\0')
+               return ROFF_IGN;
+
+       newsz = roff_getname(r, &oldn, ln, pos);
+       if (newn[newsz] == '\\' || newn[newsz] == '\t' || *oldn == '\0')
+               return ROFF_IGN;
+
+       end = oldn;
+       oldsz = roff_getname(r, &end, ln, oldn - buf->buf);
+       if (oldsz == 0)
+               return ROFF_IGN;
+
+       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;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_T_(ROFF_ARGS)
+static int
+roff_cc(ROFF_ARGS)

 {
 {

+       const char      *p;

 
 

-       if (NULL == r->tbl)
-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-       else
-               tbl_restart(ppos, ln, r->tbl);
+       p = buf->buf + pos;

 
 

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

 
 

-#if 0
-static int
-roff_closeeqn(struct roff *r)
-{
+       if (*p != '\0')
+               mandoc_msg(MANDOCERR_ARG_EXCESS,
+                   ln, p - buf->buf, "cc ... %s", p);

 
 

-       return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0);
+       return ROFF_IGN;

 }
 }

-#endif

 
 

-static void
-roff_openeqn(struct roff *r, const char *name, int line, 
-               int offs, const char *buf)
+static int
+roff_char(ROFF_ARGS)

 {
 {

-       struct eqn_node *e;
-       int              poff;
+       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++;

 
 

-       assert(NULL == r->eqn);
-       e = eqn_alloc(name, offs, line, r->parse);
+       /*
+        * If the replacement string contains a font escape sequence,
+        * we have to restore the font at the end.
+        */

 
 

-       if (r->last_eqn)
-               r->last_eqn->next = e;
-       else
-               r->first_eqn = r->last_eqn = e;
+       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_FONTCW:
+               case ESCAPE_FONTPREV:
+                       font++;
+                       break;
+               default:
+                       break;
+               }
+       }
+       if (font > 1)
+               mandoc_msg(MANDOCERR_CHAR_FONT,
+                   ln, (int)(vp - buf->buf), "%s", vp);

 
 

-       r->eqn = r->last_eqn = e;
+       /*
+        * Approximate the effect of .char using the .tr tables.
+        * XXX In groff, .char and .tr interact differently.
+        */

 
 

-       if (buf) {
-               poff = 0;
-               eqn_read(&r->eqn, line, buf, offs, &poff);
+       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;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_EQ(ROFF_ARGS)
+static int
+roff_ec(ROFF_ARGS)

 {
 {

-
-       roff_openeqn(r, *bufp + pos, ln, ppos, NULL);
-       return(ROFF_IGN);
+       const char      *p;
+
+       p = buf->buf + pos;
+       if (*p == '\0')
+               r->escape = '\\';
+       else {
+               r->escape = *p;
+               if (*++p != '\0')
+                       mandoc_msg(MANDOCERR_ARG_EXCESS, ln,
+                           (int)(p - buf->buf), "ec ... %s", p);
+       }
+       return ROFF_IGN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_EN(ROFF_ARGS)
+static int
+roff_eo(ROFF_ARGS)

 {
 {

-
-       mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-       return(ROFF_IGN);
+       r->escape = '\0';
+       if (buf->buf[pos] != '\0')
+               mandoc_msg(MANDOCERR_ARG_SKIP,
+                   ln, pos, "eo %s", buf->buf + pos);
+       return ROFF_IGN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_TS(ROFF_ARGS)
+static int
+roff_nop(ROFF_ARGS)

 {
 {

-       struct tbl_node *t;
-
-       if (r->tbl) {
-               mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
-               tbl_end(&r->tbl);
-       }
-
-       t = tbl_alloc(ppos, ln, r->parse);
-
-       if (r->last_tbl)
-               r->last_tbl->next = t;
-       else
-               r->first_tbl = r->last_tbl = t;
-
-       r->tbl = r->last_tbl = t;
-       return(ROFF_IGN);
+       while (buf->buf[pos] == ' ')
+               pos++;
+       *offs = pos;
+       return ROFF_RERUN;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
+static int

 roff_tr(ROFF_ARGS)
 {
        const char      *p, *first, *second;
        size_t           fsz, ssz;
        enum mandoc_esc  esc;
 
 roff_tr(ROFF_ARGS)
 {
        const char      *p, *first, *second;
        size_t           fsz, ssz;
        enum mandoc_esc  esc;
 

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

 
 

-       if ('\0' == *p) {
-               mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
+       if (*p == '\0') {
+               mandoc_msg(MANDOCERR_REQ_EMPTY, ln, ppos, "tr");
+               return ROFF_IGN;

        }
 
        }
 

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

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

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

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

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

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

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

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

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

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

-               } else if ('\0' == *second) {
-                       mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, 
-                                       ln, (int)(p - *bufp), NULL);
+               } else if (*second == '\0') {
+                       mandoc_msg(MANDOCERR_TR_ODD, ln,
+                           (int)(first - buf->buf), "tr %s", first);

                        second = " ";
                        p--;
                }
 
                if (fsz > 1) {
                        second = " ";
                        p--;
                }
 
                if (fsz > 1) {

-                       roff_setstrn(&r->xmbtab, first, 
-                                       fsz, second, ssz, 0);
+                       roff_setstrn(&r->xmbtab, first, fsz,
+                           second, ssz, 0);

                        continue;
                }
 
                        continue;
                }
 

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

 
                free(r->xtab[(int)*first].p);
                r->xtab[(int)*first].p = mandoc_strndup(second, ssz);
                r->xtab[(int)*first].sz = ssz;
        }
 
 
                free(r->xtab[(int)*first].p);
                r->xtab[(int)*first].p = mandoc_strndup(second, ssz);
                r->xtab[(int)*first].sz = ssz;
        }
 

-       return(ROFF_IGN);
+       return ROFF_IGN;
+}
+
+/*
+ * 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;
+       int              deftype;
+
+       oldn = newn = buf->buf + pos;
+       if (*oldn == '\0')
+               return ROFF_IGN;
+
+       oldsz = roff_getname(r, &newn, ln, pos);
+       if (oldn[oldsz] == '\\' || oldn[oldsz] == '\t' || *newn == '\0')
+               return ROFF_IGN;
+
+       end = newn;
+       newsz = roff_getname(r, &end, ln, newn - buf->buf);
+       if (newsz == 0)
+               return ROFF_IGN;
+
+       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);
+               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->strtab, newn, newsz, NULL, 0, 0);
+               break;
+       case ROFFDEF_STD:
+               roff_setstrn(&r->rentab, newn, newsz, oldn, oldsz, 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;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
+static int

 roff_so(ROFF_ARGS)
 {
 roff_so(ROFF_ARGS)
 {

-       char *name;
+       char *name, *cp;

 
 

-       mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL);
+       name = buf->buf + pos;
+       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


@@ -1442,122 +3781,164 @@ roff_so(ROFF_ARGS)
         * or using absolute paths.
         */
 
         * or using absolute paths.
         */
 

-       name = *bufp + pos;
-       if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
-               mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL);
-               return(ROFF_ERR);
+       if (*name == '/' || strstr(name, "../") || strstr(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->buf = cp;
+               *offs = 0;
+               return ROFF_REPARSE;

        }
 
        *offs = pos;
        }
 
        *offs = pos;

-       return(ROFF_SO);
+       return ROFF_SO;

 }
 
 }
 

-/* ARGSUSED */
-static enum rofferr
+/* --- user defined strings and macros ------------------------------------ */
+
+static int

 roff_userdef(ROFF_ARGS)
 {
 roff_userdef(ROFF_ARGS)
 {

-       const char       *arg[9];
-       char             *cp, *n1, *n2;
-       int               i;
+       struct mctx      *ctx;
+       char             *arg, *ap, *dst, *src;
+       size_t            sz;

 
 

-       /*
-        * Collect pointers to macro argument strings
-        * and null-terminate them.
-        */
-       cp = *bufp + pos;
-       for (i = 0; i < 9; i++)
-               arg[i] = '\0' == *cp ? "" :
-                   mandoc_getarg(r->parse, &cp, ln, &pos);
+       /* 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.

         */
         */

-       *szp = 0;
-       n1 = cp = mandoc_strdup(r->current_string);
-       while (NULL != (cp = strstr(cp, "\\$"))) {
-               i = cp[2] - '1';
-               if (0 > i || 8 < i) {
-                       /* Not an argument invocation. */
-                       cp += 2;
-                       continue;
-               }

 
 

-               *szp = strlen(n1) - 3 + strlen(arg[i]) + 1;
-               n2 = mandoc_malloc(*szp);
+       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));
+               }
+               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);
+       }

 
 

-               strlcpy(n2, n1, (size_t)(cp - n1 + 1));
-               strlcat(n2, arg[i], *szp);
-               strlcat(n2, cp + 3, *szp);
+       /* Replace the macro invocation by the macro definition. */

 
 

-               cp = n2 + (cp - n1);
-               free(n1);
-               n1 = n2;
-       }
+       free(buf->buf);
+       buf->buf = mandoc_strdup(r->current_string);
+       buf->sz = strlen(buf->buf) + 1;
+       *offs = 0;

 
 

-       /*
-        * Replace the macro invocation
-        * by the expanded macro.
-        */
-       free(*bufp);
-       *bufp = n1;
-       if (0 == *szp)
-               *szp = strlen(*bufp) + 1;
+       return buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?
+           ROFF_REPARSE | ROFF_USERCALL : ROFF_IGN | ROFF_APPEND;
+}

 
 

-       return(*szp > 1 && '\n' == (*bufp)[(int)*szp - 2] ?
-          ROFF_REPARSE : ROFF_APPEND);
+/*
+ * Calling a high-level macro that was renamed with .rn.
+ * r->current_string has already been set up by roff_parse().
+ */
+static int
+roff_renamed(ROFF_ARGS)
+{
+       char    *nbuf;
+
+       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;
+       *offs = 0;
+       return ROFF_CONT;

 }
 
 }
 

-static char *
+/*
+ * 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)
 {
        char     *name, *cp;
 roff_getname(struct roff *r, char **cpp, int ln, int pos)
 {
        char     *name, *cp;

+       size_t    namesz;

 
        name = *cpp;
 
        name = *cpp;

-       if ('\0' == *name)
-               return(name);
+       if (*name == '\0')
+               return 0;
+
+       /* Advance cp to the byte after the end of the name. */

 
 

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

                        continue;
                        continue;

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

                        continue;
                        continue;

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

        }
 
        }
 

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

        /* Read past spaces. */
        /* Read past spaces. */

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

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

-       return(name);
+       return namesz;

 }
 
 /*
  * Store *string into the user-defined string called *name.
 }
 
 /*
  * Store *string into the user-defined string called *name.

- * In multiline mode, append to an existing entry and append '\n';
- * else replace the existing entry, if there is one.

  * To clear an existing entry, call with (*r, *name, NULL, 0).
  * To clear an existing entry, call with (*r, *name, NULL, 0).

+ * append == 0: replace mode
+ * append == 1: single-line append mode
+ * append == 2: multiline append mode, append '\n' after each call

  */
 static void
 roff_setstr(struct roff *r, const char *name, const char *string,
  */
 static void
 roff_setstr(struct roff *r, const char *name, const char *string,

-       int multiline)
+       int append)

 {
 {

+       size_t   namesz;

 
 

-       roff_setstrn(&r->strtab, name, strlen(name), string,
-                       string ? strlen(string) : 0, multiline);
+       namesz = strlen(name);
+       roff_setstrn(&r->strtab, name, namesz, string,
+           string ? strlen(string) : 0, append);
+       roff_setstrn(&r->rentab, name, namesz, NULL, 0, 0);

 }
 
 static void
 roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
 }
 
 static void
 roff_setstrn(struct roffkv **r, const char *name, size_t namesz,

-               const char *string, size_t stringsz, int multiline)
+               const char *string, size_t stringsz, int append)

 {
        struct roffkv   *n;
        char            *c;
 {
        struct roffkv   *n;
        char            *c;


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

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

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


@@ -1579,8 +3961,7 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
                n->val.sz = 0;
                n->next = *r;
                *r = n;
                n->val.sz = 0;
                n->next = *r;
                *r = n;

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

                free(n->val.p);
                n->val.p = NULL;
                n->val.sz = 0;
                free(n->val.p);
                n->val.p = NULL;
                n->val.sz = 0;


@@ -1593,7 +3974,7 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
         * One additional byte for the '\n' in multiline mode,
         * and one for the terminating '\0'.
         */
         * One additional byte for the '\n' in multiline mode,
         * and one for the terminating '\0'.
         */

-       newch = stringsz + (multiline ? 2u : 1u);
+       newch = stringsz + (1 < append ? 2u : 1u);

 
        if (NULL == n->val.p) {
                n->val.p = mandoc_malloc(newch);
 
        if (NULL == n->val.p) {
                n->val.p = mandoc_malloc(newch);


@@ -1620,7 +4001,7 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
        }
 
        /* Append terminating bytes. */
        }
 
        /* Append terminating bytes. */

-       if (multiline)
+       if (1 < append)

                *c++ = '\n';
 
        *c = '\0';
                *c++ = '\n';
 
        *c = '\0';


@@ -1628,16 +4009,97 @@ 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;
+       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;
+               } 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;
+               } 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;
+                       }
+               }
+       }

 
 

-       for (n = r->strtab; n; n = n->next)
-               if (0 == strncmp(name, n->key.p, len) && 
-                               '\0' == n->key.p[(int)len])
-                       return(n->val.p);
+       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;
+               }
+
+               /* Using an undefined string defines it to be empty. */

 
 

-       return(NULL);
+               roff_setstrn(&r->strtab, name, len, "", 0, 0);
+               roff_setstrn(&r->rentab, name, len, NULL, 0, 0);
+       }
+
+       *deftype = 0;
+       return NULL;

 }
 
 static void
 }
 
 static void


@@ -1653,19 +4115,7 @@ roff_freestr(struct roffkv *r)
        }
 }
 
        }
 }
 

-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);
-}
+/* --- accessors and utility functions ------------------------------------ */

 
 /*
  * Duplicate an input string, making the appropriate character
 
 /*
  * Duplicate an input string, making the appropriate character


@@ -1682,9 +4132,9 @@ roff_strdup(const struct roff *r, const char *p)
        enum mandoc_esc  esc;
 
        if (NULL == r->xmbtab && NULL == r->xtab)
        enum mandoc_esc  esc;
 
        if (NULL == r->xmbtab && NULL == r->xtab)

-               return(mandoc_strdup(p));
+               return mandoc_strdup(p);

        else if ('\0' == *p)
        else if ('\0' == *p)

-               return(mandoc_strdup(""));
+               return mandoc_strdup("");

 
        /*
         * Step through each character looking for term matches
 
        /*
         * Step through each character looking for term matches


@@ -1698,7 +4148,8 @@ roff_strdup(const struct roff *r, const char *p)
        ssz = 0;
 
        while ('\0' != *p) {
        ssz = 0;
 
        while ('\0' != *p) {

-               if ('\\' != *p && r->xtab && r->xtab[(int)*p].p) {
+               assert((unsigned int)*p < 128);
+               if ('\\' != *p && r->xtab && r->xtab[(unsigned int)*p].p) {

                        sz = r->xtab[(int)*p].sz;
                        res = mandoc_realloc(res, ssz + sz + 1);
                        memcpy(res + ssz, r->xtab[(int)*p].p, sz);
                        sz = r->xtab[(int)*p].sz;
                        res = mandoc_realloc(res, ssz + sz + 1);
                        memcpy(res + ssz, r->xtab[(int)*p].p, sz);


@@ -1722,8 +4173,8 @@ roff_strdup(const struct roff *r, const char *p)
                         * Append the match to the array and move
                         * forward by its keysize.
                         */
                         * Append the match to the array and move
                         * forward by its keysize.
                         */

-                       res = mandoc_realloc
-                               (res, ssz + cp->val.sz + 1);
+                       res = mandoc_realloc(res,
+                           ssz + cp->val.sz + 1);

                        memcpy(res + ssz, cp->val.p, cp->val.sz);
                        ssz += cp->val.sz;
                        p += (int)cp->key.sz;
                        memcpy(res + ssz, cp->val.p, cp->val.sz);
                        ssz += cp->val.sz;
                        p += (int)cp->key.sz;


@@ -1744,10 +4195,10 @@ roff_strdup(const struct roff *r, const char *p)
                        memcpy(res + ssz, pp, sz);
                        break;
                }
                        memcpy(res + ssz, pp, sz);
                        break;
                }

-               /* 
-                * We bail out on bad escapes. 
+               /*
+                * We bail out on bad escapes.

                 * No need to warn: we already did so when
                 * 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);


@@ -1756,5 +4207,47 @@ roff_strdup(const struct roff *r, const char *p)
        }
 
        res[(int)ssz] = '\0';
        }
 
        res[(int)ssz] = '\0';

-       return(res);
+       return res;
+}
+
+int
+roff_getformat(const struct roff *r)
+{
+
+       return r->format;
+}
+
+/*
+ * Find out whether a line is a macro line or not.
+ * If it is, adjust the current position and return one; if it isn't,
+ * return zero and don't change the current position.
+ * If the control character has been set with `.cc', then let that grain
+ * precedence.
+ * This is slighly contrary to groff, where using the non-breaking
+ * control character when `cc' has been invoked will cause the
+ * non-breaking macro contents to be printed verbatim.
+ */
+int
+roff_getcontrol(const struct roff *r, const char *cp, int *ppos)
+{
+       int             pos;
+
+       pos = *ppos;
+
+       if (r->control != '\0' && cp[pos] == r->control)
+               pos++;
+       else if (r->control != '\0')
+               return 0;
+       else if ('\\' == cp[pos] && '.' == cp[pos + 1])
+               pos += 2;
+       else if ('.' == cp[pos] || '\'' == cp[pos])
+               pos++;
+       else
+               return 0;
+
+       while (' ' == cp[pos] || '\t' == cp[pos])
+               pos++;
+
+       *ppos = pos;
+       return 1;

 }
 }