Removed TODO that was fixed by parsing escapes in offset strings.

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 3744c74d15cb4bb6e129ca43a2b22a85ebbdb35b..7467fe0e11c29305693c5fff6d51a86dbd363647 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,6 +1,7 @@
-/*     $Id: roff.c,v 1.87 2010/06/09 20:00:38 kristaps Exp $ */
+/*     $Id: roff.c,v 1.102 2010/09/04 20:18:53 kristaps Exp $ */

 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>

+ * Copyright (c) 2010 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


@@ -19,19 +20,30 @@
 #endif
 
 #include <assert.h>
 #endif
 
 #include <assert.h>

+#include <errno.h>

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

+#include <limits.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "mandoc.h"
 #include "roff.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "mandoc.h"
 #include "roff.h"

+#include "libmandoc.h"

 
 #define        RSTACK_MAX      128
 
 #define        ROFF_CTL(c) \
        ('.' == (c) || '\'' == (c))
 
 
 #define        RSTACK_MAX      128
 
 #define        ROFF_CTL(c) \
        ('.' == (c) || '\'' == (c))
 

+#if 1
+#define        ROFF_DEBUG(fmt, args...) \
+       do { /* Nothing. */ } while (/*CONSTCOND*/ 0)
+#else
+#define        ROFF_DEBUG(fmt, args...) \
+       do { fprintf(stderr, fmt , ##args); } while (/*CONSTCOND*/ 0)
+#endif
+

 enum   rofft {
        ROFF_am,
        ROFF_ami,
 enum   rofft {
        ROFF_am,
        ROFF_ami,


@@ -47,7 +59,8 @@ enum  rofft {
        ROFF_rm,
        ROFF_tr,
        ROFF_cblock,
        ROFF_rm,
        ROFF_tr,
        ROFF_cblock,

-       ROFF_ccond,
+       ROFF_ccond, /* FIXME: remove this. */
+       ROFF_nr,

        ROFF_MAX
 };
 
        ROFF_MAX
 };
 


@@ -56,12 +69,21 @@ enum        roffrule {
        ROFFRULE_DENY
 };
 
        ROFFRULE_DENY
 };
 

+
+struct roffstr {
+       char            *name; /* key of symbol */
+       char            *string; /* current value */
+       struct roffstr  *next; /* next in list */
+};
+

 struct roff {
        struct roffnode *last; /* leaf of stack */
        mandocmsg        msg; /* err/warn/fatal messages */
        void            *data; /* privdata for messages */
        enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */
        int              rstackpos; /* position in rstack */
 struct roff {
        struct roffnode *last; /* leaf of stack */
        mandocmsg        msg; /* err/warn/fatal messages */
        void            *data; /* privdata for messages */
        enum roffrule    rstack[RSTACK_MAX]; /* stack of !`ie' rules */
        int              rstackpos; /* position in rstack */

+       struct regset   *regs; /* read/writable registers */
+       struct roffstr  *first_string;

 };
 
 struct roffnode {
 };
 
 struct roffnode {


@@ -103,7 +125,18 @@ static     enum rofferr     roff_ccond(ROFF_ARGS);
 static enum rofferr     roff_cond(ROFF_ARGS);
 static enum rofferr     roff_cond_text(ROFF_ARGS);
 static enum rofferr     roff_cond_sub(ROFF_ARGS);
 static enum rofferr     roff_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 const char      *roff_getstrn(const struct roff *, 
+                               const char *, size_t);

 static enum rofferr     roff_line(ROFF_ARGS);
 static enum rofferr     roff_line(ROFF_ARGS);

+static enum rofferr     roff_nr(ROFF_ARGS);
+static int              roff_res(struct roff *, 
+                               char **, size_t *, int);
+static void             roff_setstr(struct roff *,
+                               const char *, const char *);
+static char            *roff_strdup(const char *);

 
 /* See roff_hash_find() */
 
 
 /* See roff_hash_find() */
 


@@ -120,7 +153,7 @@ static      struct roffmac   roffs[ROFF_MAX] = {
        { "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 },
        { "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_line, NULL, NULL, 0, NULL },
+       { "ds", roff_ds, NULL, NULL, 0, NULL },

        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, 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 },
        { "el", roff_cond, roff_cond_text, roff_cond_sub, ROFFMAC_STRUCT, 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 },


@@ -129,16 +162,18 @@ static    struct roffmac   roffs[ROFF_MAX] = {
        { "tr", roff_line, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "\\}", roff_ccond, NULL, NULL, 0, NULL },
        { "tr", roff_line, NULL, NULL, 0, NULL },
        { ".", roff_cblock, NULL, NULL, 0, NULL },
        { "\\}", roff_ccond, NULL, NULL, 0, NULL },

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

 };
 
 static void             roff_free1(struct roff *);
 static enum rofft       roff_hash_find(const char *);
 static void             roff_hash_init(void);
 static void             roffnode_cleanscope(struct roff *);
 };
 
 static void             roff_free1(struct roff *);
 static enum rofft       roff_hash_find(const char *);
 static void             roff_hash_init(void);
 static void             roffnode_cleanscope(struct roff *);

-static int              roffnode_push(struct roff *, 
+static void             roffnode_push(struct roff *, 

                                enum rofft, int, int);
 static void             roffnode_pop(struct roff *);
 static enum rofft       roff_parse(const char *, int *);
                                enum rofft, int, int);
 static void             roffnode_pop(struct roff *);
 static enum rofft       roff_parse(const char *, int *);

+static int              roff_parse_nat(const char *, unsigned int *);

 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)
 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)


@@ -213,6 +248,7 @@ roffnode_pop(struct roff *r)
                if (r->rstackpos > -1)
                        r->rstackpos--;
 
                if (r->rstackpos > -1)
                        r->rstackpos--;
 

+       ROFF_DEBUG("roff: popping scope\n");

        r->last = r->last->parent;
        if (p->end)
                free(p->end);
        r->last = r->last->parent;
        if (p->end)
                free(p->end);


@@ -224,16 +260,12 @@ roffnode_pop(struct roff *r)
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().
  */
  * Push a roff node onto the instruction stack.  This must later be
  * removed with roffnode_pop().
  */

-static int
+static void

 roffnode_push(struct roff *r, enum rofft tok, int line, int col)
 {
        struct roffnode *p;
 
 roffnode_push(struct roff *r, enum rofft tok, int line, int col)
 {
        struct roffnode *p;
 

-       if (NULL == (p = calloc(1, sizeof(struct roffnode)))) {
-               (*r->msg)(MANDOCERR_MEM, r->data, line, col, NULL);
-               return(0);
-       }
-
+       p = mandoc_calloc(1, sizeof(struct roffnode));

        p->tok = tok;
        p->parent = r->last;
        p->line = line;
        p->tok = tok;
        p->parent = r->last;
        p->line = line;


@@ -241,7 +273,6 @@ roffnode_push(struct roff *r, enum rofft tok, int line, int col)
        p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY;
 
        r->last = p;
        p->rule = p->parent ? p->parent->rule : ROFFRULE_DENY;
 
        r->last = p;

-       return(1);

 }
 
 
 }
 
 


@@ -251,6 +282,7 @@ roff_free1(struct roff *r)
 
        while (r->last)
                roffnode_pop(r);
 
        while (r->last)
                roffnode_pop(r);

+       roff_freestr(r);

 }
 
 
 }
 
 


@@ -272,15 +304,12 @@ roff_free(struct roff *r)
 
 
 struct roff *
 
 
 struct roff *

-roff_alloc(const mandocmsg msg, void *data)
+roff_alloc(struct regset *regs, void *data, const mandocmsg msg)

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

-       if (NULL == (r = calloc(1, sizeof(struct roff)))) {
-               (*msg)(MANDOCERR_MEM, data, 0, 0, NULL);
-               return(0);
-       }
-
+       r = mandoc_calloc(1, sizeof(struct roff));
+       r->regs = regs;

        r->msg = msg;
        r->data = data;
        r->rstackpos = -1;
        r->msg = msg;
        r->data = data;
        r->rstackpos = -1;


@@ -290,13 +319,89 @@ roff_alloc(const mandocmsg msg, void *data)
 }
 
 
 }
 
 

+/*
+ * 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. 
+ */
+static int
+roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
+{
+       const char      *cp, *cpp, *st, *res;
+       int              i, maxl;
+       size_t           nsz;
+       char            *n;
+
+       /* LINTED */
+       for (cp = &(*bufp)[pos]; (cpp = strstr(cp, "\\*")); cp++) {
+               cp = cpp + 2;
+               switch (*cp) {
+               case ('('):
+                       cp++;
+                       maxl = 2;
+                       break;
+               case ('['):
+                       cp++;
+                       maxl = 0;
+                       break;
+               default:
+                       maxl = 1;
+                       break;
+               }
+
+               st = cp;
+
+               for (i = 0; 0 == maxl || i < maxl; i++, cp++) {
+                       if ('\0' == *cp)
+                               return(1); /* Error. */
+                       if (0 == maxl && ']' == *cp)
+                               break;
+               }
+
+               res = roff_getstrn(r, st, (size_t)i);
+
+               if (NULL == res) {
+                       cp -= maxl ? 1 : 0;
+                       continue;
+               }
+
+               ROFF_DEBUG("roff: splicing reserved: [%.*s]\n", i, st);
+
+               nsz = *szp + strlen(res) + 1;
+               n = mandoc_malloc(nsz);
+
+               *n = '\0';
+
+               strlcat(n, *bufp, (size_t)(cpp - *bufp + 1));
+               strlcat(n, res, nsz);
+               strlcat(n, cp + (maxl ? 0 : 1), nsz);
+
+               free(*bufp);
+
+               *bufp = n;
+               *szp = nsz;
+               return(0);
+       }
+
+       return(1);
+}
+
+

 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, char **bufp, 
+               size_t *szp, int pos, int *offs)

 {
        enum rofft       t;
        int              ppos;
 
 {
        enum rofft       t;
        int              ppos;
 

+       /*
+        * Run the reserved-word filter only if we have some reserved
+        * words to fill in.
+        */
+
+       if (r->first_string && ! roff_res(r, bufp, szp, pos))
+               return(ROFF_RERUN);
+

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


@@ -306,8 +411,11 @@ roff_parseln(struct roff *r, int ln,
        if (r->last && ! ROFF_CTL((*bufp)[pos])) {
                t = r->last->tok;
                assert(roffs[t].text);
        if (r->last && ! ROFF_CTL((*bufp)[pos])) {
                t = r->last->tok;
                assert(roffs[t].text);

+               ROFF_DEBUG("roff: intercept scoped text: %s, [%s]\n", 
+                               roffs[t].name, &(*bufp)[pos]);

                return((*roffs[t].text)
                return((*roffs[t].text)

-                               (r, t, bufp, szp, ln, pos, pos, offs));
+                               (r, t, bufp, szp, 
+                                ln, pos, pos, offs));

        } else if ( ! ROFF_CTL((*bufp)[pos]))
                return(ROFF_CONT);
 
        } else if ( ! ROFF_CTL((*bufp)[pos]))
                return(ROFF_CONT);
 


@@ -319,8 +427,11 @@ roff_parseln(struct roff *r, int ln,
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);
        if (r->last) {
                t = r->last->tok;
                assert(roffs[t].sub);

+               ROFF_DEBUG("roff: intercept scoped context: %s, [%s]\n", 
+                               roffs[t].name, &(*bufp)[pos]);

                return((*roffs[t].sub)
                return((*roffs[t].sub)

-                               (r, t, bufp, szp, ln, pos, pos, offs));
+                               (r, t, bufp, szp, 
+                                ln, pos, pos, offs));

        }
 
        /*
        }
 
        /*


@@ -333,9 +444,12 @@ roff_parseln(struct roff *r, int ln,
        if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
                return(ROFF_CONT);
 
        if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
                return(ROFF_CONT);
 

+       ROFF_DEBUG("roff: intercept new-scope: %s, [%s]\n", 
+                       roffs[t].name, &(*bufp)[pos]);

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

-                       (r, t, bufp, szp, ln, ppos, pos, offs));
+                       (r, t, bufp, szp, 
+                        ln, ppos, pos, offs));

 }
 
 
 }
 
 


@@ -391,6 +505,26 @@ roff_parse(const char *buf, int *pos)
 }
 
 
 }
 
 

+static int
+roff_parse_nat(const char *buf, unsigned int *res)
+{
+       char            *ep;
+       long             lval;
+
+       errno = 0;
+       lval = strtol(buf, &ep, 10);
+       if (buf[0] == '\0' || *ep != '\0')
+               return(0);
+       if ((errno == ERANGE && 
+                       (lval == LONG_MAX || lval == LONG_MIN)) ||
+                       (lval > INT_MAX || lval < 0))
+               return(0);
+
+       *res = (unsigned int)lval;
+       return(1);
+}
+
+

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


@@ -509,8 +643,7 @@ roff_block(ROFF_ARGS)
                        pos++;
        }
 
                        pos++;
        }
 

-       if ( ! roffnode_push(r, tok, ln, ppos))
-               return(ROFF_ERR);
+       roffnode_push(r, tok, ln, ppos);

 
        if ('\0' == (*bufp)[pos])
                return(ROFF_IGN);
 
        if ('\0' == (*bufp)[pos])
                return(ROFF_IGN);


@@ -532,12 +665,7 @@ roff_block(ROFF_ARGS)
        if (1 == sz && '.' == (*bufp)[sv])
                return(ROFF_IGN);
 
        if (1 == sz && '.' == (*bufp)[sv])
                return(ROFF_IGN);
 

-       r->last->end = malloc(sz + 1);
-
-       if (NULL == r->last->end) {
-               (*r->msg)(MANDOCERR_MEM, r->data, ln, pos, NULL);
-               return(ROFF_ERR);
-       }
+       r->last->end = mandoc_malloc(sz + 1);

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


@@ -601,8 +729,8 @@ roff_block_sub(ROFF_ARGS)
                return(ROFF_IGN);
 
        assert(roffs[t].proc);
                return(ROFF_IGN);
 
        assert(roffs[t].proc);

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

 }
 
 
 }
 
 


@@ -621,7 +749,6 @@ roff_cond_sub(ROFF_ARGS)
 {
        enum rofft       t;
        enum roffrule    rr;
 {
        enum rofft       t;
        enum roffrule    rr;

-       struct roffnode *l;

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


@@ -631,14 +758,15 @@ roff_cond_sub(ROFF_ARGS)
         * continue. 
         */
 
         * continue. 
         */
 

-       l = r->last;

        roffnode_cleanscope(r);
 
        roffnode_cleanscope(r);
 

-       if (l != r->last)
-               return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
-
-       if (ROFF_MAX == (t = roff_parse(*bufp, &pos)))
+       if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) {
+               if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1])
+                       return(roff_ccond
+                               (r, ROFF_ccond, bufp, szp, 
+                                ln, pos, pos + 2, offs));

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

+       }

 
        /*
         * A denied conditional must evaluate its children if and only
 
        /*
         * A denied conditional must evaluate its children if and only


@@ -651,8 +779,8 @@ roff_cond_sub(ROFF_ARGS)
                                return(ROFF_IGN);
 
        assert(roffs[t].proc);
                                return(ROFF_IGN);
 
        assert(roffs[t].proc);

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

 }
 
 
 }
 
 


@@ -670,6 +798,8 @@ roff_cond_text(ROFF_ARGS)
         * scope permits us to do so.
         */
 
         * scope permits us to do so.
         */
 

+       /* FIXME: use roff_ccond? */
+

        st = &(*bufp)[pos];
        if (NULL == (ep = strstr(st, "\\}"))) {
                roffnode_cleanscope(r);
        st = &(*bufp)[pos];
        if (NULL == (ep = strstr(st, "\\}"))) {
                roffnode_cleanscope(r);


@@ -684,12 +814,46 @@ roff_cond_text(ROFF_ARGS)
 }
 
 
 }
 
 

+static enum roffrule
+roff_evalcond(const char *v, int *pos)
+{
+
+       switch (v[*pos]) {
+       case ('n'):
+               (*pos)++;
+               return(ROFFRULE_ALLOW);
+       case ('e'):
+               /* FALLTHROUGH */
+       case ('o'):
+               /* FALLTHROUGH */
+       case ('t'):
+               (*pos)++;
+               return(ROFFRULE_DENY);
+       default:
+               break;
+       }
+
+       while (v[*pos] && ' ' != v[*pos])
+               (*pos)++;
+       return(ROFFRULE_DENY);
+}
+
+
+/* ARGSUSED */
+static enum rofferr
+roff_line(ROFF_ARGS)
+{
+
+       return(ROFF_IGN);
+}
+
+

 /* ARGSUSED */
 static enum rofferr
 roff_cond(ROFF_ARGS)
 {
 /* ARGSUSED */
 static enum rofferr
 roff_cond(ROFF_ARGS)
 {

-       int              cpos;  /* position of the condition */

        int              sv;
        int              sv;

+       enum roffrule    rule;

 
        /* Stack overflow! */
 
 
        /* Stack overflow! */
 


@@ -698,20 +862,22 @@ roff_cond(ROFF_ARGS)
                return(ROFF_ERR);
        }
 
                return(ROFF_ERR);
        }
 

-       cpos = pos;
+       /* First, evaluate the conditional. */

 
 

-       if (ROFF_if == tok || ROFF_ie == tok) {
-               /*
-                * Read ahead past the conditional.  FIXME: this does
-                * not work, as conditionals don't end on whitespace,
-                * but are parsed according to a formal grammar.  It's
-                * good enough for now, however.
-                */
-               while ((*bufp)[pos] && ' ' != (*bufp)[pos])
-                       pos++;
-       }
+       if (ROFF_el == tok) {
+               /* 
+                * An `.el' will get the value of the current rstack
+                * entry set in prior `ie' calls or defaults to DENY.
+                */
+               if (r->rstackpos < 0)
+                       rule = ROFFRULE_DENY;
+               else
+                       rule = r->rstack[r->rstackpos];
+       } else
+               rule = roff_evalcond(*bufp, &pos);

 
        sv = pos;
 
        sv = pos;

+

        while (' ' == (*bufp)[pos])
                pos++;
 
        while (' ' == (*bufp)[pos])
                pos++;
 


@@ -721,30 +887,20 @@ roff_cond(ROFF_ARGS)
         * really doing anything.  Warn about this.  It's probably
         * wrong.
         */
         * really doing anything.  Warn about this.  It's probably
         * wrong.
         */

+

        if ('\0' == (*bufp)[pos] && sv != pos) {
        if ('\0' == (*bufp)[pos] && sv != pos) {

-               if ( ! (*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL))
-                       return(ROFF_ERR);
-               return(ROFF_IGN);
+               if ((*r->msg)(MANDOCERR_NOARGS, r->data, ln, ppos, NULL))
+                       return(ROFF_IGN);
+               return(ROFF_ERR);

        }
 
        }
 

-       if ( ! roffnode_push(r, tok, ln, ppos))
-               return(ROFF_ERR);
+       roffnode_push(r, tok, ln, ppos);

 
 

-       /* XXX: Implement more conditionals. */
+       r->last->rule = rule;
+
+       ROFF_DEBUG("roff: cond: %s -> %s\n", roffs[tok].name, 
+                       ROFFRULE_ALLOW == rule ?  "allow" : "deny");

 
 

-       if (ROFF_if == tok || ROFF_ie == tok)
-               r->last->rule = 'n' == (*bufp)[cpos] ?
-                   ROFFRULE_ALLOW : ROFFRULE_DENY;
-       else if (ROFF_el == tok) {
-               /* 
-                * An `.el' will get the value of the current rstack
-                * entry set in prior `ie' calls or defaults to DENY.
-                */
-               if (r->rstackpos < 0)
-                       r->last->rule = ROFFRULE_DENY;
-               else
-                       r->last->rule = r->rstack[r->rstackpos];
-       }

        if (ROFF_ie == tok) {
                /*
                 * An if-else will put the NEGATION of the current
        if (ROFF_ie == tok) {
                /*
                 * An if-else will put the NEGATION of the current


@@ -756,15 +912,31 @@ roff_cond(ROFF_ARGS)
                else
                        r->rstack[r->rstackpos] = ROFFRULE_DENY;
        }
                else
                        r->rstack[r->rstackpos] = ROFFRULE_DENY;
        }

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

                r->last->rule = ROFFRULE_DENY;
                r->last->rule = ROFFRULE_DENY;

+               ROFF_DEBUG("roff: cond override: %s -> deny\n",
+                               roffs[tok].name);
+       }
+
+       /*
+        * 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.
+        */

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

-       } 
+               ROFF_DEBUG("roff: cond-scope: %s, multi-line\n", 
+                               roffs[tok].name);
+       } else
+               ROFF_DEBUG("roff: cond-scope: %s, one-line\n", 
+                               roffs[tok].name);

 
        /*
         * If there are no arguments on the line, the next-line scope is
 
        /*
         * If there are no arguments on the line, the next-line scope is


@@ -783,8 +955,160 @@ roff_cond(ROFF_ARGS)
 
 /* ARGSUSED */
 static enum rofferr
 
 /* ARGSUSED */
 static enum rofferr

-roff_line(ROFF_ARGS)
+roff_ds(ROFF_ARGS)
+{
+       char            *name, *string;
+
+       /*
+        * A symbol is named by the first word following the macro
+        * invocation up to a space.  Its value is anything after the
+        * name's trailing whitespace and optional double-quote.  Thus,
+        *
+        *  [.ds foo "bar  "     ]
+        *
+        * will have `bar  "     ' as its value.
+        */
+
+       name = *bufp + pos;
+       if ('\0' == *name)
+               return(ROFF_IGN);
+
+       string = name;
+       /* Read until end of name. */
+       while (*string && ' ' != *string)
+               string++;
+
+       /* Nil-terminate name. */
+       if (*string)
+               *(string++) = '\0';
+       
+       /* Read past spaces. */
+       while (*string && ' ' == *string)
+               string++;
+
+       /* Read passed initial double-quote. */
+       if (*string && '"' == *string)
+               string++;
+
+       /* The rest is the value. */
+       roff_setstr(r, name, string);
+       return(ROFF_IGN);
+}
+
+
+/* ARGSUSED */
+static enum rofferr
+roff_nr(ROFF_ARGS)

 {
 {

+       const char      *key, *val;
+       struct reg      *rg;
+
+       key = &(*bufp)[pos];
+       rg = r->regs->regs;
+
+       /* Parse register request. */
+       while ((*bufp)[pos] && ' ' != (*bufp)[pos])
+               pos++;
+
+       /*
+        * Set our nil terminator.  Because this line is going to be
+        * ignored anyway, we can munge it as we please.
+        */
+       if ((*bufp)[pos])
+               (*bufp)[pos++] = '\0';
+
+       /* Skip whitespace to register token. */
+       while ((*bufp)[pos] && ' ' == (*bufp)[pos])
+               pos++;
+
+       val = &(*bufp)[pos];
+
+       /* Process register token. */
+
+       if (0 == strcmp(key, "nS")) {
+               rg[(int)REG_nS].set = 1;
+               if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u))
+                       rg[(int)REG_nS].v.u = 0;
+
+               ROFF_DEBUG("roff: register nS: %u\n", 
+                               rg[(int)REG_nS].v.u);
+       } else
+               ROFF_DEBUG("roff: ignoring register: %s\n", key);

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

+
+
+static char *
+roff_strdup(const char *name)
+{
+       char            *namecopy, *sv;
+
+       /* 
+        * This isn't a nice simple mandoc_strdup() because we must
+        * handle roff's stupid double-escape rule. 
+        */
+       sv = namecopy = mandoc_malloc(strlen(name) + 1);
+       while (*name) {
+               if ('\\' == *name && '\\' == *(name + 1))
+                       name++;
+               *namecopy++ = *name++;
+       }
+
+       *namecopy = '\0';
+       return(sv);
+}
+
+
+static void
+roff_setstr(struct roff *r, const char *name, const char *string)
+{
+       struct roffstr   *n;
+       char             *namecopy;
+
+       n = r->first_string;
+       while (n && strcmp(name, n->name))
+               n = n->next;
+
+       if (NULL == n) {
+               namecopy = mandoc_strdup(name);
+               n = mandoc_malloc(sizeof(struct roffstr));
+               n->name = namecopy;
+               n->next = r->first_string;
+               r->first_string = n;
+       } else
+               free(n->string);
+
+       /* Don't use mandoc_strdup: clean out double-escapes. */
+       n->string = string ? roff_strdup(string) : NULL;
+       ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, n->string);
+}
+
+
+static const char *
+roff_getstrn(const struct roff *r, const char *name, size_t len)
+{
+       const struct roffstr *n;
+
+       n = r->first_string;
+       while (n && (strncmp(name, n->name, len) || '\0' != n->name[(int)len]))
+               n = n->next;
+
+       return(n ? n->string : NULL);
+}
+
+
+static void
+roff_freestr(struct roff *r)
+{
+       struct roffstr   *n, *nn;
+
+       for (n = r->first_string; n; n = nn) {
+               free(n->name);
+               free(n->string);
+               nn = n->next;
+               free(n);
+       }
+
+       r->first_string = NULL;
+}