don't #include too much stuff in .h

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

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 21a451fa8bab007d8af02977a2438e1400ddbb0e..4f59e333fe7a3e9fcf11ce41dd4df259d19a3791 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -129,12 +129,10 @@ inline CatCode catcode(unsigned char c)
 
 
 enum {
-       FLAG_BRACE      = 1 << 0,  //  an opening brace needed
        FLAG_BRACE_LAST = 1 << 1,  //  last closing brace ends the parsing process
        FLAG_RIGHT      = 1 << 2,  //  next \\right ends the parsing process
        FLAG_END        = 1 << 3,  //  next \\end ends the parsing process
        FLAG_BRACK_END  = 1 << 4,  //  next closing bracket ends the parsing process
-       FLAG_NEWLINE    = 1 << 6,  //  next \\\\ ends the parsing process
        FLAG_ITEM       = 1 << 7,  //  read a (possibly braced token)
        FLAG_BLOCK      = 1 << 8,  //  next block ends the parsing process
        FLAG_LEAVE      = 1 << 9   //  leave the loop at the end
@@ -538,7 +536,7 @@ string Parser::parse_macro()
        }
 
        if (getToken().cat() != catBegin) {
-               lyxerr << "'{' expected\n";
+               lyxerr << "'{' in \\newcommand expected (1)\n";
                return name;
        }
 
@@ -551,10 +549,15 @@ string Parser::parse_macro()
 
        string    arg  = getArg('[', ']');
        int       narg = arg.empty() ? 0 : atoi(arg.c_str()); 
+
+       if (getToken().cat() != catBegin) {
+               lyxerr << "'{' in \\newcommand expected (2)\n";
+               return name;
+       }
+
        MathArray ar;
-       parse_into(ar, FLAG_BRACE | FLAG_BRACE_LAST);
+       parse_into(ar, FLAG_BRACE_LAST);
        MathMacroTable::create(name, narg, ar);
-       
        return name;
 }
 
@@ -694,17 +697,6 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                        }
                }
 
-               if (flags & FLAG_BRACE) {
-                       if (t.cat() != catBegin) {
-                               error("Expected {. Maybe you forgot to enclose an argument in {}");
-                               panic = true;
-                               break;
-                       } else {
-                               flags &= ~FLAG_BRACE;
-                               continue;
-                       }
-               }
-
                if (flags & FLAG_BLOCK) {
                        if (t.cat() == catAlign || t.cs() == "\\")
                                return;
@@ -732,19 +724,31 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                }
 
                else if (t.cat() == catBegin) {
-                       array.push_back(MathAtom(new MathBraceInset));
-                       parse_into(array.back()->cell(0), FLAG_BRACE_LAST, LM_TC_MIN);
+                       MathArray ar;
+                       parse_into(ar, FLAG_BRACE_LAST);
+#ifndef WITH_WARNINGS
+#warning this might be wrong in general!
+#endif
+                       // ignore braces around simple items
+                       if (ar.size() == 1 || (ar.size() == 2 && ar.back()->asScriptInset())) {
+                               array.push_back(ar);
+                       } else {
+                               array.push_back(MathAtom(new MathBraceInset));
+                               array.back()->cell(0).swap(ar);
+                       }
                }
 
                else if (t.cat() == catEnd) {
                        if (flags & FLAG_BRACE_LAST)
                                return;
-                       lyxerr << "found '}' unexpectedly, array: '" << array << "'\n";
+                       //lyxerr << "found '}' unexpectedly, array: '" << array << "'\n";
+                       lyxerr << "found '}' unexpectedly\n";
                        add(array, '}', LM_TC_TEX);
                }
                
                else if (t.cat() == catAlign) {
-                       lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
+                       //lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
+                       lyxerr << "found tab unexpectedly\n";
                        add(array, '&', LM_TC_TEX);
                }
                
@@ -770,9 +774,10 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                        add(array, t.character(), code);
                
                //
-               // codesequences
+               // control sequences
                //      
-               else if (t.cs() == "protect") 
+               else if (t.cs() == "protect")
+                       // ignore \\protect, will be re-added during output 
                        ;
 
                else if (t.cs() == "end")
@@ -786,10 +791,8 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
 
                else if (t.cs() == "\\") {
                        curr_skip_ = getArg('[', ']');
-                       if (flags & FLAG_NEWLINE)
-                               return;
-                       lyxerr[Debug::MATHED]
-                                       << "found newline unexpectedly, array: '" << array << "'\n";
+                       //lyxerr << "found newline unexpectedly, array: '" << array << "'\n";
+                       lyxerr << "found newline unexpectedly\n";
                        array.push_back(createMathInset("\\"));
                }
        
@@ -830,7 +833,7 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                
                else if (t.cs() == "right") {
                        if (!(flags & FLAG_RIGHT)) {
-                               lyxerr << "got so far: '" << array << "'\n";
+                               //lyxerr << "got so far: '" << array << "'\n";
                                error("Unmatched right delimiter");
                        }
                        return;
@@ -883,41 +886,15 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                }
 
                else if (t.cs() == "label") {
-                       //MathArray ar;
-                       //parse_into(ar, FLAG_ITEM);
-                       //ostringstream os;
-                       //ar.write(os, true);
-                       //curr_label_ = os.str();
-                       // was: 
                        curr_label_ = getArg('{', '}');
                }
 
                else if (t.cs() == "choose" || t.cs() == "over" || t.cs() == "atop") {
                        MathAtom p = createMathInset(t.cs());
-                       // search backward for position of last '{' if any
-                       int pos;
-                       for (pos = array.size() - 1; pos >= 0; --pos)
-                               if (array.at(pos)->getChar() == '{')
-                                       break;
-                       if (pos >= 0) {
-                               // found it -> use the part after '{' as "numerator"
-                               p->cell(0) = MathArray(array, pos + 1, array.size());
-                               parse_into(p->cell(1), FLAG_BRACE_LAST);
-                               // delete denominator and the '{'
-                               array.erase(pos, array.size());
-                       } else if (flags & FLAG_RIGHT) {
-                               // we are inside a \left ... \right block
-                               //lyxerr << "found '" << t.cs() << "' enclosed by \\left .. \\right\n";
-                               p->cell(0).swap(array);
-                               parse_into(p->cell(1), FLAG_RIGHT);
-                               // handle the right delimiter properly
-                               putback();
-                       } else {
-                               // not found -> use everything as "numerator"
-                               p->cell(0).swap(array);
-                               parse_into(p->cell(1), FLAG_BLOCK);
-                       }
-                       array.push_back(MathAtom(p));
+                       array.swap(p->cell(0));
+                       parse_into(p->cell(1), flags, code);
+                       array.push_back(p);
+                       return;
                }
 
 /*