fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/formula.C b/src/mathed/formula.C
index 9b9e6c777f882b6236f0e6b76f04f5ffd6661912..31af423668c2985d0b523bb75415fee006172d9f 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -64,10 +64,8 @@ InsetFormula::InsetFormula(MathInsetTypes t)
 
 
 InsetFormula::InsetFormula(string const & s)
-       : InsetFormulaBase(0)
+       : InsetFormulaBase(mathed_parse(s))
 {
-       istringstream is(s.c_str());
-       par(mathed_parse(is));
        Metrics();
 }
 
@@ -171,7 +169,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        mathcursor->GetPos(x, y);
                        mathcursor->breakLine();
                        mathcursor->normalize();
-                       updateLocal(bv);
+                       updateLocal(bv, true);
                        break;
 
                case LFUN_MATH_NUMBER:
@@ -183,7 +181,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                                for (int row = 0; row < par()->nrows(); ++row)
                                        par()->numbered(row, !old);
                                bv->owner()->message(old ? _("No number") : _("Number"));
-                               updateLocal(bv);
+                               updateLocal(bv, true);
                        }
                        break;
                }
@@ -197,7 +195,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                                bool old = par()->numbered(row);
                                bv->owner()->message(old ? _("No number") : _("Number"));
                                par()->numbered(row, !old);
-                               updateLocal(bv);
+                               updateLocal(bv, true);
                        }
                        break;
                }
@@ -236,14 +234,14 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 
                        par()->label(row, new_label);
 
-                       updateLocal(bv);
+                       updateLocal(bv, true);
                        break;
                }
 
                case LFUN_MATH_EXTERN:
                        bv->lockedInsetStoreUndo(Undo::EDIT);
                        handleExtern(arg, bv);
-                       updateLocal(bv);
+                       updateLocal(bv, true);
                        break;
 
                case LFUN_MATH_MUTATE:
@@ -255,7 +253,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        par()->mutate(arg);
                        mathcursor->SetPos(x, y);
                        mathcursor->normalize();
-                       updateLocal(bv);
+                       updateLocal(bv, true);
                        break;
                }
 
@@ -270,7 +268,7 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                                par()->mutate(LM_OT_SIMPLE);
                        mathcursor->SetPos(x, y);
                        mathcursor->normalize();
-                       updateLocal(bv);
+                       updateLocal(bv, true);
                        break;
                }
 
@@ -327,6 +325,11 @@ void InsetFormula::validate(LaTeXFeatures & features) const
        par()->Validate(features);
 }
 
+bool InsetFormula::insetAllowed(Inset::Code code) const
+{
+       return code == Inset::LABEL_CODE; 
+}
+
 
 int InsetFormula::ascent(BufferView *, LyXFont const &) const
 {
@@ -343,5 +346,5 @@ int InsetFormula::descent(BufferView *, LyXFont const &) const
 int InsetFormula::width(BufferView *, LyXFont const &) const
 {
        Metrics();
-       return par()->width() + 2;
+       return par()->width();
 }