]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_parser.C
Small parser bug fixed
[lyx.git] / src / mathed / math_parser.C
index 44c070c3892bad542c155cd76b4bf8e0f0456a66..bdba0035a3742131f65136fc95727dc072106fa1 100644 (file)
@@ -7,7 +7,7 @@
  *
  *  Dependencies: Xlib, XForms
  *
- *  Copyright: (c) 1996, Alejandro Aguilar Sierra
+ *  Copyright: 1996, Alejandro Aguilar Sierra
  *
  *   Version: 0.8beta.
  *
  */
 
 #include <config.h>
-#include <stdlib.h>
-#include <ctype.h>
+
+#include <cctype>
 
 #ifdef __GNUG__
-#pragma implementation "math_parser.h"
+#pragma implementation
 #endif
 
 #include "math_parser.h"
-#include "math_iter.h"
+#include "array.h"
 #include "math_inset.h"
 #include "math_macro.h"
+#include "math_macrotable.h"
+#include "math_macrotemplate.h"
 #include "math_root.h"
-#include "error.h"
+#include "math_arrayinset.h"
+#include "math_sqrtinset.h"
+#include "math_matrixinset.h"
+#include "math_accentinset.h"
+#include "math_bigopinset.h"
+#include "math_funcinset.h"
+#include "math_spaceinset.h"
+#include "math_sizeinset.h"
+#include "math_dotsinset.h"
+#include "math_fracinset.h"
+#include "math_deliminset.h"
+#include "math_decorationinset.h"
+#include "debug.h"
+#include "mathed/support.h"
+#include "lyxlex.h"
+
+using std::istream;
+using std::endl;
 
-enum {
-       FLAG_BRACE      = 1,    //  A { needed
-       FLAG_BRACE_ARG  = 2,    //  Next { is argument
-       FLAG_BRACE_OPT  = 4,    //  Optional {
-       FLAG_BRACE_LAST = 8,    //  Last } ends the parsing process
-       FLAG_BRACK_ARG  = 16,   //  Optional [
-       FLAG_RIGHT      = 32,      //  Next right ends the parsing process
-       FLAG_END        = 64,      //  Next end ends the parsing process
-       FLAG_BRACE_FONT = 128,  //  Next } closes a font
-       FLAG_BRACK_END  = 256   // Next ] ends the parsing process
+
+
+// These are lexical codes, not semantic
+enum lexcode_enum {
+       LexNone,
+       LexESC,
+       LexAlpha,
+       LexDigit,
+       LexBOP,         // Binary operators or relations
+       LexMathSpace,
+       LexOpen,
+       LexClose,
+       LexComment,
+       LexArgument,
+       LexSpace,
+       LexNewLine,
+       LexOther,
+       LexSelf
 };
 
-YYSTYPE yylval;
+lexcode_enum lexcode[256];  
+
+
+char const * latex_special_chars = "#$%&_{}";
+
+
+/// Read TeX into data, flags give stop conditions
+void mathed_parse(MathArray & data, unsigned flags);
 
 
-static short mathed_env = LM_EN_INTEXT;
+namespace {
 
-char *mathed_label = 0;
+const unsigned char LM_TK_OPEN  = '{';
+const unsigned char LM_TK_CLOSE = '}';
 
-char const *latex_mathenv[] = { 
-   "math", 
-   "displaymath", 
-   "equation", 
-   "eqnarray*",
-   "eqnarray",
-   "array"
+enum {
+       FLAG_BRACE      = 1 << 0,  //  A { needed              //}
+       FLAG_BRACE_OPT  = 1 << 2,  //  Optional {              
+       FLAG_BRACE_LAST = 1 << 3,  //  Last } ends the parsing process
+       FLAG_BRACK_ARG  = 1 << 4,  //  Optional [     
+       FLAG_RIGHT      = 1 << 5,  //  Next right ends the parsing process
+       FLAG_END        = 1 << 6,  //  Next end ends the parsing process
+       FLAG_BRACE_FONT = 1 << 7,  //  Next } closes a font
+       FLAG_BRACK_END  = 1 << 9,  //  Next ] ends the parsing process
+       FLAG_AMPERSAND  = 1 << 10, //  Next & ends the parsing process
+       FLAG_NEWLINE    = 1 << 11  //  Next \\ ends the parsing process
 };
 
 
-char const *latex_mathspace[] = {
-   "!", ",", ":", ";", "quad", "qquad"
+///
+union {
+       ///
+       int i;
+       ///
+       latexkeys const * l;
+} yylval;
+
+
+string yytext;
+int yylineno;
+istream * yyis;
+MathTextCodes yyvarcode;
+
+
+
+struct latex_mathenv_type {
+       char const *      name;
+       char const *      basename;
+       MathInsetTypes    typ;
+       bool              numbered;
+       bool              ams;
 };
-   
-char const *latex_special_chars = "#$%&_{}";
-           
-// These are lexical codes, not semantic
-enum lexcode_enum {
-   LexNone,
-   LexESC,
-   LexAlpha,
-   LexDigit,
-   LexBOP,         // Binary operators or relations
-   LexMathSpace,
-   LexOpen,
-   LexClose,
-   LexComment,
-   LexArgument,
-   LexSpace,
-   LexNewLine,
-   LexOther,
-   LexSelf
+
+latex_mathenv_type latex_mathenv[] = { 
+       {"math",         "math",         LM_OT_SIMPLE,   0, 0},
+       {"equation*",    "equation",     LM_OT_EQUATION, 0, 0},
+       {"equation",     "equation",     LM_OT_EQUATION, 1, 0},
+       {"eqnarray*",    "eqnarray",     LM_OT_EQNARRAY, 0, 0},
+       {"eqnarray",     "eqnarray",     LM_OT_EQNARRAY, 1, 0},
+       {"align*",       "align",        LM_OT_ALIGN,    0, 1},
+       {"align",        "align",        LM_OT_ALIGN,    1, 1},
+       {"alignat*",     "alignat",      LM_OT_ALIGNAT,  0, 1},
+       {"alignat",      "alignat",      LM_OT_ALIGNAT,  1, 1},
+       {"multline*",    "multline",     LM_OT_MULTLINE, 0, 1},
+       {"multline",     "multline",     LM_OT_MULTLINE, 1, 1},
+       {"array",        "array",        LM_OT_MATRIX,   0, 1}
 };
 
-static lexcode_enum lexcode[256];  
-static char yytext[256];
-static int yylineno;
-static FILE *yyin;
-static bool yy_mtextmode=false;
-           
-inline
-char *strnew(char const* s)
-{
-       char *s1 = new char[strlen(s)+1]; // this leaks when not delete[]'ed
-       strcpy(s1, s);
-       return s1;
-}
+int const latex_mathenv_num = sizeof(latex_mathenv)/sizeof(latex_mathenv[0]);
+
 
 
-static void mathPrintError(char const *msg) 
+void mathPrintError(string const & msg) 
 {
-    fprintf(stderr, "Line ~%d: Math parse error: %s\n", yylineno, msg); 
+       lyxerr << "Line ~" << yylineno << ": Math parse error: " << msg << endl;
 }
 
 
-static void LexInitCodes()
+void LexInitCodes()
 {
-   int i;
-   
-   for (i=0;  i<=255; i++)     {
-     if (isalpha(i)) lexcode[i] = LexAlpha;
-     else if (isdigit(i)) lexcode[i] = LexDigit;
-     else if (isspace(i)) lexcode[i] = LexSpace;
-     else lexcode[i] = LexNone;
-   }
-    
-   lexcode['\t'] = lexcode['\f'] = lexcode[' '] = LexSpace;
-   lexcode['\n'] = LexNewLine;
-   lexcode['%'] = LexComment;
-   lexcode['#'] = LexArgument;
-   lexcode['+'] = lexcode['-'] = lexcode['*'] = lexcode['/'] = 
-   lexcode['<'] = lexcode['>'] = lexcode['='] = LexBOP;
-   
-   lexcode['!'] = lexcode[','] = lexcode[':'] = lexcode[';'] = LexMathSpace;
-   lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] = lexcode['?'] = LexOther; 
-   lexcode['\'']= LexAlpha;
-   
-   lexcode['['] = lexcode[']'] = lexcode['^'] = lexcode['_'] = 
-   lexcode['&'] = LexSelf;  
-   
-   lexcode['\\'] = LexESC;
-   lexcode['{'] = LexOpen;
-   lexcode['}'] = LexClose;
+       for (int i = 0; i <= 255; ++i) {
+               if (isdigit(i))
+                       lexcode[i] = LexDigit;
+               else if (isspace(i))
+                       lexcode[i] = LexSpace;
+               else
+                       lexcode[i] = LexAlpha;
+       }
+       
+       lexcode['\t'] = lexcode['\f'] = lexcode[' '] = LexSpace;
+       lexcode['\n'] = LexNewLine;
+       lexcode['%'] = LexComment;
+       lexcode['#'] = LexArgument;
+       lexcode['+'] = lexcode['-'] = lexcode['*'] = lexcode['/']
+               = lexcode['<'] = lexcode['>'] = lexcode['='] = LexBOP;
+       
+       lexcode['!'] = lexcode[','] = lexcode[':']
+               = lexcode[';'] = LexMathSpace;
+       
+       lexcode['('] = lexcode[')'] = lexcode['|'] = lexcode['.'] =
+               lexcode['?'] = LexOther; 
+       
+       lexcode['\''] = lexcode['@'] = LexAlpha;
+       
+       lexcode['['] = lexcode[']'] = lexcode['^'] = lexcode['_'] = 
+               lexcode['&'] = LexSelf;  
+       
+       lexcode['\\'] = LexESC;
+       lexcode['{'] = LexOpen;
+       lexcode['}'] = LexClose;
 }
 
-static char LexGetArg(char lf, bool accept_spaces=false)
-{
-   char c, rg, *p = &yytext[0];
-   int bcnt =1;
-   
-   while (!feof(yyin)) {
-      c = getc(yyin); 
-      if (c>' ') {
-        if (!lf) lf = c; else
-        if (c!=lf)
-          fprintf(stderr, "Math parse error: unexpected '%c'\n", c);
-        break;
-      }
-   }
-   rg = (lf=='{') ? '}': ((lf=='[') ? ']': ((lf=='(') ? ')': 0));
-   if (!rg) {
-      fprintf(stderr, "Math parse error: unknown bracket '%c'\n", lf);
-      return '\0';
-   } 
-   do {
-      c = getc(yyin); 
-      if (c==lf) bcnt++;
-      if (c==rg) bcnt--;
-      if ((c>' ' || (c==' ' && accept_spaces)) && bcnt>0) *(p++) = c;
-   } while (bcnt>0 && !feof(yyin));
-   *p = '\0';
-   return rg;
-}
 
-static int yylex(void)
+unsigned char LexGetArg(unsigned char lf, bool accept_spaces = false)
 {
-   static int init_done = 0;
-   unsigned char c;
-   
-   if (!init_done) LexInitCodes();
-   
-   while (!feof(yyin)) { 
-      c = getc(yyin);
-       
-      if (yy_mtextmode && c==' ') {
-         yylval.i=' ';
-         return LM_TK_ALPHA;
-      }
-       
-       if (lexcode[c]==LexNewLine) {
-          yylineno++; 
-          continue;
-       }
-        
-      if (lexcode[c]==LexComment) 
-       do c = getc(yyin); while (c!='\n' % !feof(yyin));  // eat comments
-    
-      if (lexcode[c]==LexDigit || lexcode[c]==LexOther || lexcode[c]==LexMathSpace) 
-        { yylval.i= c; return LM_TK_STR; }
-      if (lexcode[c]==LexAlpha) { yylval.i=c; return LM_TK_ALPHA; }
-      if (lexcode[c]==LexBOP)   { yylval.i=c; return LM_TK_BOP; }
-      if (lexcode[c]==LexSelf)  { return c; }   
-      if (lexcode[c]==LexArgument)   { 
-         c = getc(yyin);
-         yylval.i = c - '0';
-         return LM_TK_ARGUMENT; 
-      }
-      if (lexcode[c]==LexOpen)   { return LM_TK_OPEN; }
-      if (lexcode[c]==LexClose)   { return LM_TK_CLOSE; }
-      
-      if (lexcode[c]==LexESC)   {
-        c = getc(yyin);
-        if (c=='\\')   { return LM_TK_NEWLINE; }
-        if (c=='(')    { yylval.i = LM_EN_INTEXT; return LM_TK_BEGIN; }
-        if (c==')')    { yylval.i = LM_EN_INTEXT; return LM_TK_END; }
-        if (c=='[')    { yylval.i = LM_EN_DISPLAY; return LM_TK_BEGIN; }
-        if (c==']')    { yylval.i = LM_EN_DISPLAY; return LM_TK_END; }
-        if (strchr(latex_special_chars, c)) {
-            yylval.i = c;
-            return LM_TK_SPECIAL;
-        }  
-        if (lexcode[c]==LexMathSpace) {
-           int i;
-           for (i=0; i<4 && c!=latex_mathspace[i][0]; i++);
-           yylval.i = (i<4) ? i: 0; 
-           return LM_TK_SPACE; 
-        }
-        if (lexcode[c]==LexAlpha || lexcode[c]==LexDigit) {
-           char* p = &yytext[0];
-           while (lexcode[c]==LexAlpha || lexcode[c]==LexDigit) {
-              *p = c;
-              c = getc(yyin);
-              p++;
-           }
-           *p = '\0';
-           if (!feof(yyin)) ungetc(c, yyin);
-           latexkeys *l = in_word_set (yytext, strlen(yytext));
-           if (l) {
-              if (l->token==LM_TK_BEGIN || l->token==LM_TK_END) { 
-                 int i;
-                 LexGetArg('{');
-//               for (i=0; i<5 && strncmp(yytext, latex_mathenv[i],
-//                             strlen(latex_mathenv[i])); i++);
-                 
-                 for (i=0; i<6 && strcmp(yytext, latex_mathenv[i]); i++);
-                 yylval.i = i;
-              } else
-              if (l->token==LM_TK_SPACE) 
-                yylval.i = l->id;
-              else
-                yylval.l = l;
-              return l->token;
-           } else { 
-              yylval.s = yytext;
-              return LM_TK_UNDEF;
-           }
-        }
-      }
-   }
-   return 0;
+       while (yyis->good()) {
+               unsigned char c;
+               yyis->get(c);
+               if (c > ' ') {
+                       if (!lf) 
+                               lf = c;
+                       else if (c != lf) {
+                               lyxerr << "Math parse error: unexpected '" << c << "'" << endl;
+                               return '\0';
+                       }
+                       break;
+               }
+       }
+       unsigned char rg = 0;
+       if (lf == '{') rg = '}';
+       if (lf == '[') rg = ']';
+       if (lf == '(') rg = ')';
+       if (!rg) {
+               lyxerr << "Math parse error: unknown bracket '" << lf << "'" << endl;
+               return '\0';
+       }
+       yytext.erase();
+       int bcnt = 1;
+       do {
+               unsigned char c;
+               yyis->get(c);
+               if (c == lf) ++bcnt;
+               if (c == rg) --bcnt;
+               if ((c > ' ' || (c == ' ' && accept_spaces)) && bcnt > 0)
+                       yytext += c;
+       } while (bcnt > 0 && yyis->good());
+
+       return rg;
 }
 
-int parse_align(char *hor, char *)
-{    
-   char *c;
 
-   int nc = 0;
-   for (c=hor; c && *c>' '; c++) nc++;
-   return nc;
+int yylex()
+{
+       static int init_done;
+       
+       if (!init_done) LexInitCodes();
+       
+       while (yyis->good()) {
+               unsigned char c;
+               yyis->get(c);
+               lyxerr << "reading byte: '" << c << "' code: " << lexcode[c] << endl;
+               lyxerr << "              code: " << lexcode['ΓΌ'] << endl;
+               
+               if (yyvarcode == LM_TC_TEXTRM && c == ' ') {
+                       yylval.i = ' ';
+                       return LM_TK_ALPHA;
+               } else if (lexcode[c] == LexNewLine) {
+                       ++yylineno; 
+                       continue;
+               } else if (lexcode[c] == LexComment) {
+                       do {
+                               yyis->get(c);
+                       } while (c != '\n' && yyis->good());  // eat comments
+               } else if (lexcode[c] == LexDigit
+                          || lexcode[c] == LexOther
+                          || lexcode[c] == LexMathSpace) {
+                       yylval.i = c;
+                       return LM_TK_STR;
+               } else if (lexcode[c] == LexAlpha) {
+                       yylval.i = c;
+                       return LM_TK_ALPHA;
+               } else if (lexcode[c] == LexBOP) {
+                       yylval.i = c;
+                       return LM_TK_BOP;
+               } else if (lexcode[c] == LexSelf) {
+                       return c;
+               } else if (lexcode[c] == LexArgument) {
+                       yyis->get(c);
+                       yylval.i = c - '0';
+                       return LM_TK_ARGUMENT; 
+               } else if (lexcode[c] == LexOpen) {
+                       return LM_TK_OPEN;
+               } else if (lexcode[c] == LexClose) {
+                       return LM_TK_CLOSE;
+               } else if (lexcode[c] == LexESC)   {
+                       yyis->get(c);
+                       if (c == '\\')  {
+                               yylval.i = -1;
+                               return LM_TK_NEWLINE;
+                       }
+                       if (c == '(') {
+                               yylval.i = LM_OT_SIMPLE;
+                               return LM_TK_BEGIN;
+                       }
+                       if (c == ')') {
+                               yylval.i = LM_OT_SIMPLE;
+                               return LM_TK_END;
+                       }
+                       if (c == '[') {
+                               yylval.i = LM_OT_EQUATION;
+                               return LM_TK_BEGIN;
+                       }
+                       if (c == ']') {
+                               yylval.i = LM_OT_EQUATION;
+                               return LM_TK_END;
+                       }
+                       if (contains(latex_special_chars, c)) {
+                               yylval.i = c;
+                               return LM_TK_SPECIAL;
+                       } 
+                       if (lexcode[c] == LexMathSpace) {
+                               int i;
+                               for (i = 0; i < 4 && static_cast<int>(c) != latex_mathspace[i][0]; ++i)
+                                       ;
+                               yylval.i = (i < 4) ? i : 0; 
+                               return LM_TK_SPACE; 
+                       }
+                       if (lexcode[c] == LexAlpha || lexcode[c] == LexDigit) {
+                               yytext.erase();
+                               while (lexcode[c] == LexAlpha || lexcode[c] == LexDigit) {
+                                       yytext += c;
+                                       yyis->get(c);
+                               }
+                               if (yyis->good())
+                                       yyis->putback(c);
+                               lyxerr << "reading: text '" << yytext << "'\n";
+                               latexkeys const * l = in_word_set(yytext);
+                               if (!l)
+                                       return LM_TK_UNDEF;
+
+                               if (l->token == LM_TK_BEGIN || l->token == LM_TK_END) { 
+                                       LexGetArg('{');
+                                       int i = 0;
+                                       while (i < latex_mathenv_num && yytext != latex_mathenv[i].name)
+                                                ++i;
+                                       yylval.i = i;
+                               } else if (l->token == LM_TK_SPACE) 
+                                       yylval.i = l->id;
+                               else
+                                       yylval.l = l;
+                               return l->token;
+                       }
+               }
+       }
+       return 0;
 }
 
+
 // Accent hacks only for 0.12. Stolen from Cursor.
 int accent = 0;
 int nestaccent[8];
 
 void setAccent(int ac)
 {
-       if (ac > 0 && accent < 8) {
+       if (ac > 0 && accent < 8)
                nestaccent[accent++] = ac;
-       else
+       else
          accent = 0;  // consumed!
 }
 
 
-MathedInset *doAccent(byte c, MathedTextCodes t)
+MathInset * doAccent(unsigned char c, MathTextCodes t)
 {
-       MathedInset *ac = 0;
+       MathInset * ac = 0;
        
-       for (int i=accent-1; i>=0; i--) {
-               if (i==accent-1)
+       for (int i = accent - 1; i >= 0; --i) {
+               if (i == accent - 1)
                  ac = new MathAccentInset(c, t, nestaccent[i]);
                else 
                  ac = new MathAccentInset(ac, nestaccent[i]);
@@ -289,12 +356,12 @@ MathedInset *doAccent(byte c, MathedTextCodes t)
 }
 
 
-MathedInset *doAccent(MathedInset *p)
+MathInset * doAccent(MathInset * p)
 {
-       MathedInset *ac = 0;
+       MathInset * ac = 0;
        
-       for (int i=accent-1; i>=0; i--) {
-               if (i==accent-1)
+       for (int i = accent - 1; i >= 0; --i) {
+               if (i == accent - 1)
                  ac = new MathAccentInset(p, nestaccent[i]);
                else 
                  ac = new MathAccentInset(ac, nestaccent[i]);
@@ -305,540 +372,578 @@ MathedInset *doAccent(MathedInset *p)
 }
 
 
+void do_insert(MathArray & dat, MathInset * m)
+{
+       if (accent) 
+               dat.push_back(doAccent(m));
+       else
+               dat.push_back(m);
+}
+
+void do_insert(MathArray & dat, unsigned char ch, MathTextCodes fcode)
+{
+       if (accent) 
+               dat.push_back(doAccent(ch, fcode));
+       else
+               dat.push_back(ch, fcode);
+}
+
+
+void handle_frac(MathArray & dat, MathInsetTypes t)
+{
+       MathFracInset * p = new MathFracInset(t);
+       mathed_parse(p->cell(0), FLAG_BRACE | FLAG_BRACE_LAST);
+       mathed_parse(p->cell(1), FLAG_BRACE | FLAG_BRACE_LAST);
+       dat.push_back(p);
+}
 
 
-LyxArrayBase *mathed_parse(unsigned flags, LyxArrayBase *array, MathParInset **mtx)
+MathScriptInset * lastScriptInset(MathArray & array)
 {
-   int t = yylex(), tprev = 0;
-   bool panic = false;
-   static int plevel = -1;
-   static int size = LM_ST_TEXT;
-   MathedTextCodes varcode = LM_TC_VAR;
-   MathedInset* binset = 0;
-   static MathMacroTemplate *macro=0;
-   
-   int brace = 0;
-   int acc_brace = 0;
-   int acc_braces[8];
-   MathParInset *mt = (mtx) ? *mtx: 0;//(MathParInset*)0;
-    MathedRowSt *crow = (mt) ? mt->getRowSt(): 0;
-
-   plevel++;
-   if (!array) array = new LyxArrayBase;
-   MathedIter data(array);
-   while (t) {
-      if ((flags & FLAG_BRACE) && t != LM_TK_OPEN) {
-        if ((flags & FLAG_BRACK_ARG) && t=='[') {
-        }
-        else {
-            mathPrintError("Expected {. Maybe you forgot to enclose an argument in {}");
-           panic = true;
-           break;
-        }
-      }
-    MathedInsetTypes fractype = LM_OT_FRAC;
-    switch (t) {
-    case LM_TK_ALPHA:
-      {
-        if (accent) {
-            data.Insert(doAccent(yylval.i, varcode));
-        } else
-           data.Insert (yylval.i, varcode);  //LM_TC_VAR);
-        break;
-      }
-    case LM_TK_ARGUMENT:
-      {
-         if (macro) {
-             data.Insert(macro->getMacroPar(yylval.i-1), LM_TC_INSET);
-         } 
-         break;
-      } 
-    case LM_TK_NEWCOMMAND:
-      {
-         int na = 0; 
-
-         LexGetArg('{');
-         // This name lives until quitting, for that reason
-         // I didn't care on deleting explicitly. Later I will.
-         char const *name = strnew(&yytext[1]);
-         // ugly trick to be removed soon (lyx3)
-         char c = getc(yyin);
-         ungetc(c, yyin);
-         if (c=='[') {
-             LexGetArg('[');
-             na = atoi(yytext);
-         }  
-         macro = new MathMacroTemplate(name, na);
-         flags = FLAG_BRACE|FLAG_BRACE_LAST;
-         *mtx = macro;
-         macro->SetData(array);
-         break;
-      }
-    case LM_TK_SPECIAL:
-      {          
-         data.Insert (yylval.i, LM_TC_SPECIAL);
-         break;
-      }
-    case LM_TK_STR:
-      {          
-         if (accent) {
-                 data.Insert(doAccent(yylval.i, LM_TC_CONST));
-         } else
-           data.Insert (yylval.i, LM_TC_CONST);
-         break;
-      }
-    case LM_TK_OPEN:
-      {
-       brace++;
-       if  (accent && tprev==LM_TK_ACCENT) {
-           acc_braces[acc_brace++] = brace;
-           break;
+       MathInset * p = array.back_inset();
+       if (!p || !p->isScriptInset()) {
+               p = new MathScriptInset;
+               array.push_back(p);
        }
-       if (flags & FLAG_BRACE_OPT) {
-          flags &= ~FLAG_BRACE_OPT;
-          flags |= FLAG_BRACE;
+       return static_cast<MathScriptInset *>(p);
+}
+
+}
+
+
+
+static bool   curr_num;
+static string curr_label;
+
+void mathed_parse_lines(MathInset * inset, int col, bool numbered, bool outmost)
+{
+       // save global variables
+       bool   saved_num   = curr_num;
+       string saved_label = curr_label;
+
+       MathGridInset * p = static_cast<MathGridInset *>(inset);
+       for (int row = 0; true; ++row) {
+               // reset global variables
+               curr_num   = numbered;
+               curr_label = string();
+
+               // reading a row
+               int idx = p->nargs() - p->ncols();
+               for (int i = 0; i < col - 1; ++i, ++idx)
+                       mathed_parse(p->cell(idx), FLAG_AMPERSAND);
+               mathed_parse(p->cell(idx), FLAG_NEWLINE | FLAG_END);
+
+               if (outmost) {
+                       MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+                       m->numbered(row, curr_num);
+                       m->label(row, curr_label);
+               }
+
+               // Hack!
+               // no newline
+               if (yylval.i != -1)
+                       break;
+
+               p->appendRow();
        }
-                
-       if (flags & FLAG_BRACE)
-         flags &= ~FLAG_BRACE;
-        else {
-           data.Insert ('{', LM_TC_TEX);
-        }
-       break;
-      }
-    case LM_TK_CLOSE:
-      {
-        brace--;        
-        if (brace < 0) {
-           mathPrintError("Unmatching braces");
-           panic = true;
-           break;
-        }
-        if (acc_brace && brace==acc_braces[acc_brace-1]-1) {
-            acc_brace--;
-            break;
-        }
-        if (flags & FLAG_BRACE_FONT) {
-           varcode = LM_TC_VAR;
-           yy_mtextmode = false;
-           flags &= ~FLAG_BRACE_FONT;
-           break;
-        }
-        if (brace == 0 && (flags & FLAG_BRACE_LAST)) {
-           plevel--;
-           return array;
-        } else {
-           data.Insert ('}', LM_TC_TEX);
-        }
-        break;
-      }
-
-    case '[':
-      {
-        if (flags & FLAG_BRACK_ARG) {
-          flags &= ~FLAG_BRACK_ARG;
-          char rg=LexGetArg('[');
-          if (rg!=']') {
-             mathPrintError("Expected ']'");
-             panic = true;
-             break;
-          }       
-//        if (arg) strcpy(arg, yytext);
-       } else
-         data.Insert ('[');
-       break;
-      }
-    case ']':
-      {
-         if (flags & FLAG_BRACK_END) {
-             plevel--;
-             return array;
-         } else
-           data.Insert (']');
-       break;
-      }
-
-    case '^':
-      {  
-        MathParInset *p = new MathParInset(size, "", LM_OT_SCRIPT);
-        LyxArrayBase * ar = mathed_parse(FLAG_BRACE_OPT|FLAG_BRACE_LAST, 0);
-        p->SetData(ar);
-//      fprintf(stderr, "UP[%d]", p->GetStyle());
-        data.Insert (p, LM_TC_UP);
-        break;
-      }
-    case '_':
-      {
-        MathParInset *p = new MathParInset(size, "", LM_OT_SCRIPT);
-        LyxArrayBase * ar = mathed_parse(FLAG_BRACE_OPT|FLAG_BRACE_LAST, 0);
-        p->SetData(ar);
-        data.Insert (p, LM_TC_DOWN);
-        break;
-      }
-
-    case LM_TK_LIMIT:
-      {
-        if (binset) {
-           binset->SetLimits((bool)(yylval.l->id));
-           binset = 0;
-        }
-        break;
-      }
-      
-    case '&':    // Tab
-      {
-        if ((flags & FLAG_END) && mt && data.getCol()<mt->GetColumns()-1) {
-            data.setNumCols(mt->GetColumns());
-            data.Insert('T', LM_TC_TAB);
-        } else 
-           mathPrintError("Unexpected tab");
-        // debug info. [made that conditional -JMarc]
-        if (lyxerr.debugging(Error::MATHED))
-                fprintf(stderr, "%d %d\n", data.getCol(), mt->GetColumns());
-       break;
-      }
-    case LM_TK_NEWLINE:
-      {
-         if (mt && (flags & FLAG_END)) {
-             if (mt->Permit(LMPF_ALLOW_CR)) {
-                 if (crow) {
-                         crow->setNext(new MathedRowSt(mt->GetColumns()+1)); // this leaks
-                     crow = crow->getNext();
-                 }
-                 data.Insert('K', LM_TC_CR);
-             } else 
-               mathPrintError("Unexpected newline");
-         }
-         break;
-      }
-    case LM_TK_BIGSYM:  
-      {
-        binset = new MathBigopInset(yylval.l->name,yylval.l->id);
-        data.Insert(binset);   
-        break;
-      }
-    case LM_TK_SYM:
-      {
-        if (yylval.l->id < 256) {
-           MathedTextCodes tc = MathIsBOPS(yylval.l->id) ? LM_TC_BOPS: LM_TC_SYMB;
-           if (accent) {
-               data.Insert(doAccent(yylval.l->id, tc));
-           } else
-           data.Insert (yylval.l->id, tc);
-        } else {
-           MathFuncInset *bg = new MathFuncInset(yylval.l->name);
-            if (accent) {
-                    data.Insert(doAccent(bg));
-            } else
-            data.Insert(bg, true);     
-        }
-        break;
-      }
-    case LM_TK_BOP:
-      {
-        if (accent) {
-                data.Insert(doAccent(yylval.i, LM_TC_BOP));
-         } else
-           data.Insert (yylval.i, LM_TC_BOP);
-        break;
-      }
-    case LM_TK_STY:
-      {
-         if (mt) {
-             mt->UserSetSize(yylval.l->id);
-         }
-         break; 
-      }
-    case LM_TK_SPACE:
-      {
-        if (yylval.i>=0) {
-           MathSpaceInset *sp = new MathSpaceInset(yylval.i);
-           data.Insert(sp);
-        }
-        break;
-      }           
-    case LM_TK_DOTS:
-      {
-        MathDotsInset *p = new MathDotsInset(yylval.l->name, yylval.l->id);
-        data.Insert(p);
-        break;
-      }     
-    case LM_TK_STACK:
-       fractype = LM_OT_STACKREL;
-    case LM_TK_FRAC:
-      {
-        MathFracInset *fc = new MathFracInset(fractype);
-        LyxArrayBase* num = mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST);
-        LyxArrayBase* den = mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST);
-        fc->SetData(num, den);
-        data.Insert(fc, LM_TC_ACTIVE_INSET);
-        break;
-      }
-    case LM_TK_SQRT:
-      {            
-        MathParInset *rt;
-         
-        char c = getc(yyin);
-         
-        if (c=='[') {
-            rt = new MathRootInset(size);
-            rt->setArgumentIdx(0);
-            rt->SetData(mathed_parse(FLAG_BRACK_END, 0, &rt));
-            rt->setArgumentIdx(1);
-        } else {
-            ungetc(c, yyin);
-            rt = new MathSqrtInset(size);
-        }
-        rt->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST, 0, &rt));
-        data.Insert(rt, LM_TC_ACTIVE_INSET);
-        break;
-      }
-       
-    case LM_TK_LEFT:
-      {
-        int lfd, rgd;
-        lfd=yylex();
-        if (lfd==LM_TK_SYM || lfd==LM_TK_STR || lfd==LM_TK_BOP|| lfd==LM_TK_SPECIAL)
-          lfd = (lfd==LM_TK_SYM) ? yylval.l->id: yylval.i;
-//      fprintf(stderr, "L[%d %c]", lfd, lfd);
-        LyxArrayBase* a = mathed_parse(FLAG_RIGHT);
-        rgd=yylex();
-//      fprintf(stderr, "R[%d]", rgd);
-        if (rgd==LM_TK_SYM || rgd==LM_TK_STR || rgd==LM_TK_BOP || rgd==LM_TK_SPECIAL)
-          rgd = (rgd==LM_TK_SYM) ? yylval.l->id: yylval.i;      
-        MathDelimInset *dl = new MathDelimInset(lfd, rgd);
-        dl->SetData(a);
-        data.Insert(dl, LM_TC_ACTIVE_INSET);
-//      fprintf(stderr, "RL[%d %d]", lfd, rgd);
-        break;
-      }
-    case LM_TK_RIGHT:
-      {
-        if (flags & FLAG_RIGHT) { 
-           plevel--;
-           return array;
-        } else {
-           mathPrintError("Unmatched right delimiter");
-//         panic = true;
-        }
-        break;
-      }
-
-    case LM_TK_FONT:
-      {
-        varcode = (MathedTextCodes)yylval.l->id;
-         yy_mtextmode = (bool)(varcode==LM_TC_TEXTRM);
-        flags |= (FLAG_BRACE|FLAG_BRACE_FONT);
-       break;
-      }
-    case LM_TK_WIDE:
-      {  
-        MathDecorationInset *sq = new MathDecorationInset(yylval.l->id, size);
-        sq->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST));
-        data.Insert(sq, LM_TC_ACTIVE_INSET);
-        break;
-      }
-      
-    case LM_TK_ACCENT: setAccent(yylval.l->id); break;
-         
-    case LM_TK_NONUM:
-      {
-         if (crow)
-           crow->setNumbered(false);
-         break;
-      }
-
-    case LM_TK_PMOD:
-    case LM_TK_FUNC:
-      {
-         MathedInset *bg = new MathFuncInset(yylval.l->name); 
-         if (accent) {
-             data.Insert(t);
-         } else
-           data.Insert(bg);
-         break;
-      }
-    case LM_TK_FUNCLIM:
-      {
-        data.Insert(new MathFuncInset(yylval.l->name, LM_OT_FUNCLIM));
-        break;
-      }
-    case LM_TK_UNDEF:
-      {
-         
-       MathMacro* p = 
-        MathMacroTable::mathMTable.getMacro(yylval.s);
-       if (p) {
-          if (accent) 
-            data.Insert(doAccent(p), p->getTCode());
-          else
-            data.Insert(p, p->getTCode());
-          for (int i=0; p->setArgumentIdx(i); i++)
-            p->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST));
-       }
-       else {
-          MathedInset *q = new MathFuncInset(yylval.s, LM_OT_UNDEF);
-          if (accent) {
-                  data.Insert(doAccent(q));
-          } else {
-              data.Insert(q);
-          }
-       }
-        break;
-      }
-    case LM_TK_END:
-      {
-         if (mathed_env != yylval.i && yylval.i!=LM_EN_ARRAY)
-          mathPrintError("Unmatched environment");
-        // debug info [made that conditional -JMarc]
-        if (lyxerr.debugging(Error::MATHED))
-                fprintf(stderr, "[%d]\n", yylval.i);
-        plevel--;
-        if (mt) { // && (flags & FLAG_END)) {
-           mt->SetData(array);
-           array = 0;
-        }
-        return array;
-      }
-    case LM_TK_BEGIN:
-      {
-        if (yylval.i==LM_EN_ARRAY) {
-           char ar[120], ar2[8];
-           ar[0] = ar2[0] = '\0'; 
-            char rg=LexGetArg(0);
-           if (rg==']') {
-              strcpy(ar2, yytext);
-              rg = LexGetArg('{');
-           }
-           strcpy(ar, yytext);
-           int nc = parse_align(ar, ar2);
-           MathParInset* mm = new MathMatrixInset(nc, 0);
-           mm->SetAlign(ar2[0], ar);
-                   data.Insert(mm, LM_TC_ACTIVE_INSET);
-            mathed_parse(FLAG_END, mm->GetData(), &mm);
-        } else
-        if (yylval.i>=LM_EN_INTEXT && yylval.i<=LM_EN_EQNARRAY) {
-            if (plevel!=0) {
-                mathPrintError("Misplaced environment");
-                break;
-            }
-            if (!mt) {
-                mathPrintError("0 paragraph.");
-                panic = true;
-            }
-            
-            mathed_env = yylval.i;
-            if (mathed_env>=LM_EN_DISPLAY) {
-                size = LM_ST_DISPLAY;
-                if (mathed_env>LM_EN_EQUATION) {
-                    mt = new MathMatrixInset(3, -1);
-                    mt->SetAlign(' ', "rcl");
-                    if (mtx) *mtx = mt;
-                    flags |= FLAG_END;
-//                  data.Insert(' ', LM_TC_TAB);
-//                  data.Insert(' ', LM_TC_TAB);
-//                  data.Reset();
-                }
-                mt->SetStyle(size);
-                mt->SetType(mathed_env);
-                crow = mt->getRowSt();
-            }
-                              
-#ifdef DEBUG
-              fprintf(stderr, "MATH BEGIN[%d]\n", mathed_env);
-#endif
-        } else {
-//          fprintf(stderr, "MATHCRO[%s]",yytext);
-            MathMacro* p = 
-              MathMacroTable::mathMTable.getMacro(yytext);
-            if (p) {
-                data.Insert(p, p->getTCode());
-                p->setArgumentIdx(0);
-                mathed_parse(FLAG_END, p->GetData(), (MathParInset**)&p);
-//              for (int i=0; p->setArgumentIdx(i); i++)
-//                p->SetData(mathed_parse(FLAG_BRACE|FLAG_BRACE_LAST));
-            } else 
-              mathPrintError("Unrecognized environment");
-        }
-        break;
-      }
-       
-    case LM_TK_MACRO:
-     { 
-         MathedInset* p = 
-           MathMacroTable::mathMTable.getMacro(yylval.l->name);
-        
-         if (p) {
-             if (accent) {
-               data.Insert(doAccent(p));
-             } else
-               data.Insert(p, ((MathMacro*)p)->getTCode());
-         }
-         break;
-      }
-       
-     case LM_TK_LABEL:
-       {          
-         char rg = LexGetArg('\0', true);
-         if (rg != '}') {
-            mathPrintError("Expected '{'");
-             // debug info
-             fprintf(stderr, "[%s]\n", yytext); fflush(stderr);
-             panic = true;
-            break;
-         } 
-         if (crow) {
-             // This is removed by crow's destructor. Bad design? yes, this 
-             // will be changed after 0.12
-             crow->setLabel(strnew(yytext));
-         }
-         else {
-                 // where is this math_label free'ed?
-                 // Supposedly in ~formula, another bad hack,
-                 // give me some time please.
-                 mathed_label = strnew(yytext);
-         }
-#ifdef DEBUG
-         fprintf(stderr, "Label[%d]\n", mathed_label);
-#endif
-         break;
-       } 
-     default:
-       mathPrintError("Unrecognized token");
-       // debug info
-       fprintf(stderr, "[%d %s]\n", t, yytext);
-       break;
-    }
-    tprev = t;
-    if (panic) {
-       fprintf(stderr, " Math Panic, expect problems!\n"); 
-       //   Search for the end command. 
-       do t = yylex (); while (t != LM_TK_END && t);
-    } else
-     t = yylex ();
-   
-   if ((flags & FLAG_BRACE_OPT)/* && t!='^' && t!='_'*/) {
-        flags &= ~FLAG_BRACE_OPT;
-       //data.Insert (LM_TC_CLOSE);
-       break;
-    }
-   }
-   plevel--;
-   return array;
+
+       // restore global variables
+       curr_num   = saved_num;
+       curr_label = saved_label;
 }
 
 
-void mathed_parser_file(FILE* file, int lineno)
+MathInset * mathed_parse()
 {
-    yyin = file;
-    yylineno = lineno;
-    if (!MathMacroTable::built)
-       MathMacroTable::mathMTable.builtinMacros();
+       MathInset * p = 0;
+       int t = yylex();
+
+       switch (t) {
+               case LM_TK_NEWCOMMAND: {
+                       LexGetArg('{');
+                       string name = yytext.substr(1);
+                       
+                       int na = 0; 
+                       unsigned char const c = yyis->peek();
+                       if (c == '[') {
+                               LexGetArg('[');
+                               na = atoi(yytext.c_str());
+                       } 
+
+                       p = new MathMacroTemplate(name, na);
+                       mathed_parse(p->cell(0), FLAG_BRACE | FLAG_BRACE_LAST);
+                       lyxerr << "LM_TK_NEWCOMMAND: name: " << name << " na: " << na << "\n";
+                       break;
+               }
+
+               case LM_TK_BEGIN: {
+                       int i = yylval.i;
+                       lyxerr << "reading math environment " << i << " "
+                               << latex_mathenv[i].name << "\n";
+
+                       MathInsetTypes typ = latex_mathenv[i].typ;
+                       p = new MathMatrixInset(typ);
+                       switch (typ) {
+
+                               case LM_OT_SIMPLE: {
+                                       curr_num   = latex_mathenv[i].numbered;
+                                       curr_label = string();
+                                       mathed_parse(p->cell(0), 0);
+                                       MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+                                       m->numbered(0, curr_num);
+                                       m->label(0, curr_label);
+                                       break;
+                               }
+
+                               case LM_OT_EQUATION: {
+                                       curr_num   = latex_mathenv[i].numbered;
+                                       curr_label = string();
+                                       mathed_parse(p->cell(0), FLAG_END);
+                                       MathMatrixInset * m = static_cast<MathMatrixInset *>(p);
+                                       m->numbered(0, curr_num);
+                                       m->label(0, curr_label);
+                                       break;
+                               }
+
+                               case LM_OT_EQNARRAY: {
+                                       mathed_parse_lines(p, 3, latex_mathenv[i].numbered, true);
+                                       break;
+                               }
+
+                               case LM_OT_ALIGNAT: {
+                                       LexGetArg('{');
+                                       //int c = atoi(yytext.c_str());
+                                       lyxerr << "LM_OT_ALIGNAT: not implemented\n";
+                                       mathed_parse_lines(p, 2, latex_mathenv[i].numbered, true);
+                                       lyxerr << "LM_OT_ALIGNAT: par: " << *p << "\n";
+                                       break;
+                               }
+
+                               default: 
+                                       lyxerr << "1: unknown math environment: " << typ << "\n";
+                       }
+
+                       p->SetName(latex_mathenv[i].basename);
+
+                       break;
+               }
+               
+               default:
+                       lyxerr << "2 unknown math environment: " << t << "\n";
+       }
+
+       return p;
+}
+
+
+void mathed_parse(MathArray & array, unsigned flags)
+{
+       int  t = yylex();
+       int  tprev = 0;
+       bool panic = false;
+       static int plevel = -1;
+       yyvarcode = LM_TC_VAR;
+       
+       int brace = 0;
+       int acc_brace = 0;
+       int acc_braces[8];
+
+       ++plevel;
+       while (t) {
+               //lyxerr << "t: " << t << " flags: " << flags;
+               //array.dump(lyxerr);
+               //lyxerr << "\n";
+
+               if ((flags & FLAG_BRACE) && t != LM_TK_OPEN) {
+                       if (!(flags & FLAG_BRACK_ARG) || t != '[') {
+                               mathPrintError(
+                                       "Expected {. Maybe you forgot to enclose an argument in {}");
+                               panic = true;
+                               break;
+                       }
+               }
+
+               switch (t) {
+                       
+               case LM_TK_ALPHA:
+                       do_insert(array, yylval.i, yyvarcode);
+                       break;
+
+               case LM_TK_ARGUMENT:
+                       array.push_back(new MathMacroArgument(yylval.i));
+                       break;
+
+               case LM_TK_SPECIAL:
+                       array.push_back(yylval.i, LM_TC_SPECIAL);
+                       break;
+
+               case LM_TK_STR:
+                       do_insert(array, yylval.i, LM_TC_CONST);
+                       break;
+
+               case LM_TK_OPEN:
+                       ++brace;
+                       if (accent && tprev == LM_TK_ACCENT) {
+                               acc_braces[acc_brace++] = brace;
+                               break;
+                       }
+                       if (flags & FLAG_BRACE_OPT) {
+                               flags &= ~FLAG_BRACE_OPT;
+                               flags |= FLAG_BRACE;
+                       }
+                       
+                       if (flags & FLAG_BRACE)
+                               flags &= ~FLAG_BRACE;
+                       else 
+                               array.push_back('{', LM_TC_TEX);
+                       break;
+
+               case LM_TK_CLOSE:
+                       --brace;         
+                       if (brace < 0) {
+                               mathPrintError("Unmatching braces");
+                               panic = true;
+                               break;
+                       }
+                       if (acc_brace && brace == acc_braces[acc_brace - 1] - 1) {
+                               --acc_brace;
+                               break;
+                       }
+                       if (flags & FLAG_BRACE_FONT) {
+                               yyvarcode = LM_TC_VAR;
+                               flags &= ~FLAG_BRACE_FONT;
+                               break;
+                       }
+                       if (brace == 0 && (flags & FLAG_BRACE_LAST)) {
+                               --plevel;
+                               return;
+                       }
+                       array.push_back('}', LM_TC_TEX);
+                       break;
+               
+               case '[':
+                       if (flags & FLAG_BRACK_ARG) {
+                               flags &= ~FLAG_BRACK_ARG;
+                               unsigned char const rg = LexGetArg('[');
+                               if (rg != ']') {
+                                       mathPrintError("Expected ']'");
+                                       panic = true;
+                                       break;
+                               }          
+                       } else
+                               array.push_back('[', LM_TC_CONST);
+                       break;
+
+               case ']':
+                       if (flags & FLAG_BRACK_END) {
+                               --plevel;
+                               return;
+                       }
+                       array.push_back(']', LM_TC_CONST);
+                       break;
+               
+               case '^':
+               {
+                       MathArray ar;
+                       mathed_parse(ar, FLAG_BRACE_OPT | FLAG_BRACE_LAST);
+                       MathScriptInset * p = lastScriptInset(array);
+                       p->setData(ar, 0);
+                       p->up(true);
+                       break;
+               }
+               
+               case '_':
+               {
+                       MathArray ar;
+                       mathed_parse(ar, FLAG_BRACE_OPT | FLAG_BRACE_LAST);
+                       MathScriptInset * p = lastScriptInset(array);
+                       p->setData(ar, 1);
+                       p->down(true);
+                       break;
+               }
+               
+               case LM_TK_LIMIT:
+               {
+                       MathScriptInset * p = lastScriptInset(array);
+                       if (p) 
+                               p->limits(yylval.l->id ? 1 : -1);
+                       break;
+               }
+               
+               case '&':
+               {
+                       if (flags & FLAG_AMPERSAND) {
+                               flags &= ~FLAG_AMPERSAND;
+                               --plevel;
+                               return;
+                       }
+                       lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
+                       break;
+               }
+               
+               case LM_TK_NEWLINE:
+               {
+                       if (flags & FLAG_NEWLINE) {
+                               flags &= ~FLAG_NEWLINE;
+                               --plevel;
+                               return;
+                       }
+                       lyxerr << "found newline unexpectedly, array: '" << array << "'\n";
+                       break;
+               }
+               
+               case LM_TK_BIGSYM:  
+               {
+                       array.push_back(new MathBigopInset(yylval.l->name, yylval.l->id));
+                       break;
+               }
+               
+               case LM_TK_SYM:
+                       if (yylval.l->id < 256) {
+                               MathTextCodes tc = MathIsBOPS(yylval.l->id) ? LM_TC_BOPS: LM_TC_SYMB;
+                               do_insert(array, yylval.l->id, tc);
+                       } else 
+                               do_insert(array, new MathFuncInset(yylval.l->name));
+                       break;
+
+               case LM_TK_BOP:
+                       do_insert(array, yylval.i, LM_TC_BOP);
+                       break;
+
+               case LM_TK_SPACE:
+                       if (yylval.i >= 0) 
+                               array.push_back(new MathSpaceInset(yylval.i));
+                       break;
+
+               case LM_TK_DOTS:
+                       array.push_back(new MathDotsInset(yylval.l->name, yylval.l->id));
+                       break;
+               
+               case LM_TK_CHOOSE:
+                       handle_frac(array, LM_OT_ATOP); 
+                       break;
+
+               case LM_TK_STACK:
+                       handle_frac(array, LM_OT_STACKREL);     
+                       break;
+
+               case LM_TK_FRAC:
+                       handle_frac(array, LM_OT_FRAC); 
+                       break;
+
+               case LM_TK_SQRT:
+               {           
+                       unsigned char c;
+                       yyis->get(c);
+                       if (c == '[') {
+                               MathRootInset * rt = new MathRootInset;
+                               mathed_parse(rt->cell(0), FLAG_BRACK_END);
+                               mathed_parse(rt->cell(1), FLAG_BRACE | FLAG_BRACE_LAST);
+                               array.push_back(rt);
+                       } else {
+                               yyis->putback(c);
+                               MathSqrtInset * sq = new MathSqrtInset;
+                               mathed_parse(sq->cell(0), FLAG_BRACE | FLAG_BRACE_LAST);
+                               array.push_back(sq);
+                       }
+                       break;
+               }
+               
+               case LM_TK_LEFT:
+               {
+                       int ld = yylex();
+                       if (ld == LM_TK_SYM)
+                               ld = yylval.l->id;
+                       else if (ld == LM_TK_STR || ld == LM_TK_BOP || ld == LM_TK_SPECIAL)
+                               ld = yylval.i;
+
+                       MathArray ar;
+                       mathed_parse(ar, FLAG_RIGHT);
+
+                       int rd = yylex();
+                       if (rd == LM_TK_SYM)
+                               rd = yylval.l->id;
+                       else if (rd == LM_TK_STR || rd == LM_TK_BOP || rd == LM_TK_SPECIAL)
+                               rd = yylval.i;   
+
+                       MathDelimInset * dl = new MathDelimInset(ld, rd);
+                       dl->setData(ar, 0);
+                       array.push_back(dl);
+                       break;
+               }
+               
+               case LM_TK_RIGHT:
+                       if (flags & FLAG_RIGHT) { 
+                               --plevel;
+                               return;
+                       }
+                       mathPrintError("Unmatched right delimiter");
+//       panic = true;
+                       break;
+               
+               case LM_TK_FONT:
+                       yyvarcode = static_cast<MathTextCodes>(yylval.l->id);
+                       flags |= (FLAG_BRACE | FLAG_BRACE_FONT);
+                       break;
+
+               case LM_TK_STY:
+               {
+                       lyxerr << "LM_TK_STY not implemented\n";
+                       //MathArray tmp = array;
+                       //MathSizeInset * p = new MathSizeInset(MathStyles(yylval.l->id));
+                       //array.push_back(p);
+                       //mathed_parse(p->cell(0), FLAG_BRACE_FONT);
+                       break; 
+               }
+
+
+               case LM_TK_WIDE:
+               {  
+                       MathDecorationInset * sq = new MathDecorationInset(yylval.l->id);
+                       mathed_parse(sq->cell(0), FLAG_BRACE | FLAG_BRACE_LAST);
+                       array.push_back(sq);
+                       break;
+               }
+               
+               case LM_TK_ACCENT:
+                       setAccent(yylval.l->id);
+                       break;
+                       
+               case LM_TK_NONUM:
+                       curr_num = false;
+                       break;
+               
+               case LM_TK_PMOD:
+               case LM_TK_FUNC:
+                       if (accent) 
+                               array.push_back(t, LM_TC_CONST);
+                       else 
+                               array.push_back(new MathFuncInset(yylval.l->name));
+                       break;
+               
+               case LM_TK_FUNCLIM:
+                       array.push_back(new MathFuncInset(yylval.l->name, LM_OT_FUNCLIM));
+                       break;
+
+               case LM_TK_UNDEF: 
+                       if (MathMacroTable::hasTemplate(yytext)) {
+                               MathMacro * m = MathMacroTable::cloneTemplate(yytext);
+                               for (int i = 0; i < m->nargs(); ++i) {
+                                       mathed_parse(m->cell(i), FLAG_BRACE_OPT | FLAG_BRACE_LAST);
+                                       lyxerr << "reading cell " << i << " '" << m->cell(i) << "'\n";
+                               }
+                               do_insert(array, m);
+                               lyxerr << "macro: " << *m << "\n";
+                               m->Metrics(LM_ST_TEXT);
+                       } else
+                               do_insert(array, new MathFuncInset(yytext, LM_OT_UNDEF));
+                       break;
+               
+               case LM_TK_END:
+                       --plevel;
+                       return;
+
+               case LM_TK_BEGIN:
+               {
+                       int i = yylval.i;
+                       MathInsetTypes typ = latex_mathenv[i].typ;
+
+                       if (typ == LM_OT_MATRIX) {
+                               string valign = "\0";
+                               unsigned char rg = LexGetArg(0);
+                               if (rg == ']') {
+                                       valign = yytext;
+                                       rg = LexGetArg('{');
+                               }
+
+                               string halign = yytext;
+                               MathArrayInset * mm = new MathArrayInset(halign.size(), 1);
+                               valign += 'c';
+                               mm->valign(valign[0]);
+                               mm->halign(halign);
+
+                               mathed_parse_lines(mm, halign.size(), latex_mathenv[i].numbered, false);
+                               do_insert(array, mm);
+                               //lyxerr << "read matrix " << *mm << "\n";      
+                               break;
+                       } else 
+                               lyxerr << "unknow math inset " << typ << "\n";  
+                       break;
+               }
+       
+               case LM_TK_MACRO:
+                       do_insert(array, MathMacroTable::cloneTemplate(yylval.l->name));
+                       break;
+               
+               case LM_TK_LABEL:
+               {       
+                       unsigned char const rg = LexGetArg('\0', true);
+                       if (rg != '}') {
+                               mathPrintError("Expected '{'");
+                               // debug info
+                               lyxerr << "[" << yytext << "]" << endl;
+                               panic = true;
+                               break;
+                       } 
+                       //lyxerr << " setting label to " << yytext << "\n";
+                       curr_label = yytext;
+                       break;
+               }
+               
+               default:
+                       mathPrintError("Unrecognized token");
+                       lyxerr << "[" << t << " " << yytext << "]" << endl;
+                       break;
+
+               } // end of big switch
+               
+               tprev = t;
+               if (panic) {
+                       lyxerr << " Math Panic, expect problems!" << endl;
+                       //   Search for the end command. 
+                       do {
+                               t = yylex();
+                       } while (t != LM_TK_END && t);
+               } else
+                       t = yylex();
+               
+               if (flags & FLAG_BRACE_OPT) {
+                       flags &= ~FLAG_BRACE_OPT;
+                       break;
+               }
+       }
+       --plevel;
 }
 
 
-int mathed_parser_lineno()
+MathInset * mathed_parse(istream & is)
 {
-    return yylineno;
+       yyis     = &is;
+       yylineno = 0;
+       return mathed_parse();
 }
 
+
+MathInset * mathed_parse(LyXLex & lex)
+{
+       yyis     = &lex.getStream();
+       yylineno = lex.GetLineNo();
+
+       MathInset * p = mathed_parse();
+
+       // Update line number
+       lex.setLineNo(yylineno);
+
+       // reading of end_inset
+       while (lex.IsOK()) {
+               lex.nextToken();
+               if (lex.GetString() == "\\end_inset")
+                       break;
+               lyxerr << "InsetFormula::Read: Garbage before \\end_inset,"
+                       " or missing \\end_inset!" << endl;
+       }
+
+       return p;
+}
+
+