]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/formulabase.C
fix #1073
[lyx.git] / src / mathed / formulabase.C
index 6914826429068c0df4a481be0004fe19ac02f4f1..d6e350fd819e31463ab17ba947b227bb9dfcb4e6 100644 (file)
@@ -18,9 +18,6 @@
 #include "Lsstream.h"
 #include "support/LAssert.h"
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "formula.h"
 #include "formulamacro.h"
@@ -32,7 +29,7 @@
 #include "LaTeXFeatures.h"
 #include "debug.h"
 #include "math_support.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "support/lstrings.h"
 #include "frontends/LyXView.h"
 #include "frontends/font_metrics.h"
 #include "textpainter.h"
 #include "frontends/Dialogs.h"
 #include "intl.h"
-#include "insets/insetcommandparams.h"
 #include "ref_inset.h"
 
 using std::endl;
 using std::ostream;
 using std::vector;
 using std::abs;
+using std::max;
 
 MathCursor * mathcursor = 0;
 
@@ -94,7 +91,7 @@ InsetFormulaBase::InsetFormulaBase()
        // This is needed as long the math parser is not re-entrant
        initMath();
        //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
-       //lyxerr << "sizeof MathMetricsInfo: " << sizeof(MathMetricsInfo) << "\n";
+       //lyxerr << "sizeof MetricsInfo: " << sizeof(MetricsInfo) << "\n";
        //lyxerr << "sizeof MathCharInset: " << sizeof(MathCharInset) << "\n";
        //lyxerr << "sizeof LyXFont: " << sizeof(LyXFont) << "\n";
 }
@@ -125,18 +122,24 @@ void InsetFormulaBase::mutateToText()
 void InsetFormulaBase::handleFont
        (BufferView * bv, string const & arg, string const & font)
 {
+       // this whole function is a hack and won't work for incremental font
+       // changes...
        bv->lockedInsetStoreUndo(Undo::EDIT);
-       bool sel = mathcursor->selection();
-       if (sel)
-               updateLocal(bv, true);
-       mathcursor->handleNest(createMathInset(font));
-       mathcursor->insert(arg);
-       if (!sel)
-               updateLocal(bv, false);
+       if (mathcursor->par()->name() == font)
+               mathcursor->handleFont(font);
+       else {
+               mathcursor->handleNest(createMathInset(font));
+               mathcursor->insert(arg);
+       }
+}
+
+
+BufferView * InsetFormulaBase::view() const
+{
+       return view_.lock().get();
 }
 
 
-// Check if uses AMS macros
 void InsetFormulaBase::validate(LaTeXFeatures &) const
 {}
 
@@ -152,7 +155,7 @@ void InsetFormulaBase::metrics(BufferView * bv) const
 {
        if (bv)
                view_ = bv->owner()->view();
-       MathMetricsInfo mi;
+       MetricsInfo mi;
        mi.base.style = LM_ST_TEXT;
        mi.base.font  = font_;
        mi.base.font.setColor(LColor::math);
@@ -173,12 +176,10 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int y, mouse_button::state)
        releaseMathCursor(bv);
        mathcursor = new MathCursor(this, true);
        metrics(bv);
-       mathcursor->setPos(x, y);
-       //lyxerr << "setting pos to " << x << "," << y << "\n";
-
+       mathcursor->setPos(x + xo_, y + yo_);
        // if that is removed, we won't get the magenta box when entering an
        // inset for the first time
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
@@ -189,7 +190,7 @@ void InsetFormulaBase::edit(BufferView * bv, bool front)
        releaseMathCursor(bv);
        mathcursor = new MathCursor(this, front);
        metrics(bv);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
@@ -198,12 +199,12 @@ void InsetFormulaBase::insetUnlock(BufferView * bv)
        if (mathcursor) {
                if (mathcursor->inMacroMode()) {
                        mathcursor->macroModeClose();
-                       updateLocal(bv, true);
+                       bv->updateInset(this);
                }
                releaseMathCursor(bv);
        }
        generatePreview();
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
@@ -218,15 +219,20 @@ void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
                return;
        }
        mathcursor->getPos(x, y);
-       //x -= xo_;
+       x = mathcursor->targetX();
+       x -= xo_;
        y -= yo_;
-       //lyxerr << "getCursorPos: " << x << " " << y << "\n";
+       //lyxerr << "getCursorPos: " << x << ' ' << y << endl;
 }
 
 
 void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 {
-       //lyxerr << "toggleInsetCursor: " << isCursorVisible() << "\n";
+       if (!mathcursor) {
+               lyxerr[Debug::MATHED] << "toggleInsetCursor impossible" << endl;
+               return;
+       }
+       //lyxerr << "toggleInsetCursor: " << isCursorVisible() << endl;
        if (isCursorVisible())
                hideInsetCursor(bv);
        else
@@ -236,25 +242,30 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 
 void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
 {
+       if (!mathcursor) {
+               lyxerr << "showInsetCursor impossible" << endl;
+               return;
+       }
        if (isCursorVisible())
                return;
-       fitInsetCursor(bv);
        int x, y, asc, des;
-       getCursorPos(bv, x, y);
+       mathcursor->getPos(x, y);
        math_font_max_dim(font_, asc, des);
-       bv->showLockedInsetCursor(x, y, asc, des);
+       bv->showLockedInsetCursor(x, y - yo_, asc, des);
        setCursorVisible(true);
-       //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
+       //lyxerr << "showInsetCursor: " << x << ' ' << y << endl;
 }
 
 
 void InsetFormulaBase::hideInsetCursor(BufferView * bv)
 {
+       if (!mathcursor)
+               return;
        if (!isCursorVisible())
                return;
        bv->hideLockedInsetCursor();
        setCursorVisible(false);
-       //lyxerr << "hideInsetCursor: \n";
+       //lyxerr << "hideInsetCursor: " << endl;
 }
 
 
@@ -266,7 +277,7 @@ void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
        math_font_max_dim(font_, asc, des);
        getCursorPos(bv, x, y);
        //y += yo_;
-       //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
+       //lyxerr << "fitInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << endl;
        bv->fitLockedInsetCursor(x, y, asc, des);
 }
 
@@ -274,7 +285,7 @@ void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
 void InsetFormulaBase::toggleInsetSelection(BufferView * bv)
 {
        if (mathcursor)
-               bv->updateInset(this, false);
+               bv->updateInset(this);
 }
 
 
@@ -284,13 +295,7 @@ vector<string> const InsetFormulaBase::getLabelList() const
 }
 
 
-void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
-{
-       bv->updateInset(this, dirty);
-}
-
-
-Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
 {
        if (!mathcursor)
                return UNDISPATCHED;
@@ -298,20 +303,31 @@ Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
        BufferView * bv = cmd.view();
        hideInsetCursor(bv);
        showInsetCursor(bv);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
+       //lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
 
        if (cmd.button() == mouse_button::button3) {
                // try to dispatch to enclosed insets first
-               if (mathcursor->dispatch(cmd) == MathInset::UNDISPATCHED) {     
+               if (mathcursor->dispatch(cmd) == UNDISPATCHED) {
                        // launch math panel for right mouse button
+                       lyxerr << "lfunMouseRelease: undispatched: " << cmd.button() << endl;
                        bv->owner()->getDialogs().showMathPanel();
                }
                return DISPATCHED;
        }
 
+       if (cmd.button() == mouse_button::button2) {
+               mathcursor->selClear();
+               mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+               mathcursor->insert(asArray(bv->getClipboard()));
+               bv->updateInset(this);
+               return DISPATCHED;
+       }
+
        if (cmd.button() == mouse_button::button1) {
                // try to dispatch to enclosed insets first
                mathcursor->dispatch(cmd);
+               cmd.view()->stuffClipboard(mathcursor->grabSelection());
                // try to set the cursor
                //delete mathcursor;
                //mathcursor = new MathCursor(this, x == 0);
@@ -319,49 +335,58 @@ Inset::RESULT InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
                //mathcursor->setPos(x + xo_, y + yo_);
                return DISPATCHED;
        }
+
        return UNDISPATCHED;
 }
 
 
-Inset::RESULT InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
 {
        BufferView * bv = cmd.view();
-       releaseMathCursor(bv);
-       mathcursor = new MathCursor(this, cmd.x == 0);
+       //lyxerr << "lfunMousePress: buttons: " << cmd.button() << endl;
 
-       if (cmd.button() == mouse_button::button1) {
-               // just set the cursor here
-               //lyxerr << "setting cursor\n";
+       if (!mathcursor || mathcursor->formula() != this) {
+               lyxerr[Debug::MATHED] << "re-create cursor" << endl;
+               releaseMathCursor(bv);
+               mathcursor = new MathCursor(this, cmd.x == 0);
                metrics(bv);
-               first_x = cmd.x;
-               first_y = cmd.y;
-               mathcursor->selClear();
                mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
+       }
+
+       if (cmd.button() == mouse_button::button3) {
                mathcursor->dispatch(cmd);
                return DISPATCHED;
        }
-       if (cmd.button() == mouse_button::button3) {
+
+       if (cmd.button() == mouse_button::button1) {
+               first_x = cmd.x;
+               first_y = cmd.y;
+               mathcursor->selClear();
+               mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
                mathcursor->dispatch(cmd);
-               //delete mathcursor;
                return DISPATCHED;
        }
-       bv->updateInset(this, false);
+
+       bv->updateInset(this);
        return DISPATCHED;
 }
 
 
-Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
 {
        if (!mathcursor)
                return DISPATCHED;
 
-       if (mathcursor->dispatch(FuncRequest(cmd)) != MathInset::UNDISPATCHED)
+       if (mathcursor->dispatch(FuncRequest(cmd)) != UNDISPATCHED)
                return DISPATCHED;
 
-       if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2) {
-               //lyxerr << "insetMotionNotify: ignored\n";
+       // only select with button 1
+       if (cmd.button() != mouse_button::button1)
                return DISPATCHED;
-       }
+
+       if (abs(cmd.x - first_x) < 2 && abs(cmd.y - first_y) < 2)
+               return DISPATCHED;
+
        first_x = cmd.x;
        first_y = cmd.y;
 
@@ -372,26 +397,35 @@ Inset::RESULT InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
        hideInsetCursor(bv);
        mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
        showInsetCursor(bv);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
        return DISPATCHED;
 }
 
 
-Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
+dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 {
        //lyxerr << "InsetFormulaBase::localDispatch: act: " << cmd.action
        //      << " arg: '" << cmd.argument
        //      << " x: '" << cmd.x
        //      << " y: '" << cmd.y
-       //      << "' button: " << cmd.button() << "\n";
+       //      << "' button: " << cmd.button() << endl;
+
+       // delete empty mathbox (LFUN_BACKSPACE and LFUN_DELETE)
+       bool remove_inset = false;
 
        switch (cmd.action) {
                case LFUN_MOUSE_PRESS:
+                       //lyxerr << "Mouse single press\n";
                        return lfunMousePress(cmd);
                case LFUN_MOUSE_MOTION:
+                       //lyxerr << "Mouse motion\n";
                        return lfunMouseMotion(cmd);
                case LFUN_MOUSE_RELEASE:
+                       //lyxerr << "Mouse single release\n";
                        return lfunMouseRelease(cmd);
+               case LFUN_MOUSE_DOUBLE:
+                       //lyxerr << "Mouse double\n";
+                       return localDispatch(FuncRequest(LFUN_WORDSEL));
                default:
                        break;
        }
@@ -415,106 +449,114 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        case LFUN_MATH_MUTATE:
        case LFUN_MATH_DISPLAY:
-       case LFUN_MATH_HALIGN:
-       case LFUN_MATH_VALIGN:
-       case LFUN_MATH_ROW_INSERT:
-       case LFUN_MATH_ROW_DELETE:
-       case LFUN_MATH_COLUMN_INSERT:
-       case LFUN_MATH_COLUMN_DELETE:
        case LFUN_MATH_NUMBER:
        case LFUN_MATH_NONUMBER:
-       case LFUN_TABINSERT:
+       case LFUN_CELL_SPLIT:
        case LFUN_BREAKLINE:
        case LFUN_DELETE_LINE_FORWARD:
        case LFUN_INSERT_LABEL:
        case LFUN_MATH_EXTERN:
+       case LFUN_TABULAR_FEATURE:
+       case LFUN_PASTESELECTION:
+       case LFUN_MATH_LIMITS:
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->dispatch(cmd);
-               updateLocal(bv, true);
                break;
 
-       case LFUN_WORDRIGHTSEL:
        case LFUN_RIGHTSEL:
                sel = true; // fall through...
        case LFUN_RIGHT:
                result = mathcursor->right(sel) ? DISPATCHED : FINISHED_RIGHT;
                //lyxerr << "calling scroll 20\n";
                //scroll(bv, 20);
-               updateLocal(bv, false);
                // write something to the minibuffer
                //bv->owner()->message(mathcursor->info());
                break;
 
-       case LFUN_WORDLEFTSEL:
        case LFUN_LEFTSEL:
                sel = true; // fall through
        case LFUN_LEFT:
                result = mathcursor->left(sel) ? DISPATCHED : FINISHED;
-               updateLocal(bv, false);
                break;
 
        case LFUN_UPSEL:
                sel = true; // fall through
        case LFUN_UP:
                result = mathcursor->up(sel) ? DISPATCHED : FINISHED_UP;
-               updateLocal(bv, false);
                break;
 
        case LFUN_DOWNSEL:
                sel = true; // fall through
        case LFUN_DOWN:
                result = mathcursor->down(sel) ? DISPATCHED : FINISHED_DOWN;
-               updateLocal(bv, false);
+               break;
+
+       case LFUN_WORDSEL:
+               mathcursor->home(false);
+               mathcursor->end(true);
+               break;
+
+       case LFUN_UP_PARAGRAPHSEL:
+       case LFUN_UP_PARAGRAPH:
+       case LFUN_DOWN_PARAGRAPHSEL:
+       case LFUN_DOWN_PARAGRAPH:
+               result = FINISHED;
                break;
 
        case LFUN_HOMESEL:
+       case LFUN_WORDLEFTSEL:
                sel = true; // fall through
        case LFUN_HOME:
+       case LFUN_WORDLEFT:
                result = mathcursor->home(sel) ? DISPATCHED : FINISHED;
-               updateLocal(bv, false);
                break;
 
        case LFUN_ENDSEL:
+       case LFUN_WORDRIGHTSEL:
                sel = true; // fall through
        case LFUN_END:
+       case LFUN_WORDRIGHT:
                result = mathcursor->end(sel) ? DISPATCHED : FINISHED_RIGHT;
-               updateLocal(bv, false);
                break;
 
        case LFUN_PRIORSEL:
        case LFUN_PRIOR:
-               result = FINISHED_UP;
-               updateLocal(bv, false);
+       case LFUN_BEGINNINGBUFSEL:
+       case LFUN_BEGINNINGBUF:
+               result = FINISHED;
                break;
 
        case LFUN_NEXTSEL:
        case LFUN_NEXT:
-               result = FINISHED_DOWN;
-               updateLocal(bv, false);
+       case LFUN_ENDBUFSEL:
+       case LFUN_ENDBUF:
+               result = FINISHED_RIGHT;
                break;
 
-       case LFUN_TAB:
+       case LFUN_CELL_FORWARD:
                mathcursor->idxNext();
-               updateLocal(bv, false);
                break;
 
-       case LFUN_SHIFT_TAB:
+       case LFUN_CELL_BACKWARD:
                mathcursor->idxPrev();
-               updateLocal(bv, false);
                break;
 
        case LFUN_DELETE_WORD_BACKWARD:
        case LFUN_BACKSPACE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
-               mathcursor->backspace();
-               updateLocal(bv, true);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               if (!mathcursor->backspace()) {
+                       result = FINISHED;
+                       remove_inset = true;
+               }
                break;
 
        case LFUN_DELETE_WORD_FORWARD:
        case LFUN_DELETE:
-               bv->lockedInsetStoreUndo(Undo::DELETE);
-               mathcursor->erase();
-               bv->updateInset(this, true);
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               if (!mathcursor->erase()) {
+                       result = FINISHED;
+                       remove_inset = true;
+               }
                break;
 
        //    case LFUN_GETXY:
@@ -528,31 +570,23 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                istringstream is(cmd.argument.c_str());
                is >> x >> y;
                mathcursor->setPos(x, y);
-               updateLocal(bv, false);
                break;
        }
 
-/*
-       case LFUN_PASTESELECTION: {
-               string const clip = bv->getClipboard();
-               if (!clip.empty())
-                       mathed_parse_normal(par_, clip);
-               break;
-       }
-*/
-
-       case LFUN_PASTE:
+       case LFUN_PASTE: {
+               int n = 0;
+               istringstream is(cmd.argument.c_str());
+               is >> n;
                if (was_macro)
                        mathcursor->macroModeClose();
                bv->lockedInsetStoreUndo(Undo::EDIT);
-               mathcursor->selPaste();
-               updateLocal(bv, true);
+               mathcursor->selPaste(n);
                break;
+       }
 
        case LFUN_CUT:
                bv->lockedInsetStoreUndo(Undo::DELETE);
                mathcursor->selCut();
-               updateLocal(bv, true);
                break;
 
        case LFUN_COPY:
@@ -568,7 +602,6 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                        // deadkeys
                        bv->lockedInsetStoreUndo(Undo::EDIT);
                        mathcursor->script(true);
-                       updateLocal(bv, true);
                }
                break;
 
@@ -589,64 +622,55 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                break;
 
        //  Math fonts
-       case LFUN_GREEK_TOGGLE: handleFont(bv, cmd.argument, "lyxgreek"); break;
-       case LFUN_BOLD:         handleFont(bv, cmd.argument, "textbf"); break;
-       case LFUN_SANS:         handleFont(bv, cmd.argument, "textsf"); break;
+       case LFUN_BOLD:         handleFont(bv, cmd.argument, "mathbf"); break;
+       case LFUN_SANS:         handleFont(bv, cmd.argument, "mathsf"); break;
        case LFUN_EMPH:         handleFont(bv, cmd.argument, "mathcal"); break;
        case LFUN_ROMAN:        handleFont(bv, cmd.argument, "mathrm"); break;
        case LFUN_CODE:         handleFont(bv, cmd.argument, "texttt"); break;
        case LFUN_FRAK:         handleFont(bv, cmd.argument, "mathfrak"); break;
        case LFUN_ITAL:         handleFont(bv, cmd.argument, "mathit"); break;
        case LFUN_NOUN:         handleFont(bv, cmd.argument, "mathbb"); break;
+       case LFUN_FREEFONT_APPLY:  handleFont(bv, cmd.argument, "textrm"); break;
        case LFUN_DEFAULT:      handleFont(bv, cmd.argument, "textnormal"); break;
-       case LFUN_FREE:         handleFont(bv, cmd.argument, "textrm"); break;
-
-       case LFUN_GREEK:
-               handleFont(bv, cmd.argument, "lyxgreek1");
-               if (cmd.argument.size())
-                       mathcursor->interpret(cmd.argument);
-               break;
 
        case LFUN_MATH_MODE:
-               if (mathcursor->currentMode())
-                       handleFont(bv, cmd.argument, "textrm");
-               else {
+               if (mathcursor->currentMode() == MathInset::TEXT_MODE)
                        mathcursor->niceInsert(MathAtom(new MathHullInset("simple")));
-                       updateLocal(bv, true);
-               }
+               else
+                       handleFont(bv, cmd.argument, "textrm");
                //bv->owner()->message(_("math text mode toggled"));
                break;
 
-       case LFUN_MATH_LIMITS:
-               bv->lockedInsetStoreUndo(Undo::EDIT);
-               if (mathcursor->toggleLimits())
-                       updateLocal(bv, true);
-               break;
-
        case LFUN_MATH_SIZE:
 #if 0
                if (!arg.empty()) {
                        bv->lockedInsetStoreUndo(Undo::EDIT);
                        mathcursor->setSize(arg);
-                       updateLocal(bv, true);
                }
 #endif
                break;
 
-       case LFUN_INSERT_MATRIX:
-               if (!cmd.argument.empty()) {
-                       bv->lockedInsetStoreUndo(Undo::EDIT);
-                       mathcursor->interpret("matrix " + cmd.argument);
-                       updateLocal(bv, true);
-               }
+       case LFUN_INSERT_MATRIX: {
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               unsigned int m = 1;
+               unsigned int n = 1;
+               string v_align;
+               string h_align;
+               istringstream is(STRCONV(argument));
+               is >> m >> n >> v_align >> h_align;
+               m = max(1u, m);
+               n = max(1u, n);
+               v_align += 'c';
+               mathcursor->niceInsert(
+                       MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
                break;
+       }
 
        case LFUN_SUPERSCRIPT:
        case LFUN_SUBSCRIPT:
        {
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->script(cmd.action == LFUN_SUPERSCRIPT);
-               updateLocal(bv, true);
                break;
        }
 
@@ -663,7 +687,6 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->handleNest(MathAtom(new MathDelimInset(ls, rs)));
-               updateLocal(bv, true);
                break;
        }
 
@@ -671,7 +694,6 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
        case LFUN_MATH_SPACE:
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->insert(MathAtom(new MathSpaceInset(",")));
-               updateLocal(bv, true);
                break;
 
        case LFUN_UNDO:
@@ -687,7 +709,6 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                // interpret this as if a backslash was typed
                bv->lockedInsetStoreUndo(Undo::EDIT);
                mathcursor->interpret('\\');
-               updateLocal(bv, true);
                break;
 
        case LFUN_BREAKPARAGRAPH:
@@ -696,16 +717,22 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                argument = "\n";
                // fall through
 
-       case -1:
+// FIXME: We probably should swap parts of "math-insert" and "self-insert"
+// handling such that "self-insert" works on "arbitrary stuff" too, and
+// math-insert only handles special math things like "matrix".
        case LFUN_INSERT_MATH:
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->niceInsert(argument);
+               break;
+
+       case -1:
        case LFUN_SELFINSERT:
                if (!argument.empty()) {
                        bv->lockedInsetStoreUndo(Undo::EDIT);
                        if (argument.size() == 1)
                                result = mathcursor->interpret(argument[0]) ? DISPATCHED : FINISHED_RIGHT;
                        else
-                               result = mathcursor->interpret(argument) ? DISPATCHED : FINISHED_RIGHT;
-                       updateLocal(bv, true);
+                               mathcursor->insert(asArray(argument));
                }
                break;
 
@@ -722,39 +749,51 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
 
        case LFUN_INSET_TOGGLE:
                mathcursor->insetToggle();
-               updateLocal(bv, true);
-               break;
-
-       case LFUN_REF_INSERT:
-               //if (argument.empty()) {
-               //      InsetCommandParams p("ref");
-               //      owner_->getDialogs().createRef(p.getAsString());
-               //} else {
-               //      InsetCommandParams p;
-               //      p.setFromString(argument);
-
-               //      InsetRef * inset = new InsetRef(p, *buffer_);
-               //      if (!insertInset(inset))
-               //              delete inset;
-               //      else
-               //              updateInset(inset, true);
-               //}
-               //
-               if (cmd.argument.empty()) {
-                       InsetCommandParams p("ref");
-                       bv->owner()->getDialogs().createRef(p.getAsString());
+               break;
+
+       case LFUN_DIALOG_SHOW_NEW_INSET: {
+               string const & name = argument;
+               string data;
+               if (name == "ref") {
+                       RefInset tmp(name);
+                       data = tmp.createDialogStr(name);
+               }
+
+               if (data.empty())
+                       result = UNDISPATCHED;
+               else {
+                       bv->owner()->getDialogs().show(name, data, 0);
+               }
+       }
+       break;
+
+       case LFUN_INSET_APPLY: {
+               string const name = cmd.getArg(0);
+               InsetBase * base =
+                       bv->owner()->getDialogs().getOpenInset(name);
+
+               if (base) {
+                       FuncRequest fr(bv, LFUN_INSET_MODIFY, cmd.argument);
+                       result = base->localDispatch(fr);
                } else {
-                       //mathcursor->handleNest(new InsetRef2);
-                       //mathcursor->insert(arg);
-                       mathcursor->insert(MathAtom(new RefInset(cmd.argument)));
+                       MathArray ar;
+                       if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+                               mathcursor->insert(ar);
+                               result = DISPATCHED;
+                       } else {
+                               result = UNDISPATCHED;
+                       }
                }
-               updateLocal(bv, true);
-               break;
+       }
+       break;
 
        default:
                result = UNDISPATCHED;
        }
 
+       if (result == DISPATCHED)
+               bv->updateInset(this);
+
        mathcursor->normalize();
        mathcursor->touch();
 
@@ -768,9 +807,12 @@ Inset::RESULT InsetFormulaBase::localDispatch(FuncRequest const & cmd)
                fitInsetCursor(bv);
                showInsetCursor(bv);
                revealCodes(bv);
+               cmd.view()->stuffClipboard(mathcursor->grabSelection());
        } else {
                releaseMathCursor(bv);
                bv->unlockInset(this);
+               if (remove_inset)
+                       bv->owner()->dispatch(FuncRequest(LFUN_DELETE));
        }
 
        return result;  // original version
@@ -881,7 +923,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
                        mathcursor->setSelection(it, ar.size());
                        current = it;
                        it.jump(ar.size());
-                       updateLocal(bv, false);
+                       bv->updateInset(this);
                        return true;
                }
        }
@@ -906,6 +948,11 @@ bool InsetFormulaBase::display() const
 }
 
 
+string InsetFormulaBase::selectionAsString() const
+{
+       return mathcursor ? mathcursor->grabSelection() : string();
+}
+
 /////////////////////////////////////////////////////////////////////
 
 
@@ -979,18 +1026,18 @@ void mathDispatch(FuncRequest const & cmd)
                        }
                        break;
 
-               case LFUN_GREEK: 
-               case LFUN_INSERT_MATH: 
-               case LFUN_INSERT_MATRIX: 
+               case LFUN_INSERT_MATH:
+               case LFUN_INSERT_MATRIX:
                case LFUN_MATH_DELIM: {
                        InsetFormula * f = new InsetFormula(bv);
                        if (openNewInset(bv, f)) {
-                               bv->theLockingInset()-> 
+                               bv->theLockingInset()->
                                        localDispatch(FuncRequest(bv, LFUN_MATH_MUTATE, "simple"));
                                bv->theLockingInset()->localDispatch(cmd);
                        }
                        break;
                }
+
                default:
                        break;
        }