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 b3a648990301f0de03235280a3ce2f0ac943e6e8..31af423668c2985d0b523bb75415fee006172d9f 100644 (file)
--- a/src/mathed/formula.C
+++ b/src/mathed/formula.C
@@ -13,22 +13,19 @@
 *   the GNU General Public Licence version 2 or later.
 */
 
-#include <config.h>
-#include <fstream>
-
-#include "support/LOstream.h"
-
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
+#include <config.h>
+#include <fstream>
+
 #include "formula.h"
 #include "commandtags.h"
 #include "math_cursor.h"
 #include "math_parser.h"
 #include "lyx_main.h"
 #include "BufferView.h"
-#include "lyxtext.h"
 #include "gettext.h"
 #include "debug.h"
 #include "lyx_gui_misc.h"
@@ -37,12 +34,10 @@
 #include "support/syscall.h"
 #include "LyXView.h"
 #include "Painter.h"
-#include "font.h"
 #include "lyxrc.h"
 #include "math_matrixinset.h"
 #include "mathed/support.h"
 
-using std::ostringstream;
 using std::ostream;
 using std::ifstream;
 using std::istream;
@@ -69,10 +64,9 @@ 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();
 }
 
 
@@ -118,6 +112,7 @@ int InsetFormula::docBook(ostream & os) const
 void InsetFormula::read(LyXLex & lex)
 {
        par(mathed_parse(lex));
+       Metrics();
 }
 
 
@@ -126,36 +121,33 @@ void InsetFormula::draw(BufferView * bv, LyXFont const &,
 {
        int x = int(xx) - 1;
        y -= 2;
+
        MathInset::workwidth = bv->workWidth();
        Painter & pain = bv->painter();
 
+       Metrics();
        int w = par()->width();
        int h = par()->height();
        int a = par()->ascent();
-       pain.fillRectangle(int(x), y - a, w, h, LColor::mathbg);
-
-       if (mathcursor) {
-               par()->Metrics(LM_ST_TEXT);
-
-               if (mathcursor->formula() == this) {
-                       if (mathcursor->Selection()) {
-                               int xp[10];
-                               int yp[10];
-                               int n;
-                               mathcursor->SelGetArea(xp, yp, n);
-                               pain.fillPolygon(xp, yp, n, LColor::selection);
-                       }
-                       pain.rectangle(int(x), y - a, w, h, LColor::mathframe);
-               }
+       pain.fillRectangle(x, y - a, w, h, LColor::mathbg);
+
+       if (mathcursor && mathcursor->formula() == this) {
+               mathcursor->drawSelection(pain);
+               pain.rectangle(x, y - a, w, h, LColor::mathframe);
        }
 
-       par()->draw(pain, int(x), y);
+       par()->draw(pain, x, y);
        xx += par()->width();
 
        setCursorVisible(false);
 }
 
 
+void InsetFormula::Metrics() const 
+{
+       const_cast<MathInset *>(par_)->Metrics(display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+}
+
 vector<string> const InsetFormula::getLabelList() const
 {
        return par()->getLabelList();
@@ -172,8 +164,12 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
 
                case LFUN_BREAKLINE: 
                        bv->lockedInsetStoreUndo(Undo::INSERT);
+                       int x;
+                       int y;
+                       mathcursor->GetPos(x, y);
                        mathcursor->breakLine();
-                       updateLocal(bv);
+                       mathcursor->normalize();
+                       updateLocal(bv, true);
                        break;
 
                case LFUN_MATH_NUMBER:
@@ -185,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;
                }
@@ -199,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;
                }
@@ -238,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:
@@ -257,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;
                }
 
@@ -266,15 +262,13 @@ InsetFormula::localDispatch(BufferView * bv, kb_action action,
                        int x;
                        int y;
                        mathcursor->GetPos(x, y);
-                       if (par()->GetType() == LM_OT_SIMPLE) {
+                       if (par()->GetType() == LM_OT_SIMPLE)
                                par()->mutate(LM_OT_EQUATION);
-                               par()->numbered(0, false);
-                       }
                        else
                                par()->mutate(LM_OT_SIMPLE);
                        mathcursor->SetPos(x, y);
                        mathcursor->normalize();
-                       updateLocal(bv);
+                       updateLocal(bv, true);
                        break;
                }
 
@@ -299,6 +293,7 @@ void InsetFormula::handleExtern(const string & arg, BufferView *)
 
        ifstream is(outfile.c_str());
        par(mathed_parse(is));
+       Metrics();
 }
 
 bool InsetFormula::display() const
@@ -330,21 +325,26 @@ 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
 {
-       return par()->ascent() + 4;
+       return par()->ascent() + 1;
 }
 
 
 int InsetFormula::descent(BufferView *, LyXFont const &) const
 {
-       return par()->descent();
+       return par()->descent() + 1;
 }
 
 
 int InsetFormula::width(BufferView *, LyXFont const &) const
 {
-       par()->Metrics(LM_ST_TEXT);
+       Metrics();
        return par()->width();
 }