]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/formulabase.C
fix typo that put too many include paths for most people
[lyx.git] / src / mathed / formulabase.C
index 124c64e39584d81e8d4d711c173af4e5808ee7ce..5bd77093ddeb9de73603d3a8c3756926f5348f90 100644 (file)
@@ -25,7 +25,6 @@
 #include "formula.h"
 #include "formulamacro.h"
 #include "commandtags.h"
-#include "math_cursor.h"
 #include "BufferView.h"
 #include "lyxtext.h"
 #include "lyxfunc.h"
 #include "LyXView.h"
 #include "Painter.h"
 #include "font.h"
+#include "Lsstream.h"
 #include "math_arrayinset.h"
-#include "math_spaceinset.h"
-#include "math_macrotable.h"
+#include "math_charinset.h"
+#include "math_cursor.h"
 #include "math_factory.h"
-#include "support/lyxlib.h"
+#include "math_hullinset.h"
+#include "math_iterator.h"
+#include "math_macrotable.h"
+#include "math_parser.h"
+#include "math_pos.h"
+#include "math_spaceinset.h"
 #include "undo_funcs.h"
+#include "textpainter.h"
+#include "frontends/Dialogs.h"
+#include "intl.h"
 
 using std::endl;
 using std::ostream;
 using std::vector;
 
-extern char const * latex_mathenv[];
-MathCursor        * mathcursor = 0;
+MathCursor * mathcursor = 0;
 
 
 namespace {
 
 
 // local global
-int sel_x;
-int sel_y;
-bool sel_flag;
+int first_x;
+int first_y;
+int hack_x;
+int hack_y;
+int hack_button;
 
 
-void handleFont(BufferView * bv, MathTextCodes t) 
+void handleFont(BufferView * bv, string const & arg, MathTextCodes t)
 {
        if (mathcursor->selection())
                bv->lockedInsetStoreUndo(Undo::EDIT);
        mathcursor->handleFont(t);
-}
-
-
-void handleAccent(BufferView * bv, string const & name)
-{
-       bv->lockedInsetStoreUndo(Undo::EDIT);
-       mathcursor->insert(createMathInset(name));
+       for (string::const_iterator it = arg.begin(); it != arg.end(); ++it)
+               mathcursor->insert(*it);
 }
 
 
@@ -97,6 +101,30 @@ InsetFormulaBase::InsetFormulaBase()
        // This is needed as long the math parser is not re-entrant
        MathMacroTable::builtinMacros();
        //lyxerr << "sizeof MathInset: " << sizeof(MathInset) << "\n";
+       //lyxerr << "sizeof(MathMetricsInfo): " << sizeof(MathMetricsInfo) << "\n";
+       //lyxerr << "sizeof(MathCharInset): " << sizeof(MathCharInset) << "\n";
+}
+
+
+// simply scrap this function if you want
+void InsetFormulaBase::mutateToText()
+{
+#if 0
+       // translate to latex
+       ostringstream os;
+       latex(NULL, os, false, false);
+       string str = os.str();
+
+       // insert this text
+       LyXText * lt = view_->getLyXText();
+       string::const_iterator cit = str.begin();
+       string::const_iterator end = str.end();
+       for (; cit != end; ++cit)
+               view_->owner()->getIntl()->getTrans().TranslateAndInsert(*cit, lt);
+
+       // remove ourselves
+       //view_->owner()->getLyXFunc()->dispatch(LFUN_ESCAPE);
+#endif
 }
 
 
@@ -105,11 +133,17 @@ void InsetFormulaBase::validate(LaTeXFeatures &) const
 {}
 
 
-void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const 
+void InsetFormulaBase::metrics(BufferView * bv, LyXFont const & f) const
+{
+       font_ = f;
+       metrics(bv);
+}
+
+
+void InsetFormulaBase::metrics(BufferView * bv) const
 {
        if (bv)
                view_ = bv;
-       font_ = f;
        MathMetricsInfo mi(view_, font_, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
        par()->metrics(mi);
 }
@@ -126,14 +160,20 @@ void InsetFormulaBase::edit(BufferView * bv, int x, int /*y*/, unsigned int)
        if (!bv->lockInset(this))
                lyxerr[Debug::MATHED] << "Cannot lock inset!!!" << endl;
 
-       mathcursor = new MathCursor(this, x == 0);
-       metrics(bv);
+       //lyxerr << "edit: " << x  << " " << y << " button: " << button << "\n";
+       if (!mathcursor) {
+               mathcursor = new MathCursor(this, x == 0);
+               metrics(bv);
+               // handle ignored click
+               if (hack_x || hack_y) {
+                       insetButtonPress(bv, hack_x, hack_y, hack_button);
+                       hack_x = hack_y = 0;
+               }
+       } else
+               metrics(bv);
        // if that is removed, we won't get the magenta box when entering an
        // inset for the first time
        bv->updateInset(this, false);
-       sel_x = 0;
-       sel_y = 0;
-       sel_flag = false;
 }
 
 
@@ -162,7 +202,7 @@ void InsetFormulaBase::getCursorPos(BufferView *, int & x, int & y) const
 {
        mathcursor->getPos(x, y);
        x += xo_;
-       y += yo_ - 3;
+       y += yo_;
        //lyxerr << "getCursorPos: " << x << " " << y << "\n";
 }
 
@@ -179,12 +219,10 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
                int x;
                int y;
                mathcursor->getPos(x, y);
-               y -= 3;
                y -= yo_;
                int asc = 0;
                int des = 0;
-               MathMetricsInfo mi(bv, font_, LM_ST_TEXT);
-               math_font_max_dim(LM_TC_TEXTRM, mi, asc, des);
+               math_font_max_dim(font_, asc, des);
                bv->showLockedInsetCursor(x, y, asc, des);
                //lyxerr << "toggleInsetCursor: " << x << " " << y << "\n";
        }
@@ -195,21 +233,21 @@ void InsetFormulaBase::toggleInsetCursor(BufferView * bv)
 
 void InsetFormulaBase::showInsetCursor(BufferView * bv, bool)
 {
-       if (!isCursorVisible()) {
-               if (mathcursor) {
-                       int x;
-                       int y;
-                       mathcursor->getPos(x, y);
-                       int asc = 0;
-                       int des = 0;
-                       MathMetricsInfo mi(bv, font_, LM_ST_TEXT);
-                       math_font_max_dim(LM_TC_TEXTRM, mi, asc, des);
-                       //bv->fitLockedInsetCursor(x, y, asc, des);
-                       //metrics(bv);
-                       //lyxerr << "showInsetCursor: " << x << " " << y << "\n";
-               }
-               toggleInsetCursor(bv);
+       if (isCursorVisible())
+               return;
+       if (mathcursor) {
+               metrics(bv);
+               int x;
+               int y;
+               mathcursor->getPos(x, y);
+               y -= yo_;
+               int asc = 0;
+               int des = 0;
+               math_font_max_dim(font_, asc, des);
+               bv->fitLockedInsetCursor(x, y, asc, des);
+               //lyxerr << "showInsetCursor: x: " << x << " y: " << y << " yo: " << yo_ << "\n";
        }
+       toggleInsetCursor(bv);
 }
 
 
@@ -229,7 +267,7 @@ void InsetFormulaBase::toggleInsetSelection(BufferView * bv)
 
 vector<string> const InsetFormulaBase::getLabelList() const
 {
-  return std::vector<string>();
+  return vector<string>();
 }
 
 
@@ -240,57 +278,90 @@ void InsetFormulaBase::updateLocal(BufferView * bv, bool dirty)
 }
 
 
-void InsetFormulaBase::insetButtonRelease(BufferView * bv,
-                                         int x, int y, int /*button*/)
+bool InsetFormulaBase::insetButtonRelease(BufferView * bv,
+                                         int /*x*/, int /*y*/, int /*button*/)
 {
-       if (mathcursor) {
-               hideInsetCursor(bv);
-               mathcursor->setPos(x + xo_, y + yo_);
-               //lyxerr << "insetButtonRelease: " << x + xo_ << " " << y + yo_ << "\n";
-               showInsetCursor(bv);
-               if (sel_flag) {
-                       sel_flag = false;
-                       sel_x = 0;
-                       sel_y = 0;
-               }
-               bv->updateInset(this, false);
-       }
+       if (!mathcursor)
+               return false;
+       //lyxerr << "insetButtonRelease: " << x << " " << y << "\n";
+       hideInsetCursor(bv);
+       showInsetCursor(bv);
+       bv->updateInset(this, false);
+       return false;
 }
 
 
 void InsetFormulaBase::insetButtonPress(BufferView * bv,
-                                       int x, int y, int /*button*/)
+                                       int x, int y, int button)
 {
-       sel_flag = false;
-       sel_x = x;
-       sel_y = y;
-       if (mathcursor && mathcursor->selection()) {
-               mathcursor->selClear();
-               bv->updateInset(this, false);
+       // hack to cope with mouseclick that comes before the call to edit()
+       if (!mathcursor) {
+               hack_x = x;
+               hack_y = y;
+               hack_button = button;
+               return;
+       }
+
+       lyxerr << "insetButtonPress: " << x + xo_ << " " << y + yo_
+               << " but: " << button << "\n";
+       switch (button) {
+               default:
+               case 1:
+                       // just click
+                       first_x = x;
+                       first_y = y;
+                       if (mathcursor) {
+                               mathcursor->selClear();
+                               mathcursor->setPos(x + xo_, y + yo_);
+                       }
+                       break;
+/*
+               case 2:
+                       lyxerr << "insetButtonPress: 2\n";
+                       // insert stuff
+                       if (mathcursor) {
+                               bv->lockedInsetStoreUndo(Undo::EDIT);
+                               MathArray ar;
+                               mathcursor->selGet(ar);
+                               mathcursor->setPos(x + xo_, y + yo_);
+                               string sel =
+                                       bv->getLyXText()->selectionAsString(bv->buffer(), false);
+                               mathed_parse_cell(ar, sel);
+                               mathcursor->insert(ar);
+                       }
+                       break;
+*/
+               case 3:
+                       // launch math panel for right mouse button
+                       bv->owner()->getDialogs()->showMathPanel();
+                       break;
        }
+       bv->updateInset(this, false);
 }
 
 
 void InsetFormulaBase::insetMotionNotify(BufferView * bv,
                                         int x, int y, int /*button*/)
 {
-       if (sel_x && sel_y && abs(x-sel_x) > 4 && !sel_flag) {
-               sel_flag = true;
-               hideInsetCursor(bv);
-               mathcursor->setPos(sel_x, sel_y);
-               mathcursor->selStart();
-               showInsetCursor(bv);
-               mathcursor->getPos(sel_x, sel_y);
-       } else if (sel_flag) {
-               hideInsetCursor(bv);
-               mathcursor->setPos(x, y);
-               showInsetCursor(bv);
-               mathcursor->getPos(x, y);
-               if (sel_x != x || sel_y != y)
-                       bv->updateInset(this, false);
-               sel_x = x;
-               sel_y = y;
+       if (!mathcursor)
+               return;
+
+       if (abs(x - first_x) < 2 && abs(y - first_y) < 2) {
+               //lyxerr << "insetMotionNotify: ignored\n";
+               return;
        }
+       first_x = x;
+       first_y = y;
+
+       if (!mathcursor->selection())
+               mathcursor->selStart();
+
+       //lyxerr << "insetMotionNotify: " << x + xo_ << ' ' << y + yo_
+       //      << ' ' << button << "\n";
+       hideInsetCursor(bv);
+       mathcursor->setPos(x + xo_, y + yo_);
+       showInsetCursor(bv);
+       bv->updateInset(this, false);
 }
 
 
@@ -307,7 +378,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        //lyxerr << "InsetFormulaBase::localDispatch: act: " << action
        //      << " arg: '" << arg << "' cursor: " << mathcursor << "\n";
 
-       if (!mathcursor) 
+       if (!mathcursor)
                return UNDISPATCHED;
 
        if (mathcursor->asHyperActiveInset()) {
@@ -323,6 +394,7 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        hideInsetCursor(bv);
 
        mathcursor->normalize();
+       mathcursor->touch();
 
        switch (action) {
 
@@ -333,7 +405,11 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
 
        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;
 
 
@@ -415,10 +491,10 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                bv->updateInset(this, true);
                break;
 
-               //    case LFUN_GETXY:
-               //      sprintf(dispatch_buffer, "%d %d",);
-               //      dispatch_result = dispatch_buffer;
-               //      break;
+       //    case LFUN_GETXY:
+       //      sprintf(dispatch_buffer, "%d %d",);
+       //      dispatch_result = dispatch_buffer;
+       //      break;
        case LFUN_SETXY: {
                lyxerr << "LFUN_SETXY broken!\n";
                int x = 0;
@@ -452,37 +528,62 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_WORDLEFTSEL:
                break;
 
-               // --- accented characters ------------------------------
-
-       case LFUN_UMLAUT:       handleAccent(bv, "ddot"); break;
-       case LFUN_CIRCUMFLEX:   handleAccent(bv, "hat"); break;
-       case LFUN_GRAVE:        handleAccent(bv, "grave"); break;
-       case LFUN_ACUTE:        handleAccent(bv, "acute"); break;
-       case LFUN_TILDE:        handleAccent(bv, "tilde"); break;
-       case LFUN_MACRON:       handleAccent(bv, "bar"); break;
-       case LFUN_DOT:          handleAccent(bv, "dot"); break;
-       case LFUN_CARON:        handleAccent(bv, "check"); break;
-       case LFUN_BREVE:        handleAccent(bv, "breve"); break;
-       case LFUN_VECTOR:       handleAccent(bv, "vec"); break;
+       // Special casing for superscript in case of LyX handling
+       // dead-keys:
+       case LFUN_CIRCUMFLEX:
+               if (arg.empty()) {
+                       // do superscript if LyX handles
+                       // deadkeys
+                       bv->lockedInsetStoreUndo(Undo::EDIT);
+                       mathcursor->script(true);
+                       updateLocal(bv, true);
+               }
+               break;
+       case LFUN_UMLAUT:
+       case LFUN_ACUTE:
+       case LFUN_GRAVE:
+       case LFUN_BREVE:
+       case LFUN_DOT:
+       case LFUN_MACRON:
+       case LFUN_CARON:
+       case LFUN_TILDE:
+       case LFUN_CEDILLA:
+       case LFUN_CIRCLE:
+       case LFUN_UNDERDOT:
+       case LFUN_TIE:
+       case LFUN_OGONEK:
+       case LFUN_HUNG_UMLAUT:
+               break;
 
        //  Math fonts
-       case LFUN_GREEK_TOGGLE: handleFont(bv, LM_TC_GREEK); break;
-       case LFUN_BOLD:         handleFont(bv, LM_TC_BF); break;
-       case LFUN_SANS:         handleFont(bv, LM_TC_SF); break;
-       case LFUN_EMPH:         handleFont(bv, LM_TC_CAL); break;
-       case LFUN_ROMAN:        handleFont(bv, LM_TC_RM); break;
-       case LFUN_CODE:         handleFont(bv, LM_TC_TT); break;
-       case LFUN_NOUN:         handleFont(bv, LM_TC_BB); break;
-       case LFUN_DEFAULT:      handleFont(bv, LM_TC_VAR); break;
-
-       case LFUN_GREEK: 
-               handleFont(bv, LM_TC_GREEK1);
+       case LFUN_GREEK_TOGGLE: handleFont(bv, arg, LM_TC_GREEK); break;
+       case LFUN_BOLD:         handleFont(bv, arg, LM_TC_BF); break;
+       case LFUN_SANS:         handleFont(bv, arg, LM_TC_SF); break;
+       case LFUN_EMPH:         handleFont(bv, arg, LM_TC_CAL); break;
+       case LFUN_ROMAN:        handleFont(bv, arg, LM_TC_RM); break;
+       case LFUN_CODE:         handleFont(bv, arg, LM_TC_TT); break;
+       case LFUN_FRAK:         handleFont(bv, arg, LM_TC_EUFRAK); break;
+       case LFUN_ITAL:         handleFont(bv, arg, LM_TC_IT); break;
+       case LFUN_NOUN:         handleFont(bv, arg, LM_TC_BB); break;
+       case LFUN_DEFAULT:      handleFont(bv, arg, LM_TC_VAR); break;
+       case LFUN_FREE:         handleFont(bv, arg, LM_TC_TEXTRM); break;
+
+       case LFUN_GREEK:
+               handleFont(bv, arg, LM_TC_GREEK1);
                if (arg.size())
                        mathcursor->interpret(arg);
                break;
 
        case LFUN_MATH_MODE:
-               handleFont(bv, LM_TC_TEXTRM);
+#if 1
+               handleFont(bv, arg, LM_TC_TEXTRM);
+#endif
+
+#if 0
+               mathcursor->niceInsert(MathAtom(new MathHullInset(LM_OT_SIMPLE)));
+               updateLocal(bv, true);
+#endif
+
                //bv->owner()->message(_("math text mode toggled"));
                break;
 
@@ -518,9 +619,18 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                break;
        }
 
+       case LFUN_SUPERSCRIPT:
+       case LFUN_SUBSCRIPT:
+       {
+               bv->lockedInsetStoreUndo(Undo::EDIT);
+               mathcursor->script((action == LFUN_SUPERSCRIPT));
+               updateLocal(bv, true);
+               break;
+       }
+
        case LFUN_MATH_DELIM:
        {
-               //lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
+               lyxerr << "formulabase::LFUN_MATH_DELIM, arg: '" << arg << "'\n";
                string ls;
                string rs;
                istringstream is(arg.c_str());
@@ -555,13 +665,14 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        case LFUN_MATH_COLUMN_DELETE:
        {
                MathInset::idx_type idx = 0;
-               MathArrayInset * p = mathcursor ? mathcursor->enclosingArray(idx) : 0;
+               MathGridInset * p = mathcursor ? mathcursor->enclosingGrid(idx) : 0;
                if (p) {
+                       mathcursor->popToEnclosingGrid();
                        bv->lockedInsetStoreUndo(Undo::EDIT);
-                       char al = arg.size() ? arg[0] : 'c';
+                       char align = arg.size() ? arg[0] : 'c';
                        switch (action) {
-                               case LFUN_MATH_HALIGN: p->halign(al, p->col(idx)); break;
-                               case LFUN_MATH_VALIGN: p->valign(al); break;
+                               case LFUN_MATH_HALIGN: p->halign(align, p->col(idx)); break;
+                               case LFUN_MATH_VALIGN: p->valign(align); break;
                                case LFUN_MATH_ROW_INSERT: p->addRow(p->row(idx)); break;
                                case LFUN_MATH_ROW_DELETE: p->delRow(p->row(idx)); break;
                                case LFUN_MATH_COLUMN_INSERT: p->addCol(p->col(idx)); break;
@@ -603,17 +714,22 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
                result = UNDISPATCHED;
                break;
 
+       case LFUN_ESCAPE:
+               if (mathcursor->selection())
+                       mathcursor->selClear();
+               else
+                       result = UNDISPATCHED;
+               break;
+
        default:
                result = UNDISPATCHED;
        }
 
+       mathcursor->normalize();
+       mathcursor->touch();
+
        lyx::Assert(mathcursor);
-       //mathcursor->normalize();
 
-       if (//was_macro != mathcursor->inMacroMode() &&
-                               action >= 0 && action != LFUN_BACKSPACE) 
-               updateLocal(bv, true);
-       
        if (mathcursor->selection() || was_selection)
                toggleInsetSelection(bv);
 
@@ -623,28 +739,133 @@ InsetFormulaBase::localDispatch(BufferView * bv, kb_action action,
        else
                bv->unlockInset(this);
 
+       revealCodes(bv);
+
        return result;  // original version
 }
 
 
+void InsetFormulaBase::revealCodes(BufferView * /*bv*/) const
+{
+       if (!mathcursor)
+               return;
+#if 0
+       // write something to the minibuffer
+       // translate to latex
+       mathcursor->markInsert();
+       ostringstream os;
+       write(NULL, os);
+       string str = os.str();
+       mathcursor->markErase();
+       string::size_type pos = 0;
+       string res;
+       for (string::iterator it = str.begin(); it != str.end(); ++it) {
+               if (*it == '\n')
+                       res += ' ';
+               else if (*it == '\0') {
+                       res += "  -X-  ";
+                       pos = it - str.begin();
+               }
+               else
+                       res += *it;
+       }
+       if (pos > 30)
+               res = res.substr(pos - 30);
+       if (res.size() > 60)
+               res = res.substr(0, 60);
+       bv->owner()->message(res);
+#endif
+}
+
+
 Inset::Code InsetFormulaBase::lyxCode() const
 {
        return Inset::MATH_CODE;
 }
 
 
-int InsetFormulaBase::upperY() const
+int InsetFormulaBase::ylow() const
 {
        return yo_ - ascent(view_, font_);
 }
 
 
-int InsetFormulaBase::lowerY() const
+int InsetFormulaBase::yhigh() const
 {
        return yo_ + descent(view_, font_);
 }
 
 
+int InsetFormulaBase::xlow() const
+{
+       return xo_;
+}
+
+
+int InsetFormulaBase::xhigh() const
+{
+       return xo_ + width(view_, font_);
+}
+
+
+/////////////////////////////////////////////////////////////////////
+
+
+bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
+                                    bool, bool)
+{
+#ifdef WITH_WARNINGS
+#warning pretty ugly
+#endif
+       static InsetFormulaBase * lastformula = 0;
+       static MathIterator current = MathIterator(ibegin(par().nucleus()));
+       static MathArray ar;
+       static string laststr;
+
+       if (lastformula != this || laststr != str) {
+               //lyxerr << "reset lastformula to " << this << "\n";
+               lastformula = this;
+               laststr = str;
+               current = ibegin(par().nucleus());
+               ar.clear();
+               mathed_parse_cell(ar, str);
+       } else {
+               ++current;
+       }
+       //lyxerr << "searching '" << str << "' in " << this << ar << endl;
+
+       for (MathIterator it = current; it != iend(par().nucleus()); ++it) {
+               if (it.cell().matchpart(ar, it.position().pos_)) {
+                       mathcursor->setSelection(it.cursor(), ar.size());
+                       current = it;
+                       it.jump(ar.size());
+                       // I guess some of the following can go
+                       bv->toggleSelection(true);
+                       hideInsetCursor(bv);
+                       updateLocal(bv, true);
+                       showInsetCursor(bv);
+                       metrics(bv);
+                       return true;
+               }
+       }
+
+       //lyxerr << "not found!\n";
+       lastformula = 0;
+       // we have to unlock ourself in this function by default!
+       // don't ask me why...
+       bv->unlockInset(this);
+       return false;
+}
+
+
+bool InsetFormulaBase::searchBackward(BufferView * bv, string const & what,
+                                     bool a, bool b)
+{
+       lyxerr << "searching backward not implemented in mathed" << endl;
+       return searchForward(bv, what, a, b);
+}
+
+
 /////////////////////////////////////////////////////////////////////
 
 
@@ -673,10 +894,15 @@ void mathDispatchCreation(BufferView * bv, string const & arg, bool display)
                } else {
                        // create a macro if we see "\\newcommand" somewhere, and an ordinary
                        // formula otherwise
-                       if (sel.find("\\newcommand") == string::npos) 
+                       if (sel.find("\\newcommand") == string::npos &&
+                                 sel.find("\\def") == string::npos)
                                f = new InsetFormula(sel);
-                       else
+                       else {
+                               string name;
+                               if (!mathed_parse_macro(name, sel))
+                                       return;
                                f = new InsetFormulaMacro(sel);
+                       }
                        bv->getLyXText()->cutSelection(bv);
                        openNewInset(bv, f);
                }
@@ -690,7 +916,7 @@ void mathDispatchMathDisplay(BufferView * bv, string const & arg)
        mathDispatchCreation(bv, arg, true);
 }
 
-       
+
 void mathDispatchMathMode(BufferView * bv, string const & arg)
 {
        mathDispatchCreation(bv, arg, false);
@@ -709,7 +935,7 @@ void mathDispatchMathMacro(BufferView * bv, string const & arg)
                if (arg.empty())
                        bv->owner()->getLyXFunc()->setErrorMessage(N_("Missing argument"));
                else {
-                       string s(arg);
+                       string s = arg;
                        string const s1 = token(s, ' ', 1);
                        int const na = s1.empty() ? 0 : lyx::atoi(s1);
                        openNewInset(bv, new InsetFormulaMacro(token(s, ' ', 0), na));
@@ -719,21 +945,21 @@ void mathDispatchMathMacro(BufferView * bv, string const & arg)
 
 
 void mathDispatchMathDelim(BufferView * bv, string const & arg)
-{         
-       if (bv->available()) { 
+{
+       if (bv->available()) {
                if (openNewInset(bv, new InsetFormula))
                        bv->theLockingInset()->localDispatch(bv, LFUN_MATH_DELIM, arg);
        }
-}         
+}
 
 
 void mathDispatchInsertMatrix(BufferView * bv, string const & arg)
-{         
-       if (bv->available()) { 
+{
+       if (bv->available()) {
                if (openNewInset(bv, new InsetFormula))
                        bv->theLockingInset()->localDispatch(bv, LFUN_INSERT_MATRIX, arg);
        }
-}         
+}
 
 
 void mathDispatchInsertMath(BufferView * bv, string const & arg)
@@ -750,14 +976,16 @@ void mathDispatchInsertMath(BufferView * bv, string const & arg)
 
 
 void mathDispatchGreek(BufferView * bv, string const & arg)
-{         
-       if (bv->available()) { 
+{
+       if (bv->available()) {
                InsetFormula * f = new InsetFormula;
                if (openNewInset(bv, f)) {
                        bv->theLockingInset()->localDispatch(bv, LFUN_GREEK, arg);
                        bv->unlockInset(f);
                }
        }
-}         
+}
 
 
+void mathDispatch(BufferView *, kb_action, string const &)
+{}