Clarify what eqn actually is.

[mandoc.git] / read.c

diff --git a/read.c b/read.c
index da273ae183c98ec18a09301e9cefd9b3f1fb26a8..33450152d56a6da56060b8dbc8912444db228d8f 100644 (file)
--- a/read.c
+++ b/read.c
@@ -1,4 +1,4 @@
-/*     $Id: read.c,v 1.15 2011/05/26 20:36:21 kristaps Exp $ */
+/*     $Id: read.c,v 1.23 2011/07/23 18:41:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -59,7 +59,6 @@ struct        mparse {
        struct man       *man; /* man parser */
        struct mdoc      *mdoc; /* mdoc parser */
        struct roff      *roff; /* roff parser (!NULL) */
-       struct regset     regs; /* roff registers */
        int               reparse_count; /* finite interp. stack */
        mandocmsg         mmsg; /* warning/error message handler */
        void             *arg; /* argument to mmsg */
@@ -146,9 +145,19 @@ static     const char * const      mandocerrs[MANDOCERR_MAX] = {
        "bad comment style",
        "bad escape sequence",
        "unterminated quoted string",
+
+       /* related to equations */
+       "unexpected literal in equation",
        
        "generic error",
 
+       /* related to equations */
+       "unexpected equation scope closure",
+       "equation scope open on exit",
+       "overlapping equation scopes",
+       "unexpected end of equation",
+       "equation syntax error",
+
        /* related to tables */
        "bad table syntax",
        "bad table option",
@@ -237,13 +246,13 @@ pset(const char *buf, int pos, struct mparse *curp)
        switch (curp->inttype) {
        case (MPARSE_MDOC):
                if (NULL == curp->pmdoc) 
-                       curp->pmdoc = mdoc_alloc(&curp->regs, curp);
+                       curp->pmdoc = mdoc_alloc(curp->roff, curp);
                assert(curp->pmdoc);
                curp->mdoc = curp->pmdoc;
                return;
        case (MPARSE_MAN):
                if (NULL == curp->pman) 
-                       curp->pman = man_alloc(&curp->regs, curp);
+                       curp->pman = man_alloc(curp->roff, curp);
                assert(curp->pman);
                curp->man = curp->pman;
                return;
@@ -253,14 +262,14 @@ pset(const char *buf, int pos, struct mparse *curp)
 
        if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3))  {
                if (NULL == curp->pmdoc) 
-                       curp->pmdoc = mdoc_alloc(&curp->regs, curp);
+                       curp->pmdoc = mdoc_alloc(curp->roff, curp);
                assert(curp->pmdoc);
                curp->mdoc = curp->pmdoc;
                return;
        } 
 
        if (NULL == curp->pman) 
-               curp->pman = man_alloc(&curp->regs, curp);
+               curp->pman = man_alloc(curp->roff, curp);
        assert(curp->pman);
        curp->man = curp->pman;
 }
@@ -681,7 +690,7 @@ mparse_alloc(enum mparset inttype, enum mandoclevel wlevel, mandocmsg mmsg, void
        curp->arg = arg;
        curp->inttype = inttype;
 
-       curp->roff = roff_alloc(&curp->regs, curp);
+       curp->roff = roff_alloc(curp);
        return(curp);
 }
 
@@ -689,8 +698,6 @@ void
 mparse_reset(struct mparse *curp)
 {
 
-       memset(&curp->regs, 0, sizeof(struct regset));
-
        roff_reset(curp->roff);
 
        if (curp->mdoc)