Three bugfixes related to the closing of conditional blocks:

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index a9dbce22a58db061900e7d4a6c9778e45880463d..0772d8ab9d28287cea7652ed40d8fbd7cfc4cda8 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.141 2011/05/24 21:18:06 kristaps Exp $ */
+/*     $Id: roff.c,v 1.195 2014/03/07 02:22:05 schwarze Exp $ */

 /*
 /*

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


@@ -21,6 +21,7 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

+#include <stdio.h>

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


@@ -31,16 +32,24 @@
 /* Maximum number of nested if-else conditionals. */
 #define        RSTACK_MAX      128
 
 /* Maximum number of nested if-else conditionals. */
 #define        RSTACK_MAX      128
 

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

 enum   rofft {
        ROFF_ad,
        ROFF_am,
        ROFF_ami,
        ROFF_am1,
 enum   rofft {
        ROFF_ad,
        ROFF_am,
        ROFF_ami,
        ROFF_am1,

+       ROFF_as,
+       ROFF_cc,
+       ROFF_ce,

        ROFF_de,
        ROFF_dei,
        ROFF_de1,
        ROFF_ds,
        ROFF_el,
        ROFF_de,
        ROFF_dei,
        ROFF_de1,
        ROFF_ds,
        ROFF_el,

+       ROFF_fam,
+       ROFF_hw,

        ROFF_hy,
        ROFF_ie,
        ROFF_if,
        ROFF_hy,
        ROFF_ie,
        ROFF_if,


@@ -55,35 +64,61 @@ enum        rofft {
        ROFF_so,
        ROFF_ta,
        ROFF_tr,
        ROFF_so,
        ROFF_ta,
        ROFF_tr,

+       ROFF_Dd,
+       ROFF_TH,

        ROFF_TS,
        ROFF_TE,
        ROFF_T_,
        ROFF_EQ,
        ROFF_EN,
        ROFF_cblock,
        ROFF_TS,
        ROFF_TE,
        ROFF_T_,
        ROFF_EQ,
        ROFF_EN,
        ROFF_cblock,

-       ROFF_ccond,

        ROFF_USERDEF,
        ROFF_MAX
 };
 
 enum   roffrule {
        ROFF_USERDEF,
        ROFF_MAX
 };
 
 enum   roffrule {

-       ROFFRULE_ALLOW,
-       ROFFRULE_DENY
+       ROFFRULE_DENY,
+       ROFFRULE_ALLOW

 };
 
 };
 

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

 struct roffstr {
 struct roffstr {

-       char            *name; /* key of symbol */
-       char            *string; /* current value */
-       struct roffstr  *next; /* next in list */
+       char            *p; /* nil-terminated buffer */
+       size_t           sz; /* saved strlen(p) */
+};
+
+/*
+ * A key-value roffstr pair as part of a singly-linked list.
+ */
+struct roffkv {
+       struct roffstr   key;
+       struct roffstr   val;
+       struct roffkv   *next; /* next in list */
+};
+
+/*
+ * A single number register as part of a singly-linked list.
+ */
+struct roffreg {
+       struct roffstr   key;
+       int              val;
+       struct roffreg  *next;

 };
 
 struct roff {
 };
 
 struct roff {

+       enum mparset     parsetype; /* requested parse type */

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

+       int              quick; /* skip standard macro deletion */

        struct roffnode *last; /* leaf of stack */
        enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */
        struct roffnode *last; /* leaf of stack */
        enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */

+       char             control; /* control character */

        int              rstackpos; /* position in rstack */
        int              rstackpos; /* position in rstack */

-       struct regset   *regs; /* read/writable registers */
-       struct roffstr  *first_string; /* user-defined strings & macros */
+       struct roffreg  *regtab; /* number registers */
+       struct roffkv   *strtab; /* user-defined strings & macros */
+       struct roffkv   *xmbtab; /* multi-byte trans table (`tr') */
+       struct roffstr  *xtab; /* single-byte trans table (`tr') */

        const char      *current_string; /* value of last called user macro */
        struct tbl_node *first_tbl; /* first table parsed */
        struct tbl_node *last_tbl; /* last table parsed */
        const char      *current_string; /* value of last called user macro */
        struct tbl_node *first_tbl; /* first table parsed */
        struct tbl_node *last_tbl; /* last table parsed */


@@ -133,28 +168,52 @@ struct    predef {
 #define        PREDEF(__name, __str) \
        { (__name), (__str) },
 
 #define        PREDEF(__name, __str) \
        { (__name), (__str) },
 

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

 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_block_sub(ROFF_ARGS);
 static enum rofferr     roff_cblock(ROFF_ARGS);
 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_block_sub(ROFF_ARGS);
 static enum rofferr     roff_cblock(ROFF_ARGS);

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

 static enum rofferr     roff_cond(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum roffrule    roff_evalcond(const char *, int *);
 static enum rofferr     roff_cond(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_ds(ROFF_ARGS);
 static enum roffrule    roff_evalcond(const char *, int *);

-static void             roff_freestr(struct roff *);
+static void             roff_free1(struct roff *);
+static void             roff_freereg(struct roffreg *);
+static void             roff_freestr(struct roffkv *);

 static char            *roff_getname(struct roff *, char **, int, int);
 static char            *roff_getname(struct roff *, char **, int, int);

+static int              roff_getnum(const char *, int *, int *);
+static int              roff_getop(const char *, int *, char *);
+static int              roff_getregn(const struct roff *,
+                               const char *, size_t);
+static int              roff_getregro(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 enum rofferr     roff_it(ROFF_ARGS);

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

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

 static enum rofferr     roff_rm(ROFF_ARGS);
 static void             roff_setstr(struct roff *,
                                const char *, const char *, int);
 static enum rofferr     roff_rm(ROFF_ARGS);
 static void             roff_setstr(struct roff *,
                                const char *, const char *, int);

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

 static enum rofferr     roff_so(ROFF_ARGS);
 static enum rofferr     roff_so(ROFF_ARGS);

+static enum rofferr     roff_tr(ROFF_ARGS);
+static enum rofferr     roff_Dd(ROFF_ARGS);
+static enum rofferr     roff_TH(ROFF_ARGS);

 static enum rofferr     roff_TE(ROFF_ARGS);
 static enum rofferr     roff_TS(ROFF_ARGS);
 static enum rofferr     roff_EQ(ROFF_ARGS);
 static enum rofferr     roff_TE(ROFF_ARGS);
 static enum rofferr     roff_TS(ROFF_ARGS);
 static enum rofferr     roff_EQ(ROFF_ARGS);


@@ -162,7 +221,7 @@ static      enum rofferr     roff_EN(ROFF_ARGS);
 static enum rofferr     roff_T_(ROFF_ARGS);
 static enum rofferr     roff_userdef(ROFF_ARGS);
 
 static enum rofferr     roff_T_(ROFF_ARGS);
 static enum rofferr     roff_userdef(ROFF_ARGS);
 

-/* See roff_hash_find() */
+/* See roffhash_find() */

 
 #define        ASCII_HI         126
 #define        ASCII_LO         33
 
 #define        ASCII_HI         126
 #define        ASCII_LO         33


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

+       { "as", roff_ds, NULL, NULL, 0, NULL },
+       { "cc", roff_cc, NULL, NULL, 0, NULL },
+       { "ce", roff_line_ignore, NULL, NULL, 0, NULL },

        { "de", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },
        { "de", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "dei", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "de1", roff_block, roff_block_text, roff_block_sub, 0, NULL },
        { "ds", roff_ds, NULL, NULL, 0, NULL },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, NULL },

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

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

-       { "it", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "it", roff_it, NULL, NULL, 0, NULL },

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


@@ -193,37 +257,63 @@ static    struct roffmac   roffs[ROFF_MAX] = {
        { "rm", roff_rm, NULL, NULL, 0, NULL },
        { "so", roff_so, NULL, NULL, 0, NULL },
        { "ta", roff_line_ignore, NULL, NULL, 0, NULL },
        { "rm", roff_rm, NULL, NULL, 0, NULL },
        { "so", roff_so, NULL, NULL, 0, NULL },
        { "ta", roff_line_ignore, NULL, NULL, 0, NULL },

-       { "tr", roff_line_ignore, NULL, NULL, 0, NULL },
+       { "tr", roff_tr, NULL, NULL, 0, NULL },
+       { "Dd", roff_Dd, NULL, NULL, 0, NULL },
+       { "TH", roff_TH, NULL, NULL, 0, NULL },

        { "TS", roff_TS, NULL, NULL, 0, NULL },
        { "TE", roff_TE, NULL, NULL, 0, NULL },
        { "T&", roff_T_, NULL, NULL, 0, NULL },
        { "EQ", roff_EQ, NULL, NULL, 0, NULL },
        { "EN", roff_EN, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "TS", roff_TS, NULL, NULL, 0, NULL },
        { "TE", roff_TE, NULL, NULL, 0, NULL },
        { "T&", roff_T_, NULL, NULL, 0, NULL },
        { "EQ", roff_EQ, NULL, NULL, 0, NULL },
        { "EN", roff_EN, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },

-       { "\\}", roff_ccond, NULL, NULL, 0, NULL },

        { NULL, roff_userdef, NULL, NULL, 0, NULL },
 };
 
        { NULL, roff_userdef, NULL, NULL, 0, NULL },
 };
 

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

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

-static void             roff_free1(struct roff *);
-static enum rofft       roff_hash_find(const char *, size_t);
-static void             roff_hash_init(void);
-static void             roffnode_cleanscope(struct roff *);
-static void             roffnode_push(struct roff *, enum rofft,
-                               const char *, int, int);
-static void             roffnode_pop(struct roff *);
-static enum rofft       roff_parse(struct roff *, const char *, int *);
-
-/* See roff_hash_find() */
+/* See roffhash_find() */

 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)
 
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)
 

+static int      roffit_lines;  /* number of lines to delay */
+static char    *roffit_macro;  /* nil-terminated macro line */
+

 static void
 static void

-roff_hash_init(void)
+roffhash_init(void)

 {
        struct roffmac   *n;
        int               buc, i;
 {
        struct roffmac   *n;
        int               buc, i;


@@ -248,7 +338,7 @@ roff_hash_init(void)
  * the nil-terminated string name could be found.
  */
 static enum rofft
  * the nil-terminated string name could be found.
  */
 static enum rofft

-roff_hash_find(const char *p, size_t s)
+roffhash_find(const char *p, size_t s)

 {
        int              buc;
        struct roffmac  *n;
 {
        int              buc;
        struct roffmac  *n;


@@ -320,12 +410,13 @@ roffnode_push(struct roff *r, enum rofft tok, const char *name,
 static void
 roff_free1(struct roff *r)
 {
 static void
 roff_free1(struct roff *r)
 {

-       struct tbl_node *t;
+       struct tbl_node *tbl;

        struct eqn_node *e;
        struct eqn_node *e;

+       int              i;

 
 

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

        }
 
        r->first_tbl = r->last_tbl = r->tbl = NULL;
        }
 
        r->first_tbl = r->last_tbl = r->tbl = NULL;


@@ -340,15 +431,29 @@ roff_free1(struct roff *r)
        while (r->last)
                roffnode_pop(r);
 
        while (r->last)
                roffnode_pop(r);
 

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

 
 

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

 
 void
 roff_reset(struct roff *r)
 {
 
        roff_free1(r);
 
 void
 roff_reset(struct roff *r)
 {
 
        roff_free1(r);

+       r->control = 0;

 }
 
 
 }
 
 


@@ -362,67 +467,83 @@ roff_free(struct roff *r)
 
 
 struct roff *
 
 
 struct roff *

-roff_alloc(struct regset *regs, struct mparse *parse)
+roff_alloc(enum mparset type, struct mparse *parse, int quick)

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

-       int              i;

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

-       r->regs = regs;
+       r->parsetype = type;

        r->parse = parse;
        r->parse = parse;

+       r->quick = quick;

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

-       roff_hash_init();
-
-       for (i = 0; i < PREDEFS_MAX; i++) 
-               roff_setstr(r, predefs[i].name, predefs[i].str, 0);
+       roffhash_init();

 
        return(r);
 }
 
 
        return(r);
 }
 

-

 /*
 /*

- * Pre-filter each and every line for reserved words (one beginning with
- * `\*', e.g., `\*(ab').  These must be handled before the actual line
- * is processed. 
+ * In the current line, expand user-defined strings ("\*")
+ * and references to number registers ("\n").
+ * Also check the syntax of other escape sequences.

  */
  */

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

 {
 {

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

        const char      *stesc; /* start of an escape sequence ('\\') */
        const char      *stnam; /* start of the name, after "[(*" */
        const char      *cp;    /* end of the name, e.g. before ']' */
        const char      *res;   /* the string to be substituted */
        const char      *stesc; /* start of an escape sequence ('\\') */
        const char      *stnam; /* start of the name, after "[(*" */
        const char      *cp;    /* end of the name, e.g. before ']' */
        const char      *res;   /* the string to be substituted */

-       int              i, maxl;
-       size_t           nsz;
-       char            *n;
+       char            *nbuf;  /* new buffer to copy bufp to */
+       size_t           nsz;   /* size of the new buffer */
+       size_t           maxl;  /* expected length of the escape name */
+       size_t           naml;  /* actual length of the escape name */
+       int              expand_count;  /* to avoid infinite loops */

 
 

-       /* Search for a leading backslash and save a pointer to it. */
+       expand_count = 0;

 
 

+again:

        cp = *bufp + pos;
        while (NULL != (cp = strchr(cp, '\\'))) {
                stesc = cp++;
 
                /*
        cp = *bufp + pos;
        while (NULL != (cp = strchr(cp, '\\'))) {
                stesc = cp++;
 
                /*

-                * The second character must be an asterisk.
+                * The second character must be an asterisk or an n.

                 * If it isn't, skip it anyway:  It is escaped,
                 * so it can't start another escape sequence.
                 */
 
                if ('\0' == *cp)
                 * If it isn't, skip it anyway:  It is escaped,
                 * so it can't start another escape sequence.
                 */
 
                if ('\0' == *cp)

-                       return(1);
-               if ('*' != *cp++)
-                       continue;
+                       return(ROFF_CONT);
+
+               switch (*cp) {
+               case ('*'):
+                       res = NULL;
+                       break;
+               case ('n'):
+                       res = ubuf;
+                       break;
+               default:
+                       if (ESCAPE_ERROR != mandoc_escape(&cp, NULL, NULL))
+                               continue;
+                       mandoc_msg
+                               (MANDOCERR_BADESCAPE, r->parse, 
+                                ln, (int)(stesc - *bufp), NULL);
+                       return(ROFF_CONT);
+               }
+
+               cp++;

 
                /*
                 * The third character decides the length
 
                /*
                 * The third character decides the length

-                * of the name of the string.
+                * of the name of the string or register.

                 * Save a pointer to the name.
                 */
 
                switch (*cp) {
                case ('\0'):
                 * Save a pointer to the name.
                 */
 
                switch (*cp) {
                case ('\0'):

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

                case ('('):
                        cp++;
                        maxl = 2;
                case ('('):
                        cp++;
                        maxl = 2;


@@ -439,9 +560,14 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
 
                /* Advance to the end of the name. */
 
 
                /* Advance to the end of the name. */
 

-               for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
-                       if ('\0' == *cp)
-                               return(1); /* Error. */
+               for (naml = 0; 0 == maxl || naml < maxl; naml++, cp++) {
+                       if ('\0' == *cp) {
+                               mandoc_msg
+                                       (MANDOCERR_BADESCAPE, 
+                                        r->parse, ln, 
+                                        (int)(stesc - *bufp), NULL);
+                               return(ROFF_CONT);
+                       }

                        if (0 == maxl && ']' == *cp)
                                break;
                }
                        if (0 == maxl && ']' == *cp)
                                break;
                }


@@ -451,32 +577,104 @@ roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
                 * undefined, resume searching for escapes.
                 */
 
                 * undefined, resume searching for escapes.
                 */
 

-               res = roff_getstrn(r, stnam, (size_t)i);
+               if (NULL == res)
+                       res = roff_getstrn(r, stnam, naml);
+               else
+                       snprintf(ubuf, sizeof(ubuf), "%d",
+                           roff_getregn(r, stnam, naml));

 
                if (NULL == res) {
 
                if (NULL == res) {

-                       cp -= maxl ? 1 : 0;
-                       continue;
+                       mandoc_msg
+                               (MANDOCERR_BADESCAPE, r->parse, 
+                                ln, (int)(stesc - *bufp), NULL);
+                       res = "";

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

+               pos = stesc - *bufp;
+

                nsz = *szp + strlen(res) + 1;
                nsz = *szp + strlen(res) + 1;

-               n = mandoc_malloc(nsz);
+               nbuf = mandoc_malloc(nsz);

 
 

-               strlcpy(n, *bufp, (size_t)(stesc - *bufp + 1));
-               strlcat(n, res, nsz);
-               strlcat(n, cp + (maxl ? 0 : 1), nsz);
+               strlcpy(nbuf, *bufp, (size_t)(stesc - *bufp + 1));
+               strlcat(nbuf, res, nsz);
+               strlcat(nbuf, cp + (maxl ? 0 : 1), nsz);

 
                free(*bufp);
 
 
                free(*bufp);
 

-               *bufp = n;
+               *bufp = nbuf;

                *szp = nsz;
                *szp = nsz;

-               return(0);
-       }

 
 

-       return(1);
+               if (EXPAND_LIMIT >= ++expand_count)
+                       goto again;
+
+               /* Just leave the string unexpanded. */
+               mandoc_msg(MANDOCERR_ROFFLOOP, r->parse, ln, pos, NULL);
+               return(ROFF_IGN);
+       }
+       return(ROFF_CONT);

 }
 
 }
 

+/*
+ * Process text streams:
+ * Convert all breakable hyphens into ASCII_HYPH.
+ * Decrement and spring input line trap.
+ */
+static enum rofferr
+roff_parsetext(char **bufp, size_t *szp, int pos, int *offs)
+{
+       size_t           sz;
+       const char      *start;
+       char            *p;
+       int              isz;
+       enum mandoc_esc  esc;
+
+       start = p = *bufp + pos;
+
+       while ('\0' != *p) {
+               sz = strcspn(p, "-\\");
+               p += sz;
+
+               if ('\0' == *p)
+                       break;
+
+               if ('\\' == *p) {
+                       /* Skip over escapes. */
+                       p++;
+                       esc = mandoc_escape((const char **)&p, NULL, NULL);
+                       if (ESCAPE_ERROR == esc)
+                               break;
+                       continue;
+               } else if (p == start) {
+                       p++;
+                       continue;
+               }
+
+               if (isalpha((unsigned char)p[-1]) &&
+                   isalpha((unsigned char)p[1]))
+                       *p = ASCII_HYPH;
+               p++;
+       }
+
+       /* Spring the input line trap. */
+       if (1 == roffit_lines) {
+               isz = asprintf(&p, "%s\n.%s", *bufp, roffit_macro);
+               if (-1 == isz) {
+                       perror(NULL);
+                       exit((int)MANDOCLEVEL_SYSERR);
+               }
+               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);
+}

 
 enum rofferr
 roff_parseln(struct roff *r, int ln, char **bufp, 
 
 enum rofferr
 roff_parseln(struct roff *r, int ln, char **bufp, 


@@ -491,11 +689,13 @@ roff_parseln(struct roff *r, int ln, char **bufp,
         * words to fill in.
         */
 
         * words to fill in.
         */
 

-       if (r->first_string && ! roff_res(r, bufp, szp, pos))
-               return(ROFF_REPARSE);
+       e = roff_res(r, bufp, szp, ln, pos);
+       if (ROFF_IGN == e)
+               return(e);
+       assert(ROFF_CONT == e);

 
        ppos = pos;
 
        ppos = pos;

-       ctl = mandoc_getcontrol(*bufp, &pos);
+       ctl = roff_getcontrol(r, *bufp, &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


@@ -513,19 +713,14 @@ roff_parseln(struct roff *r, int ln, char **bufp,
                assert(ROFF_IGN == e || ROFF_CONT == e);
                if (ROFF_CONT != e)
                        return(e);
                assert(ROFF_IGN == e || ROFF_CONT == e);
                if (ROFF_CONT != e)
                        return(e);

-               if (r->eqn)
-                       return(eqn_read(&r->eqn, ln, *bufp, pos));
-               if (r->tbl)
-                       return(tbl_read(r->tbl, ln, *bufp, pos));
-               return(ROFF_CONT);
-       } else if ( ! ctl) {
-               if (r->eqn)
-                       return(eqn_read(&r->eqn, ln, *bufp, pos));
+       }
+       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));
                if (r->tbl)
                        return(tbl_read(r->tbl, ln, *bufp, pos));

-               return(ROFF_CONT);
-       } else if (r->eqn)
-               return(eqn_read(&r->eqn, ln, *bufp, ppos));
+               return(roff_parsetext(bufp, szp, pos, offs));
+       }

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


@@ -567,16 +762,14 @@ roff_endparse(struct roff *r)
 
        if (r->eqn) {
                mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
 
        if (r->eqn) {
                mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 

-                               r->eqn->eqn.line, r->eqn->eqn.pos, NULL);
-               eqn_end(r->eqn);
-               r->eqn = NULL;
+                               r->eqn->eqn.ln, r->eqn->eqn.pos, NULL);
+               eqn_end(&r->eqn);

        }
 
        if (r->tbl) {
                mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
                                r->tbl->line, r->tbl->pos, NULL);
        }
 
        if (r->tbl) {
                mandoc_msg(MANDOCERR_SCOPEEXIT, r->parse, 
                                r->tbl->line, r->tbl->pos, NULL);

-               tbl_end(r->tbl);
-               r->tbl = NULL;
+               tbl_end(&r->tbl);

        }
 }
 
        }
 }
 


@@ -591,14 +784,17 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        size_t           maclen;
        enum rofft       t;
 
        size_t           maclen;
        enum rofft       t;
 

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

                return(ROFF_MAX);
 
                return(ROFF_MAX);
 

+       /* We stop the macro parse at an escape, tab, space, or nil. */
+

        mac = buf + *pos;
        maclen = strcspn(mac, " \\\t\0");
 
        t = (r->current_string = roff_getstrn(r, mac, maclen))
        mac = buf + *pos;
        maclen = strcspn(mac, " \\\t\0");
 
        t = (r->current_string = roff_getstrn(r, mac, maclen))

-           ? ROFF_USERDEF : roff_hash_find(mac, maclen);
+           ? ROFF_USERDEF : roffhash_find(mac, maclen);

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


@@ -657,21 +853,20 @@ roffnode_cleanscope(struct roff *r)
 {
 
        while (r->last) {
 {
 
        while (r->last) {

-               if (--r->last->endspan < 0)
+               if (--r->last->endspan != 0)

                        break;
                roffnode_pop(r);
        }
 }
 
 
                        break;
                roffnode_pop(r);
        }
 }
 
 

-/* ARGSUSED */
-static enum rofferr
-roff_ccond(ROFF_ARGS)
+static void
+roff_ccond(struct roff *r, int ln, int ppos)

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

-               return(ROFF_IGN);
+               return;

        }
 
        switch (r->last->tok) {
        }
 
        switch (r->last->tok) {


@@ -683,20 +878,17 @@ roff_ccond(ROFF_ARGS)
                break;
        default:
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
                break;
        default:
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

-               return(ROFF_IGN);
+               return;

        }
 
        if (r->last->endspan > -1) {
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
        }
 
        if (r->last->endspan > -1) {
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);

-               return(ROFF_IGN);
+               return;

        }
 
        }
 

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

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

-       return(ROFF_IGN);
+       return;

 }
 
 
 }
 
 


@@ -741,7 +933,7 @@ roff_block(ROFF_ARGS)
        /*
         * At the beginning of a `de' macro, clear the existing string
         * with the same name, if there is one.  New content will be
        /*
         * At the beginning of a `de' macro, clear the existing string
         * with the same name, if there is one.  New content will be

-        * added from roff_block_text() in multiline mode.
+        * appended from roff_block_text() in multiline mode.

         */
 
        if (ROFF_de == tok)
         */
 
        if (ROFF_de == tok)


@@ -831,7 +1023,7 @@ roff_block_sub(ROFF_ARGS)
         */
        if (ROFF_cblock != t) {
                if (ROFF_de == tok)
         */
        if (ROFF_cblock != t) {
                if (ROFF_de == tok)

-                       roff_setstr(r, r->last->name, *bufp + ppos, 1);
+                       roff_setstr(r, r->last->name, *bufp + ppos, 2);

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


@@ -847,7 +1039,7 @@ roff_block_text(ROFF_ARGS)
 {
 
        if (ROFF_de == tok)
 {
 
        if (ROFF_de == tok)

-               roff_setstr(r, r->last->name, *bufp + pos, 1);
+               roff_setstr(r, r->last->name, *bufp + pos, 2);

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


@@ -863,42 +1055,43 @@ 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);

 
        /*
 
        /*

-        * If the macro is unknown, first check if it contains a closing
-        * delimiter `\}'.  If it does, close out our scope and return
-        * the currently-scoped rule (ignore or continue).  Else, drop
-        * into the currently-scoped rule.
+        * Fully handle known macros when they are structurally
+        * required or when the conditional evaluated to true.

         */
 
         */
 

-       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) {
-               ep = &(*bufp)[pos];
-               for ( ; NULL != (ep = strchr(ep, '\\')); ep++) {
-                       ep++;
-                       if ('}' != *ep)
-                               continue;
-                       *ep = '&';
-                       roff_ccond(r, ROFF_ccond, bufp, szp, 
-                                       ln, pos, pos + 2, offs);
-                       break;
-               }
-               return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
+       if ((ROFF_MAX != t) &&
+           (ROFFRULE_ALLOW == rr ||
+            ROFFMAC_STRUCT & roffs[t].flags)) {
+               assert(roffs[t].proc);
+               return((*roffs[t].proc)(r, t, bufp, szp,
+                                       ln, ppos, pos, offs));

        }
 
        }
 

-       /*
-        * A denied conditional must evaluate its children if and only
-        * if they're either structurally required (such as loops and
-        * conditionals) or a closing macro.
-        */
+       /* Always check for the closing delimiter `\}'. */

 
 

-       if (ROFFRULE_DENY == rr)
-               if ( ! (ROFFMAC_STRUCT & roffs[t].flags))
-                       if (ROFF_ccond != t)
-                               return(ROFF_IGN);
+       ep = &(*bufp)[pos];
+       while (NULL != (ep = strchr(ep, '\\'))) {
+               if ('}' != *(++ep))
+                       continue;

 
 

-       assert(roffs[t].proc);
-       return((*roffs[t].proc)(r, t, bufp, szp, 
-                               ln, ppos, pos, offs));
+               /*
+                * If we're at the end of line, then just chop
+                * off the \} and resize the buffer.
+                * If we aren't, then convert it to spaces.
+                */
+
+               if ('\0' == *(ep + 1)) {
+                       *--ep = '\0';
+                       *szp -= 2;
+               } else
+                       *(ep - 1) = *ep = ' ';
+
+               roff_ccond(r, ln, pos);
+       }
+       return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -917,15 +1110,66 @@ roff_cond_text(ROFF_ARGS)
                if ('}' != *ep)
                        continue;
                *ep = '&';
                if ('}' != *ep)
                        continue;
                *ep = '&';

-               roff_ccond(r, ROFF_ccond, bufp, szp, 
-                               ln, pos, pos + 2, offs);
+               roff_ccond(r, ln, pos);

        }
        return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 }
 
        }
        return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
 }
 

+static int
+roff_getnum(const char *v, int *pos, int *res)
+{
+       int p, n;
+
+       p = *pos;
+       n = v[p] == '-';
+       if (n)
+               p++;
+
+       for (*res = 0; isdigit((unsigned char)v[p]); p++)
+               *res += 10 * *res + v[p] - '0';
+       if (p == *pos + n)
+               return 0;
+
+       if (n)
+               *res = -*res;
+
+       *pos = p;
+       return 1;
+}
+
+static int
+roff_getop(const char *v, int *pos, char *res)
+{
+       int e;
+
+       *res = v[*pos];
+       e = v[*pos + 1] == '=';
+
+       switch (*res) {
+       case '=':
+               break;
+       case '>':
+               if (e)
+                       *res = 'g';
+               break;
+       case '<':
+               if (e)
+                       *res = 'l';
+               break;
+       default:
+               return(0);
+       }
+
+       *pos += 1 + e;
+
+       return(*res);
+}
+

 static enum roffrule
 roff_evalcond(const char *v, int *pos)
 {
 static enum roffrule
 roff_evalcond(const char *v, int *pos)
 {

+       int      not, lh, rh;
+       char     op;

 
        switch (v[*pos]) {
        case ('n'):
 
        switch (v[*pos]) {
        case ('n'):


@@ -938,13 +1182,47 @@ roff_evalcond(const char *v, int *pos)
        case ('t'):
                (*pos)++;
                return(ROFFRULE_DENY);
        case ('t'):
                (*pos)++;
                return(ROFFRULE_DENY);

+       case ('!'):
+               (*pos)++;
+               not = 1;
+               break;

        default:
        default:

+               not = 0;

                break;
        }
 
                break;
        }
 

-       while (v[*pos] && ' ' != v[*pos])
-               (*pos)++;
-       return(ROFFRULE_DENY);
+       if (!roff_getnum(v, pos, &lh))
+               return ROFFRULE_DENY;
+       if (!roff_getop(v, pos, &op)) {
+               if (lh < 0)
+                       lh = 0;
+               goto out;
+       }
+       if (!roff_getnum(v, pos, &rh))
+               return ROFFRULE_DENY;
+       switch (op) {
+       case 'g':
+               lh = lh >= rh;
+               break;
+       case 'l':
+               lh = lh <= rh;
+               break;
+       case '=':
+               lh = lh == rh;
+               break;
+       case '>':
+               lh = lh > rh;
+               break;
+       case '<':
+               lh = lh < rh;
+               break;
+       default:
+               return ROFFRULE_DENY;
+       }
+out:
+       if (not)
+               lh = !lh;
+       return lh ? ROFFRULE_ALLOW : ROFFRULE_DENY;

 }
 
 /* ARGSUSED */
 }
 
 /* ARGSUSED */


@@ -952,9 +1230,6 @@ static enum rofferr
 roff_line_ignore(ROFF_ARGS)
 {
 
 roff_line_ignore(ROFF_ARGS)
 {
 

-       if (ROFF_it == tok)
-               mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos, "it");
-

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


@@ -962,8 +1237,8 @@ roff_line_ignore(ROFF_ARGS)
 static enum rofferr
 roff_cond(ROFF_ARGS)
 {
 static enum rofferr
 roff_cond(ROFF_ARGS)
 {

-       int              sv;
-       enum roffrule    rule;
+
+       roffnode_push(r, tok, NULL, ln, ppos);

 
        /* 
         * An `.el' has no conditional body: it will consume the value
 
        /* 
         * An `.el' has no conditional body: it will consume the value


@@ -973,31 +1248,11 @@ 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.
         */
 

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

                (r->rstackpos < 0 ? 
                 ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
                roff_evalcond(*bufp, &pos);
 
                (r->rstackpos < 0 ? 
                 ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
                roff_evalcond(*bufp, &pos);
 

-       sv = pos;
-       while (' ' == (*bufp)[pos])
-               pos++;
-
-       /*
-        * Roff is weird.  If we have just white-space after the
-        * conditional, it's considered the BODY and we exit without
-        * really doing anything.  Warn about this.  It's probably
-        * wrong.
-        */
-
-       if ('\0' == (*bufp)[pos] && sv != pos) {
-               mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
-               return(ROFF_IGN);
-       }
-
-       roffnode_push(r, tok, NULL, ln, ppos);
-
-       r->last->rule = rule;
-

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


@@ -1020,28 +1275,39 @@ roff_cond(ROFF_ARGS)
                r->last->rule = ROFFRULE_DENY;
 
        /*
                r->last->rule = ROFFRULE_DENY;
 
        /*

-        * Determine scope.  If we're invoked with "\{" trailing the
-        * conditional, then we're in a multiline scope.  Else our scope
-        * expires on the next line.
+        * Determine scope.
+        * If there is nothing on the line after the conditional,
+        * not even whitespace, use next-line scope.

         */
 
         */
 

-       r->last->endspan = 1;
+       if ('\0' == (*bufp)[pos]) {
+               r->last->endspan = 2;
+               goto out;
+       }
+
+       while (' ' == (*bufp)[pos])
+               pos++;
+
+       /* An opening brace requests multiline scope. */

 
        if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) {
                r->last->endspan = -1;
                pos += 2;
 
        if ('\\' == (*bufp)[pos] && '{' == (*bufp)[pos + 1]) {
                r->last->endspan = -1;
                pos += 2;

+               goto out;

        } 
 
        /*
        } 
 
        /*

-        * If there are no arguments on the line, the next-line scope is
-        * assumed.
+        * Anything else following the conditional causes
+        * single-line scope.  Warn if the scope contains
+        * nothing but trailing whitespace.

         */
 
        if ('\0' == (*bufp)[pos])
         */
 
        if ('\0' == (*bufp)[pos])

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

 
 

-       /* Otherwise re-run the roff parser after recalculating. */
+       r->last->endspan = 1;

 
 

+out:

        *offs = pos;
        return(ROFF_RERUN);
 }
        *offs = pos;
        return(ROFF_RERUN);
 }


@@ -1073,10 +1339,118 @@ roff_ds(ROFF_ARGS)
                string++;
 
        /* The rest is the value. */
                string++;
 
        /* The rest is the value. */

-       roff_setstr(r, name, string, 0);
+       roff_setstr(r, name, string, ROFF_as == tok);

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

+void
+roff_setreg(struct roff *r, const char *name, int val, char sign)
+{
+       struct roffreg  *reg;
+
+       /* Search for an existing register with the same name. */
+       reg = r->regtab;
+
+       while (reg && strcmp(name, reg->key.p))
+               reg = reg->next;
+
+       if (NULL == reg) {
+               /* Create a new register. */
+               reg = mandoc_malloc(sizeof(struct roffreg));
+               reg->key.p = mandoc_strdup(name);
+               reg->key.sz = strlen(name);
+               reg->val = 0;
+               reg->next = r->regtab;
+               r->regtab = reg;
+       }
+
+       if ('+' == sign)
+               reg->val += val;
+       else if ('-' == sign)
+               reg->val -= val;
+       else
+               reg->val = val;
+}
+
+/*
+ * Handle some predefined read-only number registers.
+ * For now, return -1 if the requested register is not predefined;
+ * in case a predefined read-only register having the value -1
+ * were to turn up, another special value would have to be chosen.
+ */
+static int
+roff_getregro(const char *name)
+{
+
+       switch (*name) {
+       case ('A'):  /* ASCII approximation mode is always off. */
+               return(0);
+       case ('g'):  /* Groff compatibility mode is always on. */
+               return(1);
+       case ('H'):  /* Fixed horizontal resolution. */
+               return (24);
+       case ('j'):  /* Always adjust left margin only. */
+               return(0);
+       case ('T'):  /* Some output device is always defined. */
+               return(1);
+       case ('V'):  /* Fixed vertical resolution. */
+               return (40);
+       default:
+               return (-1);
+       }
+}
+
+int
+roff_getreg(const struct roff *r, const char *name)
+{
+       struct roffreg  *reg;
+       int              val;
+
+       if ('.' == name[0] && '\0' != name[1] && '\0' == name[2]) {
+               val = roff_getregro(name + 1);
+               if (-1 != val)
+                       return (val);
+       }
+
+       for (reg = r->regtab; reg; reg = reg->next)
+               if (0 == strcmp(name, reg->key.p))
+                       return(reg->val);
+
+       return(0);
+}
+
+static int
+roff_getregn(const struct roff *r, const char *name, size_t len)
+{
+       struct roffreg  *reg;
+       int              val;
+
+       if ('.' == name[0] && 2 == len) {
+               val = roff_getregro(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 void
+roff_freereg(struct roffreg *reg)
+{
+       struct roffreg  *old_reg;
+
+       while (NULL != reg) {
+               free(reg->key.p);
+               old_reg = reg;
+               reg = reg->next;
+               free(old_reg);
+       }
+}

 
 /* ARGSUSED */
 static enum rofferr
 
 /* ARGSUSED */
 static enum rofferr


@@ -1084,20 +1458,21 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
 {
        const char      *key;
        char            *val;

+       size_t           sz;

        int              iv;
        int              iv;

-       struct reg      *rg;
+       char             sign;

 
        val = *bufp + pos;
        key = roff_getname(r, &val, ln, pos);
 
        val = *bufp + pos;
        key = roff_getname(r, &val, ln, pos);

-       rg = r->regs->regs;

 
 

-       if (0 == strcmp(key, "nS")) {
-               rg[(int)REG_nS].set = 1;
-               if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
-                       rg[REG_nS].v.u = (unsigned)iv;
-               else
-                       rg[(int)REG_nS].v.u = 0u;
-       }
+       sign = *val;
+       if ('+' == sign || '-' == sign)
+               val++;
+
+       sz = strspn(val, "0123456789");
+       iv = sz ? mandoc_strntoi(val, sz, 10) : 0;
+
+       roff_setreg(r, key, iv, sign);

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


@@ -1118,6 +1493,57 @@ roff_rm(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

+/* ARGSUSED */
+static enum rofferr
+roff_it(ROFF_ARGS)
+{
+       char            *cp;
+       size_t           len;
+       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);
+       }
+       cp += len + 1;
+
+       /* Arm the input line trap. */
+       roffit_lines = iv;
+       roffit_macro = mandoc_strdup(cp);
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_Dd(ROFF_ARGS)
+{
+       const char *const       *cp;
+
+       if (0 == r->quick && MPARSE_MDOC != r->parsetype)
+               for (cp = __mdoc_reserved; *cp; cp++)
+                       roff_setstr(r, *cp, NULL, 0);
+
+       return(ROFF_CONT);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_TH(ROFF_ARGS)
+{
+       const char *const       *cp;
+
+       if (0 == r->quick && MPARSE_MDOC != r->parsetype)
+               for (cp = __man_reserved; *cp; cp++)
+                       roff_setstr(r, *cp, NULL, 0);
+
+       return(ROFF_CONT);
+}
+

 /* ARGSUSED */
 static enum rofferr
 roff_TE(ROFF_ARGS)
 /* ARGSUSED */
 static enum rofferr
 roff_TE(ROFF_ARGS)


@@ -1126,9 +1552,8 @@ roff_TE(ROFF_ARGS)
        if (NULL == r->tbl)
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
        else
        if (NULL == r->tbl)
                mandoc_msg(MANDOCERR_NOSCOPE, r->parse, ln, ppos, NULL);
        else

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

 
 

-       r->tbl = NULL;

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


@@ -1145,14 +1570,24 @@ roff_T_(ROFF_ARGS)
        return(ROFF_IGN);
 }
 
        return(ROFF_IGN);
 }
 

-/* ARGSUSED */
-static enum rofferr
-roff_EQ(ROFF_ARGS)
+#if 0
+static int
+roff_closeeqn(struct roff *r)

 {
 {

-       struct eqn_node *e;
+
+       return(r->eqn && ROFF_EQN == eqn_end(&r->eqn) ? 1 : 0);
+}
+#endif
+
+static void
+roff_openeqn(struct roff *r, const char *name, int line, 
+               int offs, const char *buf)
+{
+       struct eqn_node *e;
+       int              poff;

 
        assert(NULL == r->eqn);
 
        assert(NULL == r->eqn);

-       e = eqn_alloc(ppos, ln);
+       e = eqn_alloc(name, offs, line, r->parse);

 
        if (r->last_eqn)
                r->last_eqn->next = e;
 
        if (r->last_eqn)
                r->last_eqn->next = e;


@@ -1160,6 +1595,19 @@ roff_EQ(ROFF_ARGS)
                r->first_eqn = r->last_eqn = e;
 
        r->eqn = r->last_eqn = e;
                r->first_eqn = r->last_eqn = e;
 
        r->eqn = r->last_eqn = e;

+
+       if (buf) {
+               poff = 0;
+               eqn_read(&r->eqn, line, buf, offs, &poff);
+       }
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_EQ(ROFF_ARGS)
+{
+
+       roff_openeqn(r, *bufp + pos, ln, ppos, NULL);

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


@@ -1176,21 +1624,103 @@ roff_EN(ROFF_ARGS)
 static enum rofferr
 roff_TS(ROFF_ARGS)
 {
 static enum rofferr
 roff_TS(ROFF_ARGS)
 {

-       struct tbl_node *t;
+       struct tbl_node *tbl;

 
        if (r->tbl) {
                mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);
 
        if (r->tbl) {
                mandoc_msg(MANDOCERR_SCOPEBROKEN, r->parse, ln, ppos, NULL);

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

        }
 
        }
 

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

 
        if (r->last_tbl)
 
        if (r->last_tbl)

-               r->last_tbl->next = t;
+               r->last_tbl->next = tbl;

        else
        else

-               r->first_tbl = r->last_tbl = t;
+               r->first_tbl = r->last_tbl = tbl;
+
+       r->tbl = r->last_tbl = tbl;
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_cc(ROFF_ARGS)
+{
+       const char      *p;
+
+       p = *bufp + pos;
+
+       if ('\0' == *p || '.' == (r->control = *p++))
+               r->control = 0;
+
+       if ('\0' != *p)
+               mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
+
+       return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_tr(ROFF_ARGS)
+{
+       const char      *p, *first, *second;
+       size_t           fsz, ssz;
+       enum mandoc_esc  esc;
+
+       p = *bufp + pos;
+
+       if ('\0' == *p) {
+               mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, ln, ppos, NULL);
+               return(ROFF_IGN);
+       }
+
+       while ('\0' != *p) {
+               fsz = ssz = 1;
+
+               first = p++;
+               if ('\\' == *first) {
+                       esc = mandoc_escape(&p, NULL, NULL);
+                       if (ESCAPE_ERROR == esc) {
+                               mandoc_msg
+                                       (MANDOCERR_BADESCAPE, r->parse, 
+                                        ln, (int)(p - *bufp), NULL);
+                               return(ROFF_IGN);
+                       }
+                       fsz = (size_t)(p - first);
+               }
+
+               second = p++;
+               if ('\\' == *second) {
+                       esc = mandoc_escape(&p, NULL, NULL);
+                       if (ESCAPE_ERROR == esc) {
+                               mandoc_msg
+                                       (MANDOCERR_BADESCAPE, r->parse, 
+                                        ln, (int)(p - *bufp), NULL);
+                               return(ROFF_IGN);
+                       }
+                       ssz = (size_t)(p - second);
+               } else if ('\0' == *second) {
+                       mandoc_msg(MANDOCERR_ARGCOUNT, r->parse, 
+                                       ln, (int)(p - *bufp), NULL);
+                       second = " ";
+                       p--;
+               }
+
+               if (fsz > 1) {
+                       roff_setstrn(&r->xmbtab, first, 
+                                       fsz, second, ssz, 0);
+                       continue;
+               }
+
+               if (NULL == r->xtab)
+                       r->xtab = mandoc_calloc
+                               (128, sizeof(struct roffstr));
+
+               free(r->xtab[(int)*first].p);
+               r->xtab[(int)*first].p = mandoc_strndup(second, ssz);
+               r->xtab[(int)*first].sz = ssz;
+       }

 
 

-       r->tbl = r->last_tbl = t;

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


@@ -1229,7 +1759,7 @@ roff_userdef(ROFF_ARGS)
 
        /*
         * Collect pointers to macro argument strings
 
        /*
         * Collect pointers to macro argument strings

-        * and null-terminate them.
+        * and NUL-terminate them.

         */
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)
         */
        cp = *bufp + pos;
        for (i = 0; i < 9; i++)


@@ -1309,34 +1839,48 @@ roff_getname(struct roff *r, char **cpp, int ln, int pos)
 
 /*
  * Store *string into the user-defined string called *name.
 
 /*
  * Store *string into the user-defined string called *name.

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

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

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

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

-       int multiline)
+       int append)
+{
+
+       roff_setstrn(&r->strtab, name, strlen(name), string,
+                       string ? strlen(string) : 0, append);
+}
+
+static void
+roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
+               const char *string, size_t stringsz, int append)

 {
 {

-       struct roffstr   *n;
-       char             *c;
-       size_t            oldch, newch;
+       struct roffkv   *n;
+       char            *c;
+       int              i;
+       size_t           oldch, newch;

 
        /* Search for an existing string with the same name. */
 
        /* Search for an existing string with the same name. */

-       n = r->first_string;
-       while (n && strcmp(name, n->name))
+       n = *r;
+
+       while (n && strcmp(name, n->key.p))

                n = n->next;
 
        if (NULL == n) {
                /* Create a new string table entry. */
                n = n->next;
 
        if (NULL == n) {
                /* Create a new string table entry. */

-               n = mandoc_malloc(sizeof(struct roffstr));
-               n->name = mandoc_strdup(name);
-               n->string = NULL;
-               n->next = r->first_string;
-               r->first_string = n;
-       } else if (0 == multiline) {
-               /* In multiline mode, append; else replace. */
-               free(n->string);
-               n->string = NULL;
+               n = mandoc_malloc(sizeof(struct roffkv));
+               n->key.p = mandoc_strndup(name, namesz);
+               n->key.sz = namesz;
+               n->val.p = NULL;
+               n->val.sz = 0;
+               n->next = *r;
+               *r = n;
+       } else if (0 == append) {
+               free(n->val.p);
+               n->val.p = NULL;
+               n->val.sz = 0;

        }
 
        if (NULL == string)
        }
 
        if (NULL == string)


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

-       newch = strlen(string) + (multiline ? 2u : 1u);
-       if (NULL == n->string) {
-               n->string = mandoc_malloc(newch);
-               *n->string = '\0';
+       newch = stringsz + (1 < append ? 2u : 1u);
+
+       if (NULL == n->val.p) {
+               n->val.p = mandoc_malloc(newch);
+               *n->val.p = '\0';

                oldch = 0;
        } else {
                oldch = 0;
        } else {

-               oldch = strlen(n->string);
-               n->string = mandoc_realloc(n->string, oldch + newch);
+               oldch = n->val.sz;
+               n->val.p = mandoc_realloc(n->val.p, oldch + newch);

        }
 
        /* Skip existing content in the destination buffer. */
        }
 
        /* Skip existing content in the destination buffer. */

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

 
        /* Append new content to the destination buffer. */
 
        /* Append new content to the destination buffer. */

-       while (*string) {
+       i = 0;
+       while (i < (int)stringsz) {

                /*
                 * Rudimentary roff copy mode:
                 * Handle escaped backslashes.
                 */
                /*
                 * Rudimentary roff copy mode:
                 * Handle escaped backslashes.
                 */

-               if ('\\' == *string && '\\' == *(string + 1))
-                       string++;
-               *c++ = *string++;
+               if ('\\' == string[i] && '\\' == string[i + 1])
+                       i++;
+               *c++ = string[i++];

        }
 
        /* Append terminating bytes. */
        }
 
        /* Append terminating bytes. */

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

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

+

        *c = '\0';
        *c = '\0';

+       n->val.sz = (int)(c - n->val.p);

 }
 
 static const char *
 roff_getstrn(const struct roff *r, const char *name, size_t len)
 {
 }
 
 static const char *
 roff_getstrn(const struct roff *r, const char *name, size_t len)
 {

-       const struct roffstr *n;
+       const struct roffkv *n;
+       int i;

 
 

-       n = r->first_string;
-       while (n && (strncmp(name, n->name, len) || '\0' != n->name[(int)len]))
-               n = n->next;
+       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 ? n->string : NULL);
+       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(NULL);

 }
 
 static void
 }
 
 static void

-roff_freestr(struct roff *r)
+roff_freestr(struct roffkv *r)

 {
 {

-       struct roffstr   *n, *nn;
+       struct roffkv    *n, *nn;

 
 

-       for (n = r->first_string; n; n = nn) {
-               free(n->name);
-               free(n->string);
+       for (n = r; n; n = nn) {
+               free(n->key.p);
+               free(n->val.p);

                nn = n->next;
                free(n);
        }
                nn = n->next;
                free(n);
        }

-
-       r->first_string = NULL;

 }
 
 const struct tbl_span *
 }
 
 const struct tbl_span *


@@ -1416,3 +1969,130 @@ roff_eqn(const struct roff *r)
        
        return(r->last_eqn ? &r->last_eqn->eqn : NULL);
 }
        
        return(r->last_eqn ? &r->last_eqn->eqn : NULL);
 }

+
+/*
+ * Duplicate an input string, making the appropriate character
+ * conversations (as stipulated by `tr') along the way.
+ * Returns a heap-allocated string with all the replacements made.
+ */
+char *
+roff_strdup(const struct roff *r, const char *p)
+{
+       const struct roffkv *cp;
+       char            *res;
+       const char      *pp;
+       size_t           ssz, sz;
+       enum mandoc_esc  esc;
+
+       if (NULL == r->xmbtab && NULL == r->xtab)
+               return(mandoc_strdup(p));
+       else if ('\0' == *p)
+               return(mandoc_strdup(""));
+
+       /*
+        * Step through each character looking for term matches
+        * (remember that a `tr' can be invoked with an escape, which is
+        * a glyph but the escape is multi-character).
+        * We only do this if the character hash has been initialised
+        * and the string is >0 length.
+        */
+
+       res = NULL;
+       ssz = 0;
+
+       while ('\0' != *p) {
+               if ('\\' != *p && r->xtab && r->xtab[(int)*p].p) {
+                       sz = r->xtab[(int)*p].sz;
+                       res = mandoc_realloc(res, ssz + sz + 1);
+                       memcpy(res + ssz, r->xtab[(int)*p].p, sz);
+                       ssz += sz;
+                       p++;
+                       continue;
+               } else if ('\\' != *p) {
+                       res = mandoc_realloc(res, ssz + 2);
+                       res[ssz++] = *p++;
+                       continue;
+               }
+
+               /* Search for term matches. */
+               for (cp = r->xmbtab; cp; cp = cp->next)
+                       if (0 == strncmp(p, cp->key.p, cp->key.sz))
+                               break;
+
+               if (NULL != cp) {
+                       /*
+                        * A match has been found.
+                        * Append the match to the array and move
+                        * forward by its keysize.
+                        */
+                       res = mandoc_realloc
+                               (res, ssz + cp->val.sz + 1);
+                       memcpy(res + ssz, cp->val.p, cp->val.sz);
+                       ssz += cp->val.sz;
+                       p += (int)cp->key.sz;
+                       continue;
+               }
+
+               /*
+                * Handle escapes carefully: we need to copy
+                * over just the escape itself, or else we might
+                * do replacements within the escape itself.
+                * Make sure to pass along the bogus string.
+                */
+               pp = p++;
+               esc = mandoc_escape(&p, NULL, NULL);
+               if (ESCAPE_ERROR == esc) {
+                       sz = strlen(pp);
+                       res = mandoc_realloc(res, ssz + sz + 1);
+                       memcpy(res + ssz, pp, sz);
+                       break;
+               }
+               /* 
+                * We bail out on bad escapes. 
+                * No need to warn: we already did so when
+                * roff_res() was called.
+                */
+               sz = (int)(p - pp);
+               res = mandoc_realloc(res, ssz + sz + 1);
+               memcpy(res + ssz, pp, sz);
+               ssz += sz;
+       }
+
+       res[(int)ssz] = '\0';
+       return(res);
+}
+
+/*
+ * Find out whether a line is a macro line or not.  
+ * If it is, adjust the current position and return one; if it isn't,
+ * return zero and don't change the current position.
+ * If the control character has been set with `.cc', then let that grain
+ * precedence.
+ * This is slighly contrary to groff, where using the non-breaking
+ * control character when `cc' has been invoked will cause the
+ * non-breaking macro contents to be printed verbatim.
+ */
+int
+roff_getcontrol(const struct roff *r, const char *cp, int *ppos)
+{
+       int             pos;
+
+       pos = *ppos;
+
+       if (0 != r->control && cp[pos] == r->control)
+               pos++;
+       else if (0 != r->control)
+               return(0);
+       else if ('\\' == cp[pos] && '.' == cp[pos + 1])
+               pos += 2;
+       else if ('.' == cp[pos] || '\'' == cp[pos])
+               pos++;
+       else
+               return(0);
+
+       while (' ' == cp[pos] || '\t' == cp[pos])
+               pos++;
+
+       *ppos = pos;
+       return(1);
+}