Decide whether to use_pager as early as possible,

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index b76e6d8ad8c2034c2f7af9b7a3c07c73454a0a32..c91b258d8ea46623e629f803bd61c29ff215a617 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.217 2014/07/04 16:12:08 schwarze Exp $ */
+/*     $Id: roff.c,v 1.277 2015/10/06 18:32:20 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2015 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,20 +15,23 @@
  * 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 <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc.h"
 #include "mandoc_aux.h"

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

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

+#include "roff_int.h"
+#include "libroff.h"

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


@@ -36,43 +39,250 @@
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 
 /* Maximum number of string expansions per line, to break infinite loops. */
 #define        EXPAND_LIMIT    1000
 

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

 enum   rofft {
 enum   rofft {

+       ROFF_ab,

        ROFF_ad,
        ROFF_ad,

+       ROFF_af,
+       ROFF_aln,
+       ROFF_als,

        ROFF_am,
        ROFF_am,

-       ROFF_ami,

        ROFF_am1,
        ROFF_am1,

+       ROFF_ami,
+       ROFF_ami1,

        ROFF_as,
        ROFF_as,

+       ROFF_as1,
+       ROFF_asciify,
+       ROFF_backtrace,
+       ROFF_bd,
+       ROFF_bleedat,
+       ROFF_blm,
+       ROFF_box,
+       ROFF_boxa,
+       ROFF_bp,
+       ROFF_BP,
+       /* MAN_br, MDOC_br */
+       ROFF_break,
+       ROFF_breakchar,
+       ROFF_brnl,
+       ROFF_brp,
+       ROFF_brpnl,
+       ROFF_c2,

        ROFF_cc,
        ROFF_ce,
        ROFF_cc,
        ROFF_ce,

+       ROFF_cf,
+       ROFF_cflags,
+       ROFF_ch,
+       ROFF_char,
+       ROFF_chop,
+       ROFF_class,
+       ROFF_close,
+       ROFF_CL,
+       ROFF_color,
+       ROFF_composite,
+       ROFF_continue,
+       ROFF_cp,
+       ROFF_cropat,
+       ROFF_cs,
+       ROFF_cu,
+       ROFF_da,
+       ROFF_dch,
+       ROFF_Dd,

        ROFF_de,
        ROFF_de,

-       ROFF_dei,

        ROFF_de1,
        ROFF_de1,

+       ROFF_defcolor,
+       ROFF_dei,
+       ROFF_dei1,
+       ROFF_device,
+       ROFF_devicem,
+       ROFF_di,
+       ROFF_do,

        ROFF_ds,
        ROFF_ds,

+       ROFF_ds1,
+       ROFF_dwh,
+       ROFF_dt,
+       ROFF_ec,
+       ROFF_ecr,
+       ROFF_ecs,

        ROFF_el,
        ROFF_el,

+       ROFF_em,
+       ROFF_EN,
+       ROFF_eo,
+       ROFF_EP,
+       ROFF_EQ,
+       ROFF_errprint,
+       ROFF_ev,
+       ROFF_evc,
+       ROFF_ex,
+       ROFF_fallback,

        ROFF_fam,
        ROFF_fam,

+       ROFF_fc,
+       ROFF_fchar,
+       ROFF_fcolor,
+       ROFF_fdeferlig,
+       ROFF_feature,
+       /* MAN_fi; ignored in mdoc(7) */
+       ROFF_fkern,
+       ROFF_fl,
+       ROFF_flig,
+       ROFF_fp,
+       ROFF_fps,
+       ROFF_fschar,
+       ROFF_fspacewidth,
+       ROFF_fspecial,
+       /* MAN_ft; ignored in mdoc(7) */
+       ROFF_ftr,
+       ROFF_fzoom,
+       ROFF_gcolor,
+       ROFF_hc,
+       ROFF_hcode,
+       ROFF_hidechar,
+       ROFF_hla,
+       ROFF_hlm,
+       ROFF_hpf,
+       ROFF_hpfa,
+       ROFF_hpfcode,

        ROFF_hw,
        ROFF_hy,
        ROFF_hw,
        ROFF_hy,

+       ROFF_hylang,
+       ROFF_hylen,
+       ROFF_hym,
+       ROFF_hypp,
+       ROFF_hys,

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

+       /* MAN_in; ignored in mdoc(7) */
+       ROFF_index,

        ROFF_it,
        ROFF_it,

+       ROFF_itc,
+       ROFF_IX,
+       ROFF_kern,
+       ROFF_kernafter,
+       ROFF_kernbefore,
+       ROFF_kernpair,
+       ROFF_lc,
+       ROFF_lc_ctype,
+       ROFF_lds,
+       ROFF_length,
+       ROFF_letadj,
+       ROFF_lf,
+       ROFF_lg,
+       ROFF_lhang,
+       ROFF_linetabs,
+       /* MAN_ll, MDOC_ll */
+       ROFF_lnr,
+       ROFF_lnrf,
+       ROFF_lpfx,
+       ROFF_ls,
+       ROFF_lsm,
+       ROFF_lt,
+       ROFF_mc,
+       ROFF_mediasize,
+       ROFF_minss,
+       ROFF_mk,
+       ROFF_mso,
+       ROFF_na,

        ROFF_ne,
        ROFF_ne,

+       /* MAN_nf; ignored in mdoc(7) */

        ROFF_nh,
        ROFF_nh,

+       ROFF_nhychar,
+       ROFF_nm,
+       ROFF_nn,
+       ROFF_nop,

        ROFF_nr,
        ROFF_nr,

+       ROFF_nrf,
+       ROFF_nroff,

        ROFF_ns,
        ROFF_ns,

+       ROFF_nx,
+       ROFF_open,
+       ROFF_opena,
+       ROFF_os,
+       ROFF_output,
+       ROFF_padj,
+       ROFF_papersize,
+       ROFF_pc,
+       ROFF_pev,
+       ROFF_pi,
+       ROFF_PI,
+       ROFF_pl,
+       ROFF_pm,
+       ROFF_pn,
+       ROFF_pnr,
+       ROFF_po,

        ROFF_ps,
        ROFF_ps,

+       ROFF_psbb,
+       ROFF_pshape,
+       ROFF_pso,
+       ROFF_ptr,
+       ROFF_pvs,
+       ROFF_rchar,
+       ROFF_rd,
+       ROFF_recursionlimit,
+       ROFF_return,
+       ROFF_rfschar,
+       ROFF_rhang,
+       ROFF_rj,

        ROFF_rm,
        ROFF_rm,

+       ROFF_rn,
+       ROFF_rnn,

        ROFF_rr,
        ROFF_rr,

+       ROFF_rs,
+       ROFF_rt,
+       ROFF_schar,
+       ROFF_sentchar,
+       ROFF_shc,
+       ROFF_shift,
+       ROFF_sizes,

        ROFF_so,
        ROFF_so,

+       /* MAN_sp, MDOC_sp */
+       ROFF_spacewidth,
+       ROFF_special,
+       ROFF_spreadwarn,
+       ROFF_ss,
+       ROFF_sty,
+       ROFF_substring,
+       ROFF_sv,
+       ROFF_sy,
+       ROFF_T_,

        ROFF_ta,
        ROFF_ta,

-       ROFF_tr,
-       ROFF_Dd,
+       ROFF_tc,
+       ROFF_TE,

        ROFF_TH,
        ROFF_TH,

+       ROFF_ti,
+       ROFF_tkf,
+       ROFF_tl,
+       ROFF_tm,
+       ROFF_tm1,
+       ROFF_tmc,
+       ROFF_tr,
+       ROFF_track,
+       ROFF_transchar,
+       ROFF_trf,
+       ROFF_trimat,
+       ROFF_trin,
+       ROFF_trnt,
+       ROFF_troff,

        ROFF_TS,
        ROFF_TS,

-       ROFF_TE,
-       ROFF_T_,
-       ROFF_EQ,
-       ROFF_EN,
+       ROFF_uf,
+       ROFF_ul,
+       ROFF_unformat,
+       ROFF_unwatch,
+       ROFF_unwatchn,
+       ROFF_vpt,
+       ROFF_vs,
+       ROFF_warn,
+       ROFF_warnscale,
+       ROFF_watch,
+       ROFF_watchlength,
+       ROFF_watchn,
+       ROFF_wh,
+       ROFF_while,
+       ROFF_write,
+       ROFF_writec,
+       ROFF_writem,
+       ROFF_xflag,

        ROFF_cblock,
        ROFF_USERDEF,
        ROFF_MAX
        ROFF_cblock,
        ROFF_USERDEF,
        ROFF_MAX


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

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

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

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

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


@@ -122,6 +330,13 @@ struct     roff {
        struct eqn_node *last_eqn; /* last equation parsed */
        struct eqn_node *first_eqn; /* first equation parsed */
        struct eqn_node *eqn; /* current equation being parsed */
        struct eqn_node *last_eqn; /* last equation parsed */
        struct eqn_node *first_eqn; /* first equation parsed */
        struct eqn_node *eqn; /* current equation being parsed */

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

 };
 
 struct roffnode {
 };
 
 struct roffnode {


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

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

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


@@ -164,6 +378,8 @@ struct      predef {
 #define        PREDEF(__name, __str) \
        { (__name), (__str) },
 
 #define        PREDEF(__name, __str) \
        { (__name), (__str) },
 

+/* --- function prototypes ------------------------------------------------ */
+

 static enum rofft       roffhash_find(const char *, size_t);
 static void             roffhash_init(void);
 static void             roffnode_cleanscope(struct roff *);
 static enum rofft       roffhash_find(const char *, size_t);
 static void             roffhash_init(void);
 static void             roffnode_cleanscope(struct roff *);


@@ -173,6 +389,7 @@ static      void             roffnode_push(struct roff *, enum rofft,
 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_block_sub(ROFF_ARGS);
 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_block_sub(ROFF_ARGS);

+static enum rofferr     roff_brp(ROFF_ARGS);

 static enum rofferr     roff_cblock(ROFF_ARGS);
 static enum rofferr     roff_cc(ROFF_ARGS);
 static void             roff_ccond(struct roff *, int, int);
 static enum rofferr     roff_cblock(ROFF_ARGS);
 static enum rofferr     roff_cc(ROFF_ARGS);
 static void             roff_ccond(struct roff *, int, int);


@@ -180,31 +397,37 @@ static    enum rofferr     roff_cond(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);

-static int              roff_evalcond(const char *, int *);
-static int              roff_evalnum(const char *, int *, int *, int);
-static int              roff_evalpar(const char *, int *, int *);
+static enum rofferr     roff_eqndelim(struct roff *, struct buf *, int);
+static int              roff_evalcond(struct roff *r, int, 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 void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static size_t           roff_getname(struct roff *, char **, int, int);
 static int              roff_evalstrcond(const char *, int *);
 static void             roff_free1(struct roff *);
 static void             roff_freereg(struct roffreg *);
 static void             roff_freestr(struct roffkv *);
 static size_t           roff_getname(struct roff *, char **, int, int);

-static int              roff_getnum(const char *, int *, int *);
+static int              roff_getnum(const char *, int *, int *, int);

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

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

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

+static int              roff_hasregn(const struct roff *,
+                               const char *, size_t);
+static enum rofferr     roff_insec(ROFF_ARGS);

 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);
 static enum rofferr     roff_it(ROFF_ARGS);
 static enum rofferr     roff_line_ignore(ROFF_ARGS);

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

 static enum rofferr     roff_nr(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 *, char *, int *,
                                int, int);
 static enum rofft       roff_parse(struct roff *, char *, int *,
                                int, int);

-static enum rofferr     roff_parsetext(char **, size_t *, int, int *);
-static enum rofferr     roff_res(struct roff *,
-                               char **, size_t *, int, int);
+static enum rofferr     roff_parsetext(struct buf *, int, int *);
+static enum rofferr     roff_res(struct roff *, struct buf *, int, int);

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


@@ -220,53 +443,257 @@ 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_EQ(ROFF_ARGS);
 static enum rofferr     roff_EN(ROFF_ARGS);
 static enum rofferr     roff_T_(ROFF_ARGS);

+static enum rofferr     roff_unsupp(ROFF_ARGS);

 static enum rofferr     roff_userdef(ROFF_ARGS);
 
 static enum rofferr     roff_userdef(ROFF_ARGS);
 

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

 /* See roffhash_find() */
 
 #define        ASCII_HI         126
 #define        ASCII_LO         33
 #define        HASHWIDTH       (ASCII_HI - ASCII_LO + 1)
 
 /* See roffhash_find() */
 
 #define        ASCII_HI         126
 #define        ASCII_LO         33
 #define        HASHWIDTH       (ASCII_HI - ASCII_LO + 1)
 

+#define        ROFFNUM_SCALE   (1 << 0)  /* Honour scaling in roff_getnum(). */
+#define        ROFFNUM_WHITE   (1 << 1)  /* Skip whitespace in roff_evalnum(). */
+

 static struct roffmac  *hash[HASHWIDTH];
 
 static struct roffmac   roffs[ROFF_MAX] = {
 static struct roffmac  *hash[HASHWIDTH];
 
 static struct roffmac   roffs[ROFF_MAX] = {

+       { "ab", roff_unsupp, NULL, NULL, 0, NULL },

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

+       { "af", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "aln", roff_unsupp, NULL, NULL, 0, NULL },
+       { "als", roff_unsupp, NULL, NULL, 0, NULL },

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

-       { "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },

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

+       { "ami", roff_block, roff_block_text, roff_block_sub, 0, NULL },
+       { "ami1", roff_block, roff_block_text, roff_block_sub, 0, NULL },

        { "as", roff_ds, NULL, NULL, 0, NULL },
        { "as", roff_ds, NULL, NULL, 0, NULL },

+       { "as1", roff_ds, NULL, NULL, 0, NULL },
+       { "asciify", roff_unsupp, NULL, NULL, 0, NULL },
+       { "backtrace", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "bd", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "bleedat", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "blm", roff_unsupp, NULL, NULL, 0, NULL },
+       { "box", roff_unsupp, NULL, NULL, 0, NULL },
+       { "boxa", roff_unsupp, NULL, NULL, 0, NULL },
+       { "bp", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "BP", roff_unsupp, NULL, NULL, 0, NULL },
+       { "break", roff_unsupp, NULL, NULL, 0, NULL },
+       { "breakchar", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "brnl", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "brp", roff_brp, NULL, NULL, 0, NULL },
+       { "brpnl", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "c2", roff_unsupp, NULL, NULL, 0, NULL },

        { "cc", roff_cc, NULL, NULL, 0, NULL },
        { "ce", roff_line_ignore, NULL, NULL, 0, NULL },
        { "cc", roff_cc, NULL, NULL, 0, NULL },
        { "ce", roff_line_ignore, NULL, NULL, 0, NULL },

+       { "cf", roff_insec, NULL, NULL, 0, NULL },
+       { "cflags", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ch", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "char", roff_unsupp, NULL, NULL, 0, NULL },
+       { "chop", roff_unsupp, NULL, NULL, 0, NULL },
+       { "class", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "close", roff_insec, NULL, NULL, 0, NULL },
+       { "CL", roff_unsupp, NULL, NULL, 0, NULL },
+       { "color", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "composite", roff_unsupp, NULL, NULL, 0, NULL },
+       { "continue", roff_unsupp, NULL, NULL, 0, NULL },
+       { "cp", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "cropat", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "cs", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "cu", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "da", roff_unsupp, NULL, NULL, 0, NULL },
+       { "dch", roff_unsupp, NULL, NULL, 0, NULL },
+       { "Dd", roff_Dd, NULL, NULL, 0, NULL },

        { "de", 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 },
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },

+       { "defcolor", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL },
+       { "dei1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
+       { "device", roff_unsupp, NULL, NULL, 0, NULL },
+       { "devicem", roff_unsupp, NULL, NULL, 0, NULL },
+       { "di", roff_unsupp, NULL, NULL, 0, NULL },
+       { "do", roff_unsupp, NULL, NULL, 0, NULL },

        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },

+       { "ds1", roff_ds, NULL, NULL, 0, NULL },
+       { "dwh", roff_unsupp, NULL, NULL, 0, NULL },
+       { "dt", roff_unsupp, NULL, NULL, 0, NULL },
+       { "ec", roff_unsupp, NULL, NULL, 0, NULL },
+       { "ecr", roff_unsupp, NULL, NULL, 0, NULL },
+       { "ecs", roff_unsupp, NULL, NULL, 0, NULL },

        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },

+       { "em", roff_unsupp, NULL, NULL, 0, NULL },
+       { "EN", roff_EN, NULL, NULL, 0, NULL },
+       { "eo", roff_unsupp, NULL, NULL, 0, NULL },
+       { "EP", roff_unsupp, NULL, NULL, 0, NULL },
+       { "EQ", roff_EQ, NULL, NULL, 0, NULL },
+       { "errprint", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ev", roff_unsupp, NULL, NULL, 0, NULL },
+       { "evc", roff_unsupp, NULL, NULL, 0, NULL },
+       { "ex", roff_unsupp, NULL, NULL, 0, NULL },
+       { "fallback", roff_line_ignore, NULL, NULL, 0, NULL },

        { "fam", roff_line_ignore, NULL, NULL, 0, NULL },
        { "fam", roff_line_ignore, NULL, NULL, 0, NULL },

+       { "fc", roff_unsupp, NULL, NULL, 0, NULL },
+       { "fchar", roff_unsupp, NULL, NULL, 0, NULL },
+       { "fcolor", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fdeferlig", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "feature", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fkern", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fl", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "flig", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fp", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fps", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fschar", roff_unsupp, NULL, NULL, 0, NULL },
+       { "fspacewidth", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fspecial", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ftr", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "fzoom", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "gcolor", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hc", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hcode", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hidechar", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hla", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hlm", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hpf", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hpfa", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hpfcode", roff_line_ignore, NULL, NULL, 0, NULL },

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

+       { "hylang", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hylen", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hym", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hypp", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "hys", roff_line_ignore, NULL, NULL, 0, NULL },

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

+       { "index", roff_unsupp, NULL, NULL, 0, NULL },

        { "it", roff_it, NULL, NULL, 0, NULL },
        { "it", roff_it, NULL, NULL, 0, NULL },

+       { "itc", roff_unsupp, NULL, NULL, 0, NULL },
+       { "IX", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "kern", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "kernafter", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "kernbefore", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "kernpair", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "lc", roff_unsupp, NULL, NULL, 0, NULL },
+       { "lc_ctype", roff_unsupp, NULL, NULL, 0, NULL },
+       { "lds", roff_unsupp, NULL, NULL, 0, NULL },
+       { "length", roff_unsupp, NULL, NULL, 0, NULL },
+       { "letadj", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "lf", roff_insec, NULL, NULL, 0, NULL },
+       { "lg", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "lhang", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "linetabs", roff_unsupp, NULL, NULL, 0, NULL },
+       { "lnr", roff_unsupp, NULL, NULL, 0, NULL },
+       { "lnrf", roff_unsupp, NULL, NULL, 0, NULL },
+       { "lpfx", roff_unsupp, NULL, NULL, 0, NULL },
+       { "ls", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "lsm", roff_unsupp, NULL, NULL, 0, NULL },
+       { "lt", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "mc", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "mediasize", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "minss", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "mk", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "mso", roff_insec, NULL, NULL, 0, NULL },
+       { "na", roff_line_ignore, NULL, NULL, 0, NULL },

        { "ne", roff_line_ignore, NULL, NULL, 0, NULL },
        { "nh", roff_line_ignore, NULL, NULL, 0, NULL },
        { "ne", roff_line_ignore, NULL, NULL, 0, NULL },
        { "nh", roff_line_ignore, NULL, NULL, 0, NULL },

+       { "nhychar", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "nm", roff_unsupp, NULL, NULL, 0, NULL },
+       { "nn", roff_unsupp, NULL, NULL, 0, NULL },
+       { "nop", roff_unsupp, NULL, NULL, 0, NULL },

        { "nr", roff_nr, NULL, NULL, 0, NULL },
        { "nr", roff_nr, NULL, NULL, 0, NULL },

+       { "nrf", roff_unsupp, NULL, NULL, 0, NULL },
+       { "nroff", roff_line_ignore, NULL, NULL, 0, NULL },

        { "ns", roff_line_ignore, NULL, NULL, 0, NULL },
        { "ns", roff_line_ignore, NULL, NULL, 0, NULL },

+       { "nx", roff_insec, NULL, NULL, 0, NULL },
+       { "open", roff_insec, NULL, NULL, 0, NULL },
+       { "opena", roff_insec, NULL, NULL, 0, NULL },
+       { "os", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "output", roff_unsupp, NULL, NULL, 0, NULL },
+       { "padj", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "papersize", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pc", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pev", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pi", roff_insec, NULL, NULL, 0, NULL },
+       { "PI", roff_unsupp, NULL, NULL, 0, NULL },
+       { "pl", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pm", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pn", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pnr", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "po", roff_line_ignore, NULL, NULL, 0, NULL },

        { "ps", roff_line_ignore, NULL, NULL, 0, NULL },
        { "ps", roff_line_ignore, NULL, NULL, 0, NULL },

+       { "psbb", roff_unsupp, NULL, NULL, 0, NULL },
+       { "pshape", roff_unsupp, NULL, NULL, 0, NULL },
+       { "pso", roff_insec, NULL, NULL, 0, NULL },
+       { "ptr", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "pvs", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "rchar", roff_unsupp, NULL, NULL, 0, NULL },
+       { "rd", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "recursionlimit", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "return", roff_unsupp, NULL, NULL, 0, NULL },
+       { "rfschar", roff_unsupp, NULL, NULL, 0, NULL },
+       { "rhang", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "rj", roff_line_ignore, NULL, NULL, 0, NULL },

        { "rm", roff_rm, NULL, NULL, 0, NULL },
        { "rm", roff_rm, NULL, NULL, 0, NULL },

+       { "rn", roff_unsupp, NULL, NULL, 0, NULL },
+       { "rnn", roff_unsupp, NULL, NULL, 0, NULL },

        { "rr", roff_rr, NULL, NULL, 0, NULL },
        { "rr", roff_rr, NULL, NULL, 0, NULL },

+       { "rs", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "rt", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "schar", roff_unsupp, NULL, NULL, 0, NULL },
+       { "sentchar", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "shc", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "shift", roff_unsupp, NULL, NULL, 0, NULL },
+       { "sizes", roff_line_ignore, NULL, NULL, 0, NULL },

        { "so", roff_so, NULL, NULL, 0, NULL },
        { "so", roff_so, NULL, NULL, 0, NULL },

-       { "ta", roff_line_ignore, NULL, NULL, 0, NULL },
-       { "tr", roff_tr, NULL, NULL, 0, NULL },
-       { "Dd", roff_Dd, NULL, NULL, 0, NULL },
+       { "spacewidth", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "special", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "spreadwarn", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ss", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "sty", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "substring", roff_unsupp, NULL, NULL, 0, NULL },
+       { "sv", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "sy", roff_insec, NULL, NULL, 0, NULL },
+       { "T&", roff_T_, NULL, NULL, 0, NULL },
+       { "ta", roff_unsupp, NULL, NULL, 0, NULL },
+       { "tc", roff_unsupp, NULL, NULL, 0, NULL },
+       { "TE", roff_TE, NULL, NULL, 0, NULL },

        { "TH", roff_TH, NULL, NULL, 0, NULL },
        { "TH", roff_TH, NULL, NULL, 0, NULL },

+       { "ti", roff_unsupp, NULL, NULL, 0, NULL },
+       { "tkf", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tl", roff_unsupp, NULL, NULL, 0, NULL },
+       { "tm", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tm1", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tmc", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tr", roff_tr, NULL, NULL, 0, NULL },
+       { "track", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "transchar", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "trf", roff_insec, NULL, NULL, 0, NULL },
+       { "trimat", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "trin", roff_unsupp, NULL, NULL, 0, NULL },
+       { "trnt", roff_unsupp, NULL, NULL, 0, NULL },
+       { "troff", roff_line_ignore, NULL, NULL, 0, NULL },

        { "TS", roff_TS, 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 },
+       { "uf", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "ul", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "unformat", roff_unsupp, NULL, NULL, 0, NULL },
+       { "unwatch", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "unwatchn", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "vpt", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "vs", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "warn", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "warnscale", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "watch", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "watchlength", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "watchn", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "wh", roff_unsupp, NULL, NULL, 0, NULL },
+       { "while", roff_unsupp, NULL, NULL, 0, NULL },
+       { "write", roff_insec, NULL, NULL, 0, NULL },
+       { "writec", roff_insec, NULL, NULL, 0, NULL },
+       { "writem", roff_insec, NULL, NULL, 0, NULL },
+       { "xflag", roff_line_ignore, NULL, NULL, 0, NULL },

        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { NULL, roff_userdef, NULL, NULL, 0, NULL },
 };
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { NULL, roff_userdef, NULL, NULL, 0, NULL },
 };


@@ -317,6 +744,8 @@ static      int      roffit_lines;  /* number of lines to delay */
 static char    *roffit_macro;  /* nil-terminated macro line */
 
 
 static char    *roffit_macro;  /* nil-terminated macro line */
 
 

+/* --- request table ------------------------------------------------------ */
+

 static void
 roffhash_init(void)
 {
 static void
 roffhash_init(void)
 {


@@ -356,19 +785,21 @@ roffhash_find(const char *p, size_t s)
         */
 
        if (p[0] < ASCII_LO || p[0] > ASCII_HI)
         */
 
        if (p[0] < ASCII_LO || p[0] > ASCII_HI)

-               return(ROFF_MAX);
+               return ROFF_MAX;

 
        buc = ROFF_HASH(p);
 
        if (NULL == (n = hash[buc]))
 
        buc = ROFF_HASH(p);
 
        if (NULL == (n = hash[buc]))

-               return(ROFF_MAX);
+               return ROFF_MAX;

        for ( ; n; n = n->next)
                if (0 == strncmp(n->name, p, s) && '\0' == n->name[(int)s])
        for ( ; n; n = n->next)
                if (0 == strncmp(n->name, p, s) && '\0' == n->name[(int)s])

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

 
 

-       return(ROFF_MAX);
+       return ROFF_MAX;

 }
 
 }
 

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


@@ -409,6 +840,8 @@ roffnode_push(struct roff *r, enum rofft tok, const char *name,
        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)
 {


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

-

        r->first_tbl = r->last_tbl = r->tbl = NULL;
 
        while (NULL != (e = r->first_eqn)) {
                r->first_eqn = e->next;
                eqn_free(e);
        }
        r->first_tbl = r->last_tbl = r->tbl = NULL;
 
        while (NULL != (e = r->first_eqn)) {
                r->first_eqn = e->next;
                eqn_free(e);
        }

-

        r->first_eqn = r->last_eqn = r->eqn = NULL;
 
        while (r->last)
                roffnode_pop(r);
 
        r->first_eqn = r->last_eqn = r->eqn = NULL;
 
        while (r->last)
                roffnode_pop(r);
 

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

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

-

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

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

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

-

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


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

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

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


@@ -467,27 +901,393 @@ roff_free(struct roff *r)
 }
 
 struct roff *
 }
 
 struct roff *

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

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

+       r->mchars = mchars;

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

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

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

-       return(r);
+       return r;
+}
+
+/* --- syntax tree state data management ---------------------------------- */
+
+static void
+roff_man_free1(struct roff_man *man)
+{
+
+       if (man->first != NULL)
+               roff_node_delete(man, man->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);
+}
+
+static void
+roff_man_alloc1(struct roff_man *man)
+{
+
+       memset(&man->meta, 0, sizeof(man->meta));
+       man->first = mandoc_calloc(1, sizeof(*man->first));
+       man->first->type = ROFFT_ROOT;
+       man->last = man->first;
+       man->last_es = NULL;
+       man->flags = 0;
+       man->macroset = MACROSET_NONE;
+       man->lastsec = man->lastnamed = SEC_NONE;
+       man->next = ROFF_NEXT_CHILD;
+}
+
+void
+roff_man_reset(struct roff_man *man)
+{
+
+       roff_man_free1(man);
+       roff_man_alloc1(man);
+}
+
+void
+roff_man_free(struct roff_man *man)
+{
+
+       roff_man_free1(man);
+       free(man);
+}
+
+struct roff_man *
+roff_man_alloc(struct roff *roff, struct mparse *parse,
+       const char *defos, int quick)
+{
+       struct roff_man *man;
+
+       man = mandoc_calloc(1, sizeof(*man));
+       man->parse = parse;
+       man->roff = roff;
+       man->defos = defos;
+       man->quick = quick;
+       roff_man_alloc1(man);
+       return man;
+}
+
+/* --- syntax tree handling ----------------------------------------------- */
+
+struct roff_node *
+roff_node_alloc(struct roff_man *man, int line, int pos,
+       enum roff_type type, int tok)
+{
+       struct roff_node        *n;
+
+       n = mandoc_calloc(1, sizeof(*n));
+       n->line = line;
+       n->pos = pos;
+       n->tok = tok;
+       n->type = type;
+       n->sec = man->lastsec;
+
+       if (man->flags & MDOC_SYNOPSIS)
+               n->flags |= MDOC_SYNPRETTY;
+       else
+               n->flags &= ~MDOC_SYNPRETTY;
+       if (man->flags & MDOC_NEWLINE)
+               n->flags |= MDOC_LINE;
+       man->flags &= ~MDOC_NEWLINE;
+
+       return n;
+}
+
+void
+roff_node_append(struct roff_man *man, struct roff_node *n)
+{
+
+       switch (man->next) {
+       case ROFF_NEXT_SIBLING:
+               man->last->next = n;
+               n->prev = man->last;
+               n->parent = man->last->parent;
+               break;
+       case ROFF_NEXT_CHILD:
+               man->last->child = n;
+               n->parent = man->last;
+               break;
+       default:
+               abort();
+       }
+       n->parent->nchild++;
+       n->parent->last = n;
+
+       /*
+        * Copy over the normalised-data pointer of our parent.  Not
+        * everybody has one, but copying a null pointer is fine.
+        */
+
+       switch (n->type) {
+       case ROFFT_BODY:
+               if (n->end != ENDBODY_NOT)
+                       break;
+               /* FALLTHROUGH */
+       case ROFFT_TAIL:
+               /* FALLTHROUGH */
+       case ROFFT_HEAD:
+               n->norm = n->parent->norm;
+               break;
+       default:
+               break;
+       }
+
+       if (man->macroset == MACROSET_MDOC)
+               mdoc_valid_pre(man, n);
+
+       switch (n->type) {
+       case ROFFT_HEAD:
+               assert(n->parent->type == ROFFT_BLOCK);
+               n->parent->head = n;
+               break;
+       case ROFFT_BODY:
+               if (n->end)
+                       break;
+               assert(n->parent->type == ROFFT_BLOCK);
+               n->parent->body = n;
+               break;
+       case ROFFT_TAIL:
+               assert(n->parent->type == ROFFT_BLOCK);
+               n->parent->tail = n;
+               break;
+       default:
+               break;
+       }
+       man->last = n;
+}
+
+void
+roff_word_alloc(struct roff_man *man, int line, int pos, const char *word)
+{
+       struct roff_node        *n;
+
+       n = roff_node_alloc(man, line, pos, ROFFT_TEXT, TOKEN_NONE);
+       n->string = roff_strdup(man->roff, word);
+       roff_node_append(man, n);
+       if (man->macroset == MACROSET_MDOC)
+               mdoc_valid_post(man);
+       else
+               man_valid_post(man);
+       man->next = ROFF_NEXT_SIBLING;
+}
+
+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;

 }
 
 }
 

+void
+roff_elem_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;
+
+       n = roff_node_alloc(man, line, pos, ROFFT_ELEM, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+}
+
+struct roff_node *
+roff_block_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;
+
+       n = roff_node_alloc(man, line, pos, ROFFT_BLOCK, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+       return n;
+}
+
+struct roff_node *
+roff_head_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;
+
+       n = roff_node_alloc(man, line, pos, ROFFT_HEAD, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+       return n;
+}
+
+struct roff_node *
+roff_body_alloc(struct roff_man *man, int line, int pos, int tok)
+{
+       struct roff_node        *n;
+
+       n = roff_node_alloc(man, line, pos, ROFFT_BODY, tok);
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_CHILD;
+       return n;
+}
+
+void
+roff_addeqn(struct roff_man *man, const struct eqn *eqn)
+{
+       struct roff_node        *n;
+
+       n = roff_node_alloc(man, eqn->ln, eqn->pos, ROFFT_EQN, TOKEN_NONE);
+       n->eqn = eqn;
+       if (eqn->ln > man->last->line)
+               n->flags |= MDOC_LINE;
+       roff_node_append(man, n);
+       man->next = ROFF_NEXT_SIBLING;
+}
+
+void
+roff_addtbl(struct roff_man *man, const struct tbl_span *tbl)
+{
+       struct roff_node        *n;
+
+       if (man->macroset == MACROSET_MAN)
+               man_breakscope(man, TOKEN_NONE);
+       n = roff_node_alloc(man, tbl->line, 0, ROFFT_TBL, TOKEN_NONE);
+       n->span = tbl;
+       roff_node_append(man, n);
+       if (man->macroset == MACROSET_MDOC)
+               mdoc_valid_post(man);
+       else
+               man_valid_post(man);
+       man->next = ROFF_NEXT_SIBLING;
+}
+
+void
+roff_node_unlink(struct roff_man *man, struct roff_node *n)
+{
+
+       /* Adjust siblings. */
+
+       if (n->prev)
+               n->prev->next = n->next;
+       if (n->next)
+               n->next->prev = n->prev;
+
+       /* Adjust parent. */
+
+       if (n->parent != NULL) {
+               n->parent->nchild--;
+               if (n->parent->child == n)
+                       n->parent->child = n->next;
+               if (n->parent->last == n)
+                       n->parent->last = n->prev;
+       }
+
+       /* Adjust parse point. */
+
+       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->first == n)
+               man->first = NULL;
+}
+
+void
+roff_node_free(struct roff_node *n)
+{
+
+       if (n->args != NULL)
+               mdoc_argv_free(n->args);
+       if (n->type == ROFFT_BLOCK || n->type == ROFFT_ELEM)
+               free(n->norm);
+       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);
+       assert(n->nchild == 0);
+       roff_node_unlink(man, n);
+       roff_node_free(n);
+}
+
+void
+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;
+       }
+
+       /* Skip leading whitespace and escape sequences. */
+
+       cp = n->string;
+       while (*cp != '\0') {
+               if ('\\' == *cp) {
+                       cp++;
+                       mandoc_escape((const char **)&cp, NULL, NULL);
+               } else if (isspace((unsigned char)*cp))
+                       cp++;
+               else
+                       break;
+       }
+
+       /* Skip trailing whitespace. */
+
+       for (sz = strlen(cp); 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 ---------------------------------- */
+

 /*
  * In the current line, expand escape sequences that tend to get
  * used in numerical expressions and conditional requests.
  * Also check the syntax of the remaining escape sequences.
  */
 static enum rofferr
 /*
  * In the current line, expand escape sequences that tend to get
  * used in numerical expressions and conditional requests.
  * Also check the syntax of the remaining escape sequences.
  */
 static enum rofferr

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

 {
        char             ubuf[24]; /* buffer to print the number */
        const char      *start; /* start of the string to process */
 {
        char             ubuf[24]; /* buffer to print the number */
        const char      *start; /* start of the string to process */


@@ -495,31 +1295,33 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int ln, int pos)
        const char      *stnam; /* start of the name, after "[(*" */
        const char      *cp;    /* end of the name, e.g. before ']' */
        const char      *res;   /* the string to be substituted */
        const char      *stnam; /* start of the name, after "[(*" */
        const char      *cp;    /* end of the name, e.g. before ']' */
        const char      *res;   /* the string to be substituted */

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

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

+       enum mandoc_esc  esc;   /* type of the escape sequence */
+       int              inaml; /* length returned from mandoc_escape() */

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

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

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

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

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

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

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

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

                                break;
 
                                break;
 

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

                        stesc = (char *)cp;
                        continue;
                }
                        stesc = (char *)cp;
                        continue;
                }


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

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

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

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

                }
 
                /*
                }
 
                /*


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

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

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


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

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

                                break;
                        }
                                break;
                        }

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

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

+                       if (*cp++ != '\\' || stesc[1] != 'w') {
+                               naml++;
+                               continue;
+                       }
+                       switch (mandoc_escape(&cp, NULL, NULL)) {
+                       case ESCAPE_SPECIAL:
+                               /* FALLTHROUGH */
+                       case ESCAPE_UNICODE:
+                               /* FALLTHROUGH */
+                       case ESCAPE_NUMBERED:
+                               /* FALLTHROUGH */
+                       case ESCAPE_OVERSTRIKE:
+                               naml++;
+                               break;
+                       default:
+                               break;
+                       }

                }
 
                /*
                }
 
                /*


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

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

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

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

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

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

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

+                       /* use even incomplete args */

                        (void)snprintf(ubuf, sizeof(ubuf), "%d",
                            24 * (int)naml);
                        break;
                }
 
                        (void)snprintf(ubuf, sizeof(ubuf), "%d",
                            24 * (int)naml);
                        break;
                }
 

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

                        res = "";
                        res = "";

+               } else if (buf->sz + strlen(res) > SHRT_MAX) {
+                       mandoc_msg(MANDOCERR_ROFFLOOP, r->parse,
+                           ln, (int)(stesc - buf->buf), NULL);
+                       return ROFF_IGN;

                }
 
                /* Replace the escape sequence by the string. */
 
                *stesc = '\0';
                }
 
                /* Replace the escape sequence by the string. */
 
                *stesc = '\0';

-               *szp = mandoc_asprintf(&nbuf, "%s%s%s",
-                   *bufp, res, cp) + 1;
+               buf->sz = mandoc_asprintf(&nbuf, "%s%s%s",
+                   buf->buf, res, cp) + 1;

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

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

        }
        }

-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 /*
 }
 
 /*

- * Process text streams:
- * Convert all breakable hyphens into ASCII_HYPH.
- * Decrement and spring input line trap.
+ * Process text streams.

  */
 static enum rofferr
  */
 static enum rofferr

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

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


@@ -659,21 +1494,39 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
        int              isz;
        enum mandoc_esc  esc;
 
        int              isz;
        enum mandoc_esc  esc;
 

-       start = p = *bufp + pos;
+       /* Spring the input line trap. */

 
 

-       while ('\0' != *p) {
+       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;
+
+       /* Convert all breakable hyphens into ASCII_HYPH. */
+
+       start = p = buf->buf + pos;
+
+       while (*p != '\0') {

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

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

                        break;
 
                        break;
 

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

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

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

                                break;
                                break;

+                       while (*p == '-')
+                               p++;

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


@@ -685,66 +1538,72 @@ roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
                        *p = ASCII_HYPH;
                p++;
        }
                        *p = ASCII_HYPH;
                p++;
        }

-
-       /* Spring the input line trap. */
-       if (1 == roffit_lines) {
-               isz = mandoc_asprintf(&p, "%s\n.%s", *bufp, roffit_macro);
-               free(*bufp);
-               *bufp = p;
-               *szp = isz + 1;
-               *offs = 0;
-               free(roffit_macro);
-               roffit_lines = 0;
-               return(ROFF_REPARSE);
-       } else if (1 < roffit_lines)
-               --roffit_lines;
-       return(ROFF_CONT);
+       return ROFF_CONT;

 }
 
 enum rofferr
 }
 
 enum rofferr

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

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

-       int              ppos, ctl;
+       int              pos;   /* parse point */
+       int              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);
+       }

 
 

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

 
 

-       e = roff_res(r, bufp, szp, ln, pos);
-       if (ROFF_IGN == e)
-               return(e);
-       assert(ROFF_CONT == e);
+       e = roff_res(r, buf, ln, pos);
+       if (e == ROFF_IGN)
+               return e;
+       assert(e == ROFF_CONT);

 
 

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

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

-        * 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.
+        * 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 && ! ctl) {
+       if (r->last != NULL && ! ctl) {

                t = r->last->tok;
                assert(roffs[t].text);
                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, ppos, offs));
-       if ( ! ctl) {
-               if (r->tbl)
-                       return(tbl_read(r->tbl, ln, *bufp, pos));
-               return(roff_parsetext(bufp, szp, pos, offs));
+               e = (*roffs[t].text)(r, t, buf, ln, pos, pos, offs);
+               assert(e == ROFF_IGN || e == ROFF_CONT);
+               if (e != ROFF_CONT)
+                       return e;

        }
        }

+       if (r->eqn != NULL)
+               return eqn_read(&r->eqn, ln, buf->buf, ppos, offs);
+       if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0'))
+               return tbl_read(r->tbl, ln, buf->buf, ppos);
+       if ( ! ctl)
+               return roff_parsetext(buf, pos, offs);
+
+       /* Skip empty request lines. */
+
+       if (buf->buf[pos] == '"') {
+               mandoc_msg(MANDOCERR_COMMENT_BAD, r->parse,
+                   ln, pos, NULL);
+               return ROFF_IGN;
+       } else if (buf->buf[pos] == '\0')
+               return ROFF_IGN;

 
        /*
         * If a scope is open, go to the child handler for that macro,
 
        /*
         * If a scope is open, go to the child handler for that macro,


@@ -755,21 +1614,40 @@ roff_parseln(struct roff *r, int ln, char **bufp,
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);

-               return((*roffs[t].sub)(r, t, bufp, szp,
-                   ln, ppos, pos, offs));
+               return (*roffs[t].sub)(r, t, buf, ln, ppos, pos, offs);
+       }
+
+       /* 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 == ROFF_MAX || t == ROFF_TS)) {
+               mandoc_msg(MANDOCERR_TBLMACRO, r->parse,
+                   ln, pos, buf->buf + spos);
+               if (t == ROFF_TS)
+                       return ROFF_IGN;
+               while (buf->buf[pos] != '\0' && buf->buf[pos] != ' ')
+                       pos++;
+               while (buf->buf[pos] != '\0' && buf->buf[pos] == ' ')
+                       pos++;
+               return tbl_read(r->tbl, ln, buf->buf, pos);

        }
 
        /*
        }
 
        /*

-        * 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.
+        * This is neither a roff request nor a user-defined macro.
+        * Let the standard macro set parsers handle it.

         */
 
         */
 

-       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos, ln, ppos)))
-               return(ROFF_CONT);
+       if (t == ROFF_MAX)
+               return ROFF_CONT;
+
+       /* Execute a roff request or a user defined macro. */

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

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

 }
 
 void
 }
 
 void


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

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

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

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

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

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

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


@@ -808,7 +1687,7 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        cp = buf + *pos;
 
        if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)
        cp = buf + *pos;
 
        if ('\0' == *cp || '"' == *cp || '\t' == *cp || ' ' == *cp)

-               return(ROFF_MAX);
+               return ROFF_MAX;

 
        mac = cp;
        maclen = roff_getname(r, &cp, ln, ppos);
 
        mac = cp;
        maclen = roff_getname(r, &cp, ln, ppos);


@@ -819,9 +1698,11 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        if (ROFF_MAX != t)
                *pos = cp - buf;
 
        if (ROFF_MAX != t)
                *pos = cp - buf;
 

-       return(t);
+       return t;

 }
 
 }
 

+/* --- handling of request blocks ----------------------------------------- */
+

 static enum rofferr
 roff_cblock(ROFF_ARGS)
 {
 static enum rofferr
 roff_cblock(ROFF_ARGS)
 {


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

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

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

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

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

-       case ROFF_am1:
-               /* FALLTHROUGH */

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


@@ -851,17 +1732,18 @@ roff_cblock(ROFF_ARGS)
        case ROFF_ig:
                break;
        default:
        case ROFF_ig:
                break;
        default:

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

        }
 
        }
 

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

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

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

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

-       return(ROFF_IGN);
+       return ROFF_IGN;

 
 }
 
 
 }
 


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

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

                return;
        }
 
                return;
        }
 


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

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

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

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

                return;
        }
 
                return;
        }
 


@@ -910,34 +1795,51 @@ roff_ccond(struct roff *r, int ln, int ppos)
 static enum rofferr
 roff_block(ROFF_ARGS)
 {
 static enum rofferr
 roff_block(ROFF_ARGS)
 {

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

        size_t           namesz;
 
        size_t           namesz;
 

-       name = cp = *bufp + pos;
-       namesz = 0;
+       /* Ignore groff compatibility mode for now. */

 
 

-       if (ROFF_ig != tok) {
-               if ('\0' == *cp) {
-                       mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
-                           ln, ppos, roffs[tok].name);
-                       return(ROFF_IGN);
-               }
+       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;

 
 

-               /*
-                * Re-write `de1', since we don't really care about
-                * groff's strange compatibility mode, into `de'.
-                */
-
-               if (ROFF_de1 == tok)
-                       tok = ROFF_de;
-               else if (ROFF_de != tok)
-                       mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,
-                           roffs[tok].name);
+       /* 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);
                namesz = roff_getname(r, &cp, ln, ppos);

-               name[namesz] = '\0';
+               iname[namesz] = '\0';
+       }
+
+       /* Resolve the macro name argument if it is indirect. */
+
+       if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
+               if ((name = roff_getstrn(r, iname, namesz)) == NULL) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(iname - buf->buf),
+                           "%.*s", (int)namesz, iname);
+                       namesz = 0;
+               } else
+                       namesz = strlen(name);

        } else
        } else

-               name = NULL;
+               name = iname;
+
+       if (namesz == 0 && tok != ROFF_ig) {
+               mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse,
+                   ln, ppos, roffs[tok].name);
+               return ROFF_IGN;
+       }

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


@@ -947,24 +1849,38 @@ roff_block(ROFF_ARGS)
         * appended from roff_block_text() in multiline mode.
         */
 
         * appended from roff_block_text() in multiline mode.
         */
 

-       if (namesz && ROFF_de == tok)
+       if (tok == ROFF_de || tok == ROFF_dei)

                roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
 
                roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
 

-       if ('\0' == *cp)
-               return(ROFF_IGN);
+       if (*cp == '\0')
+               return ROFF_IGN;

 
 

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

 
 

-       name = cp;
+       iname = cp;

        namesz = roff_getname(r, &cp, ln, ppos);
        namesz = roff_getname(r, &cp, ln, ppos);

+
+       /* Resolve the end marker if it is indirect. */
+
+       if (namesz && (tok == ROFF_dei || tok == ROFF_ami)) {
+               if ((name = roff_getstrn(r, iname, namesz)) == NULL) {
+                       mandoc_vmsg(MANDOCERR_STR_UNDEF,
+                           r->parse, ln, (int)(iname - buf->buf),
+                           "%.*s", (int)namesz, iname);
+                       namesz = 0;
+               } else
+                       namesz = strlen(name);
+       } else
+               name = iname;
+

        if (namesz)
                r->last->end = mandoc_strndup(name, namesz);
 
        if (namesz)
                r->last->end = mandoc_strndup(name, namesz);
 

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

                mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
                    ln, pos, ".%s ... %s", roffs[tok].name, cp);
 
                mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
                    ln, pos, ".%s ... %s", roffs[tok].name, cp);
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -984,23 +1900,24 @@ roff_block_sub(ROFF_ARGS)
 
        if (r->last->end) {
                for (i = pos, j = 0; r->last->end[j]; j++, i++)
 
        if (r->last->end) {
                for (i = pos, j = 0; r->last->end[j]; j++, i++)

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

                                break;
 
                                break;
 

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

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

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

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

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

                }
        }
 
                }
        }
 


@@ -1009,30 +1926,26 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
         * pulling it out of the hashtable.
         */
 

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

 
 

-       /*
-        * Macros other than block-end are only significant
-        * in `de' blocks; elsewhere, simply throw them away.
-        */
-       if (ROFF_cblock != t) {
-               if (ROFF_de == tok)
-                       roff_setstr(r, r->last->name, *bufp + ppos, 2);
-               return(ROFF_IGN);
+       if (t != ROFF_cblock) {
+               if (tok != ROFF_ig)
+                       roff_setstr(r, r->last->name, buf->buf + ppos, 2);
+               return ROFF_IGN;

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

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

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

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

 
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


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

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

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

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

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

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

        }
 
        /*
        }
 
        /*


@@ -1063,20 +1975,21 @@ roff_cond_sub(ROFF_ARGS)
         * drop the line completely.
         */
 
         * drop the line completely.
         */
 

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

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

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

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

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

                }
                }

-               ++ep;
+               if (*ep != '\0')
+                       ++ep;

        }
        }

-       return(rr ? ROFF_CONT : ROFF_IGN);
+       return rr ? ROFF_CONT : ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1088,17 +2001,20 @@ roff_cond_text(ROFF_ARGS)
        rr = r->last->rule;
        roffnode_cleanscope(r);
 
        rr = r->last->rule;
        roffnode_cleanscope(r);
 

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

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

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

                }
                }

-               ++ep;
+               if (*ep != '\0')
+                       ++ep;

        }
        }

-       return(rr ? ROFF_CONT : ROFF_IGN);
+       return rr ? ROFF_CONT : ROFF_IGN;

 }
 
 }
 

+/* --- 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 a single signed integer number.  Stop at the first non-digit.
  * If there is at least one digit, return success and advance the


@@ -1106,18 +2022,22 @@ roff_cond_text(ROFF_ARGS)
  * Ignore overflows, treat them just like the C language.
  */
 static int
  * Ignore overflows, treat them just like the C language.
  */
 static int

-roff_getnum(const char *v, int *pos, int *res)
+roff_getnum(const char *v, int *pos, int *res, int flags)

 {
 {

-       int      myres, n, p;
+       int      myres, scaled, n, p;

 
        if (NULL == res)
                res = &myres;
 
        p = *pos;
        n = v[p] == '-';
 
        if (NULL == res)
                res = &myres;
 
        p = *pos;
        n = v[p] == '-';

-       if (n)
+       if (n || v[p] == '+')

                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)
        for (*res = 0; isdigit((unsigned char)v[p]); p++)
                *res = 10 * *res + v[p] - '0';
        if (p == *pos + n)


@@ -1126,7 +2046,46 @@ roff_getnum(const char *v, int *pos, int *res)
        if (n)
                *res = -*res;
 
        if (n)
                *res = -*res;
 

-       *pos = p;
+       /* 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':
+               /* FALLTHROUGH */
+       case 'P':
+               scaled = *res * 40;
+               break;
+       case 'm':
+               /* FALLTHROUGH */
+       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;
 }
 
        return 1;
 }
 


@@ -1167,10 +2126,10 @@ roff_evalstrcond(const char *v, int *pos)
 out:
        if (NULL == s3)
                s3 = strchr(s2, '\0');
 out:
        if (NULL == s3)
                s3 = strchr(s2, '\0');

-       else
+       else if (*s3 != '\0')

                s3++;
        *pos = s3 - v;
                s3++;
        *pos = s3 - v;

-       return(match);
+       return match;

 }
 
 /*
 }
 
 /*


@@ -1178,9 +2137,11 @@ out:
  * or string condition.
  */
 static int
  * or string condition.
  */
 static int

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

 {
 {

-       int      wanttrue, number;
+       char    *cp, *name;
+       size_t   sz;
+       int      number, savepos, wanttrue;

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


@@ -1189,37 +2150,65 @@ roff_evalcond(const char *v, int *pos)
                wanttrue = 1;
 
        switch (v[*pos]) {
                wanttrue = 1;
 
        switch (v[*pos]) {

+       case '\0':
+               return 0;

        case 'n':
                /* FALLTHROUGH */
        case 'o':
                (*pos)++;
        case 'n':
                /* FALLTHROUGH */
        case 'o':
                (*pos)++;

-               return(wanttrue);
+               return wanttrue;

        case 'c':
                /* FALLTHROUGH */
        case 'd':
                /* FALLTHROUGH */
        case 'e':
                /* FALLTHROUGH */
        case 'c':
                /* FALLTHROUGH */
        case 'd':
                /* FALLTHROUGH */
        case 'e':
                /* FALLTHROUGH */

-       case 'r':
-               /* FALLTHROUGH */

        case 't':
        case 't':

+               /* FALLTHROUGH */
+       case 'v':

                (*pos)++;
                (*pos)++;

-               return(!wanttrue);
+               return !wanttrue;
+       case 'r':
+               cp = name = v + ++*pos;
+               sz = roff_getname(r, &cp, ln, *pos);
+               *pos = cp - v;
+               return (sz && roff_hasregn(r, name, sz)) == wanttrue;

        default:
                break;
        }
 
        default:
                break;
        }
 

-       if (roff_evalnum(v, pos, &number, 0))
-               return((number > 0) == wanttrue);
+       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
        else

-               return(roff_evalstrcond(v, pos) == wanttrue);
+               return 0;

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

-       return(ROFF_IGN);
+       return ROFF_IGN;
+}
+
+static enum rofferr
+roff_insec(ROFF_ARGS)
+{
+
+       mandoc_msg(MANDOCERR_REQ_INSEC, r->parse,
+           ln, ppos, roffs[tok].name);
+       return ROFF_IGN;
+}
+
+static enum rofferr
+roff_unsupp(ROFF_ARGS)
+{
+
+       mandoc_msg(MANDOCERR_REQ_UNSUPP, r->parse,
+           ln, ppos, roffs[tok].name);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


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

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

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

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

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

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

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


@@ -1265,19 +2254,21 @@ roff_cond(ROFF_ARGS)
         * not even whitespace, use next-line scope.
         */
 
         * not even whitespace, use next-line scope.
         */
 

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

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

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

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

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

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

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

                goto out;
        }
 
                goto out;
        }
 


@@ -1287,7 +2278,7 @@ roff_cond(ROFF_ARGS)
         * nothing but trailing whitespace.
         */
 
         * nothing but trailing whitespace.
         */
 

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

                mandoc_msg(MANDOCERR_COND_EMPTY, r->parse,
                    ln, ppos, roffs[tok].name);
 
                mandoc_msg(MANDOCERR_COND_EMPTY, r->parse,
                    ln, ppos, roffs[tok].name);
 


@@ -1295,7 +2286,7 @@ roff_cond(ROFF_ARGS)
 
 out:
        *offs = pos;
 
 out:
        *offs = pos;

-       return(ROFF_RERUN);
+       return ROFF_RERUN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1305,28 +2296,35 @@ roff_ds(ROFF_ARGS)
        const char      *name;
        size_t           namesz;
 
        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;
+

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

-       name = string = *bufp + pos;
-       if ('\0' == *name)
-               return(ROFF_IGN);
+       name = string = buf->buf + pos;
+       if (*name == '\0')
+               return ROFF_IGN;

 
        namesz = roff_getname(r, &string, ln, pos);
 
        namesz = roff_getname(r, &string, ln, pos);

-       if ('\\' == name[namesz])
-               return(ROFF_IGN);
+       if (name[namesz] == '\\')
+               return ROFF_IGN;

 
        /* Read past the initial double-quote, if any. */
 
        /* Read past the initial double-quote, if any. */

-       if ('"' == *string)
+       if (*string == '"')

                string++;
 
        /* The rest is the value. */
        roff_setstrn(&r->strtab, name, namesz, string, strlen(string),
            ROFF_as == tok);
                string++;
 
        /* The rest is the value. */
        roff_setstrn(&r->strtab, name, namesz, string, strlen(string),
            ROFF_as == tok);

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 /*
 }
 
 /*


@@ -1392,11 +2390,11 @@ roff_getop(const char *v, int *pos, char *res)
                        (*pos)++;
                break;
        default:
                        (*pos)++;
                break;
        default:

-               return(0);
+               return 0;

        }
        (*pos)++;
 
        }
        (*pos)++;
 

-       return(*res);
+       return *res;

 }
 
 /*
 }
 
 /*


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

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

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

-               return(roff_getnum(v, pos, res));
+               return roff_getnum(v, pos, res, flags);

 
        (*pos)++;
 
        (*pos)++;

-       if ( ! roff_evalnum(v, pos, res, 1))
-               return(0);
+       if ( ! roff_evalnum(r, ln, v, pos, res, flags | ROFFNUM_WHITE))
+               return 0;

 
        /*
         * Omission of the closing parenthesis
 
        /*
         * Omission of the closing parenthesis


@@ -1423,9 +2422,9 @@ roff_evalpar(const char *v, int *pos, int *res)
        if (')' == v[*pos])
                (*pos)++;
        else if (NULL == res)
        if (')' == v[*pos])
                (*pos)++;
        else if (NULL == res)

-               return(0);
+               return 0;

 
 

-       return(1);
+       return 1;

 }
 
 /*
 }
 
 /*


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

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

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


@@ -1443,29 +2443,29 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                pos = &mypos;
        }
 
                pos = &mypos;
        }
 

-       if (skipwhite)
+       if (flags & ROFFNUM_WHITE)

                while (isspace((unsigned char)v[*pos]))
                        (*pos)++;
 
                while (isspace((unsigned char)v[*pos]))
                        (*pos)++;
 

-       if ( ! roff_evalpar(v, pos, res))
-               return(0);
+       if ( ! roff_evalpar(r, ln, v, pos, res, flags))
+               return 0;

 
        while (1) {
 
        while (1) {

-               if (skipwhite)
+               if (flags & ROFFNUM_WHITE)

                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 
                if ( ! roff_getop(v, pos, &operator))
                        break;
 
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 
                if ( ! roff_getop(v, pos, &operator))
                        break;
 

-               if (skipwhite)
+               if (flags & ROFFNUM_WHITE)

                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 

-               if ( ! roff_evalpar(v, pos, &operand2))
-                       return(0);
+               if ( ! roff_evalpar(r, ln, v, pos, &operand2, flags))
+                       return 0;

 
 

-               if (skipwhite)
+               if (flags & ROFFNUM_WHITE)

                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 
                        while (isspace((unsigned char)v[*pos]))
                                (*pos)++;
 


@@ -1483,9 +2483,21 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                        *res *= operand2;
                        break;
                case '/':
                        *res *= operand2;
                        break;
                case '/':

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

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

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

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


@@ -1524,9 +2536,11 @@ roff_evalnum(const char *v, int *pos, int *res, int skipwhite)
                        abort();
                }
        }
                        abort();
                }
        }

-       return(1);
+       return 1;

 }
 
 }
 

+/* --- register management ------------------------------------------------ */
+

 void
 roff_setreg(struct roff *r, const char *name, int val, char sign)
 {
 void
 roff_setreg(struct roff *r, const char *name, int val, char sign)
 {


@@ -1563,24 +2577,26 @@ roff_setreg(struct roff *r, const char *name, int val, char sign)
  * were to turn up, another special value would have to be chosen.
  */
 static int
  * were to turn up, another special value would have to be chosen.
  */
 static int

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

 {
 
        switch (*name) {
 {
 
        switch (*name) {

+       case '$':  /* Number of arguments of the last macro evaluated. */
+               return r->argc;

        case 'A':  /* ASCII approximation mode is always off. */
        case 'A':  /* ASCII approximation mode is always off. */

-               return(0);
+               return 0;

        case 'g':  /* Groff compatibility mode is always on. */
        case 'g':  /* Groff compatibility mode is always on. */

-               return(1);
+               return 1;

        case 'H':  /* Fixed horizontal resolution. */
        case 'H':  /* Fixed horizontal resolution. */

-               return (24);
+               return 24;

        case 'j':  /* Always adjust left margin only. */
        case 'j':  /* Always adjust left margin only. */

-               return(0);
+               return 0;

        case 'T':  /* Some output device is always defined. */
        case 'T':  /* Some output device is always defined. */

-               return(1);
+               return 1;

        case 'V':  /* Fixed vertical resolution. */
        case 'V':  /* Fixed vertical resolution. */

-               return (40);
+               return 40;

        default:
        default:

-               return (-1);
+               return -1;

        }
 }
 
        }
 }
 


@@ -1591,16 +2607,16 @@ roff_getreg(const struct roff *r, const char *name)
        int              val;
 
        if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {
        int              val;
 
        if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {

-               val = roff_getregro(name + 1);
+               val = roff_getregro(r, name + 1);

                if (-1 != val)
                if (-1 != val)

-                       return (val);
+                       return val;

        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (0 == strcmp(name, reg->key.p))
        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (0 == strcmp(name, reg->key.p))

-                       return(reg->val);
+                       return reg->val;

 
 

-       return(0);
+       return 0;

 }
 
 static int
 }
 
 static int


@@ -1610,17 +2626,37 @@ roff_getregn(const struct roff *r, const char *name, size_t len)
        int              val;
 
        if ('.' == name[0] && 2 == len) {
        int              val;
 
        if ('.' == name[0] && 2 == len) {

-               val = roff_getregro(name + 1);
+               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))
+                       return reg->val;
+
+       return 0;
+}
+
+static int
+roff_hasregn(const struct roff *r, const char *name, size_t len)
+{
+       struct roffreg  *reg;
+       int              val;
+
+       if ('.' == name[0] && 2 == len) {
+               val = roff_getregro(r, name + 1);

                if (-1 != val)
                if (-1 != val)

-                       return (val);
+                       return 1;

        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (len == reg->key.sz &&
                    0 == strncmp(name, reg->key.p, len))
        }
 
        for (reg = r->regtab; reg; reg = reg->next)
                if (len == reg->key.sz &&
                    0 == strncmp(name, reg->key.p, len))

-                       return(reg->val);
+                       return 1;

 
 

-       return(0);
+       return 0;

 }
 
 static void
 }
 
 static void


@@ -1644,23 +2680,23 @@ roff_nr(ROFF_ARGS)
        int              iv;
        char             sign;
 
        int              iv;
        char             sign;
 

-       key = val = *bufp + pos;
-       if ('\0' == *key)
-               return(ROFF_IGN);
+       key = val = buf->buf + pos;
+       if (*key == '\0')
+               return ROFF_IGN;

 
        keysz = roff_getname(r, &val, ln, pos);
 
        keysz = roff_getname(r, &val, ln, pos);

-       if ('\\' == key[keysz])
-               return(ROFF_IGN);
+       if (key[keysz] == '\\')
+               return ROFF_IGN;

        key[keysz] = '\0';
 
        sign = *val;
        key[keysz] = '\0';
 
        sign = *val;

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

                val++;
 
                val++;
 

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

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

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1670,27 +2706,29 @@ roff_rr(ROFF_ARGS)
        char            *name, *cp;
        size_t           namesz;
 
        char            *name, *cp;
        size_t           namesz;
 

-       name = cp = *bufp + pos;
-       if ('\0' == *name)
-               return(ROFF_IGN);
+       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;
        namesz = roff_getname(r, &cp, ln, pos);
        name[namesz] = '\0';
 
        prev = &r->regtab;
        while (1) {
                reg = *prev;

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

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

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

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

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 }
 

+/* --- handler functions for roff requests -------------------------------- */
+

 static enum rofferr
 roff_rm(ROFF_ARGS)
 {
 static enum rofferr
 roff_rm(ROFF_ARGS)
 {


@@ -1698,39 +2736,44 @@ roff_rm(ROFF_ARGS)
        char             *cp;
        size_t            namesz;
 
        char             *cp;
        size_t            namesz;
 

-       cp = *bufp + pos;
-       while ('\0' != *cp) {
+       cp = buf->buf + pos;
+       while (*cp != '\0') {

                name = cp;
                name = cp;

-               namesz = roff_getname(r, &cp, ln, (int)(cp - *bufp));
+               namesz = roff_getname(r, &cp, ln, (int)(cp - buf->buf));

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

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

                        break;
        }
                        break;
        }

-       return(ROFF_IGN);
+       return ROFF_IGN;

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

-       char            *cp;
-       size_t           len;

        int              iv;
 
        /* Parse the number of lines. */
        int              iv;
 
        /* Parse the number of lines. */

-       cp = *bufp + pos;
-       len = strcspn(cp, " \t");
-       cp[len] = '\0';
-       if ((iv = mandoc_strntoi(cp, len, 10)) <= 0) {
-               mandoc_msg(MANDOCERR_NUMERIC, r->parse,
-                   ln, ppos, *bufp + 1);
-               return(ROFF_IGN);
+
+       if ( ! roff_evalnum(r, ln, buf->buf, &pos, &iv, 0)) {
+               mandoc_msg(MANDOCERR_IT_NONUM, r->parse,
+                   ln, ppos, buf->buf + 1);
+               return ROFF_IGN;

        }
        }

-       cp += len + 1;

 
 

-       /* Arm the input line trap. */
+       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_lines = iv;

-       roffit_macro = mandoc_strdup(cp);
-       return(ROFF_IGN);
+       roffit_macro = mandoc_strdup(iv != 1 ||
+           strcmp(buf->buf + pos, "an-trap") ?
+           buf->buf + pos : "br");
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1738,11 +2781,14 @@ roff_Dd(ROFF_ARGS)
 {
        const char *const       *cp;
 
 {
        const char *const       *cp;
 

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

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

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

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1750,11 +2796,14 @@ roff_TH(ROFF_ARGS)
 {
        const char *const       *cp;
 
 {
        const char *const       *cp;
 

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

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

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

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1762,11 +2811,15 @@ roff_TE(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

-               mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
-       else
-               tbl_end(&r->tbl);
-
-       return(ROFF_IGN);
+               mandoc_msg(MANDOCERR_BLK_NOTOPEN, r->parse,
+                   ln, ppos, "TE");
+       else if ( ! tbl_end(&r->tbl)) {
+               free(buf->buf);
+               buf->buf = mandoc_strdup(".sp");
+               buf->sz = 4;
+               return ROFF_REPARSE;
+       }
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1774,59 +2827,111 @@ roff_T_(ROFF_ARGS)
 {
 
        if (NULL == r->tbl)
 {
 
        if (NULL == r->tbl)

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

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

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 }
 

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

 {
 {

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-       r->eqn = r->last_eqn = e;
+       if (*buf->buf != '\0') {
+               if (r->eqn == NULL)
+                       bef_pr = "\\&";
+               bef_nl = "\n";
+       }
+
+       /*
+        * Prepare replacing the delimiter with an equation macro
+        * and drop leading white space from the equation.
+        */
+
+       if (r->eqn == NULL) {
+               while (*cp2 == ' ')
+                       cp2++;
+               mac = ".EQ";
+       } else
+               mac = ".EN";

 
 

-       if (buf) {
-               poff = 0;
-               eqn_read(&r->eqn, line, buf, offs, &poff);
+       /* Handle following text, protecting whitespace. */
+
+       if (*cp2 != '\0') {
+               aft_nl = "\n";
+               if (r->eqn != NULL)
+                       aft_pr = "\\&";

        }
        }

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

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

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

 
 

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

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

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

 }
 
 static enum rofferr
 }
 
 static enum rofferr


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

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

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


@@ -1847,7 +2953,15 @@ roff_TS(ROFF_ARGS)
                r->first_tbl = r->last_tbl = tbl;
 
        r->tbl = r->last_tbl = tbl;
                r->first_tbl = r->last_tbl = tbl;
 
        r->tbl = r->last_tbl = tbl;

-       return(ROFF_IGN);
+       return ROFF_IGN;
+}
+
+static enum rofferr
+roff_brp(ROFF_ARGS)
+{
+
+       buf->buf[pos - 1] = '\0';
+       return ROFF_CONT;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


@@ -1855,15 +2969,16 @@ roff_cc(ROFF_ARGS)
 {
        const char      *p;
 
 {
        const char      *p;
 

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

 
 

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

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

-       if ('\0' != *p)
-               mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
+       if (*p != '\0')
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS, r->parse,
+                   ln, p - buf->buf, "cc ... %s", p);

 
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

 }
 
 static enum rofferr
 }
 
 static enum rofferr


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

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

 
 

-       if ('\0' == *p) {
-               mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
+       if (*p == '\0') {
+               mandoc_msg(MANDOCERR_REQ_EMPTY, r->parse, 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, r->parse,
+                                   ln, (int)(p - buf->buf), 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, r->parse,
+                                   ln, (int)(p - buf->buf), 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_vmsg(MANDOCERR_TR_ODD, r->parse,
+                           ln, first - buf->buf, "tr %s", first);

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


@@ -1918,7 +3031,7 @@ roff_tr(ROFF_ARGS)
                        continue;
                }
 
                        continue;
                }
 

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

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


@@ -1927,16 +3040,16 @@ roff_tr(ROFF_ARGS)
                r->xtab[(int)*first].sz = ssz;
        }
 
                r->xtab[(int)*first].sz = ssz;
        }
 

-       return(ROFF_IGN);
+       return ROFF_IGN;

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

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

 
 

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

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


@@ -1945,63 +3058,148 @@ roff_so(ROFF_ARGS)
         * or using absolute paths.
         */
 
         * or using absolute paths.
         */
 

-       if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
+       if (*name == '/' || strstr(name, "../") || strstr(name, "/..")) {

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

-               return(ROFF_ERR);
+               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;

 }
 
 }
 

+/* --- user defined strings and macros ------------------------------------ */
+

 static enum rofferr
 roff_userdef(ROFF_ARGS)
 {
 static enum rofferr
 roff_userdef(ROFF_ARGS)
 {

-       const char       *arg[9];
+       const char       *arg[9], *ap;

        char             *cp, *n1, *n2;
        char             *cp, *n1, *n2;

-       int               i;
+       int               i, ib, ie;
+       size_t            asz, rsz;

 
        /*
         * Collect pointers to macro argument strings
         * and NUL-terminate them.
         */
 
        /*
         * Collect pointers to macro argument strings
         * and NUL-terminate them.
         */

-       cp = *bufp + pos;
-       for (i = 0; i < 9; i++)
-               arg[i] = '\0' == *cp ? "" :
-                   mandoc_getarg(r->parse, &cp, ln, &pos);
+
+       r->argc = 0;
+       cp = buf->buf + pos;
+       for (i = 0; i < 9; i++) {
+               if (*cp == '\0')
+                       arg[i] = "";
+               else {
+                       arg[i] = mandoc_getarg(r->parse, &cp, ln, &pos);
+                       r->argc = i + 1;
+               }
+       }

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

-       *szp = 0;
-       n1 = cp = mandoc_strdup(r->current_string);
-       while (NULL != (cp = strstr(cp, "\\$"))) {
-               i = cp[2] - '1';
-               if (0 > i || 8 < i) {
-                       /* Not an argument invocation. */
-                       cp += 2;
+
+       buf->sz = strlen(r->current_string) + 1;
+       n1 = cp = mandoc_malloc(buf->sz);
+       memcpy(n1, r->current_string, buf->sz);
+       while (*cp != '\0') {
+
+               /* Scan ahead for the next argument invocation. */
+
+               if (*cp++ != '\\')
+                       continue;
+               if (*cp++ != '$')

                        continue;
                        continue;

+               if (*cp == '*') {  /* \\$* inserts all arguments */
+                       ib = 0;
+                       ie = r->argc - 1;
+               } else {  /* \\$1 .. \\$9 insert one argument */
+                       ib = ie = *cp - '1';
+                       if (ib < 0 || ib > 8)
+                               continue;
+               }
+               cp -= 2;
+
+               /*
+                * Determine the size of the expanded argument,
+                * taking escaping of quotes into account.
+                */
+
+               asz = ie > ib ? ie - ib : 0;  /* for blanks */
+               for (i = ib; i <= ie; i++) {
+                       for (ap = arg[i]; *ap != '\0'; ap++) {
+                               asz++;
+                               if (*ap == '"')
+                                       asz += 3;
+                       }
+               }
+               if (asz != 3) {
+
+                       /*
+                        * Determine the size of the rest of the
+                        * unexpanded macro, including the NUL.
+                        */
+
+                       rsz = buf->sz - (cp - n1) - 3;
+
+                       /*
+                        * When shrinking, move before
+                        * releasing the storage.
+                        */
+
+                       if (asz < 3)
+                               memmove(cp + asz, cp + 3, rsz);
+
+                       /*
+                        * Resize the storage for the macro
+                        * and readjust the parse pointer.
+                        */
+
+                       buf->sz += asz - 3;
+                       n2 = mandoc_realloc(n1, buf->sz);
+                       cp = n2 + (cp - n1);
+                       n1 = n2;
+
+                       /*
+                        * When growing, make room
+                        * for the expanded argument.
+                        */
+
+                       if (asz > 3)
+                               memmove(cp + asz, cp + 3, rsz);
+               }
+
+               /* Copy the expanded argument, escaping quotes. */
+
+               n2 = cp;
+               for (i = ib; i <= ie; i++) {
+                       for (ap = arg[i]; *ap != '\0'; ap++) {
+                               if (*ap == '"') {
+                                       memcpy(n2, "\\(dq", 4);
+                                       n2 += 4;
+                               } else
+                                       *n2++ = *ap;
+                       }
+                       if (i < ie)
+                               *n2++ = ' ';

                }
                }

-               *cp = '\0';
-               *szp = mandoc_asprintf(&n2, "%s%s%s",
-                   n1, arg[i], cp + 3) + 1;
-               cp = n2 + (cp - n1);
-               free(n1);
-               n1 = n2;

        }
 
        /*
         * Replace the macro invocation
         * by the expanded macro.
         */
        }
 
        /*
         * Replace the macro invocation
         * by the expanded macro.
         */

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

 
 

-       return(*szp > 1 && '\n' == (*bufp)[(int)*szp - 2] ?
-          ROFF_REPARSE : ROFF_APPEND);
+       free(buf->buf);
+       buf->buf = n1;
+       *offs = 0;
+
+       return buf->sz > 1 && buf->buf[buf->sz - 2] == '\n' ?
+          ROFF_REPARSE : ROFF_APPEND;

 }
 
 static size_t
 }
 
 static size_t


@@ -2012,7 +3210,7 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
 
        name = *cpp;
        if ('\0' == *name)
 
        name = *cpp;
        if ('\0' == *name)

-               return(0);
+               return 0;

 
        /* Read until end of name and terminate it with NUL. */
        for (cp = name; 1; cp++) {
 
        /* Read until end of name and terminate it with NUL. */
        for (cp = name; 1; cp++) {


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

-               mandoc_msg(MANDOCERR_NAMESC, r->parse, ln, pos, NULL);
+               mandoc_vmsg(MANDOCERR_NAMESC, r->parse, ln, pos,
+                   "%.*s", (int)(cp - name + 1), name);

                mandoc_escape((const char **)&cp, NULL, NULL);
                break;
        }
                mandoc_escape((const char **)&cp, NULL, NULL);
                break;
        }


@@ -2038,7 +3237,7 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
                cp++;
 
        *cpp = cp;
                cp++;
 
        *cpp = cp;

-       return(namesz);
+       return namesz;

 }
 
 /*
 }
 
 /*


@@ -2138,14 +3337,14 @@ roff_getstrn(const struct roff *r, const char *name, size_t len)
        for (n = r->strtab; n; n = n->next)
                if (0 == strncmp(name, n->key.p, len) &&
                    '\0' == n->key.p[(int)len])
        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);
+                       return n->val.p;

 
        for (i = 0; i < PREDEFS_MAX; i++)
                if (0 == strncmp(name, predefs[i].name, len) &&
                                '\0' == predefs[i].name[(int)len])
 
        for (i = 0; i < PREDEFS_MAX; i++)
                if (0 == strncmp(name, predefs[i].name, len) &&
                                '\0' == predefs[i].name[(int)len])

-                       return(predefs[i].str);
+                       return predefs[i].str;

 
 

-       return(NULL);
+       return NULL;

 }
 
 static void
 }
 
 static void


@@ -2161,18 +3360,20 @@ roff_freestr(struct roffkv *r)
        }
 }
 
        }
 }
 

+/* --- accessors and utility functions ------------------------------------ */
+

 const struct tbl_span *
 roff_span(const struct roff *r)
 {
 
 const struct tbl_span *
 roff_span(const struct roff *r)
 {
 

-       return(r->tbl ? tbl_span(r->tbl) : NULL);
+       return r->tbl ? tbl_span(r->tbl) : NULL;

 }
 
 const struct eqn *
 roff_eqn(const struct roff *r)
 {
 
 }
 
 const struct eqn *
 roff_eqn(const struct roff *r)
 {
 

-       return(r->last_eqn ? &r->last_eqn->eqn : NULL);
+       return r->last_eqn ? &r->last_eqn->eqn : NULL;

 }
 
 /*
 }
 
 /*


@@ -2190,9 +3391,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


@@ -2264,7 +3465,14 @@ 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;

 }
 
 /*
 }
 
 /*


@@ -2287,17 +3495,17 @@ roff_getcontrol(const struct roff *r, const char *cp, int *ppos)
        if (0 != r->control && cp[pos] == r->control)
                pos++;
        else if (0 != r->control)
        if (0 != r->control && cp[pos] == r->control)
                pos++;
        else if (0 != r->control)

-               return(0);
+               return 0;

        else if ('\\' == cp[pos] && '.' == cp[pos + 1])
                pos += 2;
        else if ('.' == cp[pos] || '\'' == cp[pos])
                pos++;
        else
        else if ('\\' == cp[pos] && '.' == cp[pos + 1])
                pos += 2;
        else if ('.' == cp[pos] || '\'' == cp[pos])
                pos++;
        else

-               return(0);
+               return 0;

 
        while (' ' == cp[pos] || '\t' == cp[pos])
                pos++;
 
        *ppos = pos;
 
        while (' ' == cp[pos] || '\t' == cp[pos])
                pos++;
 
        *ppos = pos;

-       return(1);
+       return 1;

 }
 }