read & and \\ nested in {} again

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2616 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C
index 5922f15361b2e0ee40242d2dea5b9596c9dfc030..3ca1a4a86777764e0ab398b10a76e61ea08c406f 100644 (file)
--- a/src/mathed/math_parser.C
+++ b/src/mathed/math_parser.C
@@ -696,7 +696,7 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
                
                else if (t.cat() == catAlign) {
                        lyxerr << "found tab unexpectedly, array: '" << array << "'\n";
-                       return;
+                       array.push_back(new MathCharInset('&', LM_TC_SPECIAL));
                }
                
                else if (t.cat() == catSuper)
@@ -728,10 +728,11 @@ void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
 
                else if (t.cs() == "\\") {
                        curr_skip_ = getArg('[', ']');
-                       if (!(flags & FLAG_NEWLINE))
-                               lyxerr[Debug::MATHED]
+                       if (flags & FLAG_NEWLINE)
+                               return;
+                       lyxerr[Debug::MATHED]
                                        << "found newline unexpectedly, array: '" << array << "'\n";
-                       return;
+                       array.push_back(createMathInset("\\"));
                }
        
                else if (t.cs() == "limits")