leave mathed after math-insert if we have not been in mathed before

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

diff --git a/src/mathed/formulabase.C b/src/mathed/formulabase.C
index eebcfc870316f7c461fcb6ed1e74a3d7284a1a59..38dda883f567c7c6d605a367f9413192947b800c 100644 (file)
--- a/src/mathed/formulabase.C
+++ b/src/mathed/formulabase.C
@@ -758,9 +758,11 @@ void mathDispatchInsertMatrix(BufferView * bv, string const & arg)
 void mathDispatchInsertMath(BufferView * bv, string const & arg)
 {
        if (bv->available()) {
-               if (arg.size() && arg[0] == '\\')
-                       openNewInset(bv, new InsetFormula(arg));
-               else
+               if (arg.size() && arg[0] == '\\') {
+                       InsetFormula * f = new InsetFormula(arg);
+                       if (!bv->insertInset(f))
+                               delete f;
+               } else
                        mathDispatchMathMode(bv, arg);
        }
 }

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index ca2b35904f9b371e1554971a37f62b03d1bc05e3..4c8ec8081d716661d9f072d298743f5092c3315f 100644 (file)
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -1374,13 +1374,13 @@ void MathCursor::interpret(char c)
                static char const greekl[][26] =
                        {"alpha", "beta", "chi", "delta", "epsilon", "phi",
                         "gamma", "eta", "iota", "epsilon", "kappa", "lambda", "mu",
-                        "nu", "omikron", "pi", "vartheta", "rho", "sigma",
+                        "nu", "omega", "pi", "vartheta", "rho", "sigma",
                         "tau", "upsilon", "theta", "omega", "xi", "varphi", "zeta"};
                static char const greeku[][26] =
-                       {"Alpha", "Beta", "chi", "Delta", "varepsilon", "Phi",
-                        "Gamma", "Eta", "Iota", "Epsilon", "Kappa", "Lambda", "Mu",
-                        "Nu", "Omikron", "Pi", "vartheta", "varrho", "Sigma", "varsigma",
-                        "Upsilon", "Theta", "Omega", "Xi", "Varphi", "Zeta"};
+                       {"alpha", "beta", "chi", "Delta", "varepsilon", "Phi",
+                        "Gamma", "varepsilon", "varepsilon", "epsilon", "kappa", "Lambda", "mu",
+                        "Nu", "Omega", "Pi", "vartheta", "varrho", "Sigma", "varsigma",
+                        "Upsilon", "Theta", "Omega", "Xi", "Varphi", "zeta"};
        
                latexkeys const * l = 0;        
                if ('a' <= c && c <= 'z')