]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_cursor.C
fix #1073
[lyx.git] / src / mathed / math_cursor.C
index 02593a8b5e4d894cbb950add31a059e7331f2803..3be9d00658da1bb0df79543da261d35b82d6b0c3 100644 (file)
 #include <config.h>
 #include <lyxrc.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "support/lstrings.h"
 #include "support/LAssert.h"
-#include "BufferView.h"
+#include "support/limited_stack.h"
 #include "debug.h"
-#include "LColor.h"
 #include "frontends/Painter.h"
 #include "math_cursor.h"
 #include "formulabase.h"
+#include "funcrequest.h"
 #include "math_autocorrect.h"
-#include "math_arrayinset.h"
 #include "math_braceinset.h"
 #include "math_commentinset.h"
 #include "math_charinset.h"
 #include "math_extern.h"
 #include "math_factory.h"
-#include "math_hullinset.h"
+#include "math_fontinset.h"
+#include "math_gridinset.h"
 #include "math_iterator.h"
 #include "math_macroarg.h"
 #include "math_macrotemplate.h"
 #include "math_mathmlstream.h"
-#include "math_parser.h"
-#include "math_replace.h"
 #include "math_scriptinset.h"
 #include "math_spaceinset.h"
 #include "math_support.h"
@@ -64,11 +59,11 @@ using std::isalpha;
 
 
 // matheds own cut buffer
-MathGridInset theCutBuffer = MathGridInset(1, 1);
+limited_stack<string> theCutBuffer;
 
 
 MathCursor::MathCursor(InsetFormulaBase * formula, bool front)
-       :       formula_(formula), autocorrect_(false), selection_(false)
+       :       formula_(formula), autocorrect_(false), selection_(false), targetx_(-1)
 {
        front ? first() : last();
        Anchor_ = Cursor_;
@@ -77,9 +72,9 @@ MathCursor::MathCursor(InsetFormulaBase * formula, bool front)
 
 MathCursor::~MathCursor()
 {
-  // ensure that 'notifyCursorLeave' is called
-  while (popLeft())
-    ;
+       // ensure that 'notifyCursorLeave' is called
+       while (popLeft())
+               ;
 }
 
 
@@ -91,7 +86,7 @@ void MathCursor::push(MathAtom & t)
 
 void MathCursor::pushLeft(MathAtom & t)
 {
-       //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
+       //lyxerr << "Entering atom " << t << " left\n";
        push(t);
        t->idxFirst(idx(), pos());
 }
@@ -99,7 +94,7 @@ void MathCursor::pushLeft(MathAtom & t)
 
 void MathCursor::pushRight(MathAtom & t)
 {
-       //cerr << "Entering atom "; t->write(cerr, false); cerr << " right\n";
+       //lyxerr << "Entering atom " << t << " right\n";
        posLeft();
        push(t);
        t->idxLast(idx(), pos());
@@ -108,13 +103,13 @@ void MathCursor::pushRight(MathAtom & t)
 
 bool MathCursor::popLeft()
 {
-       //cerr << "Leaving atom to the left\n";
+       //lyxerr << "Leaving atom to the left\n";
        if (depth() <= 1) {
                if (depth() == 1)
-                       par()->notifyCursorLeaves();
+                       par()->notifyCursorLeaves(idx());
                return false;
        }
-       par()->notifyCursorLeaves();
+       par()->notifyCursorLeaves(idx());
        Cursor_.pop_back();
        return true;
 }
@@ -122,13 +117,13 @@ bool MathCursor::popLeft()
 
 bool MathCursor::popRight()
 {
-       //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
+       //lyxerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
        if (depth() <= 1) {
                if (depth() == 1)
-                       par()->notifyCursorLeaves();
+                       par()->notifyCursorLeaves(idx());
                return false;
        }
-       par()->notifyCursorLeaves();
+       par()->notifyCursorLeaves(idx());
        Cursor_.pop_back();
        posRight();
        return true;
@@ -139,14 +134,14 @@ bool MathCursor::popRight()
 #if FILEDEBUG
        void MathCursor::dump(char const * what) const
        {
-               lyxerr << "MC: " << what << "\n";
-               lyxerr << " Cursor: " << depth() << "\n";
+               lyxerr << "MC: " << what << endl;
+               lyxerr << " Cursor: " << depth() << endl;
                for (unsigned i = 0; i < depth(); ++i)
-                       lyxerr << "    i: " << i << " " << Cursor_[i] << "\n";
-               lyxerr << " Anchor: " << Anchor_.size() << "\n";
+                       lyxerr << "    i: " << i << ' ' << Cursor_[i] << endl;
+               lyxerr << " Anchor: " << Anchor_.size() << endl;
                for (unsigned i = 0; i < Anchor_.size(); ++i)
-                       lyxerr << "    i: " << i << " " << Anchor_[i] << "\n";
-               lyxerr  << " sel: " << selection_ << "\n";
+                       lyxerr << "    i: " << i << ' ' << Anchor_[i] << endl;
+               lyxerr  << " sel: " << selection_ << endl;
        }
 #else
        void MathCursor::dump(char const *) const {}
@@ -261,7 +256,8 @@ void MathCursor::last()
 }
 
 
-bool positionable(MathIterator const & cursor, MathIterator const & anchor)
+bool positionable
+       (MathIterator const & cursor, MathIterator const & anchor)
 {
        // avoid deeper nested insets when selecting
        if (cursor.size() > anchor.size())
@@ -375,10 +371,20 @@ void MathCursor::insert(MathAtom const & t)
 }
 
 
+void MathCursor::niceInsert(string const & t)
+{
+       MathArray ar = asArray(t);
+       if (ar.size() == 1)
+               niceInsert(ar[0]);
+       else
+               insert(ar);
+}
+
+
 void MathCursor::niceInsert(MathAtom const & t)
 {
        macroModeClose();
-       MathGridInset safe = grabAndEraseSelection();
+       string safe = grabAndEraseSelection();
        plainInsert(t);
        // enter the new inset and move the contents of the selection if possible
        if (t->isActive()) {
@@ -394,129 +400,78 @@ void MathCursor::insert(MathArray const & ar)
        macroModeClose();
        if (selection_)
                eraseSelection();
-
-       array().insert(pos(), ar);
-       pos() += ar.size();
-}
-
-
-void MathCursor::paste(MathArray const & ar)
-{
-       Anchor_ = Cursor_;
-       selection_ = true;
        array().insert(pos(), ar);
        pos() += ar.size();
 }
 
 
-void MathCursor::paste(MathGridInset const & data)
+void MathCursor::paste(string const & data)
 {
-       if (data.nargs() == 1) {
-               // single cell/part of cell
-               paste(data.cell(0));
-       } else {
-               // multiple cells
-               idx_type idx; // index of upper left cell
-               MathGridInset * p = enclosingGrid(idx);
-               col_type const numcols = min(data.ncols(), p->ncols() - p->col(idx));
-               row_type const numrows = min(data.nrows(), p->nrows() - p->row(idx));
-               for (row_type row = 0; row < numrows; ++row) {
-                       for (col_type col = 0; col < numcols; ++col) {
-                               idx_type i = p->index(row + p->row(idx), col + p->col(idx));
-                               p->cell(i).append(data.cell(data.index(row, col)));
-                       }
-                       // append the left over horizontal cells to the last column
-                       idx_type i = p->index(row + p->row(idx), p->ncols() - 1);
-                       for (MathInset::col_type col = numcols; col < data.ncols(); ++col)
-                               p->cell(i).append(data.cell(data.index(row, col)));
-               }
-               // append the left over vertical cells to the last _cell_
-               idx_type i = p->nargs() - 1;
-               for (row_type row = numrows; row < data.nrows(); ++row)
-                       for (col_type col = 0; col < data.ncols(); ++col)
-                               p->cell(i).append(data.cell(data.index(row, col)));
-       }
+       dispatch(FuncRequest(LFUN_PASTE, data));
 }
 
 
-void MathCursor::backspace()
+bool MathCursor::backspace()
 {
        autocorrect_ = false;
-       if (pos() == 0) {
-               pullArg();
-               return;
-       }
 
        if (selection_) {
                selDel();
-               return;
+               return true;
        }
 
-/*
-       if (prevAtom()->asScriptInset()) {
-               // simply enter nucleus
-               left();
-               return;
+       if (pos() == 0) {
+               if (par()->ncols() == 1 &&
+                         par()->nrows() == 1 &&
+                         depth() == 1 &&
+                         size() == 0)
+                       return false;
+               pullArg();
+               return true;
        }
 
-       if (inNucleus()) {
-               // we are in nucleus
-               if (pos() == 1) {
+       if (inMacroMode()) {
+               MathUnknownInset * p = activeMacro();
+               if (p->name().size() > 1) {
+                       p->setName(p->name().substr(0, p->name().size() - 1));
+                       return true;
                }
        }
-*/
 
        --pos();
        plainErase();
+       return true;
 }
 
 
-void MathCursor::erase()
+bool MathCursor::erase()
 {
        autocorrect_ = false;
        if (inMacroMode())
-               return;
+               return true;
 
        if (selection_) {
                selDel();
-               return;
+               return true;
        }
 
        // delete empty cells if possible
        if (array().empty())
                if (par()->idxDelete(idx()))
-                       return;
+                       return true;
 
        // old behaviour when in last position of cell
        if (pos() == size()) {
-               par()->idxGlue(idx());
-               return;
-       }
-
-/*
-       // if we are standing in front of a script inset, grab item before us and
-       // move it into nucleus
-       // and remove first thing.
-       if (hasNextAtom() && nextAtom()->asScriptInset()) {
-               if (hasPrevAtom()) {
-                       MathAtom at = prevAtom();
-                       --pos();
-                       array().erase(pos());
-                       pushLeft(nextAtom());
-                       if (array().empty())
-                               array().push_back(at);
-                       else
-                               array()[0] = at;
-                       pos() = 1;
-               } else {
-                       pushLeft(nextAtom());
-                       array().clear();
+               if (par()->ncols() == 1 && par()->nrows() == 1 && depth() == 1 && size() == 0)
+                       return false;
+               else{
+                       par()->idxGlue(idx());
+                       return true;
                }
-               return;
        }
-*/
 
        plainErase();
+       return true;
 }
 
 
@@ -548,17 +503,6 @@ bool MathCursor::down(bool sel)
 }
 
 
-bool MathCursor::toggleLimits()
-{
-       if (!hasNextAtom() || !nextAtom()->asScriptInset())
-               return false;
-       MathScriptInset * t = nextAtom().nucleus()->asScriptInset();
-       int old = t->limits();
-       t->limits(old < 0 ? 1 : -1);
-       return old != t->limits();
-}
-
-
 void MathCursor::macroModeClose()
 {
        if (!inMacroMode())
@@ -568,8 +512,19 @@ void MathCursor::macroModeClose()
        string s = p->name();
        --pos();
        array().erase(pos());
-       if (s != "\\")
-               interpret(s);
+
+       // do nothing if the macro name is empty
+       if (s == "\\")
+               return;
+
+       string name = s.substr(1);
+
+       // prevent entering of recursive macros
+       if (formula()->lyxCode() == Inset::MATHMACRO_CODE
+                       && formula()->getInsetName() == name)
+               lyxerr << "can't enter recursive macro\n";
+
+       niceInsert(createMathInset(name));
 }
 
 
@@ -590,10 +545,10 @@ void MathCursor::selCopy()
 {
        dump("selCopy");
        if (selection_) {
-               theCutBuffer = grabSelection();
+               theCutBuffer.push(grabSelection());
                selection_ = false;
        } else {
-               theCutBuffer = MathGridInset(1, 1);
+               //theCutBuffer.erase();
        }
 }
 
@@ -601,7 +556,7 @@ void MathCursor::selCopy()
 void MathCursor::selCut()
 {
        dump("selCut");
-       theCutBuffer = grabAndEraseSelection();
+       theCutBuffer.push(grabAndEraseSelection());
 }
 
 
@@ -615,11 +570,12 @@ void MathCursor::selDel()
 }
 
 
-void MathCursor::selPaste()
+void MathCursor::selPaste(int n)
 {
        dump("selPaste");
        selClearOrDel();
-       paste(theCutBuffer);
+       if (n < theCutBuffer.size())
+               paste(theCutBuffer[n]);
        //grabSelection();
        selection_ = false;
 }
@@ -654,15 +610,7 @@ void MathCursor::selClearOrDel()
 }
 
 
-void MathCursor::selGet(MathArray & ar)
-{
-       dump("selGet");
-       if (selection_)
-               ar = grabSelection().glue();
-}
-
-
-void MathCursor::drawSelection(MathPainterInfo & pi) const
+void MathCursor::drawSelection(PainterInfo & pi) const
 {
        if (!selection_)
                return;
@@ -676,18 +624,28 @@ void MathCursor::drawSelection(MathPainterInfo & pi) const
 void MathCursor::handleNest(MathAtom const & a)
 {
        MathAtom at = a;
-       at.nucleus()->cell(0) = grabAndEraseSelection().glue();
+       at.nucleus()->cell(0) = asArray(grabAndEraseSelection());
        insert(at);
        pushRight(prevAtom());
 }
 
 
-void MathCursor::getPos(int & x, int & y)
+void MathCursor::getPos(int & x, int & y) const
 {
        par()->getPos(idx(), pos(), x, y);
 }
 
 
+int MathCursor::targetX() const
+{
+       if (targetx_ != -1)
+               return targetx_;
+       int x = 0, y = 0;
+       getPos(x, y);
+       return x;
+}
+
+
 MathInset * MathCursor::par() const
 {
        return cursor().par_;
@@ -718,6 +676,18 @@ MathCursor::pos_type MathCursor::pos() const
 }
 
 
+void MathCursor::adjust(pos_type from, difference_type diff)
+{
+       if (cursor().pos_ > from)
+               cursor().pos_ += diff;
+       if (Anchor_.back().pos_ > from)
+               Anchor_.back().pos_ += diff;
+       // just to be on the safe side
+       // theoretically unecessary
+       normalize();
+}
+
+
 MathCursor::pos_type & MathCursor::pos()
 {
        return cursor().pos_;
@@ -770,19 +740,6 @@ MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
 }
 
 
-MathHullInset * MathCursor::enclosingHull(MathCursor::idx_type & idx) const
-{
-       for (MathInset::difference_type i = depth() - 1; i >= 0; --i) {
-               MathHullInset * p = Cursor_[i].par_->asHullInset();
-               if (p) {
-                       idx = Cursor_[i].idx_;
-                       return p;
-               }
-       }
-       return 0;
-}
-
-
 void MathCursor::popToHere(MathInset const * p)
 {
        while (depth() && Cursor_.back().par_ != p)
@@ -831,36 +788,22 @@ void MathCursor::normalize()
 {
        if (idx() >= par()->nargs()) {
                lyxerr << "this should not really happen - 1: "
-                      << idx() << " " << par()->nargs() << " in: " << par() << "\n";
+                      << idx() << ' ' << par()->nargs()
+                      << " in: " << par() << endl;
                dump("error 2");
        }
        idx() = min(idx(), par()->nargs() - 1);
 
        if (pos() > size()) {
                lyxerr << "this should not really happen - 2: "
-                       << pos() << " " << size() <<  " in idx: " << idx()
-                       << " in atom: '";
+                       << pos() << ' ' << size() <<  " in idx: " << idx()
+                      << " in atom: '";
                WriteStream wi(lyxerr, false, true);
                par()->write(wi);
-               lyxerr << "\n";
+               lyxerr << endl;
                dump("error 4");
        }
        pos() = min(pos(), size());
-
-       // remove empty scripts if possible
-       if (1) {
-               for (pos_type i = 0; i < size(); ++i) {
-                       MathScriptInset * p = array()[i].nucleus()->asScriptInset();
-                       if (p) {
-                               p->removeEmptyScripts();
-                               //if (p->empty())
-                               //      array().erase(i);
-                       }
-               }
-       }
-
-       // fix again position
-       pos() = min(pos(), size());
 }
 
 
@@ -870,22 +813,6 @@ MathCursor::size_type MathCursor::size() const
 }
 
 
-MathCursor::col_type MathCursor::hullCol() const
-{
-       idx_type idx = 0;
-       MathHullInset * p = enclosingHull(idx);
-       return p->col(idx);
-}
-
-
-MathCursor::row_type MathCursor::hullRow() const
-{
-       idx_type idx = 0;
-       MathHullInset * p = enclosingHull(idx);
-       return p->row(idx);
-}
-
-
 bool MathCursor::hasPrevAtom() const
 {
        return pos() > 0;
@@ -1040,7 +967,10 @@ bool MathCursor::goUpDown(bool up)
                }
        }
 
-       // try current cell
+       // try current cell for e.g. text insets
+       if (par()->idxUpDown2(idx(), pos(), up, targetx_))
+               return true;
+
        //xarray().boundingBox(xlow, xhigh, ylow, yhigh);
        //if (up)
        //      yhigh = yo - 4;
@@ -1055,8 +985,12 @@ bool MathCursor::goUpDown(bool up)
        while (1) {
                ///lyxerr << "updown: We are in " << *par() << " idx: " << idx() << '\n';
                // ask inset first
-               if (par()->idxUpDown(idx(), pos(), up, targetx_))
+               if (par()->idxUpDown(idx(), pos(), up, targetx_)) {
+                       // try to find best position within this inset
+                       if (!selection())
+                               bruteFind2(xo, yo);
                        return true;
+               }
 
                // no such inset found, just take something "above"
                ///lyxerr << "updown: handled by strange case\n";
@@ -1093,6 +1027,7 @@ bool MathCursor::bruteFind
                        it.back().getPos(xo, yo);
                        if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
                                double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
+                               //lyxerr << "x: " << x << " y: " << y << " d: " << endl;
                                // '<=' in order to take the last possible position
                                // this is important for clicking behind \sum in e.g. '\sum_i a'
                                if (d <= best_dist) {
@@ -1113,11 +1048,29 @@ bool MathCursor::bruteFind
 }
 
 
-bool MathCursor::idxLineFirst()
+void MathCursor::bruteFind2(int x, int y)
 {
-       idx() -= idx() % par()->ncols();
-       pos() = 0;
-       return true;
+       double best_dist = 1e10;
+
+       MathIterator it = Cursor_;
+       it.back().setPos(0);
+       MathIterator et = Cursor_;
+       et.back().setPos(it.cell().size());
+       for (int i = 0; ; ++i) {
+               int xo, yo;
+               it.back().getPos(xo, yo);
+               double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
+               // '<=' in order to take the last possible position
+               // this is important for clicking behind \sum in e.g. '\sum_i a'
+               lyxerr << "i: " << i << " d: " << d << " best: " << best_dist << endl;
+               if (d <= best_dist) {
+                       best_dist = d;
+                       Cursor_   = it;
+               }
+               if (it == et)
+                       break;
+               ++it;
+       }
 }
 
 
@@ -1141,81 +1094,19 @@ bool MathCursor::idxRight()
 }
 
 
-bool MathCursor::interpret(string const & s)
-{
-       //lyxerr << "interpret 1: '" << s << "'\n";
-       if (s.empty())
-               return true;
-
-       //lyxerr << "char: '" << s[0] << "'  int: " << int(s[0]) << endl;
-       //owner_->getIntl()->getTransManager().TranslateAndInsert(s[0], lt);
-       //lyxerr << "trans: '" << s[0] << "'  int: " << int(s[0]) << endl;
-
-       if (s.size() >= 6 && s.substr(0, 6) == "matrix") {
-               unsigned int m = 1;
-               unsigned int n = 1;
-               string v_align;
-               string h_align;
-               istringstream is(s.substr(6).c_str());
-               is >> m >> n >> v_align >> h_align;
-               m = max(1u, m);
-               n = max(1u, n);
-               v_align += 'c';
-               niceInsert(MathAtom(new MathArrayInset("array", m, n, v_align[0], h_align)));
-               return true;
-       }
-
-       if (s.size() >= 7 && s.substr(0, 7) == "replace") {
-               ReplaceData rep;
-               istringstream is(s.substr(7).c_str());
-               string from, to;
-               is >> from >> to;
-               mathed_parse_cell(rep.from, from);
-               mathed_parse_cell(rep.to, to);
-               lyxerr << "replacing '" << from << "' with '" << to << "'\n";
-               par()->replace(rep);
-               return true;
-       }
-
-       string name = s.substr(1);
-
-       if (name == "over" || name == "choose" || name == "atop") {
-               MathAtom t(createMathInset(name));
-               t.nucleus()->asNestInset()->cell(0) = array();
-               array().clear();
-               pos() = 0;
-               niceInsert(t);
-               popRight();
-               left();
-               return true;
-       }
-
-       // prevent entering of recursive macros
-       if (formula()->lyxCode() == Inset::MATHMACRO_CODE
-               && formula()->getInsetName() == name)
-       {
-               lyxerr << "can't enter recursive macro\n";
-               return true;
-       }
-
-       niceInsert(createMathInset(name));
-       return true;
-}
-
-
 bool MathCursor::script(bool up)
 {
        // Hack to get \\^ and \\_ working
        if (inMacroMode() && macroName() == "\\") {
                if (up)
-                       interpret("\\mathcircumflex");
+                       niceInsert(createMathInset("mathcircumflex"));
                else
                        interpret('_');
                return true;
        }
 
        macroModeClose();
-       MathGridInset safe = grabAndEraseSelection();
+       string safe = grabAndEraseSelection();
        if (inNucleus()) {
                // we are in a nucleus of a script inset, move to _our_ script
                par()->asScriptInset()->ensure(up);
@@ -1268,12 +1159,6 @@ bool MathCursor::interpret(char c)
                string name = macroName();
                //lyxerr << "interpret name: '" << name << "'\n";
 
-               if (name.empty() && c == '\\') {
-                       backspace();
-                       interpret("\\backslash");
-                       return true;
-               }
-
                if (isalpha(c)) {
                        activeMacro()->setName(activeMacro()->name() + c);
                        return true;
@@ -1283,16 +1168,24 @@ bool MathCursor::interpret(char c)
                if (name == "\\") {
                        // remove the '\\'
                        backspace();
-                       if (c == '\\')
-                               interpret("\\backslash");
-                       else
-                               interpret(string("\\") + c);
+                       if (c == '\\') {
+                               if (currentMode() == MathInset::TEXT_MODE)
+                                       niceInsert(createMathInset("textbackslash"));
+                               else
+                                       niceInsert(createMathInset("backslash"));
+                       } else if (c == '{') {
+                               niceInsert(MathAtom(new MathBraceInset));
+                       } else {
+                               niceInsert(createMathInset(string(1, c)));
+                       }
                        return true;
                }
 
                // leave macro mode and try again if necessary
                macroModeClose();
-               if (c != ' ')
+               if (c == '{')
+                       niceInsert(MathAtom(new MathBraceInset));
+               else if (c != ' ')
                        interpret(c);
                return true;
        }
@@ -1323,7 +1216,7 @@ bool MathCursor::interpret(char c)
        }
 
        if (c == '\n') {
-               if (currentMode() == MathInset::TEXT_MODE) 
+               if (currentMode() == MathInset::TEXT_MODE)
                        insert(c);
                return true;
        }
@@ -1348,29 +1241,8 @@ bool MathCursor::interpret(char c)
                return pos() != size();
        }
 
-       if (c == '#') {
-               insert(c); // LM_TC_TEX;
-               return true;
-       }
-
-/*
-       if (c == '{' || c == '}', c)) {
-               insert(c); // LM_TC_TEX;
-               return true;
-       }
-*/
-
-       if (c == '{') {
-               niceInsert(MathAtom(new MathBraceInset));
-               return true;
-       }
-
-       if (c == '}') {
-               return true;
-       }
-
-       if (c == '$') {
-               insert(createMathInset("$"));
+       if (c == '{' || c == '}' || c == '#' || c == '&' || c == '$') {
+               createMathInset(string(1, c));
                return true;
        }
 
@@ -1379,25 +1251,6 @@ bool MathCursor::interpret(char c)
                return true;
        }
 
-/*
-       if (isalpha(c) && lastcode_ == LM_TC_GREEK) {
-               insert(c, LM_TC_VAR);
-               return true;
-       }
-
-       if (isalpha(c) && lastcode_ == LM_TC_GREEK1) {
-               insert(c, LM_TC_VAR);
-               lastcode_ = LM_TC_VAR;
-               return true;
-       }
-
-       if (c == '\\') {
-               insert(c, LM_TC_TEX);
-               //bv->owner()->message(_("TeX mode"));
-               return true;
-       }
-*/
-
        // try auto-correction
        //if (autocorrect_ && hasPrevAtom() && math_autocorrect(prevAtom(), c))
        //      return true;
@@ -1440,10 +1293,9 @@ string MathCursor::info() const
                os << "  ";
        }
        if (hasPrevAtom())
-               if (prevAtom()->asSymbolInset() || prevAtom()->asScriptInset())
-                       prevAtom()->infoize(os);
+               prevAtom()->infoize2(os);
        os << "                    ";
-       return os.str().c_str(); // .c_str() needed for lyxstring
+       return STRCONV(os.str());
 }
 
 
@@ -1475,29 +1327,34 @@ void region(MathCursorPos const & i1, MathCursorPos const & i2,
 }
 
 
-MathGridInset MathCursor::grabSelection() const
+string MathCursor::grabSelection() const
 {
        if (!selection_)
-               return MathGridInset();
+               return string();
+
        MathCursorPos i1;
        MathCursorPos i2;
        getSelection(i1, i2);
-       // shouldn't we assert on i1.par_ == i2.par_?
+
        if (i1.idx_ == i2.idx_) {
-               MathGridInset data(1, 1);
                MathArray::const_iterator it = i1.cell().begin();
-               data.cell(0) = MathArray(it + i1.pos_, it + i2.pos_);
-               return data;
+               return asString(MathArray(it + i1.pos_, it + i2.pos_));
        }
+
        row_type r1, r2;
        col_type c1, c2;
        region(i1, i2, r1, r2, c1, c2);
-       MathGridInset data(c2 - c1 + 1, r2 - r1 + 1);
-       for (row_type row = 0; row < data.nrows(); ++row)
-               for (col_type col = 0; col < data.ncols(); ++col) {
-                       idx_type i = i1.par_->index(row + r1, col + c1);
-                       data.cell(data.index(row, col)) = i1.par_->cell(i);
+
+       string data;
+       for (row_type row = r1; row <= r2; ++row) {
+               if (row > r1)
+                       data += "\\\\";
+               for (col_type col = c1; col <= c2; ++col) {
+                       if (col > c1)
+                               data += '&';
+                       data += asString(i1.par_->cell(i1.par_->index(row, col)));
                }
+       }
        return data;
 }
 
@@ -1522,11 +1379,11 @@ void MathCursor::eraseSelection()
 }
 
 
-MathGridInset MathCursor::grabAndEraseSelection()
+string MathCursor::grabAndEraseSelection()
 {
        if (!selection_)
-               return MathGridInset();
-       MathGridInset res = grabSelection();
+               return string();
+       string res = grabSelection();
        eraseSelection();
        selection_ = false;
        return res;
@@ -1550,112 +1407,46 @@ MathCursorPos MathCursor::normalAnchor() const
 }
 
 
-
-void MathCursor::handleExtern(const string & arg)
-{
-       string lang;
-       string extra;
-       istringstream iss(arg.c_str());
-       iss >> lang >> extra;
-       if (extra.empty())
-               extra = "noextra";
-
-       if (selection()) {
-               MathArray ar;
-               selGet(ar);
-               lyxerr << "use selection: " << ar << "\n";
-               insert(pipeThroughExtern(lang, extra, ar));
-               return;
-       }
-
-       MathArray eq;
-       eq.push_back(MathAtom(new MathCharInset('=')));
-
-       popToEnclosingHull();
-
-       idx_type idx = 0;
-       MathHullInset * hull = enclosingHull(idx);
-       lyx::Assert(hull);
-       idxLineFirst();
-
-       if (hull->getType() == "simple") {
-               MathArray::size_type pos = cursor().cell().find_last(eq);
-               MathArray ar;
-               if (pos == size()) {
-                       ar = array();
-                       lyxerr << "use whole cell: " << ar << "\n";
-               } else {
-                       ar = MathArray(array().begin() + pos + 1, array().end());
-                       lyxerr << "use partial cell form pos: " << pos << "\n";
+dispatch_result MathCursor::dispatch(FuncRequest const & cmd)
+{
+       // mouse clicks are somewhat special 
+       // check
+       switch (cmd.action) {
+               case LFUN_MOUSE_PRESS:
+               case LFUN_MOUSE_MOTION:
+               case LFUN_MOUSE_RELEASE:
+               case LFUN_MOUSE_DOUBLE: {
+                       MathCursorPos & pos = Cursor_.back();
+                       dispatch_result res = UNDISPATCHED;
+                       int x = 0, y = 0;
+                       getPos(x, y);
+                       if (x < cmd.x && hasPrevAtom()) {
+                               res = prevAtom().nucleus()->dispatch(cmd, pos.idx_, pos.pos_);
+                               if (res != UNDISPATCHED)
+                                       return res;
+                       }
+                       if (x > cmd.x && hasNextAtom()) {
+                               res = nextAtom().nucleus()->dispatch(cmd, pos.idx_, pos.pos_);
+                               if (res != UNDISPATCHED)
+                                       return res;
+                       }
                }
-               end();
-               insert(eq);
-               insert(pipeThroughExtern(lang, extra, ar));
-               return;
-       }
-
-       if (hull->getType() == "equation") {
-               lyxerr << "use equation inset\n";
-               hull->mutate("eqnarray");
-               MathArray & ar = cursor().cell();
-               lyxerr << "use cell: " << ar << "\n";
-               idxRight();
-               cursor().cell() = eq;
-               idxRight();
-               cursor().cell() = pipeThroughExtern(lang, extra, ar);
-               idxLineLast();
-               return;
-       }
-
-       {
-               lyxerr << "use eqnarray\n";
-               idxLineLast();
-               MathArray ar = cursor().cell();
-               lyxerr << "use cell: " << ar << "\n";
-#ifdef WITH_WARNINGS
-#warning temporarily disabled
-#endif
-               //breakLine();
-               //idxRight();
-               cursor().cell() = eq;
-               //idxRight();
-               cursor().cell() = pipeThroughExtern(lang, extra, ar);
-               idxLineLast();
-       }
-
-}
-
-
-MathInset::result_type MathCursor::dispatch(FuncRequest const & cmd)
-{
-       // try to dispatch to adajcent items if they are not editable
-       // actually, this should only happen for mouse clicks...
-       idx_type d1;
-       pos_type d2;
-       if (hasNextAtom() && !openable(nextAtom(), false)) {
-               MathInset::result_type res = nextAtom().nucleus()->dispatch(cmd, d1, d2);
-               if (res != MathInset::UNDISPATCHED)
-                       return res;
-       }
-       if (hasPrevAtom() && !openable(prevAtom(), false)) {
-               MathInset::result_type res = prevAtom().nucleus()->dispatch(cmd, d1, d2);
-               if (res != MathInset::UNDISPATCHED)
-                       return res;
+               default:
+                       break;
        }
 
        for (int i = Cursor_.size() - 1; i >= 0; --i) {
                MathCursorPos & pos = Cursor_[i];
-               MathInset::result_type const res
-                       = pos.par_->dispatch(cmd, pos.idx_, pos.pos_);
-               if (res != MathInset::UNDISPATCHED) {
-                       if (res == MathInset::DISPATCHED_POP) {
+               dispatch_result res = pos.par_->dispatch(cmd, pos.idx_, pos.pos_);
+               if (res != UNDISPATCHED) {
+                       if (res == DISPATCHED_POP) {
                                Cursor_.shrink(i + 1);
                                selClear();
                        }
                        return res;
                }
        }
-       return MathInset::UNDISPATCHED;
+       return UNDISPATCHED;
 }
 
 
@@ -1670,11 +1461,47 @@ MathInset::mode_type MathCursor::currentMode() const
 }
 
 
+void MathCursor::handleFont(string const & font)
+{
+       string safe;
+       if (selection()) {
+               macroModeClose();
+               safe = grabAndEraseSelection();
+       }
+
+       if (array().size()) {
+               // something left in the cell
+               if (pos() == 0) {
+                       // cursor in first position
+                       popLeft();
+               } else if (pos() == array().size()) {
+                       // cursor in last position
+                       popRight();
+               } else {
+                       // cursor in between. split cell
+                       MathArray::iterator bt = array().begin();
+                       MathAtom at = createMathInset(font);
+                       at.nucleus()->cell(0) = MathArray(bt, bt + pos());
+                       cursor().cell().erase(bt, bt + pos());
+                       popLeft();
+                       plainInsert(at);
+               }
+       } else {
+               // nothing left in the cell
+               pullArg();
+               plainErase();
+       }
+       insert(safe);
+}
+
+
 void releaseMathCursor(BufferView * bv)
 {
-       if (!mathcursor)
-               return;
-       mathcursor->formula()->hideInsetCursor(bv);
-       delete mathcursor;
-       mathcursor = 0;
+       if (mathcursor) {
+               InsetFormulaBase * f =  mathcursor->formula();
+               f->hideInsetCursor(bv);
+               delete mathcursor;
+               mathcursor = 0;
+               f->insetUnlock(bv);
+       }
 }