we already parse the GNU tbl(7) "nospaces" option,

[mandoc.git] / eqn.c

diff --git a/eqn.c b/eqn.c
index ca58a53f3c5de2f8578973a7d9856af8e11f96d1..27f5cac396cb52578a0d93b664c2c2bbda1ac251 100644 (file)
--- a/eqn.c
+++ b/eqn.c
@@ -1,7 +1,7 @@
-/*     $Id: eqn.c,v 1.75 2017/07/07 17:16:17 schwarze Exp $ */
+/*     $Id: eqn.c,v 1.84 2020/01/08 12:16:24 schwarze Exp $ */

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

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


@@ -27,10 +27,12 @@
 #include <string.h>
 #include <time.h>
 
 #include <string.h>
 #include <time.h>
 

-#include "mandoc.h"

 #include "mandoc_aux.h"
 #include "mandoc_aux.h"

+#include "mandoc.h"
+#include "roff.h"
+#include "eqn.h"

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

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

 
 #define        EQN_NEST_MAX     128 /* maximum nesting of defines */
 #define        STRNEQ(p1, sz1, p2, sz2) \
 
 #define        EQN_NEST_MAX     128 /* maximum nesting of defines */
 #define        STRNEQ(p1, sz1, p2, sz2) \


@@ -283,77 +285,55 @@ enum      parse_mode {
        MODE_TOK
 };
 
        MODE_TOK
 };
 

+struct eqn_def {
+       char             *key;
+       size_t            keysz;
+       char             *val;
+       size_t            valsz;
+};
+

 static struct eqn_box  *eqn_box_alloc(struct eqn_node *, struct eqn_box *);
 static struct eqn_box  *eqn_box_alloc(struct eqn_node *, struct eqn_box *);

-static void             eqn_box_free(struct eqn_box *);

 static struct eqn_box  *eqn_box_makebinary(struct eqn_node *,
                                struct eqn_box *);
 static void             eqn_def(struct eqn_node *);
 static struct eqn_def  *eqn_def_find(struct eqn_node *);
 static void             eqn_delim(struct eqn_node *);
 static enum eqn_tok     eqn_next(struct eqn_node *, enum parse_mode);
 static struct eqn_box  *eqn_box_makebinary(struct eqn_node *,
                                struct eqn_box *);
 static void             eqn_def(struct eqn_node *);
 static struct eqn_def  *eqn_def_find(struct eqn_node *);
 static void             eqn_delim(struct eqn_node *);
 static enum eqn_tok     eqn_next(struct eqn_node *, enum parse_mode);

-static enum rofferr     eqn_parse(struct eqn_node *, struct eqn_box *);

 static void             eqn_undef(struct eqn_node *);
 
 
 static void             eqn_undef(struct eqn_node *);
 
 

-enum rofferr
-eqn_read(struct eqn_node **epp, int ln,
-               const char *p, int pos, int *offs)
+struct eqn_node *
+eqn_alloc(void)

 {
 {

-       size_t           sz;
-       struct eqn_node *ep;
-       enum rofferr     er;
-
-       ep = *epp;
+       struct eqn_node *ep;

 
 

-       /*
-        * If we're the terminating mark, unset our equation status and
-        * validate the full equation.
-        */
-
-       if (0 == strncmp(p, ".EN", 3)) {
-               er = eqn_end(epp);
-               p += 3;
-               while (' ' == *p || '\t' == *p)
-                       p++;
-               if ('\0' == *p)
-                       return er;
-               mandoc_vmsg(MANDOCERR_ARG_SKIP, ep->parse,
-                   ln, pos, "EN %s", p);
-               return er;
-       }
-
-       /*
-        * Build up the full string, replacing all newlines with regular
-        * whitespace.
-        */
-
-       sz = strlen(p + pos) + 1;
-       ep->data = mandoc_realloc(ep->data, ep->sz + sz + 1);
-
-       /* First invocation: nil terminate the string. */
-
-       if (0 == ep->sz)
-               *ep->data = '\0';
-
-       ep->sz += sz;
-       strlcat(ep->data, p + pos, ep->sz + 1);
-       strlcat(ep->data, " ", ep->sz + 1);
-       return ROFF_IGN;
+       ep = mandoc_calloc(1, sizeof(*ep));
+       ep->gsize = EQN_DEFSIZE;
+       return ep;

 }
 
 }
 

-struct eqn_node *
-eqn_alloc(int pos, int line, struct mparse *parse)
+void
+eqn_reset(struct eqn_node *ep)

 {
 {

-       struct eqn_node *p;
-
-       p = mandoc_calloc(1, sizeof(struct eqn_node));
+       free(ep->data);
+       ep->data = ep->start = ep->end = NULL;
+       ep->sz = ep->toksz = 0;
+}

 
 

-       p->parse = parse;
-       p->eqn.ln = line;
-       p->eqn.pos = pos;
-       p->gsize = EQN_DEFSIZE;
+void
+eqn_read(struct eqn_node *ep, const char *p)
+{
+       char            *cp;

 
 

-       return p;
+       if (ep->data == NULL) {
+               ep->sz = strlen(p);
+               ep->data = mandoc_strdup(p);
+       } else {
+               ep->sz = mandoc_asprintf(&cp, "%s %s", ep->data, p);
+               free(ep->data);
+               ep->data = cp;
+       }
+       ep->sz += 1;

 }
 
 /*
 }
 
 /*


@@ -419,6 +399,14 @@ eqn_next(struct eqn_node *ep, enum parse_mode mode)
                case '"':
                        quoted = 1;
                        break;
                case '"':
                        quoted = 1;
                        break;

+               case ' ':
+               case '\t':
+               case '~':
+               case '^':
+                       if (quoted)
+                               break;
+                       ep->start++;
+                       continue;

                default:
                        break;
                }
                default:
                        break;
                }


@@ -426,8 +414,8 @@ eqn_next(struct eqn_node *ep, enum parse_mode mode)
                        ep->end = strchr(ep->start + 1, *ep->start);
                        ep->start++;  /* Skip opening quote. */
                        if (ep->end == NULL) {
                        ep->end = strchr(ep->start + 1, *ep->start);
                        ep->start++;  /* Skip opening quote. */
                        if (ep->end == NULL) {

-                               mandoc_msg(MANDOCERR_ARG_QUOTE, ep->parse,
-                                   ep->eqn.ln, ep->eqn.pos, NULL);
+                               mandoc_msg(MANDOCERR_ARG_QUOTE,
+                                   ep->node->line, ep->node->pos, NULL);

                                ep->end = strchr(ep->start, '\0');
                        }
                } else {
                                ep->end = strchr(ep->start, '\0');
                        }
                } else {


@@ -447,8 +435,8 @@ eqn_next(struct eqn_node *ep, enum parse_mode mode)
                if ((def = eqn_def_find(ep)) == NULL)
                        break;
                if (++lim > EQN_NEST_MAX) {
                if ((def = eqn_def_find(ep)) == NULL)
                        break;
                if (++lim > EQN_NEST_MAX) {

-                       mandoc_msg(MANDOCERR_ROFFLOOP, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, NULL);
+                       mandoc_msg(MANDOCERR_ROFFLOOP,
+                           ep->node->line, ep->node->pos, NULL);

                        return EQN_TOK_EOF;
                }
 
                        return EQN_TOK_EOF;
                }
 


@@ -492,9 +480,11 @@ eqn_next(struct eqn_node *ep, enum parse_mode mode)
        return EQN_TOK__MAX;
 }
 
        return EQN_TOK__MAX;
 }
 

-static void
+void

 eqn_box_free(struct eqn_box *bp)
 {
 eqn_box_free(struct eqn_box *bp)
 {

+       if (bp == NULL)
+               return;

 
        if (bp->first)
                eqn_box_free(bp->first);
 
        if (bp->first)
                eqn_box_free(bp->first);


@@ -509,6 +499,16 @@ eqn_box_free(struct eqn_box *bp)
        free(bp);
 }
 
        free(bp);
 }
 

+struct eqn_box *
+eqn_box_new(void)
+{
+       struct eqn_box  *bp;
+
+       bp = mandoc_calloc(1, sizeof(*bp));
+       bp->expectargs = UINT_MAX;
+       return bp;
+}
+

 /*
  * Allocate a box as the last child of the parent node.
  */
 /*
  * Allocate a box as the last child of the parent node.
  */


@@ -517,10 +517,9 @@ eqn_box_alloc(struct eqn_node *ep, struct eqn_box *parent)
 {
        struct eqn_box  *bp;
 
 {
        struct eqn_box  *bp;
 

-       bp = mandoc_calloc(1, sizeof(struct eqn_box));
+       bp = eqn_box_new();

        bp->parent = parent;
        bp->parent->args++;
        bp->parent = parent;
        bp->parent->args++;

-       bp->expectargs = UINT_MAX;

        bp->font = bp->parent->font;
        bp->size = ep->gsize;
 
        bp->font = bp->parent->font;
        bp->size = ep->gsize;
 


@@ -569,8 +568,8 @@ static void
 eqn_delim(struct eqn_node *ep)
 {
        if (ep->end[0] == '\0' || ep->end[1] == '\0') {
 eqn_delim(struct eqn_node *ep)
 {
        if (ep->end[0] == '\0' || ep->end[1] == '\0') {

-               mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                   ep->eqn.ln, ep->eqn.pos, "delim");
+               mandoc_msg(MANDOCERR_REQ_EMPTY,
+                   ep->node->line, ep->node->pos, "delim");

                if (ep->end[0] != '\0')
                        ep->end++;
        } else if (strncmp(ep->end, "off", 3) == 0) {
                if (ep->end[0] != '\0')
                        ep->end++;
        } else if (strncmp(ep->end, "off", 3) == 0) {


@@ -596,8 +595,8 @@ eqn_undef(struct eqn_node *ep)
        struct eqn_def  *def;
 
        if (eqn_next(ep, MODE_NOSUB) == EQN_TOK_EOF) {
        struct eqn_def  *def;
 
        if (eqn_next(ep, MODE_NOSUB) == EQN_TOK_EOF) {

-               mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                   ep->eqn.ln, ep->eqn.pos, "undef");
+               mandoc_msg(MANDOCERR_REQ_EMPTY,
+                   ep->node->line, ep->node->pos, "undef");

                return;
        }
        if ((def = eqn_def_find(ep)) == NULL)
                return;
        }
        if ((def = eqn_def_find(ep)) == NULL)


@@ -615,8 +614,8 @@ eqn_def(struct eqn_node *ep)
        int              i;
 
        if (eqn_next(ep, MODE_NOSUB) == EQN_TOK_EOF) {
        int              i;
 
        if (eqn_next(ep, MODE_NOSUB) == EQN_TOK_EOF) {

-               mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                   ep->eqn.ln, ep->eqn.pos, "define");
+               mandoc_msg(MANDOCERR_REQ_EMPTY,
+                   ep->node->line, ep->node->pos, "define");

                return;
        }
 
                return;
        }
 


@@ -644,8 +643,8 @@ eqn_def(struct eqn_node *ep)
        }
 
        if (eqn_next(ep, MODE_QUOTED) == EQN_TOK_EOF) {
        }
 
        if (eqn_next(ep, MODE_QUOTED) == EQN_TOK_EOF) {

-               mandoc_vmsg(MANDOCERR_REQ_EMPTY, ep->parse,
-                   ep->eqn.ln, ep->eqn.pos, "define %s", def->key);
+               mandoc_msg(MANDOCERR_REQ_EMPTY,
+                   ep->node->line, ep->node->pos, "define %s", def->key);

                free(def->key);
                free(def->val);
                def->key = def->val = NULL;
                free(def->key);
                free(def->val);
                def->key = def->val = NULL;


@@ -657,19 +656,17 @@ eqn_def(struct eqn_node *ep)
        def->valsz = ep->toksz;
 }
 
        def->valsz = ep->toksz;
 }
 

-/*
- * Recursively parse an eqn(7) expression.
- */
-static enum rofferr
-eqn_parse(struct eqn_node *ep, struct eqn_box *parent)
+void
+eqn_parse(struct eqn_node *ep)

 {
 {

-       struct eqn_box  *cur, *nbox, *split;
+       struct eqn_box  *cur, *nbox, *parent, *split;

        const char      *cp, *cpn;
        char            *p;
        enum eqn_tok     tok;
        enum { CCL_LET, CCL_DIG, CCL_PUN } ccl, ccln;
        int              size;
 
        const char      *cp, *cpn;
        char            *p;
        enum eqn_tok     tok;
        enum { CCL_LET, CCL_DIG, CCL_PUN } ccl, ccln;
        int              size;
 

+       parent = ep->node->eqn;

        assert(parent != NULL);
 
        /*
        assert(parent != NULL);
 
        /*


@@ -678,9 +675,9 @@ eqn_parse(struct eqn_node *ep, struct eqn_box *parent)
         */
 
        if (ep->data == NULL)
         */
 
        if (ep->data == NULL)

-               return ROFF_IGN;
+               return;

 
 

-       ep->start = ep->end = ep->data + strspn(ep->data, " ^~");
+       ep->start = ep->end = ep->data;

 
 next_tok:
        tok = eqn_next(ep, MODE_TOK);
 
 next_tok:
        tok = eqn_next(ep, MODE_TOK);


@@ -695,16 +692,16 @@ next_tok:
        case EQN_TOK_TDEFINE:
                if (eqn_next(ep, MODE_NOSUB) == EQN_TOK_EOF ||
                    eqn_next(ep, MODE_QUOTED) == EQN_TOK_EOF)
        case EQN_TOK_TDEFINE:
                if (eqn_next(ep, MODE_NOSUB) == EQN_TOK_EOF ||
                    eqn_next(ep, MODE_QUOTED) == EQN_TOK_EOF)

-                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, "tdefine");
+                       mandoc_msg(MANDOCERR_REQ_EMPTY,
+                           ep->node->line, ep->node->pos, "tdefine");

                break;
        case EQN_TOK_DELIM:
                eqn_delim(ep);
                break;
        case EQN_TOK_GFONT:
                if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF)
                break;
        case EQN_TOK_DELIM:
                eqn_delim(ep);
                break;
        case EQN_TOK_GFONT:
                if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF)

-                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                break;
        case EQN_TOK_MARK:
        case EQN_TOK_LINEUP:
                break;
        case EQN_TOK_MARK:
        case EQN_TOK_LINEUP:


@@ -719,8 +716,8 @@ next_tok:
        case EQN_TOK_DOT:
        case EQN_TOK_DOTDOT:
                if (parent->last == NULL) {
        case EQN_TOK_DOT:
        case EQN_TOK_DOTDOT:
                if (parent->last == NULL) {

-                       mandoc_msg(MANDOCERR_EQN_NOBOX, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_EQN_NOBOX, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        cur = eqn_box_alloc(ep, parent);
                        cur->type = EQN_TEXT;
                        cur->text = mandoc_strdup("");
                        cur = eqn_box_alloc(ep, parent);
                        cur->type = EQN_TEXT;
                        cur->text = mandoc_strdup("");


@@ -746,7 +743,7 @@ next_tok:
                        parent->bottom = mandoc_strdup("\\[ul]");
                        break;
                case EQN_TOK_BAR:
                        parent->bottom = mandoc_strdup("\\[ul]");
                        break;
                case EQN_TOK_BAR:

-                       parent->top = mandoc_strdup("\\[rl]");
+                       parent->top = mandoc_strdup("\\[rn]");

                        break;
                case EQN_TOK_DOT:
                        parent->top = mandoc_strdup("\\[a.]");
                        break;
                case EQN_TOK_DOT:
                        parent->top = mandoc_strdup("\\[a.]");


@@ -764,8 +761,8 @@ next_tok:
        case EQN_TOK_DOWN:
        case EQN_TOK_UP:
                if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF)
        case EQN_TOK_DOWN:
        case EQN_TOK_UP:
                if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF)

-                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                break;
        case EQN_TOK_FAT:
        case EQN_TOK_ROMAN:
                break;
        case EQN_TOK_FAT:
        case EQN_TOK_ROMAN:


@@ -802,14 +799,14 @@ next_tok:
        case EQN_TOK_GSIZE:
                /* Accept two values: integral size and a single. */
                if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF) {
        case EQN_TOK_GSIZE:
                /* Accept two values: integral size and a single. */
                if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF) {

-                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        break;
                }
                size = mandoc_strntoi(ep->start, ep->toksz, 10);
                if (-1 == size) {
                        break;
                }
                size = mandoc_strntoi(ep->start, ep->toksz, 10);
                if (-1 == size) {

-                       mandoc_msg(MANDOCERR_IT_NONUM, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_IT_NONUM, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        break;
                }
                if (EQN_TOK_GSIZE == tok) {
                        break;
                }
                if (EQN_TOK_GSIZE == tok) {


@@ -833,8 +830,8 @@ next_tok:
                 * and keep on reading.
                 */
                if (parent->last == NULL) {
                 * and keep on reading.
                 */
                if (parent->last == NULL) {

-                       mandoc_msg(MANDOCERR_EQN_NOBOX, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_EQN_NOBOX, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        cur = eqn_box_alloc(ep, parent);
                        cur->type = EQN_TEXT;
                        cur->text = mandoc_strdup("");
                        cur = eqn_box_alloc(ep, parent);
                        cur->type = EQN_TEXT;
                        cur->text = mandoc_strdup("");


@@ -900,8 +897,8 @@ next_tok:
                 * rebalance and continue reading.
                 */
                if (parent->last == NULL) {
                 * rebalance and continue reading.
                 */
                if (parent->last == NULL) {

-                       mandoc_msg(MANDOCERR_EQN_NOBOX, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_EQN_NOBOX, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        cur = eqn_box_alloc(ep, parent);
                        cur->type = EQN_TEXT;
                        cur->text = mandoc_strdup("");
                        cur = eqn_box_alloc(ep, parent);
                        cur->type = EQN_TEXT;
                        cur->text = mandoc_strdup("");


@@ -927,16 +924,16 @@ next_tok:
                             cur->left != NULL))
                                break;
                if (cur == NULL) {
                             cur->left != NULL))
                                break;
                if (cur == NULL) {

-                       mandoc_msg(MANDOCERR_BLK_NOTOPEN, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_BLK_NOTOPEN, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        break;
                }
                parent = cur;
                if (EQN_TOK_RIGHT == tok) {
                        if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF) {
                                mandoc_msg(MANDOCERR_REQ_EMPTY,
                        break;
                }
                parent = cur;
                if (EQN_TOK_RIGHT == tok) {
                        if (eqn_next(ep, MODE_SUB) == EQN_TOK_EOF) {
                                mandoc_msg(MANDOCERR_REQ_EMPTY,

-                                   ep->parse, ep->eqn.ln,
-                                   ep->eqn.pos, eqn_toks[tok]);
+                                   ep->node->line, ep->node->pos,
+                                   "%s", eqn_toks[tok]);

                                break;
                        }
                        /* Handling depends on right/left. */
                                break;
                        }
                        /* Handling depends on right/left. */


@@ -970,8 +967,8 @@ next_tok:
                        parent = parent->parent;
                if (EQN_TOK_LEFT == tok &&
                    eqn_next(ep, MODE_SUB) == EQN_TOK_EOF) {
                        parent = parent->parent;
                if (EQN_TOK_LEFT == tok &&
                    eqn_next(ep, MODE_SUB) == EQN_TOK_EOF) {

-                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_REQ_EMPTY, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        break;
                }
                parent = eqn_box_alloc(ep, parent);
                        break;
                }
                parent = eqn_box_alloc(ep, parent);


@@ -1004,8 +1001,8 @@ next_tok:
                        if (cur->type == EQN_PILE)
                                break;
                if (cur == NULL) {
                        if (cur->type == EQN_PILE)
                                break;
                if (cur == NULL) {

-                       mandoc_msg(MANDOCERR_IT_STRAY, ep->parse,
-                           ep->eqn.ln, ep->eqn.pos, eqn_toks[tok]);
+                       mandoc_msg(MANDOCERR_IT_STRAY, ep->node->line,
+                           ep->node->pos, "%s", eqn_toks[tok]);

                        break;
                }
                parent = eqn_box_alloc(ep, cur);
                        break;
                }
                parent = eqn_box_alloc(ep, cur);


@@ -1019,11 +1016,7 @@ next_tok:
                parent->expectargs = 1;
                break;
        case EQN_TOK_EOF:
                parent->expectargs = 1;
                break;
        case EQN_TOK_EOF:

-               /*
-                * End of file!
-                * TODO: make sure we're not in an open subexpression.
-                */
-               return ROFF_EQN;
+               return;

        case EQN_TOK__MAX:
        case EQN_TOK_FUNC:
        case EQN_TOK_QUOTED:
        case EQN_TOK__MAX:
        case EQN_TOK_FUNC:
        case EQN_TOK_QUOTED:


@@ -1074,7 +1067,7 @@ next_tok:
                                /* No boundary after last character. */
                                if (*cpn == '\0')
                                        break;
                                /* No boundary after last character. */
                                if (*cpn == '\0')
                                        break;

-                               if (ccln == ccl)
+                               if (ccln == ccl && *cp != ',' && *cpn != ',')

                                        continue;
                                /* Boundary found, split the text. */
                                if (parent->args == parent->expectargs) {
                                        continue;
                                /* Boundary found, split the text. */
                                if (parent->args == parent->expectargs) {


@@ -1120,25 +1113,13 @@ next_tok:
        goto next_tok;
 }
 
        goto next_tok;
 }
 

-enum rofferr
-eqn_end(struct eqn_node **epp)
-{
-       struct eqn_node *ep;
-
-       ep = *epp;
-       *epp = NULL;
-
-       ep->eqn.root = mandoc_calloc(1, sizeof(struct eqn_box));
-       ep->eqn.root->expectargs = UINT_MAX;
-       return eqn_parse(ep, ep->eqn.root);
-}
-

 void
 eqn_free(struct eqn_node *p)
 {
        int              i;
 
 void
 eqn_free(struct eqn_node *p)
 {
        int              i;
 

-       eqn_box_free(p->eqn.root);
+       if (p == NULL)
+               return;

 
        for (i = 0; i < (int)p->defsz; i++) {
                free(p->defs[i].key);
 
        for (i = 0; i < (int)p->defsz; i++) {
                free(p->defs[i].key);