rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

[lyx.git] / src / mathed / math_parser.C

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index d4bb600b627f314bd7ab3b7f1411902a210d0b86..44071e9001c25114540b26bf3d3e27c30a280699 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -206,6 +206,8 @@ ostream & operator<<(ostream & os, Token const & t)
 {
        if (t.cs().size())
                os << '\\' << t.cs();
+       else if (t.cat() == catLetter)
+               os << t.character();
        else
                os << '[' << t.character() << ',' << t.cat() << ']';
        return os;
@@ -529,6 +531,7 @@ bool Parser::parse(MathAtom & at)
 
 string Parser::parse_verbatim_option()
 {
+       skipSpaces();
        string res;
        if (nextToken().character() == '[') {
                Token t = getToken();
@@ -546,6 +549,7 @@ string Parser::parse_verbatim_option()
 
 string Parser::parse_verbatim_item()
 {
+       skipSpaces();
        string res;
        if (nextToken().cat() == catBegin) {
                Token t = getToken();
@@ -578,15 +582,15 @@ void Parser::parse(MathArray & array, unsigned flags, mode_type mode)
 }
 
 
-void Parser::parse2(MathAtom & at, unsigned flags, mode_type mode,
-       bool numbered)
+void Parser::parse2(MathAtom & at, const unsigned flags, const mode_type mode,
+       const bool numbered)
 {
        parse1(*(at.nucleus()->asGridInset()), flags, mode, numbered);
 }
 
 
 void Parser::parse1(MathGridInset & grid, unsigned flags,
-       mode_type mode, bool numbered)
+       const mode_type mode, const bool numbered)
 {
        int limits = 0;
        MathGridInset::row_type cellrow = 0;
@@ -609,8 +613,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
 #endif
 
                if (flags & FLAG_ITEM) {
-                       if (t.cat() == catSpace)
-                               continue;
+                       skipSpaces();
 
                        flags &= ~FLAG_ITEM;
                        if (t.cat() == catBegin) {
@@ -964,7 +967,7 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                        parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
                }
 
-               else if (t.cs() == "ref" || t.cs() == "prettyref" || 
+               else if (t.cs() == "ref" || t.cs() == "prettyref" ||
                                t.cs() == "pageref" || t.cs() == "vpageref" || t.cs() == "vref") {
                        cell->push_back(MathAtom(new RefInset(t.cs())));
                        parse(cell->back().nucleus()->cell(1), FLAG_OPTION, mode);
@@ -972,9 +975,11 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                }
 
                else if (t.cs() == "left") {
+                       skipSpaces();
                        string l = getToken().asString();
                        MathArray ar;
                        parse(ar, FLAG_RIGHT, mode);
+                       skipSpaces();
                        string r = getToken().asString();
                        cell->push_back(MathAtom(new MathDelimInset(l, r, ar)));
                }
@@ -997,11 +1002,11 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                                parse2(cell->back(), FLAG_END, mode, false);
                        }
 
-                       if (name == "tabular") {
+                       else if (name == "tabular") {
                                string const valign = parse_verbatim_option() + 'c';
                                string const halign = parse_verbatim_item();
                                cell->push_back(MathAtom(new MathTabularInset(name, valign[0], halign)));
-                               parse2(cell->back(), FLAG_END, mode, false);
+                               parse2(cell->back(), FLAG_END, MathInset::TEXT_MODE, false);
                        }
 
                        else if (name == "split" || name == "cases" ||
@@ -1075,10 +1080,11 @@ void Parser::parse1(MathGridInset & grid, unsigned flags,
                        }
 
                        else {
-                               // lyxerr << "unknow math inset begin '" << name << "'\n";
+                               dump();
+                               lyxerr << "found unknown math environment '" << name << "'\n";
                                // create generic environment inset
                                cell->push_back(MathAtom(new MathEnvInset(name)));
-                               parse(cell->back().nucleus()->cell(0), FLAG_END, mode);
+                               parse(cell->back().nucleus()->cell(0), FLAG_ITEM, mode);
                        }
                }