]> git.lyx.org Git - features.git/blobdiff - src/mathed/math_cursor.C
Replace LString.h with support/std_string.h,
[features.git] / src / mathed / math_cursor.C
index df7444f328c9ce9072bc6b2df674698ccfe4239b..96fdc1c7d9c7bd956f292ff63797cb143159b7d3 100644 (file)
@@ -1,60 +1,43 @@
-/*
- *  File:        math_cursor.C
- *  Purpose:     Interaction for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *  Created:     January 1996
- *  Description: Math interaction for a WYSIWYG math editor.
+/**
+ * \file math_cursor.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: Xlib, XForms
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, Alejandro Aguilar Sierra
- *
- *   Version: 0.8beta, Math & Lyx project.
- *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
-#include <lyxrc.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <lyxrc.h>
 
-#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 "support/std_sstream.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_iterator.h"
+#include "math_gridinset.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"
 #include "math_unknowninset.h"
 
-#include <algorithm>
-#include <cctype>
 
 //#define FILEDEBUG 1
 
+using namespace lyx::support;
+
 using std::endl;
 using std::min;
 using std::max;
@@ -65,11 +48,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_;
@@ -78,21 +61,21 @@ MathCursor::MathCursor(InsetFormulaBase * formula, bool front)
 
 MathCursor::~MathCursor()
 {
-  // ensure that 'notifyCursorLeave' is called
-  while (popLeft())
-    ;
+       // ensure that 'notifyCursorLeave' is called
+       while (popLeft())
+               ;
 }
 
 
 void MathCursor::push(MathAtom & t)
 {
-       Cursor_.push_back(MathCursorPos(t.nucleus()));
+       Cursor_.push_back(CursorPos(t.nucleus()));
 }
 
 
 void MathCursor::pushLeft(MathAtom & t)
 {
-       //lyxerr << "Entering atom " << t << " left\n";
+       //lyxerr << "Entering atom " << t << " left" << endl;
        push(t);
        t->idxFirst(idx(), pos());
 }
@@ -100,7 +83,7 @@ void MathCursor::pushLeft(MathAtom & t)
 
 void MathCursor::pushRight(MathAtom & t)
 {
-       //lyxerr << "Entering atom " << t << " right\n";
+       //lyxerr << "Entering atom " << t << " right" << endl;
        posLeft();
        push(t);
        t->idxLast(idx(), pos());
@@ -109,13 +92,13 @@ void MathCursor::pushRight(MathAtom & t)
 
 bool MathCursor::popLeft()
 {
-       //cerr << "Leaving atom to the left\n";
+       //lyxerr << "Leaving atom to the left" << endl;
        if (depth() <= 1) {
                if (depth() == 1)
-                       par()->notifyCursorLeaves();
+                       inset()->notifyCursorLeaves(idx());
                return false;
        }
-       par()->notifyCursorLeaves();
+       inset()->notifyCursorLeaves(idx());
        Cursor_.pop_back();
        return true;
 }
@@ -123,13 +106,13 @@ bool MathCursor::popLeft()
 
 bool MathCursor::popRight()
 {
-       //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
+       //lyxerr << "Leaving atom "; inset()->write(cerr, false); cerr << " right" << endl;
        if (depth() <= 1) {
                if (depth() == 1)
-                       par()->notifyCursorLeaves();
+                       inset()->notifyCursorLeaves(idx());
                return false;
        }
-       par()->notifyCursorLeaves();
+       inset()->notifyCursorLeaves(idx());
        Cursor_.pop_back();
        posRight();
        return true;
@@ -140,14 +123,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 {}
@@ -157,7 +140,7 @@ bool MathCursor::popRight()
 bool MathCursor::isInside(MathInset const * p) const
 {
        for (unsigned i = 0; i < depth(); ++i)
-               if (Cursor_[i].par_ == p)
+               if (Cursor_[i].inset_ == p)
                        return true;
        return false;
 }
@@ -175,7 +158,7 @@ bool MathCursor::openable(MathAtom const & t, bool sel) const
                // we can't move into anything new during selection
                if (depth() == Anchor_.size())
                        return false;
-               if (t.operator->() != Anchor_[depth()].par_)
+               if (t.operator->() != Anchor_[depth()].inset_)
                        return false;
        }
        return true;
@@ -184,7 +167,7 @@ bool MathCursor::openable(MathAtom const & t, bool sel) const
 
 bool MathCursor::inNucleus() const
 {
-       return par()->asScriptInset() && idx() == 2;
+       return inset()->asScriptInset() && idx() == 2;
 }
 
 
@@ -250,7 +233,7 @@ void MathCursor::first()
 {
        Cursor_.clear();
        push(formula_->par());
-       par()->idxFirst(idx(), pos());
+       inset()->idxFirst(idx(), pos());
 }
 
 
@@ -258,11 +241,12 @@ void MathCursor::last()
 {
        Cursor_.clear();
        push(formula_->par());
-       par()->idxLast(idx(), pos());
+       inset()->idxLast(idx(), pos());
 }
 
 
-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())
@@ -270,7 +254,7 @@ bool positionable(MathIterator const & cursor, MathIterator const & anchor)
 
        // anchor might be deeper, should have same path then
        for (MathIterator::size_type i = 0; i < cursor.size(); ++i)
-               if (cursor[i].par_ != anchor[i].par_)
+               if (cursor[i].inset_ != anchor[i].inset_)
                        return false;
 
        // position should be ok.
@@ -301,7 +285,7 @@ bool MathCursor::home(bool sel)
        autocorrect_ = false;
        selHandle(sel);
        macroModeClose();
-       if (!par()->idxHome(idx(), pos()))
+       if (!inset()->idxHome(idx(), pos()))
                return popLeft();
        dump("home 2");
        targetx_ = -1; // "no target"
@@ -315,7 +299,7 @@ bool MathCursor::end(bool sel)
        autocorrect_ = false;
        selHandle(sel);
        macroModeClose();
-       if (!par()->idxEnd(idx(), pos()))
+       if (!inset()->idxEnd(idx(), pos()))
                return popRight();
        dump("end 2");
        targetx_ = -1; // "no target"
@@ -331,14 +315,14 @@ void MathCursor::plainErase()
 
 void MathCursor::markInsert()
 {
-       //lyxerr << "inserting mark\n";
+       //lyxerr << "inserting mark" << endl;
        array().insert(pos(), MathAtom(new MathCharInset(0)));
 }
 
 
 void MathCursor::markErase()
 {
-       //lyxerr << "deleting mark\n";
+       //lyxerr << "deleting mark" << endl;
        array().erase(pos());
 }
 
@@ -351,9 +335,17 @@ void MathCursor::plainInsert(MathAtom const & t)
 }
 
 
+void MathCursor::insert2(string const & str)
+{
+       MathArray ar;
+       asArray(str, ar);
+       insert(ar);
+}
+
+
 void MathCursor::insert(string const & str)
 {
-       //lyxerr << "inserting '" << str << "'\n";
+       //lyxerr << "inserting '" << str << "'" << endl;
        selClearOrDel();
        for (string::const_iterator it = str.begin(); it != str.end(); ++it)
                plainInsert(MathAtom(new MathCharInset(*it)));
@@ -362,7 +354,7 @@ void MathCursor::insert(string const & str)
 
 void MathCursor::insert(char c)
 {
-       //lyxerr << "inserting '" << c << "'\n";
+       //lyxerr << "inserting '" << c << "'" << endl;
        selClearOrDel();
        plainInsert(MathAtom(new MathCharInset(c)));
 }
@@ -376,10 +368,21 @@ void MathCursor::insert(MathAtom const & t)
 }
 
 
+void MathCursor::niceInsert(string const & t)
+{
+       MathArray ar;
+       asArray(t, ar);
+       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()) {
@@ -395,116 +398,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)
 {
-       ostringstream os;
-  WriteStream wi(os, false, false);
-  data.write(wi);
-       dispatch(FuncRequest(LFUN_PASTE, os.str()));
+       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 (pos() == 0) {
+               if (inset()->ncols() == 1 &&
+                         inset()->nrows() == 1 &&
+                         depth() == 1 &&
+                         size() == 0)
+                       return false;
+               pullArg();
+               return true;
        }
 
        if (inMacroMode()) {
                MathUnknownInset * p = activeMacro();
                if (p->name().size() > 1) {
                        p->setName(p->name().substr(0, p->name().size() - 1));
-                       return;
-               }
-       }
-
-/*
-       if (prevAtom()->asScriptInset()) {
-               // simply enter nucleus
-               left();
-               return;
-       }
-
-       if (inNucleus()) {
-               // we are in nucleus
-               if (pos() == 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;
+               if (inset()->idxDelete(idx()))
+                       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 (inset()->ncols() == 1 && inset()->nrows() == 1 && depth() == 1 && size() == 0)
+                       return false;
+               else{
+                       inset()->idxGlue(idx());
+                       return true;
                }
-               return;
        }
-*/
 
        plainErase();
+       return true;
 }
 
 
@@ -536,17 +501,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())
@@ -556,8 +510,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 const name = s.substr(1);
+
+       // prevent entering of recursive macros
+       if (formula()->lyxCode() == InsetOld::MATHMACRO_CODE
+                       && formula()->getInsetName() == name)
+               lyxerr << "can't enter recursive macro" << endl;
+
+       niceInsert(createMathInset(name));
 }
 
 
@@ -578,10 +543,10 @@ void MathCursor::selCopy()
 {
        dump("selCopy");
        if (selection_) {
-               theCutBuffer = grabSelection();
+               theCutBuffer.push(grabSelection());
                selection_ = false;
        } else {
-               theCutBuffer = MathGridInset(1, 1);
+               //theCutBuffer.erase();
        }
 }
 
@@ -589,7 +554,7 @@ void MathCursor::selCopy()
 void MathCursor::selCut()
 {
        dump("selCut");
-       theCutBuffer = grabAndEraseSelection();
+       theCutBuffer.push(grabAndEraseSelection());
 }
 
 
@@ -603,11 +568,12 @@ void MathCursor::selDel()
 }
 
 
-void MathCursor::selPaste()
+void MathCursor::selPaste(size_t n)
 {
        dump("selPaste");
        selClearOrDel();
-       paste(theCutBuffer);
+       if (n < theCutBuffer.size())
+               paste(theCutBuffer[n]);
        //grabSelection();
        selection_ = false;
 }
@@ -642,43 +608,45 @@ 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;
-       MathCursorPos i1;
-       MathCursorPos i2;
+       CursorPos i1;
+       CursorPos i2;
        getSelection(i1, i2);
-       i1.par_->drawSelection(pi, i1.idx_, i1.pos_, i2.idx_, i2.pos_);
+       i1.inset_->drawSelection(pi, i1.idx_, i1.pos_, i2.idx_, i2.pos_);
 }
 
 
 void MathCursor::handleNest(MathAtom const & a)
 {
        MathAtom at = a;
-       at.nucleus()->cell(0) = grabAndEraseSelection().glue();
+       asArray(grabAndEraseSelection(), at.nucleus()->cell(0));
        insert(at);
        pushRight(prevAtom());
 }
 
 
-void MathCursor::getPos(int & x, int & y)
+void MathCursor::getPos(int & x, int & y) const
+{
+       inset()->getPos(idx(), pos(), x, y);
+}
+
+
+int MathCursor::targetX() const
 {
-       par()->getPos(idx(), pos(), x, y);
+       if (targetx_ != -1)
+               return targetx_;
+       int x = 0, y = 0;
+       getPos(x, y);
+       return x;
 }
 
 
-MathInset * MathCursor::par() const
+MathInset * MathCursor::inset() const
 {
-       return cursor().par_;
+       return cursor().inset_;
 }
 
 
@@ -706,6 +674,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_;
@@ -748,7 +728,7 @@ bool MathCursor::selection() const
 MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
 {
        for (MathInset::difference_type i = depth() - 1; i >= 0; --i) {
-               MathGridInset * p = Cursor_[i].par_->asGridInset();
+               MathGridInset * p = Cursor_[i].inset_->asGridInset();
                if (p) {
                        idx = Cursor_[i].idx_;
                        return p;
@@ -760,21 +740,21 @@ MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
 
 void MathCursor::popToHere(MathInset const * p)
 {
-       while (depth() && Cursor_.back().par_ != p)
+       while (depth() && Cursor_.back().inset_ != p)
                Cursor_.pop_back();
 }
 
 
 void MathCursor::popToEnclosingGrid()
 {
-       while (depth() && !Cursor_.back().par_->asGridInset())
+       while (depth() && !Cursor_.back().inset_->asGridInset())
                Cursor_.pop_back();
 }
 
 
 void MathCursor::popToEnclosingHull()
 {
-       while (depth() && !Cursor_.back().par_->asHullInset())
+       while (depth() && !Cursor_.back().inset_->asHullInset())
                Cursor_.pop_back();
 }
 
@@ -804,38 +784,24 @@ void MathCursor::touch()
 
 void MathCursor::normalize()
 {
-       if (idx() >= par()->nargs()) {
+       if (idx() >= inset()->nargs()) {
                lyxerr << "this should not really happen - 1: "
-                      << idx() << " " << par()->nargs() << " in: " << par() << "\n";
+                      << idx() << ' ' << inset()->nargs()
+                      << " in: " << inset() << endl;
                dump("error 2");
        }
-       idx() = min(idx(), par()->nargs() - 1);
+       idx() = min(idx(), inset()->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";
+               inset()->write(wi);
+               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());
 }
 
 
@@ -859,28 +825,28 @@ bool MathCursor::hasNextAtom() const
 
 MathAtom const & MathCursor::prevAtom() const
 {
-       lyx::Assert(pos() > 0);
+       Assert(pos() > 0);
        return array()[pos() - 1];
 }
 
 
 MathAtom & MathCursor::prevAtom()
 {
-       lyx::Assert(pos() > 0);
+       Assert(pos() > 0);
        return array()[pos() - 1];
 }
 
 
 MathAtom const & MathCursor::nextAtom() const
 {
-       lyx::Assert(pos() < size());
+       Assert(pos() < size());
        return array()[pos()];
 }
 
 
 MathAtom & MathCursor::nextAtom()
 {
-       lyx::Assert(pos() < size());
+       Assert(pos() < size());
        return array()[pos()];
 }
 
@@ -889,13 +855,13 @@ MathArray & MathCursor::array() const
 {
        static MathArray dummy;
 
-       if (idx() >= par()->nargs()) {
-               lyxerr << "############  idx_ " << idx() << " not valid\n";
+       if (idx() >= inset()->nargs()) {
+               lyxerr << "############  idx_ " << idx() << " not valid" << endl;
                return dummy;
        }
 
        if (depth() == 0) {
-               lyxerr << "############  depth() == 0 not valid\n";
+               lyxerr << "############  depth() == 0 not valid" << endl;
                return dummy;
        }
 
@@ -905,13 +871,13 @@ MathArray & MathCursor::array() const
 
 void MathCursor::idxNext()
 {
-       par()->idxNext(idx(), pos());
+       inset()->idxNext(idx(), pos());
 }
 
 
 void MathCursor::idxPrev()
 {
-       par()->idxPrev(idx(), pos());
+       inset()->idxPrev(idx(), pos());
 }
 
 
@@ -931,9 +897,9 @@ char MathCursor::halign() const
 }
 
 
-void MathCursor::getSelection(MathCursorPos & i1, MathCursorPos & i2) const
+void MathCursor::getSelection(CursorPos & i1, CursorPos & i2) const
 {
-       MathCursorPos anc = normalAnchor();
+       CursorPos anc = normalAnchor();
        if (anc < cursor()) {
                i1 = anc;
                i2 = cursor();
@@ -944,16 +910,16 @@ void MathCursor::getSelection(MathCursorPos & i1, MathCursorPos & i2) const
 }
 
 
-MathCursorPos & MathCursor::cursor()
+CursorPos & MathCursor::cursor()
 {
-       lyx::Assert(depth());
+       Assert(depth());
        return Cursor_.back();
 }
 
 
-MathCursorPos const & MathCursor::cursor() const
+CursorPos const & MathCursor::cursor() const
 {
-       lyx::Assert(depth());
+       Assert(depth());
        return Cursor_.back();
 }
 
@@ -982,7 +948,7 @@ bool MathCursor::goUpDown(bool up)
                        push(nextAtom());
                        idx() = up; // the superscript has index 1
                        pos() = size();
-                       ///lyxerr << "updown: handled by scriptinset to the left\n";
+                       ///lyxerr << "updown: handled by scriptinset to the left" << endl;
                        return true;
                }
        }
@@ -994,31 +960,38 @@ bool MathCursor::goUpDown(bool up)
                        push(nextAtom());
                        idx() = up;
                        pos() = 0;
-                       ///lyxerr << "updown: handled by scriptinset to the right\n";
+                       ///lyxerr << "updown: handled by scriptinset to the right" << endl;
                        return true;
                }
        }
 
-       // try current cell
+       // try current cell for e.g. text insets
+       if (inset()->idxUpDown2(idx(), pos(), up, targetx_))
+               return true;
+
        //xarray().boundingBox(xlow, xhigh, ylow, yhigh);
        //if (up)
        //      yhigh = yo - 4;
        //else
        //      ylow = yo + 4;
        //if (bruteFind(xo, yo, xlow, xhigh, ylow, yhigh)) {
-       //      lyxerr << "updown: handled by brute find in the same cell\n";
+       //      lyxerr << "updown: handled by brute find in the same cell" << endl;
        //      return true;
        //}
 
        // try to find an inset that knows better then we
        while (1) {
-               ///lyxerr << "updown: We are in " << *par() << " idx: " << idx() << '\n';
+               ///lyxerr << "updown: We are in " << *inset() << " idx: " << idx() << endl;
                // ask inset first
-               if (par()->idxUpDown(idx(), pos(), up, targetx_))
+               if (inset()->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";
+               ///lyxerr << "updown: handled by strange case" << endl;
                if (!popLeft())
                        return
                                bruteFind(xo, yo,
@@ -1052,6 +1025,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) {
@@ -1072,85 +1046,49 @@ bool MathCursor::bruteFind
 }
 
 
+void MathCursor::bruteFind2(int x, int y)
+{
+       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;
+       }
+}
+
+
 bool MathCursor::idxLineLast()
 {
-       idx() -= idx() % par()->ncols();
-       idx() += par()->ncols() - 1;
+       idx() -= idx() % inset()->ncols();
+       idx() += inset()->ncols() - 1;
        pos() = size();
        return true;
 }
 
 bool MathCursor::idxLeft()
 {
-       return par()->idxLeft(idx(), pos());
+       return inset()->idxLeft(idx(), pos());
 }
 
 
 bool MathCursor::idxRight()
 {
-       return par()->idxRight(idx(), pos());
-}
-
-
-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;
+       return inset()->idxRight(idx(), pos());
 }
 
 
@@ -1159,17 +1097,17 @@ 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);
+               inset()->asScriptInset()->ensure(up);
                idx() = up;
                pos() = 0;
        } else if (hasPrevAtom() && prevAtom()->asScriptInset()) {
@@ -1198,7 +1136,7 @@ bool MathCursor::script(bool up)
 
 bool MathCursor::interpret(char c)
 {
-       //lyxerr << "interpret 2: '" << c << "'\n";
+       //lyxerr << "interpret 2: '" << c << "'" << endl;
        targetx_ = -1; // "no target"
        if (inMacroArgMode()) {
                --pos();
@@ -1217,13 +1155,7 @@ bool MathCursor::interpret(char c)
        // handle macroMode
        if (inMacroMode()) {
                string name = macroName();
-               //lyxerr << "interpret name: '" << name << "'\n";
-
-               if (name.empty() && c == '\\') {
-                       backspace();
-                       interpret("\\backslash");
-                       return true;
-               }
+               //lyxerr << "interpret name: '" << name << "'" << endl;
 
                if (isalpha(c)) {
                        activeMacro()->setName(activeMacro()->name() + c);
@@ -1234,16 +1166,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;
        }
@@ -1268,13 +1208,13 @@ bool MathCursor::interpret(char c)
        selClearOrDel();
 
        if (c == '\\') {
-               //lyxerr << "starting with macro\n";
+               //lyxerr << "starting with macro" << endl;
                insert(MathAtom(new MathUnknownInset("\\", false)));
                return true;
        }
 
        if (c == '\n') {
-               if (currentMode() == MathInset::TEXT_MODE) 
+               if (currentMode() == MathInset::TEXT_MODE)
                        insert(c);
                return true;
        }
@@ -1299,29 +1239,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;
        }
 
@@ -1330,25 +1249,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;
@@ -1387,14 +1287,13 @@ string MathCursor::info() const
        ostringstream os;
        os << "Math editor mode.  ";
        for (int i = 0, n = depth(); i < n; ++i) {
-               Cursor_[i].par_->infoize(os);
+               Cursor_[i].inset_->infoize(os);
                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());
 }
 
 
@@ -1408,11 +1307,11 @@ unsigned MathCursor::depth() const
 
 namespace {
 
-void region(MathCursorPos const & i1, MathCursorPos const & i2,
+void region(CursorPos const & i1, CursorPos const & i2,
        MathInset::row_type & r1, MathInset::row_type & r2,
        MathInset::col_type & c1, MathInset::col_type & c2)
 {
-       MathInset * p = i1.par_;
+       MathInset * p = i1.inset_;
        c1 = p->col(i1.idx_);
        c2 = p->col(i2.idx_);
        if (c1 > c2)
@@ -1426,42 +1325,47 @@ void region(MathCursorPos const & i1, MathCursorPos const & i2,
 }
 
 
-MathGridInset MathCursor::grabSelection() const
+string MathCursor::grabSelection() const
 {
        if (!selection_)
-               return MathGridInset();
-       MathCursorPos i1;
-       MathCursorPos i2;
+               return string();
+
+       CursorPos i1;
+       CursorPos 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.inset_->cell(i1.inset_->index(row, col)));
                }
+       }
        return data;
 }
 
 
 void MathCursor::eraseSelection()
 {
-       MathCursorPos i1;
-       MathCursorPos i2;
+       CursorPos i1;
+       CursorPos i2;
        getSelection(i1, i2);
        if (i1.idx_ == i2.idx_)
                i1.cell().erase(i1.pos_, i2.pos_);
        else {
-               MathInset * p = i1.par_;
+               MathInset * p = i1.inset_;
                row_type r1, r2;
                col_type c1, c2;
                region(i1, i2, r1, r2, c1, c2);
@@ -1473,26 +1377,26 @@ 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;
 }
 
 
-MathCursorPos MathCursor::normalAnchor() const
+CursorPos MathCursor::normalAnchor() const
 {
        if (Anchor_.size() < depth()) {
                Anchor_ = Cursor_;
-               lyxerr << "unusual Anchor size\n";
+               lyxerr << "unusual Anchor size" << endl;
        }
        //lyx::Assert(Anchor_.size() >= cursor.depth());
        // use Anchor on the same level as Cursor
-       MathCursorPos normal = Anchor_[depth() - 1];
+       CursorPos normal = Anchor_[depth() - 1];
        if (depth() < Anchor_.size() && !(normal < cursor())) {
                // anchor is behind cursor -> move anchor behind the inset
                ++normal.pos_;
@@ -1501,43 +1405,53 @@ MathCursorPos MathCursor::normalAnchor() const
 }
 
 
-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;
+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: {
+                       CursorPos & 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;
+                       }
+               }
+               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) {
+               CursorPos & pos = Cursor_[i];
+               dispatch_result res = pos.inset_->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;
 }
 
 
 MathInset::mode_type MathCursor::currentMode() const
 {
        for (int i = Cursor_.size() - 1; i >= 0; --i) {
-               MathInset::mode_type res = Cursor_[i].par_->currentMode();
+               MathInset::mode_type res = Cursor_[i].inset_->currentMode();
                if (res != MathInset::UNDECIDED_MODE)
                        return res;
        }
@@ -1545,11 +1459,46 @@ 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();
+               delete mathcursor;
+               mathcursor = 0;
+               f->insetUnlock(bv);
+       }
 }