]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_cursor.C
activate row delete/insert for the 'cases' environment, too
[lyx.git] / src / mathed / math_cursor.C
index db86c379c19a4a5a58c88cf287c8561183ffa896..1cb978decbc0cca3aba45956a242b6ecbf88ed56 100644 (file)
 #include <algorithm>
 #include <cctype>
 
+#include "support/lstrings.h"
+#include "support/LAssert.h"
 #include "debug.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "mathed/support.h"
+#include "math_support.h"
 #include "formulabase.h"
 #include "math_cursor.h"
+#include "math_casesinset.h"
+#include "math_factory.h"
 #include "math_arrayinset.h"
-#include "math_bigopinset.h"
-#include "math_symbolinset.h"
-#include "math_decorationinset.h"
+#include "math_braceinset.h"
+#include "math_charinset.h"
 #include "math_deliminset.h"
-#include "math_dotsinset.h"
-#include "math_fracinset.h"
-#include "math_funcinset.h"
-#include "math_funcliminset.h"
-#include "math_gridinset.h"
-#include "math_macro.h"
-#include "math_macroarg.h"
-#include "math_macrotable.h"
-#include "math_macrotemplate.h"
-#include "math_matrixinset.h"
-#include "math_rootinset.h"
-#include "math_spaceinset.h"
-#include "math_sqrtinset.h"
-#include "support/lstrings.h"
+#include "math_hullinset.h"
 #include "math_scriptinset.h"
-#include "math_parser.h"
+#include "math_spaceinset.h"
+#include "math_specialcharinset.h"
+#include "math_mathmlstream.h"
+
+#define FILEDEBUG 0
 
 using std::endl;
 using std::min;
 using std::max;
+using std::swap;
 using std::isalnum;
 
-
 namespace {
 
 struct Selection
@@ -70,8 +64,9 @@ struct Selection
                if (i1.idx_ == i2.idx_)
                        data_.push_back(MathArray(i1.cell(), i1.pos_, i2.pos_));
                else {
-                       std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
-                       for (unsigned i = 0; i < indices.size(); ++i)
+                       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]));
                }
        }
@@ -81,10 +76,11 @@ struct Selection
                MathCursorPos i1;
                MathCursorPos i2;
                cursor.getSelection(i1, i2); 
-               if (i1.idx_ == i2.idx_) {
+               if (i1.idx_ == i2.idx_)
                        i1.cell().erase(i1.pos_, i2.pos_);
-               } else {
-                       std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
+               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();
                }
@@ -93,7 +89,8 @@ struct Selection
 
        void paste(MathCursor & cursor) const
        {
-               cursor.insert(glue());
+               MathArray ar = glue();
+               cursor.paste(ar);
        }
 
        // glues selection to one cell
@@ -117,67 +114,98 @@ struct Selection
 Selection theSelection;
 
 
+#if FILEDEBUG
 std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
 {
-       os << "(par: " << p.par_ << " idx: " << p.idx_
-          << " pos: " << p.pos_ << ")";
+       os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
        return os;
 }
+#endif
 
 }
 
 
-MathCursor::MathCursor(InsetFormulaBase * formula)
-       : formula_(formula), lastcode_(LM_TC_MIN), imacro_(0), selection_(false)
+MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
+       : formula_(formula), lastcode_(LM_TC_VAR), selection_(false)
 {
-       first();
+       left ? first() : last();
 }
 
 
-MathCursor::~MathCursor()
+void MathCursor::push(MathAtom & t)
 {
-       delete imacro_;
+       MathCursorPos p;
+       p.par_ = &t;
+       p.idx_ = 0;
+       p.pos_ = 0;
+       Cursor_.push_back(p);
 }
 
-void MathCursor::push(MathInset * par, bool first)
+
+void MathCursor::pushLeft(MathAtom & t)
 {
-       MathCursorPos p;
-       p.par_ = par;
-       if (first)
-               par->idxFirst(p.idx_, p.pos_);
-       else
-               par->idxLast(p.idx_, p.pos_);
-       Cursor_.push_back(p);
+       //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
+       push(t);
+       t->idxFirst(idx(), pos());
+}
+
+
+void MathCursor::pushRight(MathAtom & t)
+{
+       //cerr << "Entering atom "; t->write(cerr, false); cerr << " right\n";
+       posLeft();
+       push(t);
+       t->idxLast(idx(), pos());
 }
 
 
-bool MathCursor::pop()
+bool MathCursor::popLeft()
 {
+       //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " left\n";
        if (Cursor_.size() <= 1)
                return false;
+       //if (nextInset())
+       //      nextInset()->removeEmptyScripts();
        Cursor_.pop_back();
+       //if (nextAtom())
+       //      nextAtom()->removeEmptyScripts();
        return true;
 }
 
 
-MathInset * MathCursor::parInset(int i) const
+bool MathCursor::popRight()
 {
-       return Cursor_[i].par_;
+       //cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
+       if (Cursor_.size() <= 1)
+               return false;
+       //if (nextInset())
+       //      nextInset()->removeEmptyScripts();
+       Cursor_.pop_back();
+       //if (nextInset())
+       //      nextInset()->removeEmptyScripts();
+       posRight();
+       return true;
 }
 
 
+
+#if FILEDEBUG
 void MathCursor::dump(char const * what) const
 {
-       return;
-
        lyxerr << "MC: " << what << "\n";
        for (unsigned i = 0; i < Cursor_.size(); ++i)
                lyxerr << "  i: " << i 
-                       << " pos: " << Cursor_[i].pos_
+                       << " Cursor: pos: " << Cursor_[i].pos_
                        << " idx: " << Cursor_[i].idx_
                        << " par: " << Cursor_[i].par_ << "\n";
 
-       //lyxerr        << " sel: " << selection_ << " data: " << array() << "\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";
 }
 
 
@@ -185,7 +213,6 @@ void MathCursor::seldump(char const * str) const
 {
        //lyxerr << "SEL: " << str << ": '" << theSelection << "'\n";
        //dump("   Pos");
-       return;
 
        lyxerr << "\n\n\n=================vvvvvvvvvvvvv=======================   "
                <<  str << "\ntheSelection: " << selection_
@@ -200,191 +227,210 @@ void MathCursor::seldump(char const * str) const
        lyxerr << "\n===================^^^^^^^^^^^^=====================\n\n\n";
 }
 
+#else
+
+void MathCursor::seldump(char const *) const {}
+void MathCursor::dump(char const *) const {}
+
+#endif
+
+
+UpdatableInset * MathCursor::asHyperActiveInset() const
+{
+       return par()->asHyperActiveInset();
+}
+
 
 bool MathCursor::isInside(MathInset const * p) const
 {
        for (unsigned i = 0; i < Cursor_.size(); ++i) 
-               if (parInset(i) == p) 
+               if (Cursor_[i].par_->nucleus() == p) 
                        return true;
        return false;
 }
 
 
-bool MathCursor::openable(MathInset * p, bool sel, bool useupdown) const
+bool MathCursor::openable(MathAtom const & t, bool sel) const
 {
-       if (!p)
+       if (t->isHyperActive())
+               return true;
+
+       if (!t->isActive())
                return false;
 
-       if (!(p->isActive() || (useupdown && p->isScriptInset())))
+       if (t->asScriptInset())
                return false;
 
        if (sel) {
                // we can't move into anything new during selection
                if (Cursor_.size() == Anchor_.size())
                        return false;
-               if (p != Anchor_[Cursor_.size()].par_)
+               if (&t != Anchor_[Cursor_.size()].par_)
                        return false;
        }
        return true;
 }
 
 
-void MathCursor::plainLeft()
+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()
 {
-       --cursor().pos_;
+       if (pos() == 0)
+               return false;
+       --pos();
+       return true;
 }
 
 
-void MathCursor::plainRight()
+bool MathCursor::posRight()
 {
-       ++cursor().pos_;
+       if (pos() == size())
+               return false;
+       ++pos();
+       return true;
 }
 
 
 bool MathCursor::left(bool sel)
 {
        dump("Left 1");
-       if (imacro_) {
-               // was MacroModeBack()
-               if (!imacro_->name().empty()) {
-                       imacro_->setName(imacro_->name().substr(0, imacro_->name().length()-1));
-                       imacro_->metrics(imacro_->size());
-               } else
-                       macroModeClose();
+       if (inMacroMode()) {
+               macroModeClose();
+               lastcode_ = LM_TC_VAR;
                return true;
        }
        selHandle(sel);
-       clearLastCode();
+       lastcode_ = LM_TC_VAR;
 
-       MathInset * p = prevInset();
-       if (openable(p, sel, false)) {
-               plainLeft();
-               push(p, false);
+       if (hasPrevAtom() && openable(prevAtom(), sel)) {
+               if (prevAtom()->isHyperActive()) {
+                       lyxerr << "entering hyperactive inset\n";
+               }
+               pushRight(prevAtom());
                return true;
        } 
-       if (pos()) {
-               plainLeft();
-               return true;
-       }
-       if (par()->idxLeft(idx(), pos()))
-               return true;
-       if (pop())
-               return true;
-       return false;
+
+       return posLeft() || idxLeft() || popLeft() || selection_;
 }
 
 
 bool MathCursor::right(bool sel)
 {
        dump("Right 1");
-       if (imacro_) {
+       if (inMacroMode()) {
                macroModeClose();
+               lastcode_ = LM_TC_VAR;
                return true;
        }
        selHandle(sel);
-       clearLastCode();
-
-       MathInset * p = nextInset();
-       if (openable(p, sel, false)) {
-               push(p, true);
-               return true;
-       }
-       if (pos() != array().size()) {
-               plainRight();
-               return true;
-       }
-       if (par()->idxRight(idx(), pos())) {
-               return true;
-       }
-       if (pop()) {
-               plainRight();
+       lastcode_ = LM_TC_VAR;
+
+       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 false;
+
+       return posRight() || idxRight() || popRight() || selection_;
 }
 
 
 void MathCursor::first()
 {
        Cursor_.clear();
-       push(outerPar(), true);
+       pushLeft(formula_->par());
 }
 
 
 void MathCursor::last()
 {
-       Cursor_.clear();
-       push(outerPar(), false);
+       first();
+       end();
 }
 
 
 void MathCursor::setPos(int x, int y)
 {
-       dump("setPos 1");
+       //dump("setPos 1");
        //lyxerr << "MathCursor::setPos x: " << x << " y: " << y << "\n";
 
        macroModeClose();
-       lastcode_ = LM_TC_MIN;
+       lastcode_ = LM_TC_VAR;
        first();
 
-       cursor().par_  = outerPar();
+       cursor().par_  = &formula_->par();
 
        while (1) {
-               idx() = -1;
-               cursor().pos_ = -1;
-               //lyxerr << "found idx: " << idx_ << " cursor: " << pos()  << "\n";
+               idx() = 0;
+               cursor().pos_ = 0;
+               //lyxerr << "found idx: " << idx() << " cursor: " << pos()  << "\n";
                int distmin = 1 << 30; // large enough
-               for (int i = 0; i < par()->nargs(); ++i) {
+               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();
-                       int c  = ar.x2pos(x1);
+                       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;
+                               distmin = yy + xx;
+                               idx()   = i;
+                               pos()   = c;
                        }
                }
                //lyxerr << "found idx: " << idx() << " cursor: "
                //      << pos()  << "\n";
-               MathInset * n = nextInset();
-               MathInset * p = prevInset();
-               if (openable(n, selection_, true) && n->covers(x, y))
-                       push(n, true);
-               else if (openable(p, selection_, true) && p->covers(x, y)) {
-                       plainLeft();
-                       push(p, false);
-               } else 
+               if (hasNextAtom() && positionable(nextAtom(), x, y))
+                       pushLeft(nextAtom());
+               else if (hasPrevAtom() && positionable(prevAtom(), x, y))
+                       pushRight(prevAtom());
+               else 
                        break;
        }
-       dump("setPos 2");
+       //dump("setPos 2");
 }
 
 
-void MathCursor::home()
+void MathCursor::home(bool sel)
 {
        dump("home 1");
+       selHandle(sel);
        macroModeClose();
-       clearLastCode();
+       lastcode_ = LM_TC_VAR;
        if (!par()->idxHome(idx(), pos())) 
-               pop();
+               popLeft();
        dump("home 2");
 }
 
 
-void MathCursor::end()
+void MathCursor::end(bool sel)
 {
        dump("end 1");
+       selHandle(sel);
        macroModeClose();
-       clearLastCode();
-       if (!par()->idxEnd(idx(), pos())) {
-               pop();
-               ++pos();
-       }
+       lastcode_ = LM_TC_VAR;
+       if (!par()->idxEnd(idx(), pos()))
+               popRight();
        dump("end 2");
 }
 
@@ -395,44 +441,49 @@ void MathCursor::plainErase()
 }
 
 
-void MathCursor::insert(char c, MathTextCodes t)
+void MathCursor::plainInsert(MathAtom const & t)
 {
-       //lyxerr << "inserting '" << c << "'\n";
-       if (selection_)
-               selDel();
-
-       if (t != LM_TC_MIN)
-               lastcode_ = t;
+       array().insert(pos(), t);
+       ++pos();
+}
 
-       if (imacro_ && !(MathIsAlphaFont(t) || t == LM_TC_MIN))
-               macroModeClose();
 
-       if (imacro_) {
-               if (MathIsAlphaFont(t) || t == LM_TC_MIN) {
-                       // was MacroModeinsert(c);
-                       imacro_->setName(imacro_->name() + c);
-                       return;
-               }
-       }
-
-       array().insert(pos(), c, t);
-       plainRight();
+void MathCursor::insert(char c, MathTextCodes t)
+{
+       //lyxerr << "inserting '" << c << "'\n";
+       plainInsert(MathAtom(new MathCharInset(c, t)));
 }
 
 
-void MathCursor::insert(MathInset * p)
+void MathCursor::insert(MathAtom const & t)
 {
        macroModeClose();
 
        if (selection_) {
-               if (p->nargs())
+               if (t->nargs())
                        selCut();
                else
                        selDel();
        }
 
-       array().insert(pos(), p);
-       plainRight();
+       plainInsert(t);
+}
+
+
+void MathCursor::niceInsert(MathAtom const & t) 
+{
+       selCut();
+       insert(t); // inserting invalidates the pointer!
+       MathAtom const & p = prevAtom();
+       if (p->nargs()) {
+               posLeft();
+               right();  // do not push for e.g. MathSymbolInset
+               selPaste();
+       }
+#ifdef WITH_WARNINGS
+#warning "redraw disabled"
+#endif
+       //p->metrics(p->size());
 }
 
 
@@ -447,32 +498,43 @@ void MathCursor::insert(MathArray const & ar)
 }
 
 
+void MathCursor::paste(MathArray const & ar)
+{
+       Anchor_ = Cursor_;
+       selection_ = true;
+       array().insert(pos(), ar);
+       pos() += ar.size();
+}
+
+
 void MathCursor::backspace()
 {
-       if (inMacroMode()) {
-               left();
+       if (pos() == 0) {
+               pullArg(false);
                return;
-       }
+       }       
 
-       if (pos()) {
-               plainLeft();
-               plainErase();
+       if (selection_) {
+               selDel();
                return;
        }
 
-       if (array().size()) {
-               pullArg(false);
-               return;
+       MathScriptInset * p = prevAtom()->asScriptInset();
+       if (p) {
+               p->removeScript(p->hasUp());
+               // Don't delete if there is anything left 
+               if (p->hasUp() || p->hasDown())
+                       return;
        }
 
-       erase();
+       --pos();
+       plainErase();
 }
 
 
 void MathCursor::erase()
 {
-       dump("erase 1");
-       if (imacro_)
+       if (inMacroMode())
                return;
 
        if (selection_) {
@@ -481,19 +543,27 @@ void MathCursor::erase()
        }
 
        // delete empty cells if necessary
-       if (pos() == 0 && array().empty()) {
+       if (array().empty()) {
                bool popit;
                bool removeit;
                par()->idxDelete(idx(), popit, removeit);
-               if (popit && pop() && removeit)
+               if (popit && popLeft() && removeit)
                        plainErase();
                return;
        }
 
-       if (pos() < array().size())
-               plainErase();
+       if (pos() == size())
+               return;
 
-       dump("erase 2");
+       MathScriptInset * p = nextAtom()->asScriptInset();
+       if (p) {
+               p->removeScript(p->hasUp());
+               // Don't delete if there is anything left 
+               if (p->hasUp() || p->hasDown())
+                       return;
+       }
+
+       plainErase();
 }
 
 
@@ -508,6 +578,9 @@ void MathCursor::delLine()
 
        if (par()->nrows() > 1)
                par()->delRow(row());
+
+       if (pos() > size())
+               pos() = size();
 }
 
 
@@ -517,51 +590,30 @@ bool MathCursor::up(bool sel)
        macroModeClose();
        selHandle(sel);
 
-       if (selection_) {
-               int x = xarray().pos2x(pos());
-               if (cursor().idxDown()) {
-                       pos() = xarray().x2pos(x);
-                       return true;
-               }
-               if (pop()) 
-                       return true;
-               return false;
-       }
-
-       // check whether we could move into an inset on the right or on the left
-       MathInset * p = nextInset();
-       if (p) {
-               int idxx, poss;
-               if (p->idxFirstUp(idxx, poss)) {
-                       push(p, true);
-                       idx() = idxx;
-                       pos() = poss;
-                       dump("up 3");
-                       return true;
+       if (!selection_) {
+               // check whether we could move into a superscript 
+               if (hasPrevAtom()) {
+                       MathAtom & p = prevAtom();
+                       if (p->asScriptInset() && p->asScriptInset()->hasUp()) {
+                               pushRight(p);
+                               idx() = 1;
+                               pos() = size();
+                               return true;
+                       }
                }
-       }
 
-       p = prevInset();
-       if (p) {
-               int idxx, poss;
-               if (p->idxLastUp(idxx, poss)) {
-                       plainLeft();
-                       push(p, false);
-                       idx() = idxx;
-                       pos() = poss;
-                       dump("up 4");
-                       return true;
+               if (hasNextAtom()) {
+                       MathAtom & n = nextAtom();
+                       if (n->asScriptInset() && n->asScriptInset()->hasUp()) {
+                               pushLeft(n);
+                               idx() = 1;
+                               pos() = 0;
+                               return true;
+                       }
                }
        }
 
-       int x = xarray().pos2x(pos());
-       if (cursor().idxUp()) {
-               pos() = xarray().x2pos(x);
-               return true;
-       }
-       if (pop())
-               return true;
-       return false;
+       return goUp() || selection_;
 }
 
 
@@ -571,222 +623,75 @@ bool MathCursor::down(bool sel)
        macroModeClose();
        selHandle(sel);
 
-       if (selection_) {
-               int x = xarray().pos2x(pos());
-               if (cursor().idxDown()) {
-                       pos() = xarray().x2pos(x);
-                       return true;
-               }
-               if (pop()) 
-                       return true;
-               return false;
-       }
-
-       // check whether we could move into an inset on the right or on the left
-       MathInset * p = nextInset();
-       if (p) {
-               int idxx = 0;
-               int poss = 0;
-               if (p->idxFirstDown(idxx, poss)) {
-                       push(p, true);
-                       idx() = idxx;
-                       pos() = poss;
-                       dump("Down 3");
-                       return true;
+       if (!selection_) {
+               // check whether we could move into a subscript 
+               if (hasPrevAtom()) {
+                       MathAtom & p = prevAtom();
+                       if (p->asScriptInset() && p->asScriptInset()->hasDown()) {
+                               pushRight(p);
+                               idx() = 0;
+                               pos() = size();
+                               return true;
+                       }
                }
-       }
 
-       p = prevInset();
-       if (p) {
-               int idxx = 0;
-               int poss = 0;
-               if (p->idxLastDown(idxx, poss)) {
-                       plainLeft();
-                       push(p, false);
-                       idx() = idxx;
-                       pos() = poss;
-                       dump("Down 4");
-                       return true;
+               if (hasNextAtom()) {
+                       MathAtom & n = nextAtom();
+                       if (n->asScriptInset() && n->asScriptInset()->hasDown()) {
+                               pushLeft(n);
+                               idx() = 0;
+                               pos() = 0;
+                               return true;
+                       }
                }
        }
 
-       int x = xarray().pos2x(pos());
-       if (cursor().idxDown()) {
-               pos() = xarray().x2pos(x);
-               return true;
-       }
-       if (pop())
-               return true;
-       return false;
+       return goDown() || selection_;
 }
 
 
 bool MathCursor::toggleLimits()
 {
-       MathScriptInset * p = prevScriptInset();
-       if (!p)
+       if (!hasPrevAtom())
                return false;
-       int old = p->limits();
-       p->limits(old < 0 ? 1 : -1);
-       return old != p->limits();
-}
-
-
-void MathCursor::setSize(MathStyles size)
-{
-       par()->userSetSize(size);
+       MathScriptInset * t = prevAtom()->asScriptInset();
+       if (!t)
+               return false;
+       int old = t->limits();
+       t->limits(old < 0 ? 1 : -1);
+       return old != t->limits();
 }
 
 
-
-void MathCursor::interpret(string const & s)
+void MathCursor::macroModeClose()
 {
-       //lyxerr << "interpret: '" << s << "'\n";
-       //lyxerr << "in: " << in_word_set(s) << " \n";
-
-       if (s.empty())
-               return;
-
-       if (s[0] == '^' || s[0] == '_') {
-               bool const up = (s[0] == '^');
-               selCut();       
-               MathScriptInset * p = prevScriptInset();
-               if (!p) {
-                       MathInset * b = prevInset();
-                       if (b && b->isScriptable()) {
-                               p = new MathScriptInset(up, !up, b->clone());
-                               plainLeft();
-                               plainErase();
-                       } else {
-                               p = new MathScriptInset(up, !up);
-                       }
-                       insert(p);
-               }
-               plainLeft();
-               push(p, true);
-               if (up)
-                       p->up(true);
-               else
-                       p->down(true);
-               idx() = up ? 0 : 1;
-               pos() = 0;
-               selPaste();
-               return;
-       }
-
-       if (s[0] == '!' || s[0] == ','  || s[0] == ':' || s[0] == ';') {
-               int sp = (s[0] == ',') ? 1:((s[0] == ':') ? 2:((s[0] == ';') ? 3: 0));
-               insert(new MathSpaceInset(sp));
-               return;
-       }
-
-       MathInset * p = 0;
-       latexkeys const * l = in_word_set(s);
-
-       if (l == 0) {
-               if (s == "root") 
-                       p = new MathRootInset;
-               else if (MathMacroTable::hasTemplate(s))
-                       p = new MathMacro(MathMacroTable::provideTemplate(s));
-               else if (s.size() > 7 && s.substr(0, 7) == "matrix ") {
-                       int m = 1;
-                       int n = 1;
-                       string v_align;
-                       string h_align;
-                       istringstream is(s.substr(7).c_str());
-                       is >> m >> n >> v_align >> h_align;
-                       m = std::max(1, m);
-                       n = std::max(1, n);
-                       v_align += 'c';
-                       MathArrayInset * pp = new MathArrayInset(m, n);
-                       pp->valign(v_align[0]);
-                       pp->halign(h_align);
-                       p = pp;
-               }
-               else
-                       p = new MathFuncInset(s);
-       } else {
-               switch (l->token) {
-                       case LM_TK_BIGSYM:
-                               p = new MathBigopInset(l);
-                               break;
-
-                       case LM_TK_FUNCLIM:
-                               p = new MathFuncLimInset(l);
-                               break;
-
-                       case LM_TK_SYM: 
-                               p = new MathSymbolInset(l);
-                               break;
-
-                       case LM_TK_STACK:
-                               p = new MathFracInset("stackrel");
-                               break;
-
-                       case LM_TK_FRAC:
-                               p = new MathFracInset("frac");
-                               break;
-
-                       case LM_TK_SQRT:
-                               p = new MathSqrtInset;
-                               break;
-
-                       case LM_TK_DECORATION:
-                               p = new MathDecorationInset(l);
-                               break;
-
-                       case LM_TK_SPACE:
-                               p = new MathSpaceInset(l->id);
-                               break;
-
-                       case LM_TK_DOTS:
-                               p = new MathDotsInset(l);
-                               break;
-
-                       case LM_TK_MACRO:
-                               p = new MathMacro(MathMacroTable::provideTemplate(s));
-                               break;
-
-                       default:
-                               p = new MathFuncInset(l->name);
-                               break;
-               }
-       }
-
-       if (p) {
-               selCut();
-               insert(p);
-               if (p->nargs()) {
-                       plainLeft();
-                       right();  // do not push for e.g. MathSymbolInset
-                       selPaste();
-               }
-               p->metrics(p->size());
+       string s = macroName();
+       if (s.size()) {
+               size_type old = pos();
+               pos() -= s.size();
+               array().erase(pos(), old);
+               interpret(s);
        }
 }
 
 
-void MathCursor::macroModeOpen()
+int MathCursor::macroNamePos() const
 {
-       if (!imacro_) {
-               imacro_ = new MathFuncInset("");
-               array().insert(pos(), imacro_);
-               ++pos();
-               //insert(imacro_);
-       } else
-               lyxerr << "Math Warning: Already in macro mode" << endl;
+       for (int i = pos() - 1; i >= 0; --i) { 
+               MathAtom & p = array().at(i);
+               if (p->code() == LM_TC_TEX && p->getChar() == '\\')
+                       return i;
+       }
+       return -1;
 }
 
 
-void MathCursor::macroModeClose()
+string MathCursor::macroName() const
 {
-       if (imacro_) {
-               string name = imacro_->name();
-               plainLeft();
-               plainErase();
-               imacro_ = 0;
-               interpret(name);
-       }
+       string s;
+       for (int i = macroNamePos(); i >= 0 && i < int(pos()); ++i) 
+               s += array().at(i)->getChar();
+       return s;
 }
 
 
@@ -818,6 +723,8 @@ void MathCursor::selDel()
        seldump("selDel");
        if (selection_) {
                theSelection.erase(*this);
+               if (pos() > size())
+                       pos() = size();
                selClear();
        }
 }
@@ -827,7 +734,8 @@ void MathCursor::selPaste()
 {
        seldump("selPaste");
        theSelection.paste(*this);
-       selClear();
+       theSelection.grab(*this);
+       //selClear();
 }
 
 
@@ -861,6 +769,18 @@ void MathCursor::selClear()
 }
 
 
+void MathCursor::selGet(MathArray & ar)
+{
+       seldump("selGet");
+       if (!selection_)
+               return;
+
+       theSelection.grab(*this);
+       ar = theSelection.glue();
+}
+
+
+
 void MathCursor::drawSelection(Painter & pain) const
 {
        if (!selection_)
@@ -869,7 +789,6 @@ void MathCursor::drawSelection(Painter & pain) const
        MathCursorPos i1;
        MathCursorPos i2;
        getSelection(i1, i2);
-
        //lyxerr << "selection from: " << i1 << " to " << i2 << "\n";
 
        if (i1.idx_ == i2.idx_) {
@@ -880,8 +799,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<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
+               std::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();
@@ -891,79 +810,68 @@ 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::mathline);
+       }
+#endif
 }
 
 
 void MathCursor::handleFont(MathTextCodes t)
 {
+       macroModeClose();
        if (selection_) {
                MathCursorPos i1;
                MathCursorPos i2;
                getSelection(i1, i2); 
                if (i1.idx_ == i2.idx_) {
                        MathArray & ar = i1.cell();
-                       for (int pos = i1.pos_; pos != i2.pos_; ++pos)
-                               if (isalnum(ar.getChar(pos))) { 
-                                       MathTextCodes c = ar.getCode(pos) == t ? LM_TC_VAR : t;
-                                       ar.setCode(pos, c);
-                               }
+                       for (MathInset::pos_type pos = i1.pos_; pos != i2.pos_; ++pos)
+                               ar.at(pos)->handleFont(t);
                }
        } else 
                lastcode_ = (lastcode_ == t) ? LM_TC_VAR : t;
 }
 
 
-void MathCursor::handleAccent(string const & name)
+void MathCursor::handleDelim(string const & l, string const & r)
 {
-       latexkeys const * l = in_word_set(name);
-       if (!l)
-               return;
-
-       MathDecorationInset * p = new MathDecorationInset(l);
-       if (selection_) {
-               selCut();
-               p->cell(0) = theSelection.glue();
-       }
-       insert(p);
-       push(p, true);
+       handleNest(new MathDelimInset(l, r));
 }
 
 
-void MathCursor::handleDelim(int l, int r)
+void MathCursor::handleNest(MathInset * p)
 {
-       MathDelimInset * p = new MathDelimInset(l, r);
        if (selection_) {
                selCut();
                p->cell(0) = theSelection.glue();
        }
-       insert(p);
-       plainLeft();
-       push(p, true);
+       insert(MathAtom(p)); // this invalidates p!
+       pushRight(prevAtom());
 }
 
 
 void MathCursor::getPos(int & x, int & y)
 {
+#ifdef WITH_WARNINGS
+#warning This should probably take cellXOffset and cellYOffset into account
+#endif
        x = xarray().xo() + xarray().pos2x(pos());
        y = xarray().yo();
 }
 
 
-MathTextCodes MathCursor::nextCode() const
+MathAtom & MathCursor::par() const
 {
-       return array().getCode(pos()); 
-}
-
-
-MathTextCodes MathCursor::prevCode() const
-{
-       return array().getCode(pos() - 1); 
-}
-
-
-MathInset * MathCursor::par() const
-{
-       return cursor().par_;
+       return *cursor().par_;
 }
 
 
@@ -973,25 +881,25 @@ InsetFormulaBase const * MathCursor::formula()
 }
 
 
-int MathCursor::idx() const
+MathCursor::idx_type MathCursor::idx() const
 {
        return cursor().idx_;
 }
 
 
-int & MathCursor::idx()
+MathCursor::idx_type & MathCursor::idx()
 {
        return cursor().idx_;
 }
 
 
-int MathCursor::pos() const
+MathCursor::pos_type MathCursor::pos() const
 {
        return cursor().pos_;
 }
 
 
-int & MathCursor::pos()
+MathCursor::pos_type & MathCursor::pos()
 {
        return cursor().pos_;
 }
@@ -999,7 +907,7 @@ int & MathCursor::pos()
 
 bool MathCursor::inMacroMode() const
 {
-       return imacro_;
+       return macroNamePos() != -1;
 }
 
 
@@ -1009,30 +917,13 @@ bool MathCursor::selection() const
 }
 
 
-void MathCursor::clearLastCode()
-{
-       lastcode_ = LM_TC_MIN;
-}
-
-
-void MathCursor::setLastCode(MathTextCodes t)
-{
-       lastcode_ = t;
-}
-
-
-MathTextCodes MathCursor::getLastCode() const
-{
-       return lastcode_;
-}
-
-
-MathArrayInset * MathCursor::enclosingArray(int & idx) const
+MathGridInset * MathCursor::enclosingGrid(MathCursor::idx_type & idx) const
 {
        for (int i = Cursor_.size() - 1; i >= 0; --i) {
-               if (Cursor_[i].par_->isArray()) {
+               MathGridInset * p = (*Cursor_[i].par_)->asGridInset();
+               if (p) {
                        idx = Cursor_[i].idx_;
-                       return static_cast<MathArrayInset *>(Cursor_[i].par_);
+                       return p;
                }
        }
        return 0;
@@ -1041,10 +932,23 @@ MathArrayInset * MathCursor::enclosingArray(int & idx) const
 
 void MathCursor::pullArg(bool goright)
 {
-       // pullArg
        dump("pullarg");
        MathArray a = array();
-       if (pop()) {
+
+       MathScriptInset const * p = par()->asScriptInset();
+       if (p) {
+               // special handling for scripts
+               const bool up = p->hasUp();
+               popLeft();
+               MathScriptInset * q = nextAtom()->asScriptInset();
+               if (q)
+                       q->removeScript(up);
+               ++pos();
+               array().insert(pos(), a);
+               return;
+       }
+
+       if (popLeft()) {
                plainErase();
                array().insert(pos(), a);
                if (goright) 
@@ -1053,12 +957,6 @@ void MathCursor::pullArg(bool goright)
 }
 
 
-MathStyles MathCursor::style() const
-{
-       return xarray().style();
-}
-
-
 void MathCursor::normalize() const
 {
 #ifdef WITH_WARNINGS
@@ -1066,90 +964,89 @@ void MathCursor::normalize() const
 #endif
        MathCursor * it = const_cast<MathCursor *>(this);
 
-       if (idx() < 0 || idx() > par()->nargs() - 1)
-               lyxerr << "this should not really happen - 1\n";
-       it->idx()    = max(idx(), 0);
+       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);
 
-       if (pos() < 0 || pos() > array().size())
-               lyxerr << "this should not really happen - 2\n";
-       it->pos() = max(pos(), 0);
-       it->pos() = min(pos(), array().size());
+       if (pos() > size()) {
+               lyxerr << "this should not really happen - 2: "
+                       << pos() << " " << size() <<  " in idx: " << it->idx()
+                       << " in atom: '";
+               WriteStream wi(0, lyxerr, false);
+               it->par()->write(wi);
+               lyxerr << "\n";
+               dump("error 4");
+       }
+       it->pos() = min(pos(), size());
+}
+
+
+MathCursor::size_type MathCursor::size() const
+{
+       return array().size();
 }
 
 
-int MathCursor::col() const
+MathCursor::col_type MathCursor::col() const
 {
        return par()->col(idx());
 }
 
 
-int MathCursor::row() const
+MathCursor::row_type MathCursor::row() const
 {
        return par()->row(idx());
 }
 
 
-/*
-char MathCursorPos::getChar() const
+bool MathCursor::hasPrevAtom() const
 {
-       return array().getChar(pos());
+       return pos() > 0;
 }
 
 
-string MathCursorPos::readString()
+bool MathCursor::hasNextAtom() const
 {
-       string s;
-       int code = nextCode();
-       for ( ; OK() && nextCode() == code; Next()) 
-               s += getChar();
-
-       return s;
+       return pos() < size();
 }
-*/
 
 
-MathInset * MathCursor::prevInset() const
+MathAtom const & MathCursor::prevAtom() const
 {
-       normalize();
-       if (!pos())
-               return 0;
-       return array().nextInset(pos() - 1);
+       lyx::Assert(pos() > 0);
+       return array().at(pos() - 1);
 }
 
 
-MathInset * MathCursor::nextInset() const
+MathAtom & MathCursor::prevAtom()
 {
-       normalize();
-       return array().nextInset(pos());
+       lyx::Assert(pos() > 0);
+       return array().at(pos() - 1);
 }
 
 
-MathScriptInset * MathCursor::prevScriptInset() const
+MathAtom const & MathCursor::nextAtom() const
 {
-       normalize();
-       MathInset * p = prevInset();
-       return (p && p->isScriptInset()) ? static_cast<MathScriptInset *>(p) : 0;
+       lyx::Assert(pos() < size());
+       return array().at(pos());
 }
 
 
-MathSpaceInset * MathCursor::prevSpaceInset() const
+MathAtom & MathCursor::nextAtom()
 {
-       normalize();
-       MathInset * p = prevInset();
-       return (p && p->isSpaceInset()) ? static_cast<MathSpaceInset *>(p) : 0;
+       lyx::Assert(pos() < size());
+       return array().at(pos());
 }
 
 
 MathArray & MathCursor::array() const
 {
        static MathArray dummy;
-       if (!par()) {
-               lyxerr << "############  par_ not valid\n";
-               return dummy;
-       }
 
-       if (idx() < 0 || idx() >= par()->nargs()) {
+       if (idx() >= par()->nargs()) {
                lyxerr << "############  idx_ " << idx() << " not valid\n";
                return dummy;
        }
@@ -1164,19 +1061,6 @@ MathXArray & MathCursor::xarray() const
 }
 
 
-int MathCursor::xpos() const 
-{
-       normalize();
-       return xarray().pos2x(pos());
-}
-
-
-void MathCursor::gotoX(int x)
-{
-       pos() = xarray().x2pos(x);      
-}
-
-
 void MathCursor::idxNext()
 {
        par()->idxNext(idx(), pos());
@@ -1195,7 +1079,7 @@ void MathCursor::splitCell()
                return;
        MathArray ar = array();
        ar.erase(0, pos());
-       array().erase(pos(), array().size());
+       array().erase(pos(), size());
        ++idx();
        pos() = 0;
        array().insert(0, ar);
@@ -1204,23 +1088,25 @@ void MathCursor::splitCell()
 
 void MathCursor::breakLine()
 {
-       MathMatrixInset * p = outerPar();
+       // leave inner cells
+       while (popRight())
+               ;
+
+       MathHullInset * p = formula()->par()->asHullInset();
+       if (!p)
+               return;
+
        if (p->getType() == LM_OT_SIMPLE || p->getType() == LM_OT_EQUATION) {
                p->mutate(LM_OT_EQNARRAY);
-               p->addRow(0);
-               idx() = p->nrows();
-               pos() = 0;
+               idx() = 0;
+               pos() = size();
        } else {
                p->addRow(row());
 
                // split line
-               const int r = row();
-               for (int c = col() + 1; c < p->ncols(); ++c) {
-                       const int i1 = p->index(r, c);
-                       const int i2 = p->index(r + 1, c);      
-                       lyxerr << "swapping cells " << i1 << " and " << i2 << "\n";
-                       p->cell(i1).swap(p->cell(i2));
-               }
+               const row_type r = row();
+               for (col_type c = col() + 1; c < p->ncols(); ++c)
+                       p->cell(p->index(r, c)).swap(p->cell(p->index(r + 1, c)));
 
                // split cell
                splitCell();
@@ -1229,33 +1115,27 @@ void MathCursor::breakLine()
 }
 
 
-char MathCursor::valign() const
+void MathCursor::readLine(MathArray & ar) const
 {
-       int idx;
-       MathArrayInset * p = enclosingArray(idx);
-       return p ? p->valign() : 0;
+       idx_type base = row() * par()->ncols();
+       for (idx_type off = 0; off < par()->ncols(); ++off)
+               ar.push_back(par()->cell(base + off));
 }
 
 
-char MathCursor::halign() const
+char MathCursor::valign() const
 {
-       int idx;
-       MathArrayInset * p = enclosingArray(idx);
-       return p ? p->halign(idx % p->ncols()) : 0;
+       idx_type idx;
+       MathGridInset * p = enclosingGrid(idx);
+       return p ? p->valign() : '\0';
 }
 
 
-MathCursorPos MathCursor::firstSelectionPos() const
-{
-       MathCursorPos anc = normalAnchor();
-       return anc < cursor() ? anc : cursor(); 
-}
-
-
-MathCursorPos MathCursor::lastSelectionPos() const
+char MathCursor::halign() const
 {
-       MathCursorPos anc = normalAnchor();
-       return anc < cursor() ? cursor() : anc; 
+       idx_type idx;
+       MathGridInset * p = enclosingGrid(idx);
+       return p ? p->halign(idx % p->ncols()) : '\0';
 }
 
 
@@ -1284,6 +1164,302 @@ MathCursorPos const & MathCursor::cursor() const
 }
 
 
+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) 
+{
+       pos() = xarray().x2pos(x - cellXOffset());
+}
+
+
+bool MathCursor::goUp()
+{
+       // first ask the inset if it knows better then we
+       if (par()->idxUp(idx(), pos()))
+               return true;
+
+       // leave subscript to the nearest side  
+       MathScriptInset * p = par()->asScriptInset();
+       if (p && idx() == 0) {
+               if (pos() <= size() / 2)
+                       popLeft();
+               else
+                       popRight();             
+               return true;
+       }
+
+       // if not, apply brute force.
+       int x0;
+       int y0;
+       getPos(x0, y0);
+       std::vector<MathCursorPos> save = Cursor_;
+       y0 -= xarray().ascent();
+       for (int y = y0 - 4; y > formula()->upperY(); y -= 4) {
+               setPos(x0, y);
+               if (save != Cursor_ && xarray().yo() < y0)
+                       return true;    
+       }
+       Cursor_ = save;
+       return false;
+}
+
+
+bool MathCursor::goDown()
+{
+       // first ask the inset if it knows better then we
+       if (par()->idxDown(idx(), pos()))
+               return true;
+
+       // leave superscript to the nearest side        
+       MathScriptInset * p = par()->asScriptInset();
+       if (p && idx() == 1) {
+               if (pos() <= size() / 2)
+                       popLeft();
+               else
+                       popRight();             
+               return true;
+       }
+
+       // if not, apply brute force.
+       int x0;
+       int y0;
+       getPos(x0, y0);
+       std::vector<MathCursorPos> save = Cursor_;
+       y0 += xarray().descent();
+       for (int y = y0 + 4; y < formula()->lowerY(); y += 4) {
+               setPos(x0, y);
+               if (save != Cursor_ && xarray().yo() > y0)
+                       return true;    
+       }
+       Cursor_ = save;
+       return false;
+}
+
+
+bool MathCursor::idxLeft()
+{
+       return par()->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;
+
+       if (s.size() == 1)
+               return interpret(s[0]);
+
+       //lyxerr << "char: '" << s[0] << "'  int: " << int(s[0]) << endl;
+       //owner_->getIntl()->getTrans().TranslateAndInsert(s[0], lt);   
+       //lyxerr << "trans: '" << s[0] << "'  int: " << int(s[0]) << endl;
+
+       if (s.size() >= 5 && s.substr(0, 5) == "cases") {
+               unsigned int n = 1;
+               istringstream is(s.substr(6).c_str());
+               is >> n;
+               n = std::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());
+               is >> m >> n >> v_align >> h_align;
+               m = std::max(1u, m);
+               n = std::max(1u, n);
+               v_align += 'c';
+               niceInsert(MathAtom(new MathArrayInset(m, n, v_align[0], h_align)));
+               return true;
+       }
+
+       if (s == "\\over" || s == "\\choose" || s == "\\atop") {
+               MathArray ar = array();
+               MathAtom t = createMathInset(s.substr(1));
+               t->asNestInset()->cell(0).swap(array());
+               pos() = 0;
+               niceInsert(t);
+               popRight();
+               left();
+               return true;
+       }
+
+       niceInsert(createMathInset(s.substr(1)));
+       return true;
+}
+
+
+bool MathCursor::interpret(char c)
+{
+       //lyxerr << "interpret 2: '" << c << "'\n";
+       if (c == '^' || c == '_') {
+               macroModeClose();
+               const bool up = (c == '^');
+               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;
+       }
+
+
+       // handle macroMode
+       if (inMacroMode()) {
+               string name = macroName();
+
+               if (name == "\\" && c == '#') {
+                       insert(c, LM_TC_TEX);
+                       return true;
+               }
+
+               if (name == "\\" && c == '\\') {
+                       backspace();
+                       interpret("\\backslash");
+                       return true;
+               }
+
+               if (name == "\\#" && '1' <= c && c <= '9') {
+                       insert(c, LM_TC_TEX);
+                       macroModeClose();
+                       return true;
+               }
+
+               if (isalpha(c)) {
+                       insert(c, LM_TC_TEX);
+                       return true;
+               }
+
+               if (name == "\\") {
+                       insert(c, LM_TC_TEX);
+                       macroModeClose();
+                       return true;
+               }
+
+               macroModeClose();
+               return true;
+       }
+
+       if (selection_)
+               selDel();
+
+       if (lastcode_ == LM_TC_TEXTRM) {
+               // suppress direct insertion of to spaces in a row
+               // the still allows typing  '<space>a<space>' and deleting the 'a', but
+               // it is better than nothing
+               if (hasPrevAtom() && prevAtom()->getChar() == ' ')
+                       return true;
+               insert(c, LM_TC_TEXTRM);
+               return true;
+       }
+
+       if (c == ' ') {
+               if (hasPrevAtom() && prevAtom()->asSpaceInset()) {
+                       prevAtom()->asSpaceInset()->incSpace();
+                       return true;
+               }
+       
+               if (mathcursor->popRight())
+                       return true;
+
+               // if are at the very end, leave the formula
+               return pos() != size();
+       }
+
+/*
+       if (strchr("{}", c)) {
+               insert(c, LM_TC_TEX);
+               return true;
+       }
+*/
+
+       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 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;    
+       }
+
+       // no special circumstances, so insert the character without any fuss
+       insert(c, LM_TC_MIN);
+       return true;
+}
+
+
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -1306,26 +1482,27 @@ bool operator<(MathCursorPos const & ti, MathCursorPos const & it)
 }
 
 
-MathArray & MathCursorPos::cell(int idx) const
+MathArray & MathCursorPos::cell(MathCursor::idx_type idx) const
 {
-       return par_->cell(idx);
+       return (*par_)->cell(idx);
 }
 
+
 MathArray & MathCursorPos::cell() const
 {
-       return par_->cell(idx_);
+       return (*par_)->cell(idx_);
 }
 
 
-MathXArray & MathCursorPos::xcell(int idx) const
+MathXArray & MathCursorPos::xcell(MathCursor::idx_type idx) const
 {
-       return par_->xcell(idx);
+       return (*par_)->xcell(idx);
 }
 
 
 MathXArray & MathCursorPos::xcell() const
 {
-       return par_->xcell(idx_);
+       return (*par_)->xcell(idx_);
 }
 
 
@@ -1337,38 +1514,22 @@ MathCursorPos MathCursor::normalAnchor() const
                // anchor is behind cursor -> move anchor behind the inset
                ++normal.pos_;
        }
-       //lyxerr << "normalizing: from " << Anchor_[Anchor_.size() - 1] << " to "
-       //      << normal << "\n";
        return normal;
 }
 
 
-bool MathCursorPos::idxUp()
-{
-       return par_->idxUp(idx_, pos_);
-}
-
-
-bool MathCursorPos::idxDown()
-{
-       return par_->idxDown(idx_, pos_);
-}
-
-
-bool MathCursorPos::idxLeft()
+void MathCursor::stripFromLastEqualSign()
 {
-       return par_->idxLeft(idx_, pos_);
-}
-
+       // 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;
 
-bool MathCursorPos::idxRight()
-{
-       return par_->idxRight(idx_, pos_);
+       // delete everything behind this position
+       ar.erase(et - ar.begin(), ar.size());
+       pos() = ar.size(); 
 }
 
 
-MathMatrixInset * MathCursor::outerPar() const
-{
-       return
-               static_cast<MathMatrixInset *>(const_cast<MathInset *>(formula_->par()));
-}