]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_cursor.C
to much stuff for my liking...
[lyx.git] / src / mathed / math_cursor.C
index a89acb2933b2af9c044025b8e86a0880e5ac1ed5..2698c5bed3fa8cd72e072c5a7d47c9c2fde09905 100644 (file)
  *   the GNU General Public Licence version 2 or later.
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-#include <algorithm>
-#include <cctype>
-
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 #include "debug.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "support.h"
-#include "formulabase.h"
 #include "math_cursor.h"
-#include "math_factory.h"
+#include "formulabase.h"
 #include "math_arrayinset.h"
+#include "math_braceinset.h"
+#include "math_boxinset.h"
+#include "math_casesinset.h"
 #include "math_charinset.h"
 #include "math_deliminset.h"
-#include "math_matrixinset.h"
+#include "math_factory.h"
+#include "math_hullinset.h"
+#include "math_iterator.h"
+#include "math_macroarg.h"
+#include "math_mathmlstream.h"
+#include "math_parser.h"
+#include "math_replace.h"
 #include "math_scriptinset.h"
 #include "math_spaceinset.h"
 #include "math_specialcharinset.h"
-#include "math_parser.h"
+#include "math_support.h"
+
+#include <algorithm>
+#include <cctype>
 
 #define FILEDEBUG 0
 
@@ -48,24 +56,54 @@ using std::min;
 using std::max;
 using std::swap;
 using std::isalnum;
+using std::vector;
+using std::ostringstream;
 
 namespace {
 
 struct Selection
 {
+       typedef MathInset::col_type col_type;
+       typedef MathInset::row_type row_type;
+       typedef MathInset::idx_type idx_type;
+
+       Selection()
+               : data_(1, 1)
+       {}
+
+       void region(MathCursorPos const & i1, MathCursorPos const & i2,
+               row_type & r1, row_type & r2, col_type & c1, col_type & c2)
+       {
+               MathInset * p = i1.par_;
+               c1 = p->col(i1.idx_);
+               c2 = p->col(i2.idx_);
+               if (c1 > c2)
+                       swap(c1, c2);
+               r1 = p->row(i1.idx_);
+               r2 = p->row(i2.idx_);
+               if (r1 > r2)
+                       swap(r1, r2);
+       }
+
        void grab(MathCursor const & cursor)
        {
-               data_.clear();
                MathCursorPos i1;
                MathCursorPos i2;
-               cursor.getSelection(i1, i2); 
-               if (i1.idx_ == i2.idx_)
-                       data_.push_back(MathArray(i1.cell(), i1.pos_, i2.pos_));
-               else {
-                       std::vector<MathInset::idx_type> indices =
-                               (*i1.par_)->idxBetween(i1.idx_, i2.idx_);
-                       for (MathInset::idx_type i = 0; i < indices.size(); ++i)
-                               data_.push_back(i1.cell(indices[i]));
+               cursor.getSelection(i1, i2);
+               // shouldn'tt we assert on i1.par_ == i2.par_?
+               if (i1.idx_ == i2.idx_) {
+                       data_ = MathGridInset(1, 1);
+                       data_.cell(0) = MathArray(i1.cell(), i1.pos_, i2.pos_);
+               } else {
+                       row_type r1, r2;
+                       col_type c1, c2;
+                       region(i1, i2, r1, r2, c1, c2);
+                       data_ = MathGridInset(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);
+                               }
                }
        }
 
@@ -73,58 +111,67 @@ struct Selection
        {
                MathCursorPos i1;
                MathCursorPos i2;
-               cursor.getSelection(i1, i2); 
-               if (i1.idx_ == i2.idx_) {
+               cursor.getSelection(i1, i2);
+               if (i1.idx_ == i2.idx_)
                        i1.cell().erase(i1.pos_, i2.pos_);
-               } else {
-                       std::vector<MathInset::idx_type> indices =
-                               (*i1.par_)->idxBetween(i1.idx_, i2.idx_);
-                       for (unsigned i = 0; i < indices.size(); ++i)
-                               i1.cell(indices[i]).erase();
+               else {
+                       MathInset * p = i1.par_;
+                       row_type r1, r2;
+                       col_type c1, c2;
+                       region(i1, i2, r1, r2, c1, c2);
+                       for (row_type row = r1; row <= r2; ++row)
+                               for (col_type col = c1; col <= c2; ++col)
+                                       p->cell(p->index(row, col)).erase();
                }
                cursor.cursor() = i1;
        }
 
        void paste(MathCursor & cursor) const
        {
-               MathArray ar = glue();
-               cursor.paste(ar);
+               if (data_.nargs() == 1) {
+                       // single cell/part of cell
+                       cursor.insert(data_.cell(0));
+               } else {
+                       // mulitple cells
+                       idx_type idx;
+                       MathGridInset * p = cursor.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).push_back(data_.cell(data_.index(row, col)));
+                               }
+               }
        }
 
        // glues selection to one cell
        MathArray glue() const
        {
                MathArray ar;
-               for (unsigned i = 0; i < data_.size(); ++i)
-                       ar.push_back(data_[i]);
+               for (unsigned i = 0; i < data_.nargs(); ++i)
+                       ar.push_back(data_.cell(i));
                return ar;
        }
 
        void clear()
        {
-               data_.clear();
+               data_ = MathGridInset(1, 1);
        }
 
-       std::vector<MathArray> data_;
+       MathGridInset data_;
 };
 
 
 Selection theSelection;
 
 
-#if FILEDEBUG
-std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
-{
-       os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
-       return os;
-}
-#endif
 
 }
 
 
 MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
-       : formula_(formula), lastcode_(LM_TC_VAR), selection_(false)
+       : formula_(formula), lastcode_(LM_TC_MIN), selection_(false)
 {
        left ? first() : last();
 }
@@ -132,10 +179,7 @@ MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
 
 void MathCursor::push(MathAtom & t)
 {
-       //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
-       MathCursorPos p;
-       p.par_ = &t;
-       Cursor_.push_back(p);
+       Cursor_.push_back(MathCursorPos(t.nucleus()));
 }
 
 
@@ -161,11 +205,12 @@ bool MathCursor::popLeft()
        //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " left\n";
        if (Cursor_.size() <= 1)
                return false;
-       //if (nextInset())
-       //      nextInset()->removeEmptyScripts();
+       if (par()->asScriptInset()) {
+               par()->asScriptInset()->removeEmptyScripts();
+               if (par()->asScriptInset()->empty())
+                       plainErase();
+       }
        Cursor_.pop_back();
-       //if (nextAtom())
-       //      nextAtom()->removeEmptyScripts();
        return true;
 }
 
@@ -175,11 +220,12 @@ bool MathCursor::popRight()
        //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
        if (Cursor_.size() <= 1)
                return false;
-       //if (nextInset())
-       //      nextInset()->removeEmptyScripts();
+       if (par()->asScriptInset()) {
+               par()->asScriptInset()->removeEmptyScripts();
+               if (par()->asScriptInset()->empty())
+                       plainErase();
+       }
        Cursor_.pop_back();
-       //if (nextInset())
-       //      nextInset()->removeEmptyScripts();
        posRight();
        return true;
 }
@@ -187,55 +233,32 @@ bool MathCursor::popRight()
 
 
 #if FILEDEBUG
-void MathCursor::dump(char const * what) const
-{
-       lyxerr << "MC: " << what << "\n";
-       for (unsigned i = 0; i < Cursor_.size(); ++i)
-               lyxerr << "  i: " << i 
-                       << " Cursor: pos: " << Cursor_[i].pos_
-                       << " idx: " << Cursor_[i].idx_
-                       << " par: " << Cursor_[i].par_ << "\n";
-
-       for (unsigned i = 0; i < Anchor_.size(); ++i)
-               lyxerr << "  i: " << i 
-                       << " Anchor: pos: " << Anchor_[i].pos_
-                       << " idx: " << Anchor_[i].idx_
-                       << " par: " << Anchor_[i].par_ << "\n";
-
-       lyxerr  << " sel: " << selection_ << "\n";
-}
+       void MathCursor::dump(char const * what) const
+       {
+               lyxerr << "MC: " << what << "\n";
+               lyxerr << " Cursor: " << Cursor_.size() << "\n";
+               for (unsigned i = 0; i < Cursor_.size(); ++i)
+                       lyxerr << "    i: " << i << " " << Cursor_[i] << "\n";
+               lyxerr << " Anchor: " << Anchor_.size() << "\n";
+               for (unsigned i = 0; i < Anchor_.size(); ++i)
+                       lyxerr << "    i: " << i << " " << Anchor_[i] << "\n";
+               lyxerr  << " sel: " << selection_ << "\n";
+       }
+#else
+       void MathCursor::dump(char const *) const {}
+#endif
 
 
-void MathCursor::seldump(char const * str) const
+UpdatableInset * MathCursor::asHyperActiveInset() const
 {
-       //lyxerr << "SEL: " << str << ": '" << theSelection << "'\n";
-       //dump("   Pos");
-
-       lyxerr << "\n\n\n=================vvvvvvvvvvvvv=======================   "
-               <<  str << "\ntheSelection: " << selection_
-               << " '" << theSelection.glue() << "'\n";
-       for (unsigned int i = 0; i < Cursor_.size(); ++i) 
-               lyxerr << Cursor_[i].par_ << "\n'" << Cursor_[i].cell() << "'\n";
-       lyxerr << "\n";
-       for (unsigned int i = 0; i < Anchor_.size(); ++i) 
-               lyxerr << Anchor_[i].par_ << "\n'" << Anchor_[i].cell() << "'\n";
-       //lyxerr << "\ncursor.pos_: " << pos();
-       //lyxerr << "\nanchor.pos_: " << anchor().pos_;
-       lyxerr << "\n===================^^^^^^^^^^^^=====================\n\n\n";
+       return par()->asHyperActiveInset();
 }
 
-#else
-
-void MathCursor::seldump(char const *) const {}
-void MathCursor::dump(char const *) const {}
-
-#endif
-
 
 bool MathCursor::isInside(MathInset const * p) const
 {
-       for (unsigned i = 0; i < Cursor_.size(); ++i) 
-               if (Cursor_[i].par_->nucleus() == p) 
+       for (unsigned i = 0; i < Cursor_.size(); ++i)
+               if (Cursor_[i].par_ == p)
                        return true;
        return false;
 }
@@ -243,6 +266,9 @@ bool MathCursor::isInside(MathInset const * p) const
 
 bool MathCursor::openable(MathAtom const & t, bool sel) const
 {
+       if (t->isHyperActive())
+               return true;
+
        if (!t->isActive())
                return false;
 
@@ -253,34 +279,18 @@ bool MathCursor::openable(MathAtom const & t, bool sel) const
                // we can't move into anything new during selection
                if (Cursor_.size() == Anchor_.size())
                        return false;
-               if (&t != Anchor_[Cursor_.size()].par_)
+               if (t.nucleus() != Anchor_[Cursor_.size()].par_)
                        return false;
        }
        return true;
 }
 
 
-bool MathCursor::positionable(MathAtom const & t, int x, int y) const
-{
-       if (selection_) {
-               // we can't move into anything new during selection
-               if (Cursor_.size() == Anchor_.size())
-                       return 0;
-               //if (t != Anchor_[Cursor_.size()].par_)
-               //      return 0;
-       }
-
-       return t->nargs() && t->covers(x, y);
-}
-
-
 bool MathCursor::posLeft()
 {
        if (pos() == 0)
                return false;
-
        --pos();
-
        return true;
 }
 
@@ -289,9 +299,7 @@ bool MathCursor::posRight()
 {
        if (pos() == size())
                return false;
-
        ++pos();
-
        return true;
 }
 
@@ -301,18 +309,21 @@ bool MathCursor::left(bool sel)
        dump("Left 1");
        if (inMacroMode()) {
                macroModeClose();
-               lastcode_ = LM_TC_VAR;
+               lastcode_ = LM_TC_MIN;
                return true;
        }
        selHandle(sel);
-       lastcode_ = LM_TC_VAR;
+       lastcode_ = LM_TC_MIN;
 
        if (hasPrevAtom() && openable(prevAtom(), sel)) {
+               if (prevAtom()->isHyperActive()) {
+                       lyxerr << "entering hyperactive inset\n";
+               }
                pushRight(prevAtom());
                return true;
-       } 
-       
-       return posLeft() || idxLeft() || popLeft();
+       }
+
+       return posLeft() || idxLeft() || popLeft() || selection_;
 }
 
 
@@ -321,18 +332,24 @@ bool MathCursor::right(bool sel)
        dump("Right 1");
        if (inMacroMode()) {
                macroModeClose();
-               lastcode_ = LM_TC_VAR;
+               lastcode_ = LM_TC_MIN;
                return true;
        }
        selHandle(sel);
-       lastcode_ = LM_TC_VAR;
+       lastcode_ = LM_TC_MIN;
 
        if (hasNextAtom() && openable(nextAtom(), sel)) {
+               if (nextAtom()->isHyperActive()) {
+                       lyxerr << "entering hyperactive inset\n";
+                       int x, y;
+                       getPos(x, y);
+                       nextAtom()->edit(formula()->view(), x, y, 0);
+               }
                pushLeft(nextAtom());
                return true;
        }
 
-       return posRight() || idxRight() || popRight();
+       return posRight() || idxRight() || popRight() || selection_;
 }
 
 
@@ -350,57 +367,46 @@ void MathCursor::last()
 }
 
 
-void MathCursor::setPos(int x, int y)
+bool positionable(MathCursor::cursor_type const & cursor,
+                  MathCursor::cursor_type const & anchor)
 {
-       //dump("setPos 1");
-       //lyxerr << "MathCursor::setPos x: " << x << " y: " << y << "\n";
+       // avoid deeper nested insets when selecting
+       if (cursor.size() > anchor.size())
+               return false;
 
-       macroModeClose();
-       lastcode_ = LM_TC_VAR;
-       first();
+       // anchor might be deeper, should have same path then
+       for (MathCursor::cursor_type::size_type i = 0; i < cursor.size(); ++i)
+               if (cursor[i].par_ != anchor[i].par_)
+                       return false;
 
-       cursor().par_  = &formula_->par();
+       // position should be ok.
+       return true;
+}
 
-       while (1) {
-               idx() = 0;
-               cursor().pos_ = 0;
-               //lyxerr << "found idx: " << idx() << " cursor: " << pos()  << "\n";
-               int distmin = 1 << 30; // large enough
-               for (unsigned int i = 0; i < par()->nargs(); ++i) {
-                       MathXArray const & ar = par()->xcell(i);
-                       int x1 = x - ar.xo();
-                       int y1 = y - ar.yo();
-                       MathXArray::size_type c  = ar.x2pos(x1);
-                       int xx = abs(x1 - ar.pos2x(c));
-                       int yy = abs(y1);
-                       //lyxerr << "idx: " << i << " xx: " << xx << " yy: " << yy
-                       //      << " c: " << c  << " xo: " << ar.xo() << "\n";
-                       if (yy + xx <= distmin) {
-                               distmin = yy + xx;
-                               idx()   = i;
-                               pos()   = c;
-                       }
-               }
-               //lyxerr << "found idx: " << idx() << " cursor: "
-               //      << pos()  << "\n";
-               if (hasNextAtom() && positionable(nextAtom(), x, y))
-                       pushLeft(nextAtom());
-               else if (hasPrevAtom() && positionable(prevAtom(), x, y))
-                       pushRight(prevAtom());
-               else 
-                       break;
+
+void MathCursor::setPos(int x, int y)
+{
+       dump("setPos 1");
+       bool res = bruteFind(x, y,
+               formula()->xlow(), formula()->xhigh(),
+               formula()->ylow(), formula()->yhigh());
+       if (!res) {
+               // this ccan happen on creation of "math-display"
+               dump("setPos 1.5");
+               first();
        }
-       //dump("setPos 2");
+       dump("setPos 2");
 }
 
 
+
 void MathCursor::home(bool sel)
 {
        dump("home 1");
        selHandle(sel);
        macroModeClose();
-       lastcode_ = LM_TC_VAR;
-       if (!par()->idxHome(idx(), pos())) 
+       lastcode_ = LM_TC_MIN;
+       if (!par()->idxHome(idx(), pos()))
                popLeft();
        dump("home 2");
 }
@@ -411,7 +417,7 @@ void MathCursor::end(bool sel)
        dump("end 1");
        selHandle(sel);
        macroModeClose();
-       lastcode_ = LM_TC_VAR;
+       lastcode_ = LM_TC_MIN;
        if (!par()->idxEnd(idx(), pos()))
                popRight();
        dump("end 2");
@@ -424,6 +430,20 @@ void MathCursor::plainErase()
 }
 
 
+void MathCursor::markInsert()
+{
+       //lyxerr << "inserting mark\n";
+       array().insert(pos(), MathAtom(new MathCharInset(0, lastcode_)));
+}
+
+
+void MathCursor::markErase()
+{
+       //lyxerr << "deleting mark\n";
+       array().erase(pos());
+}
+
+
 void MathCursor::plainInsert(MathAtom const & t)
 {
        array().insert(pos(), t);
@@ -438,6 +458,12 @@ void MathCursor::insert(char c, MathTextCodes t)
 }
 
 
+void MathCursor::insert(char c)
+{
+       insert(c, lastcode_);
+}
+
+
 void MathCursor::insert(MathAtom const & t)
 {
        macroModeClose();
@@ -453,7 +479,7 @@ void MathCursor::insert(MathAtom const & t)
 }
 
 
-void MathCursor::niceInsert(MathAtom const & t) 
+void MathCursor::niceInsert(MathAtom const & t)
 {
        selCut();
        insert(t); // inserting invalidates the pointer!
@@ -463,7 +489,6 @@ void MathCursor::niceInsert(MathAtom const & t)
                right();  // do not push for e.g. MathSymbolInset
                selPaste();
        }
-       p->metrics(p->size());
 }
 
 
@@ -492,7 +517,7 @@ void MathCursor::backspace()
        if (pos() == 0) {
                pullArg(false);
                return;
-       }       
+       }
 
        if (selection_) {
                selDel();
@@ -502,7 +527,7 @@ void MathCursor::backspace()
        MathScriptInset * p = prevAtom()->asScriptInset();
        if (p) {
                p->removeScript(p->hasUp());
-               // Don't delete if there is anything left 
+               // Don't delete if there is anything left
                if (p->hasUp() || p->hasDown())
                        return;
        }
@@ -538,7 +563,7 @@ void MathCursor::erase()
        MathScriptInset * p = nextAtom()->asScriptInset();
        if (p) {
                p->removeScript(p->hasUp());
-               // Don't delete if there is anything left 
+               // Don't delete if there is anything left
                if (p->hasUp() || p->hasDown())
                        return;
        }
@@ -556,8 +581,17 @@ void MathCursor::delLine()
                return;
        }
 
-       if (par()->nrows() > 1)
-               par()->delRow(row());
+       if (par()->nrows() > 1) {
+               // grid are the only things with more than one row...
+               lyx::Assert(par()->asGridInset());
+               par()->asGridInset()->delRow(hullRow());
+       }
+
+       if (idx() >= par()->nargs())
+               idx() = par()->nargs() - 1;
+
+       if (pos() > size())
+               pos() = size();
 }
 
 
@@ -566,29 +600,11 @@ bool MathCursor::up(bool sel)
        dump("up 1");
        macroModeClose();
        selHandle(sel);
-
-       if (!selection_) {
-               // check whether we could move into a superscript 
-               if (hasPrevAtom()) {
-                       MathAtom & p = prevAtom();
-                       if (p->asScriptInset() && p->asScriptInset()->hasUp()) {
-                               pushRight(p);
-                               pos() = size();
-                               return true;
-                       }
-               }
-
-               if (hasNextAtom()) {
-                       MathAtom & n = nextAtom();
-                       if (n->asScriptInset() && n->asScriptInset()->hasUp()) {
-                               pushLeft(n);
-                               pos() = 0;
-                               return true;
-                       }
-               }
-       }
-
-       return goUp();
+       cursor_type save = Cursor_;
+       if (goUpDown(true))
+               return true;
+       Cursor_ = save;
+       return selection_;
 }
 
 
@@ -597,37 +613,19 @@ bool MathCursor::down(bool sel)
        dump("down 1");
        macroModeClose();
        selHandle(sel);
-
-       if (!selection_) {
-               // check whether we could move into a subscript 
-               if (hasPrevAtom()) {
-                       MathAtom & p = prevAtom();
-                       if (p->asScriptInset() && p->asScriptInset()->hasDown()) {
-                               pushRight(p);
-                               pos() = size();
-                               return true;
-                       }
-               }
-
-               if (hasNextAtom()) {
-                       MathAtom & n = nextAtom();
-                       if (n->asScriptInset() && n->asScriptInset()->hasDown()) {
-                               pushLeft(n);
-                               pos() = 0;
-                               return true;
-                       }
-               }
-       }
-
-       return goDown();
+       cursor_type save = Cursor_;
+       if (goUpDown(false))
+               return true;
+       Cursor_ = save;
+       return selection_;
 }
 
 
 bool MathCursor::toggleLimits()
 {
-       if (!hasPrevAtom())
+       if (!hasNextAtom())
                return false;
-       MathScriptInset * t = prevAtom()->asScriptInset();
+       MathScriptInset * t = nextAtom()->asScriptInset();
        if (!t)
                return false;
        int old = t->limits();
@@ -636,12 +634,6 @@ bool MathCursor::toggleLimits()
 }
 
 
-void MathCursor::setSize(MathStyles size)
-{
-       par()->userSetSize(size);
-}
-
-
 void MathCursor::macroModeClose()
 {
        string s = macroName();
@@ -654,9 +646,9 @@ void MathCursor::macroModeClose()
 }
 
 
-int MathCursor::macroNamePos() const
+MathInset::difference_type MathCursor::macroNamePos() const
 {
-       for (int i = pos() - 1; i >= 0; --i) { 
+       for (MathInset::difference_type i = pos() - 1; i >= 0; --i) {
                MathAtom & p = array().at(i);
                if (p->code() == LM_TC_TEX && p->getChar() == '\\')
                        return i;
@@ -668,7 +660,8 @@ int MathCursor::macroNamePos() const
 string MathCursor::macroName() const
 {
        string s;
-       for (int i = macroNamePos(); i >= 0 && i < int(pos()); ++i) 
+       MathInset::difference_type i = macroNamePos();
+       for (; i >= 0 && i < int(pos()); ++i)
                s += array().at(i)->getChar();
        return s;
 }
@@ -676,7 +669,7 @@ string MathCursor::macroName() const
 
 void MathCursor::selCopy()
 {
-       seldump("selCopy");
+       dump("selCopy");
        if (selection_) {
                theSelection.grab(*this);
                selClear();
@@ -686,7 +679,7 @@ void MathCursor::selCopy()
 
 void MathCursor::selCut()
 {
-       seldump("selCut");
+       dump("selCut");
        if (selection_) {
                theSelection.grab(*this);
                theSelection.erase(*this);
@@ -699,9 +692,11 @@ void MathCursor::selCut()
 
 void MathCursor::selDel()
 {
-       seldump("selDel");
+       dump("selDel");
        if (selection_) {
                theSelection.erase(*this);
+               if (pos() > size())
+                       pos() = size();
                selClear();
        }
 }
@@ -709,9 +704,9 @@ void MathCursor::selDel()
 
 void MathCursor::selPaste()
 {
-       seldump("selPaste");
+       dump("selPaste");
        theSelection.paste(*this);
-       theSelection.grab(*this);
+       //theSelection.grab(*this);
        //selClear();
 }
 
@@ -720,8 +715,7 @@ void MathCursor::selHandle(bool sel)
 {
        if (sel == selection_)
                return;
-
-       theSelection.clear();
+       //theSelection.clear();
        Anchor_    = Cursor_;
        selection_ = sel;
 }
@@ -729,23 +723,34 @@ void MathCursor::selHandle(bool sel)
 
 void MathCursor::selStart()
 {
-       seldump("selStart");
-       if (selection_)
-               return;
-
-       theSelection.clear();
+       dump("selStart 1");
+       //theSelection.clear();
        Anchor_ = Cursor_;
        selection_ = true;
+       dump("selStart 2");
 }
 
 
 void MathCursor::selClear()
 {
-       seldump("selClear");
+       dump("selClear 1");
        selection_ = false;
+       dump("selClear 2");
+}
+
+
+void MathCursor::selGet(MathArray & ar)
+{
+       dump("selGet");
+       if (!selection_)
+               return;
+
+       theSelection.grab(*this);
+       ar = theSelection.glue();
 }
 
 
+
 void MathCursor::drawSelection(Painter & pain) const
 {
        if (!selection_)
@@ -755,8 +760,6 @@ void MathCursor::drawSelection(Painter & pain) const
        MathCursorPos i2;
        getSelection(i1, i2);
 
-       //lyxerr << "selection from: " << i1 << " to " << i2 << "\n";
-
        if (i1.idx_ == i2.idx_) {
                MathXArray & c = i1.xcell();
                int x1 = c.xo() + c.pos2x(i1.pos_);
@@ -765,8 +768,8 @@ void MathCursor::drawSelection(Painter & pain) const
                int y2 = c.yo() + c.descent();
                pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
        } else {
-               std::vector<MathInset::idx_type> indices
-                       = (*i1.par_)->idxBetween(i1.idx_, i2.idx_);
+               vector<MathInset::idx_type> indices
+                       = i1.par_->idxBetween(i1.idx_, i2.idx_);
                for (unsigned i = 0; i < indices.size(); ++i) {
                        MathXArray & c = i1.xcell(indices[i]);
                        int x1 = c.xo();
@@ -776,6 +779,18 @@ void MathCursor::drawSelection(Painter & pain) const
                        pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
                }
        }
+
+#if 0
+       // draw anchor if different from selection boundary
+       MathCursorPos anc = Anchor_.back();
+       if (anc != i1 && anc != i2) {
+               MathXArray & c = anc.xcell();
+               int x  = c.xo() + c.pos2x(anc.pos_);
+               int y1 = c.yo() - c.ascent();
+               int y2 = c.yo() + c.descent();
+               pain.line(x, y1, x, y2, LColor::math);
+       }
+#endif
 }
 
 
@@ -785,13 +800,13 @@ void MathCursor::handleFont(MathTextCodes t)
        if (selection_) {
                MathCursorPos i1;
                MathCursorPos i2;
-               getSelection(i1, i2); 
+               getSelection(i1, i2);
                if (i1.idx_ == i2.idx_) {
                        MathArray & ar = i1.cell();
                        for (MathInset::pos_type pos = i1.pos_; pos != i2.pos_; ++pos)
                                ar.at(pos)->handleFont(t);
                }
-       } else 
+       } else
                lastcode_ = (lastcode_ == t) ? LM_TC_VAR : t;
 }
 
@@ -823,13 +838,13 @@ void MathCursor::getPos(int & x, int & y)
 }
 
 
-MathAtom & MathCursor::par() const
+MathInset * MathCursor::par() const
 {
-       return *cursor().par_;
+       return cursor().par_;
 }
 
 
-InsetFormulaBase const * MathCursor::formula()
+InsetFormulaBase * MathCursor::formula()
 {
        return formula_;
 }
@@ -865,16 +880,22 @@ bool MathCursor::inMacroMode() const
 }
 
 
+bool MathCursor::inMacroArgMode() const
+{
+       return pos() > 0 && prevAtom()->getChar() == '#';
+}
+
+
 bool MathCursor::selection() const
 {
        return selection_;
 }
 
 
-MathArrayInset * MathCursor::enclosingArray(MathCursor::idx_type & idx) const
+MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
 {
-       for (int i = Cursor_.size() - 1; i >= 0; --i) {
-               MathArrayInset * p = (*Cursor_[i].par_)->asArrayInset();
+       for (MathInset::difference_type i = Cursor_.size() - 1; i >= 0; --i) {
+               MathGridInset * p = Cursor_[i].par_->asGridInset();
                if (p) {
                        idx = Cursor_[i].idx_;
                        return p;
@@ -905,38 +926,42 @@ void MathCursor::pullArg(bool goright)
        if (popLeft()) {
                plainErase();
                array().insert(pos(), a);
-               if (goright) 
+               if (goright)
                        pos() += a.size();
+       } else {
+               formula()->mutateToText();
        }
 }
 
 
-MathStyles MathCursor::style() const
-{
-       return xarray().style();
-}
-
-
-void MathCursor::normalize() const
+void MathCursor::normalize()
 {
-#ifdef WITH_WARNINGS
-#warning This is evil!
-#endif
-       MathCursor * it = const_cast<MathCursor *>(this);
+       // rebreak
+       {
+               MathIterator it = ibegin(formula()->par().nucleus());
+               MathIterator et = iend(formula()->par().nucleus());
+               for (; it != et; ++it)
+                       if (it.par()->asBoxInset())
+                               it.par()->asBoxInset()->rebreak();
+       }
 
        if (idx() >= par()->nargs()) {
                lyxerr << "this should not really happen - 1: "
                       << idx() << " " << par()->nargs() << "\n";
                dump("error 2");
        }
-       it->idx()    = min(idx(), par()->nargs() - 1);
+       idx() = min(idx(), par()->nargs() - 1);
 
        if (pos() > size()) {
                lyxerr << "this should not really happen - 2: "
-                      << pos() << " " << size() << "\n";
+                       << pos() << " " << size() <<  " in idx: " << idx()
+                       << " in atom: '";
+               WriteStream wi(lyxerr, false);
+               par()->write(wi);
+               lyxerr << "\n";
                dump("error 4");
        }
-       it->pos() = min(pos(), size());
+       pos() = min(pos(), size());
 }
 
 
@@ -946,15 +971,15 @@ MathCursor::size_type MathCursor::size() const
 }
 
 
-MathCursor::col_type MathCursor::col() const
+MathCursor::col_type MathCursor::hullCol() const
 {
-       return par()->col(idx());
+       return Cursor_[0].par_->asGridInset()->col(Cursor_[0].idx_);
 }
 
 
-MathCursor::row_type MathCursor::row() const
+MathCursor::row_type MathCursor::hullRow() const
 {
-       return par()->row(idx());
+       return Cursor_[0].par_->asGridInset()->row(Cursor_[0].idx_);
 }
 
 
@@ -1007,12 +1032,24 @@ MathArray & MathCursor::array() const
                return dummy;
        }
 
+       if (Cursor_.size() == 0) {
+               lyxerr << "############  Cursor_.size() == 0 not valid\n";
+               return dummy;
+       }
+
        return cursor().cell();
 }
 
 
 MathXArray & MathCursor::xarray() const
 {
+       static MathXArray dummy;
+
+       if (Cursor_.size() == 0) {
+               lyxerr << "############  Cursor_.size() == 0 not valid\n";
+               return dummy;
+       }
+
        return cursor().xcell();
 }
 
@@ -1031,7 +1068,7 @@ void MathCursor::idxPrev()
 
 void MathCursor::splitCell()
 {
-       if (idx() == par()->nargs() - 1) 
+       if (idx() + 1 == par()->nargs())
                return;
        MathArray ar = array();
        ar.erase(0, pos());
@@ -1048,7 +1085,7 @@ void MathCursor::breakLine()
        while (popRight())
                ;
 
-       MathMatrixInset * p = formula()->par()->asMatrixInset();
+       MathHullInset * p = formula()->par()->asHullInset();
        if (!p)
                return;
 
@@ -1057,16 +1094,12 @@ void MathCursor::breakLine()
                idx() = 0;
                pos() = size();
        } else {
-               p->addRow(row());
+               p->addRow(hullRow());
 
                // split line
-               const row_type r = row();
-               for (col_type c = col() + 1; c < p->ncols(); ++c) {
-                       const MathMatrixInset::idx_type i1 = p->index(r, c);
-                       const MathMatrixInset::idx_type i2 = p->index(r + 1, c);        
-                       lyxerr << "swapping cells " << i1 << " and " << i2 << "\n";
-                       p->cell(i1).swap(p->cell(i2));
-               }
+               const row_type r = hullRow();
+               for (col_type c = hullCol() + 1; c < p->ncols(); ++c)
+                       p->cell(p->index(r, c)).swap(p->cell(p->index(r + 1, c)));
 
                // split cell
                splitCell();
@@ -1075,10 +1108,18 @@ void MathCursor::breakLine()
 }
 
 
+//void MathCursor::readLine(MathArray & ar) const
+//{
+//     idx_type base = row() * par()->ncols();
+//     for (idx_type off = 0; off < par()->ncols(); ++off)
+//             ar.push_back(par()->cell(base + off));
+//}
+
+
 char MathCursor::valign() const
 {
        idx_type idx;
-       MathArrayInset * p = enclosingArray(idx);
+       MathGridInset * p = enclosingGrid(idx);
        return p ? p->valign() : '\0';
 }
 
@@ -1086,7 +1127,7 @@ char MathCursor::valign() const
 char MathCursor::halign() const
 {
        idx_type idx;
-       MathArrayInset * p = enclosingArray(idx);
+       MathGridInset * p = enclosingGrid(idx);
        return p ? p->halign(idx % p->ncols()) : '\0';
 }
 
@@ -1106,110 +1147,93 @@ void MathCursor::getSelection(MathCursorPos & i1, MathCursorPos & i2) const
 
 MathCursorPos & MathCursor::cursor()
 {
+       lyx::Assert(Cursor_.size());
        return Cursor_.back();
 }
 
 
 MathCursorPos const & MathCursor::cursor() const
 {
+       lyx::Assert(Cursor_.size());
        return Cursor_.back();
 }
 
 
-int MathCursor::cellXOffset() const
-{
-       return par()->cellXOffset(idx());
-}
-
-
-int MathCursor::cellYOffset() const
-{
-       return par()->cellYOffset(idx());
-}
-
-
-int MathCursor::xpos() const
-{
-       return cellXOffset() + xarray().pos2x(pos());
-}
-
-
-int MathCursor::ypos() const
-{
-       return cellYOffset();
-}
-
-
-
-void MathCursor::gotoX(int x) 
+bool MathCursor::goUpDown(bool up)
 {
-       pos() = xarray().x2pos(x - cellXOffset());
-}
+       int xlow, xhigh, ylow, yhigh;
 
+  int xo, yo;
+       getPos(xo, yo);
 
-bool MathCursor::goUp()
-{
-       // first ask the inset if it knows better then we
-       if (par()->idxUp(idx(), pos()))
+       // try current cell first
+       xarray().boundingBox(xlow, xhigh, ylow, yhigh);
+       if (up)
+               yhigh = yo - 4;
+       else
+               ylow = yo + 4;
+       if (bruteFind(xo, yo, xlow, xhigh, ylow, yhigh))
                return true;
 
-       // leave subscript to the nearest side  
-       MathScriptInset * p = par()->asScriptInset();
-       if (p && p->hasDown()) {
-               if (pos() <= size() / 2)
-                       popLeft();
-               else
-                       popRight();             
-               return true;
-       }
+       // try to find an inset that knows better then we
+       while (1) {
+               // we found a cell that think something "below" us.
+               if (up) {
+                       if (par()->idxUp(idx()))
+                               break;
+               } else {
+                       if (par()->idxDown(idx()))
+                               break;
+               }
 
-       // if not, apply brute force.
-       int x0;
-       int y0;
-       getPos(x0, y0);
-       std::vector<MathCursorPos> save = Cursor_;
-       MathAtom const & out = formula()->par();
-       y0 -= xarray().ascent();
-       for (int y = y0 - 4; y > out->yo() - out->ascent(); y -= 4) {
-               setPos(x0, y);
-               if (save != Cursor_ && xarray().yo() < y0)
-                       return true;    
+               if (!popLeft()) {
+                       // no such inset found, just take something "above"
+                       return
+                               bruteFind(xo, yo,
+                                       formula()->xlow(),
+                                       formula()->xhigh(),
+                                       up ? formula()->ylow() : yo + 4,
+                                       up ? yo - 4 : formula()->yhigh()
+                               );
+               }
        }
-       Cursor_ = save;
-       return false;
+       xarray().boundingBox(xlow, xhigh, ylow, yhigh);
+       bruteFind(xo, yo, xlow, xhigh, ylow, yhigh);
+       return true;
 }
 
 
-bool MathCursor::goDown()
+bool MathCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh)
 {
-       // first ask the inset if it knows better then we
-       if (par()->idxDown(idx(), pos()))
-               return true;
+       cursor_type best_cursor;
+       double best_dist = 1e10;
 
-       // leave superscript to the nearest side        
-       MathScriptInset * p = par()->asScriptInset();
-       if (p && p->hasUp()) {
-               if (pos() <= size() / 2)
-                       popLeft();
-               else
-                       popRight();             
-               return true;
-       }
+       MathIterator it = ibegin(formula()->par().nucleus());
+       MathIterator et = iend(formula()->par().nucleus());
+       while (1) {
+               // avoid invalid nesting when selecting
+               if (!selection_ || positionable(it.cursor(), Anchor_)) {
+                       int xo = it.position().xpos();
+                       int yo = it.position().ypos();
+                       if (xlow - 2 <= xo && xo <= xhigh + 2 &&
+                                       ylow - 2 <= yo && yo <= yhigh + 2)
+                       {
+                               double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
+                               if (d < best_dist) {
+                                       best_dist   = d;
+                                       best_cursor = it.cursor();
+                               }
+                       }
+               }
 
-       // if not, apply brute force.
-       int x0;
-       int y0;
-       getPos(x0, y0);
-       std::vector<MathCursorPos> save = Cursor_;
-       MathAtom const & out = formula()->par();
-       y0 += xarray().descent();
-       for (int y = y0 + 4; y < out->yo() + out->descent(); y += 4) {
-               setPos(x0, y);
-               if (save != Cursor_ && xarray().yo() > y0)
-                       return true;    
+               if (it == et)
+                       break;
+               ++it;
        }
-       Cursor_ = save;
-       return false;
+
+       if (best_dist < 1e10)
+               Cursor_ = best_cursor;
+       return best_dist < 1e10;
 }
 
 
@@ -1225,253 +1249,282 @@ bool MathCursor::idxRight()
 }
 
 
-void MathCursor::interpret(string const & s)
+bool MathCursor::interpret(string const & s)
 {
        //lyxerr << "interpret 1: '" << s << "'\n";
-       //lyxerr << "in: " << in_word_set(s) << " \n";
-
        if (s.empty())
-               return;
+               return true;
 
-       if (s.size() == 1) {
-               interpret(s[0]);
-               return;
-       }
+       if (s.size() == 1)
+               return interpret(s[0]);
 
        //lyxerr << "char: '" << s[0] << "'  int: " << int(s[0]) << endl;
-       //owner_->getIntl()->getTrans().TranslateAndInsert(s[0], lt);   
+       //owner_->getIntl()->getTrans().TranslateAndInsert(s[0], lt);
        //lyxerr << "trans: '" << s[0] << "'  int: " << int(s[0]) << endl;
 
-       if (s.size() > 7 && s.substr(0, 7) == "matrix ") {
+       if (s.size() >= 5 && s.substr(0, 5) == "cases") {
+               unsigned int n = 1;
+               istringstream is(s.substr(5).c_str());
+               is >> n;
+               n = max(1u, n);
+               niceInsert(MathAtom(new MathCasesInset(n)));
+               return true;
+       }
+
+       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(7).c_str());
+               istringstream is(s.substr(6).c_str());
                is >> m >> n >> v_align >> h_align;
-               m = std::max(1u, m);
-               n = std::max(1u, n);
+               m = max(1u, m);
+               n = max(1u, n);
                v_align += 'c';
-               niceInsert(MathAtom(new MathArrayInset(m, n, v_align[0], h_align)));
-               return;
+               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;
        }
 
        if (s == "\\over" || s == "\\choose" || s == "\\atop") {
                MathArray ar = array();
-               MathAtom t = createMathInset(s.substr(1));
+               MathAtom t(createMathInset(s.substr(1)));
                t->asNestInset()->cell(0).swap(array());
                pos() = 0;
                niceInsert(t);
                popRight();
                left();
-               return;
+               return true;
+       }
+
+       latexkeys const * l = in_word_set(s.substr(1));
+       if (l && (l->token == LM_TK_FONT || l->token == LM_TK_OLDFONT)) {
+               lastcode_ = static_cast<MathTextCodes>(l->id);
+               return true;
+       }
+
+       // prevent entering of recursive macros
+       if (formula()->lyxCode() == Inset::MATHMACRO_CODE 
+               && formula()->getInsetName() == s.substr(1))
+       {
+               lyxerr << "can't enter recursive macro\n";
+               return true;
        }
 
        niceInsert(createMathInset(s.substr(1)));
+       return true;
 }
 
 
-void MathCursor::interpret(char c)
+bool MathCursor::script(bool up)
 {
-       //lyxerr << "interpret 2: '" << c << "'\n";
+       macroModeClose();
+       selCut();
+       if (hasPrevAtom() && prevAtom()->asScriptInset()) {
+               prevAtom()->asScriptInset()->ensure(up);
+               pushRight(prevAtom());
+               idx() = up;
+               pos() = size();
+       } else if (hasNextAtom() && nextAtom()->asScriptInset()) {
+               nextAtom()->asScriptInset()->ensure(up);
+               pushLeft(nextAtom());
+               idx() = up;
+               pos() = 0;
+       } else {
+               plainInsert(MathAtom(new MathScriptInset(up)));
+               prevAtom()->asScriptInset()->ensure(up);
+               pushRight(prevAtom());
+               idx() = up;
+               pos() = 0;
+       }
+       selPaste();
+       dump("1");
+       return true;
+}
 
-       if (inMacroMode()) {
-               string name = macroName();
 
-               if (name == "\\" && c == '#') {
-                       insert(c, LM_TC_TEX);
-                       return;
+bool MathCursor::interpret(char c)
+{
+       if (inMacroArgMode()) {
+               --pos();
+               plainErase();
+               if ('1' <= c && c <= '9')
+                       insert(MathAtom(new MathMacroArgument(c - '0')));
+               else {
+                       insert(MathAtom(new MathSpecialCharInset('#')));
+                       interpret(c); // try again
                }
+               return true;
+       }
+
+       // handle macroMode
+       if (inMacroMode()) {
+               string name = macroName();
 
                if (name == "\\" && c == '\\') {
                        backspace();
                        interpret("\\backslash");
-                       return;
-               }
-
-               if (name == "\\#" && '1' <= c && c <= '9') {
-                       insert(c, LM_TC_TEX);
-                       macroModeClose();
-                       return;
+                       return true;
                }
 
                if (isalpha(c)) {
                        insert(c, LM_TC_TEX);
-                       return;
+                       return true;
                }
 
                if (name == "\\") {
                        insert(c, LM_TC_TEX);
                        macroModeClose();
-                       return;
+                       return true;
                }
 
                macroModeClose();
-               return;
-       }
 
-       // no macro mode
-       if (c == '^' || c == '_') {
-               const bool up = (c == '^');
-               selCut();
-               if (hasPrevAtom() && prevAtom()->asScriptInset()) {
-                       prevAtom()->asScriptInset()->ensure(up);
-                       pushRight(prevAtom());
-                       pos() = size();
-                       idx() = up;
-                       return;
-               }
-               if (hasNextAtom() && nextAtom()->asScriptInset()) {
-                       nextAtom()->asScriptInset()->ensure(up);
-                       pushLeft(nextAtom());
-                       pos() = 0;
-                       idx() = up;
-                       return;
-               }
-               plainInsert(MathAtom(new MathScriptInset(up)));
-               pushRight(prevAtom());
-               idx() = up;
-               selPaste();
-               return;
+               if (c == '\\')
+                       insert(c, LM_TC_TEX);
+               else
+                       insert(c, lastcode_);
+
+               return true;
        }
 
-       if (selection_)
-               selDel();
+       if (selection_) {
+               selClear();
+               if (c == ' ')
+                       return true;
+               // fall through in the other cases
+       }
 
-       if (lastcode_ == LM_TC_TEXTRM) {
+       if (lastcode_ == LM_TC_TEXTRM || par()->asBoxInset()) {
+               // suppress direct insertion of two spaces in a row
+               // the still allows typing  '<space>a<space>' and deleting the 'a', but
+               // it is better than nothing...
+               if (c == ' ' && hasPrevAtom() && prevAtom()->getChar() == ' ')
+                       return true;
                insert(c, LM_TC_TEXTRM);
-               return;
+               return true;
        }
 
        if (c == ' ') {
-               MathSpaceInset * p = prevSpaceInset();
-               if (p) {
-                       p->incSpace();
-                       return;
+               if (hasPrevAtom() && prevAtom()->asSpaceInset()) {
+                       prevAtom()->asSpaceInset()->incSpace();
+                       return true;
                }
+               if (popRight())
+                       return true;
+               // if are at the very end, leave the formula
+               return pos() != size();
+       }
 
-               if (mathcursor->popRight())
-                       return;
-
-#warning look here
-                       // this would not work if the inset is in an table!
-                       //bv->text->cursorRight(bv, true);
-                       //result = FINISHED;
-               return;
+       if (c == '#') {
+               insert(c, LM_TC_TEX);
+               return true;
        }
 
+/*
        if (strchr("{}", c)) {
                insert(c, LM_TC_TEX);
-               return;
+               return true;
        }
+*/
 
-       if (strchr("#$%", c)) {
-               insert(MathAtom(new MathSpecialCharInset(c)));  
+       if (c == '{') {
+               niceInsert(MathAtom(new MathBraceInset));
+               return true;
+       }
+
+       if (c == '}') {
+               return true;
+       }
+
+       if (strchr("$%", c)) {
+               insert(MathAtom(new MathSpecialCharInset(c)));
                lastcode_ = LM_TC_VAR;
-               return;
+               return true;
        }
 
-       if (isalpha(c) && (lastcode_ == LM_TC_GREEK || lastcode_ == LM_TC_GREEK1)) {
-               static char const greekl[][26] =
-                       {"alpha", "beta", "chi", "delta", "epsilon", "phi",
-                        "gamma", "eta", "iota", "iota", "kappa", "lambda", "mu",
-                        "nu", "omikron", "pi", "omega", "rho", "sigma",
-                        "tau", "upsilon", "theta", "omega", "xi", "upsilon", "zeta"};
-               static char const greeku[][26] =
-                       {"Alpha", "Beta", "Chi", "Delta", "Epsilon", "Phi",
-                        "Gamma", "Eta", "Iota", "Iota", "Kappa", "Lambda", "Mu",
-                        "Nu", "Omikron", "Pi", "Omega", "Rho", "Sigma", "Tau",
-                        "Upsilon", "Theta", "Omega", "xi", "Upsilon", "Zeta"};
-       
-               latexkeys const * l = 0;        
-               if ('a' <= c && c <= 'z')
-                       l = in_word_set(greekl[c - 'a']);
-               if ('A' <= c && c <= 'Z')
-                       l = in_word_set(greeku[c - 'A']);
-       
-               if (l)
-                       insert(createMathInset(l));
-               else
-                       insert(c, LM_TC_VAR);
+       if (isalpha(c) && lastcode_ == LM_TC_GREEK) {
+               insert(c, LM_TC_VAR);
+               return true;
+       }
 
-#warning greek insert problem? look here!
-               if (lastcode_ == LM_TC_GREEK1)
-                       lastcode_ = LM_TC_VAR;
-               return
+       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
+               return true;
        }
 
        // no special circumstances, so insert the character without any fuss
-       insert(c, LM_TC_MIN);
+       insert(c, lastcode_ == LM_TC_MIN ? MathCharInset::nativeCode(c) : lastcode_);
+       lastcode_ = LM_TC_MIN;
+       return true;
 }
 
 
 
-////////////////////////////////////////////////////////////////////////
-
-
-bool operator==(MathCursorPos const & ti, MathCursorPos const & it)
-{
-       return ti.par_ == it.par_ && ti.idx_ == it.idx_ && ti.pos_ == it.pos_;
-}
-
-
-bool operator<(MathCursorPos const & ti, MathCursorPos const & it)
+MathCursorPos MathCursor::normalAnchor() const
 {
-       if (ti.par_ != it.par_) {
-               lyxerr << "can't compare cursor and anchor in different insets\n";
-               return true;
+       if (Anchor_.size() < Cursor_.size()) {
+               Anchor_ = Cursor_;
+               lyxerr << "unusual Anchor size\n";
+               dump("1");
        }
-       if (ti.idx_ != it.idx_)
-               return ti.idx_ < it.idx_;
-       return ti.pos_ < it.pos_;
-}
-
-
-MathArray & MathCursorPos::cell(MathCursor::idx_type idx) const
-{
-       return (*par_)->cell(idx);
+       //lyx::Assert(Anchor_.size() >= Cursor_.size());
+       // use Anchor on the same level as Cursor
+       MathCursorPos normal = Anchor_[Cursor_.size() - 1];
+       if (Cursor_.size() < Anchor_.size() && !(normal < cursor())) {
+               // anchor is behind cursor -> move anchor behind the inset
+               ++normal.pos_;
+       }
+       return normal;
 }
 
 
-MathArray & MathCursorPos::cell() const
+void MathCursor::stripFromLastEqualSign()
 {
-       return (*par_)->cell(idx_);
-}
-
+       // find position of last '=' in the array
+       MathArray & ar = cursor().cell();
+       MathArray::const_iterator et = ar.end();
+       for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
+               if ((*it)->getChar() == '=')
+                       et = it;
 
-MathXArray & MathCursorPos::xcell(MathCursor::idx_type idx) const
-{
-       return (*par_)->xcell(idx);
+       // delete everything behind this position
+       ar.erase(et - ar.begin(), ar.size());
+       pos() = ar.size();
 }
 
 
-MathXArray & MathCursorPos::xcell() const
+void MathCursor::setSelection(cursor_type const & where, size_type n)
 {
-       return (*par_)->xcell(idx_);
-}
-
-
-MathCursorPos MathCursor::normalAnchor() const
-{
-       // use Anchor on the same level as Cursor
-       MathCursorPos normal = Anchor_[Cursor_.size() - 1];
-       if (Cursor_.size() < Anchor_.size() && !(normal < cursor())) {
-               // anchor is behind cursor -> move anchor behind the inset
-               ++normal.pos_;
-       }
-       return normal;
+       selection_ = true;
+       Anchor_ = where;
+       Cursor_ = where;
+       cursor().pos_ += n;
 }
 
 
-MathSpaceInset * MathCursor::prevSpaceInset() const
+string MathCursor::info() const
 {
-       if (!hasPrevAtom())
-               return 0;
-       return prevAtom()->asSpaceInset();
+       ostringstream os;
+       if (pos() > 0)
+               prevAtom()->infoize(os);
+       return os.str();
 }