Eliminate the class=It-* attributes.

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index db11e1907f53df241b98c48d19a3638cfabe9001..c0ccca87211b4f0f4302ed7de709364d4b871fb8 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,7 +1,7 @@
-/*     $Id: roff.c,v 1.320 2017/07/08 15:28:09 schwarze Exp $ */
+/*     $Id: roff.c,v 1.328 2018/04/11 17:11:13 schwarze Exp $ */

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

- * Copyright (c) 2010-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2015, 2017, 2018 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


@@ -46,6 +46,7 @@
 #define        ROFFDEF_STD     (1 << 4)  /* mdoc(7) or man(7) macro. */
 #define        ROFFDEF_ANY     (ROFFDEF_USER | ROFFDEF_PRE | \
                         ROFFDEF_REN | ROFFDEF_STD)
 #define        ROFFDEF_STD     (1 << 4)  /* mdoc(7) or man(7) macro. */
 #define        ROFFDEF_ANY     (ROFFDEF_USER | ROFFDEF_PRE | \
                         ROFFDEF_REN | ROFFDEF_STD)

+#define        ROFFDEF_UNDEF   (1 << 5)  /* Completely undefined. */

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


@@ -72,6 +73,7 @@ struct        roffkv {
 struct roffreg {
        struct roffstr   key;
        int              val;
 struct roffreg {
        struct roffstr   key;
        int              val;

+       int              step;

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


@@ -153,6 +155,7 @@ static      void             roffnode_cleanscope(struct roff *);
 static void             roffnode_pop(struct roff *);
 static void             roffnode_push(struct roff *, enum roff_tok,
                                const char *, int, int);
 static void             roffnode_pop(struct roff *);
 static void             roffnode_push(struct roff *, enum roff_tok,
                                const char *, int, int);

+static void             roff_addtbl(struct roff_man *, struct tbl_node *);

 static enum rofferr     roff_als(ROFF_ARGS);
 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);
 static enum rofferr     roff_als(ROFF_ARGS);
 static enum rofferr     roff_block(ROFF_ARGS);
 static enum rofferr     roff_block_text(ROFF_ARGS);


@@ -180,11 +183,11 @@ static    void             roff_freestr(struct roffkv *);
 static size_t           roff_getname(struct roff *, char **, int, int);
 static int              roff_getnum(const char *, int *, int *, int);
 static int              roff_getop(const char *, int *, char *);
 static size_t           roff_getname(struct roff *, char **, int, int);
 static int              roff_getnum(const char *, int *, int *, int);
 static int              roff_getop(const char *, int *, char *);

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

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

-static const char      *roff_getstrn(const struct roff *,
+static const char      *roff_getstrn(struct roff *,

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


@@ -205,6 +208,8 @@ static      enum rofferr     roff_res(struct roff *, struct buf *, int, int);
 static enum rofferr     roff_rm(ROFF_ARGS);
 static enum rofferr     roff_rn(ROFF_ARGS);
 static enum rofferr     roff_rr(ROFF_ARGS);
 static enum rofferr     roff_rm(ROFF_ARGS);
 static enum rofferr     roff_rn(ROFF_ARGS);
 static enum rofferr     roff_rr(ROFF_ARGS);

+static void             roff_setregn(struct roff *, const char *,
+                               size_t, int, char, int);

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


@@ -757,7 +762,7 @@ roff_alloc(struct mparse *parse, int options)
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->parse = parse;
 
        r = mandoc_calloc(1, sizeof(struct roff));
        r->parse = parse;

-       r->reqtab = roffhash_alloc(0, ROFF_USERDEF);
+       r->reqtab = roffhash_alloc(0, ROFF_RENAMED);

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


@@ -979,18 +984,21 @@ roff_body_alloc(struct roff_man *man, int line, int pos, int tok)
        return n;
 }
 
        return n;
 }
 

-void
-roff_addtbl(struct roff_man *man, const struct tbl_span *tbl)
+static void
+roff_addtbl(struct roff_man *man, struct tbl_node *tbl)

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

+       const struct tbl_span   *span;

 
        if (man->macroset == MACROSET_MAN)
                man_breakscope(man, ROFF_TS);
 
        if (man->macroset == MACROSET_MAN)
                man_breakscope(man, ROFF_TS);

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

 }
 
 void
 }
 
 void


@@ -1114,8 +1122,10 @@ static enum rofferr
 roff_res(struct roff *r, struct buf *buf, int ln, int pos)
 {
        char             ubuf[24]; /* buffer to print the number */
 roff_res(struct roff *r, struct buf *buf, int ln, int pos)
 {
        char             ubuf[24]; /* buffer to print the number */

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

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

+       char            *ep;    /* end of comment string */

        const char      *stnam; /* start of the name, after "[(*" */
        const char      *cp;    /* end of the name, e.g. before ']' */
        const char      *res;   /* the string to be substituted */
        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 */


@@ -1123,13 +1133,14 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
        size_t           maxl;  /* expected length of the escape name */
        size_t           naml;  /* actual length of the escape name */
        enum mandoc_esc  esc;   /* type of the escape sequence */
        size_t           maxl;  /* expected length of the escape name */
        size_t           naml;  /* actual length of the escape name */
        enum mandoc_esc  esc;   /* type of the escape sequence */

-       enum mandoc_os   os_e;  /* kind of RCS id seen */

        int              inaml; /* length returned from mandoc_escape() */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */
        int              arg_complete; /* argument not interrupted by eol */
        int              done;  /* no more input available */
        int              deftype; /* type of definition to paste */
        int              inaml; /* length returned from mandoc_escape() */
        int              expand_count;  /* to avoid infinite loops */
        int              npos;  /* position in numeric expression */
        int              arg_complete; /* argument not interrupted by eol */
        int              done;  /* no more input available */
        int              deftype; /* type of definition to paste */

+       int              rcsid; /* kind of RCS id seen */
+       char             sign;  /* increment number register */

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


@@ -1145,32 +1156,54 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
 
                /* Comment found, look for RCS id. */
 
 
                /* Comment found, look for RCS id. */
 

+               rcsid = 0;

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

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

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

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

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

-                       if (r->man->meta.rcsids & (1 << os_e))
+                       if (r->man->meta.rcsids & rcsid)

                                mandoc_msg(MANDOCERR_RCS_REP, r->parse,
                                    ln, stesc + 1 - buf->buf, stesc + 1);
                                mandoc_msg(MANDOCERR_RCS_REP, r->parse,
                                    ln, stesc + 1 - buf->buf, stesc + 1);

-                       r->man->meta.rcsids |= 1 << os_e;
+                       r->man->meta.rcsids |= rcsid;

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

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

                        done = 1;
                        done = 1;

-                       cp--;
+                       ep--;

                }
                }

-               if (*cp == ' ' || *cp == '\t')
+               if (*ep == ' ' || *ep == '\t')

                        mandoc_msg(MANDOCERR_SPACE_EOL, r->parse,
                        mandoc_msg(MANDOCERR_SPACE_EOL, r->parse,

-                           ln, cp - buf->buf, NULL);
+                           ln, ep - buf->buf, NULL);
+
+               /*
+                * Save comments preceding the title macro
+                * in the syntax tree.
+                */
+
+               if (r->format == 0) {
+                       while (*ep == ' ' || *ep == '\t')
+                               ep--;
+                       ep[1] = '\0';
+                       n = roff_node_alloc(r->man,
+                           ln, stesc + 1 - buf->buf,
+                           ROFFT_COMMENT, TOKEN_NONE);
+                       n->string = mandoc_strdup(stesc + 2);
+                       roff_node_append(r->man, n);
+                       n->flags |= NODE_VALID | NODE_ENDED;
+                       r->man->next = ROFF_NEXT_SIBLING;
+               }
+
+               /* Discard comments. */
+

                while (stesc > start && stesc[-1] == ' ')
                        stesc--;
                *stesc = '\0';
                while (stesc > start && stesc[-1] == ' ')
                        stesc--;
                *stesc = '\0';


@@ -1239,6 +1272,9 @@ roff_res(struct roff *r, struct buf *buf, int ln, int pos)
                        term = cp[1];
                        /* FALLTHROUGH */
                case 'n':
                        term = cp[1];
                        /* FALLTHROUGH */
                case 'n':

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

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


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

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

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


@@ -1501,8 +1537,11 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
                eqn_read(r->eqn, buf->buf + ppos);
                return ROFF_IGN;
        }
                eqn_read(r->eqn, buf->buf + ppos);
                return ROFF_IGN;
        }

-       if (r->tbl != NULL && ( ! ctl || buf->buf[pos] == '\0'))
-               return tbl_read(r->tbl, ln, buf->buf, ppos);
+       if (r->tbl != NULL && (ctl == 0 || buf->buf[pos] == '\0')) {
+               tbl_read(r->tbl, ln, buf->buf, ppos);
+               roff_addtbl(r->man, r->tbl);
+               return ROFF_IGN;
+       }

        if ( ! ctl)
                return roff_parsetext(r, buf, pos, offs);
 
        if ( ! ctl)
                return roff_parsetext(r, buf, pos, offs);
 


@@ -1543,13 +1582,16 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
                        pos++;
                while (buf->buf[pos] == ' ')
                        pos++;
                        pos++;
                while (buf->buf[pos] == ' ')
                        pos++;

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

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

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

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


@@ -1572,23 +1614,23 @@ roff_parseln(struct roff *r, int ln, struct buf *buf, int *offs)
 void
 roff_endparse(struct roff *r)
 {
 void
 roff_endparse(struct roff *r)
 {

-
-       if (r->last)
+       if (r->last != NULL)

                mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
                    r->last->line, r->last->col,
                    roff_name[r->last->tok]);
 
                mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
                    r->last->line, r->last->col,
                    roff_name[r->last->tok]);
 

-       if (r->eqn) {
+       if (r->eqn != NULL) {

                mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
                    r->eqn->node->line, r->eqn->node->pos, "EQ");
                eqn_parse(r->eqn);
                r->eqn = NULL;
        }
 
                mandoc_msg(MANDOCERR_BLK_NOEND, r->parse,
                    r->eqn->node->line, r->eqn->node->pos, "EQ");
                eqn_parse(r->eqn);
                r->eqn = NULL;
        }
 

-       if (r->tbl) {
+       if (r->tbl != NULL) {

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

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

        }
 }
 
        }
 }
 


@@ -1628,6 +1670,11 @@ roff_parse(struct roff *r, char *buf, int *pos, int ln, int ppos)
        }
        if (t != TOKEN_NONE)
                *pos = cp - buf;
        }
        if (t != TOKEN_NONE)
                *pos = cp - buf;

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

        return t;
 }
 
        return t;
 }
 


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

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

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

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

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

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

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

+               reg->step = 0;

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


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

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

 }
 
 /*
 }
 
 /*


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

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

 {
 {

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

 }
 
 static int
 }
 
 static int

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

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


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

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

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

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

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

+               }
+       }

 
 

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

        return 0;
 }
 
        return 0;
 }
 


@@ -2635,9 +2693,9 @@ roff_freereg(struct roffreg *reg)
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {
 static enum rofferr
 roff_nr(ROFF_ARGS)
 {

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

        size_t           keysz;
        size_t           keysz;

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

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


@@ -2647,15 +2705,22 @@ roff_nr(ROFF_ARGS)
        keysz = roff_getname(r, &val, ln, pos);
        if (key[keysz] == '\\')
                return ROFF_IGN;
        keysz = roff_getname(r, &val, ln, pos);
        if (key[keysz] == '\\')
                return ROFF_IGN;

-       key[keysz] = '\0';

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

-       if (roff_evalnum(r, ln, val, NULL, &iv, ROFFNUM_SCALE))
-               roff_setreg(r, key, iv, sign);
+       len = 0;
+       if (roff_evalnum(r, ln, val, &len, &iv, ROFFNUM_SCALE) == 0)
+               return ROFF_IGN;
+
+       step = val + len;
+       while (isspace((unsigned char)*step))
+               step++;
+       if (roff_evalnum(r, ln, step, NULL, &is, 0) == 0)
+               is = INT_MIN;

 
 

+       roff_setregn(r, key, keysz, iv, sign, is);

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 


@@ -2770,16 +2835,19 @@ roff_Dd(ROFF_ARGS)
 static enum rofferr
 roff_TE(ROFF_ARGS)
 {
 static enum rofferr
 roff_TE(ROFF_ARGS)
 {

-
-       if (NULL == r->tbl)
+       if (r->tbl == NULL) {

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

-       else if ( ! tbl_end(&r->tbl)) {
+               return ROFF_IGN;
+       }
+       if (tbl_end(r->tbl) == 0) {
+               r->tbl = NULL;

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

+       r->tbl = NULL;

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 


@@ -2867,6 +2935,8 @@ roff_EQ(ROFF_ARGS)
 {
        struct roff_node        *n;
 
 {
        struct roff_node        *n;
 

+       if (r->man->macroset == MACROSET_MAN)
+               man_breakscope(r->man, ROFF_EQ);

        n = roff_node_alloc(r->man, ln, ppos, ROFFT_EQN, TOKEN_NONE);
        if (ln > r->man->last->line)
                n->flags |= NODE_LINE;
        n = roff_node_alloc(r->man, ln, ppos, ROFFT_EQN, TOKEN_NONE);
        if (ln > r->man->last->line)
                n->flags |= NODE_LINE;


@@ -2907,22 +2977,17 @@ roff_EN(ROFF_ARGS)
 static enum rofferr
 roff_TS(ROFF_ARGS)
 {
 static enum rofferr
 roff_TS(ROFF_ARGS)
 {

-       struct tbl_node *tbl;
-
-       if (r->tbl) {
+       if (r->tbl != NULL) {

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

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

        }
        }

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

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

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

        else
        else

-               r->first_tbl = r->last_tbl = tbl;
-
-       r->tbl = r->last_tbl = tbl;
+               r->first_tbl = r->tbl;
+       r->last_tbl = r->tbl;

        return ROFF_IGN;
 }
 
        return ROFF_IGN;
 }
 


@@ -3526,62 +3591,95 @@ roff_setstrn(struct roffkv **r, const char *name, size_t namesz,
 }
 
 static const char *
 }
 
 static const char *

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

     int *deftype)
 {
        const struct roffkv     *n;
     int *deftype)
 {
        const struct roffkv     *n;

-       int                      i;
+       int                      found, i;

        enum roff_tok            tok;
 
        enum roff_tok            tok;
 

-       if (*deftype & ROFFDEF_USER) {
-               for (n = r->strtab; n != NULL; n = n->next) {
-                       if (strncmp(name, n->key.p, len) == 0 &&
-                           n->key.p[len] == '\0' &&
-                           n->val.p != NULL) {
-                               *deftype = ROFFDEF_USER;
-                               return n->val.p;
-                       }
+       found = 0;
+       for (n = r->strtab; n != NULL; n = n->next) {
+               if (strncmp(name, n->key.p, len) != 0 ||
+                   n->key.p[len] != '\0' || n->val.p == NULL)
+                       continue;
+               if (*deftype & ROFFDEF_USER) {
+                       *deftype = ROFFDEF_USER;
+                       return n->val.p;
+               } else {
+                       found = 1;
+                       break;

                }
        }
                }
        }

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

                }
        }
                }
        }

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

                }
        }
                }
        }

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

                        }
                }
                        }
                }

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

                        }
                }
        }
                        }
                }
        }

+
+       if (found == 0 && *deftype != ROFFDEF_ANY) {
+               if (*deftype & ROFFDEF_REN) {
+                       /*
+                        * This might still be a request,
+                        * so do not treat it as undefined yet.
+                        */
+                       *deftype = ROFFDEF_UNDEF;
+                       return NULL;
+               }
+
+               /* Using an undefined string defines it to be empty. */
+
+               roff_setstrn(&r->strtab, name, len, "", 0, 0);
+               roff_setstrn(&r->rentab, name, len, NULL, 0, 0);
+       }
+

        *deftype = 0;
        return NULL;
 }
        *deftype = 0;
        return NULL;
 }


@@ -3601,13 +3699,6 @@ roff_freestr(struct roffkv *r)
 
 /* --- accessors and utility functions ------------------------------------ */
 
 
 /* --- accessors and utility functions ------------------------------------ */
 

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

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