]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_cursor.C
cursor up/down behind scripts fixed
[lyx.git] / src / mathed / math_cursor.C
index b0811d3b57044d4e509dec45c42ad7ce0a629ad3..ca2b35904f9b371e1554971a37f62b03d1bc05e3 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 "support.h"
 #include "formulabase.h"
 #include "math_cursor.h"
+#include "math_factory.h"
 #include "math_arrayinset.h"
-#include "math_bigopinset.h"
-#include "math_decorationinset.h"
+#include "math_charinset.h"
 #include "math_deliminset.h"
-#include "math_dotsinset.h"
-#include "math_fracinset.h"
-#include "math_funcinset.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_scriptinset.h"
+#include "math_spaceinset.h"
+#include "math_specialcharinset.h"
 #include "math_parser.h"
 
+#define FILEDEBUG 0
+
 using std::endl;
 using std::min;
 using std::max;
+using std::swap;
 using std::isalnum;
 
-
 namespace {
 
 struct Selection
@@ -68,8 +62,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]));
                }
        }
@@ -82,7 +77,8 @@ struct Selection
                if (i1.idx_ == i2.idx_) {
                        i1.cell().erase(i1.pos_, i2.pos_);
                } 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)
                                i1.cell(indices[i]).erase();
                }
@@ -91,7 +87,8 @@ struct Selection
 
        void paste(MathCursor & cursor) const
        {
-               cursor.insert(glue());
+               MathArray ar = glue();
+               cursor.paste(ar);
        }
 
        // glues selection to one cell
@@ -115,306 +112,358 @@ 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();
 }
 
 
-void MathCursor::push(MathInset * par, bool first)
+void MathCursor::push(MathAtom & t)
 {
+       //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
        MathCursorPos p;
-       p.par_ = par;
-       if (first)
-               par->idxFirst(p.idx_, p.pos_);
-       else
-               par->idxLast(p.idx_, p.pos_);
+       p.par_ = &t;
        Cursor_.push_back(p);
 }
 
 
-bool MathCursor::pop()
+void MathCursor::pushLeft(MathAtom & t)
 {
+       //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::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";
 }
 
 
-void MathCursor::seldump(char const *) const
+void MathCursor::seldump(char const * str) const
 {
        //lyxerr << "SEL: " << str << ": '" << theSelection << "'\n";
        //dump("   Pos");
-       return;
 
-       //lyxerr << "\n\n\\n=================vvvvvvvvvvvvv=======================   "
-       //      <<  str << "\ntheSelection: " << theSelection;
-       //for (unsigned int i = 0; i < Cursor_.size(); ++i) 
-       //      lyxerr << Cursor_[i].par_ << "\n'" << Cursor_[i].cell() << "'\n";
-       //lyxerr << "\ncursor.pos_: " << cursor().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";
+       lyxerr << "\n===================^^^^^^^^^^^^=====================\n\n\n";
 }
 
+#else
+
+void MathCursor::seldump(char const *) const {}
+void MathCursor::dump(char const *) const {}
 
-bool MathCursor::isInside(MathInset * p) const
+#endif
+
+
+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->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;
 }
 
 
-bool 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()
+{
+       if (pos() == 0)
+               return false;
+
+       --pos();
+
+       return true;
+}
+
+
+bool MathCursor::posRight()
 {
-       return array().prev(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)) {
+               pushRight(prevAtom());
                return true;
        } 
-       if (plainLeft())
-               return true;
-       if (cursor().par_->idxLeft(cursor().idx_, cursor().pos_))
-               return true;
-       if (pop())
-               return true;
-       return false;
-}
-
-
-bool MathCursor::plainRight()
-{
-       return array().next(cursor().pos_);
+       
+       return posLeft() || idxLeft() || popLeft();
 }
 
 
 bool MathCursor::right(bool sel)
 {
        dump("Right 1");
-       if (imacro_) {
+       if (inMacroMode()) {
                macroModeClose();
+               lastcode_ = LM_TC_VAR;
                return true;
        }
        selHandle(sel);
-       clearLastCode();
+       lastcode_ = LM_TC_VAR;
 
-       MathInset * p = nextInset();
-       if (openable(p, sel, false)) {
-               push(p, true);
+       if (hasNextAtom() && openable(nextAtom(), sel)) {
+               pushLeft(nextAtom());
                return true;
        }
-       if (array().next(cursor().pos_))
-               return true;
-       if (cursor().par_->idxRight(cursor().idx_, cursor().pos_))
-               return true;
-       if (!pop())
-               return false;
-       array().next(cursor().pos_);
-       return true;
+
+       return posRight() || idxRight() || popRight();
 }
 
 
 void MathCursor::first()
 {
        Cursor_.clear();
-       push(formula_->par(), true);
+       pushLeft(formula_->par());
 }
 
 
 void MathCursor::last()
 {
-       Cursor_.clear();
-       push(formula_->par(), 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_  = formula()->par();
+       cursor().par_  = &formula_->par();
 
        while (1) {
-               cursor().idx_ = -1;
-               cursor().pos_ = -1;
-               //lyxerr << "found idx: " << idx_ << " cursor: " << 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 < cursor().par_->nargs(); ++i) {
-                       MathXArray const & ar = cursor().par_->xcell(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;
-                               cursor().idx_  = i;
-                               cursor().pos_  = c;
+                               distmin = yy + xx;
+                               idx()   = i;
+                               pos()   = c;
                        }
                }
-               //lyxerr << "found idx: " << cursor().idx_ << " cursor: "
-               //      << 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 
+               //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;
        }
-       dump("setPos 2");
+       //dump("setPos 2");
 }
 
 
-void MathCursor::home()
+void MathCursor::home(bool sel)
 {
        dump("home 1");
+       selHandle(sel);
        macroModeClose();
-       clearLastCode();
-       if (!cursor().par_->idxHome(cursor().idx_, cursor().pos_)) 
-               pop();
+       lastcode_ = LM_TC_VAR;
+       if (!par()->idxHome(idx(), pos())) 
+               popLeft();
        dump("home 2");
 }
 
 
-void MathCursor::end()
+void MathCursor::end(bool sel)
 {
        dump("end 1");
+       selHandle(sel);
        macroModeClose();
-       clearLastCode();
-       if (!cursor().par_->idxEnd(cursor().idx_, cursor().pos_)) {
-               pop();
-               array().next(cursor().pos_);
-       }
+       lastcode_ = LM_TC_VAR;
+       if (!par()->idxEnd(idx(), pos()))
+               popRight();
        dump("end 2");
 }
 
 
 void MathCursor::plainErase()
 {
-       array().erase(cursor().pos_);
+       array().erase(pos());
 }
 
 
-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;
-
-       if (imacro_ && !(MathIsAlphaFont(t) || t == LM_TC_MIN))
-               macroModeClose();
+       array().insert(pos(), t);
+       ++pos();
+}
 
-       if (imacro_) {
-               if (MathIsAlphaFont(t) || t == LM_TC_MIN) {
-                       // was MacroModeinsert(c);
-                       imacro_->setName(imacro_->name() + c);
-                       return;
-               }
-       }
 
-       array().insert(cursor().pos_, c, t);
-       array().next(cursor().pos_);
+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(cursor().pos_, p);
-       array().next(cursor().pos_);
+       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();
+       }
+       p->metrics(p->size());
 }
 
 
@@ -424,15 +473,48 @@ void MathCursor::insert(MathArray const & ar)
        if (selection_)
                selCut();
 
-       array().insert(cursor().pos_, ar);
-       cursor().pos_ += ar.size();
+       array().insert(pos(), ar);
+       pos() += ar.size();
+}
+
+
+void MathCursor::paste(MathArray const & ar)
+{
+       Anchor_ = Cursor_;
+       selection_ = true;
+       array().insert(pos(), ar);
+       pos() += ar.size();
+}
+
+
+void MathCursor::backspace()
+{
+       if (pos() == 0) {
+               pullArg(false);
+               return;
+       }       
+
+       if (selection_) {
+               selDel();
+               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;
+       }
+
+       --pos();
+       plainErase();
 }
 
 
 void MathCursor::erase()
 {
-       dump("erase 1");
-       if (imacro_)
+       if (inMacroMode())
                return;
 
        if (selection_) {
@@ -441,19 +523,27 @@ void MathCursor::erase()
        }
 
        // delete empty cells if necessary
-       if (cursor().pos_ == 0 && array().size() == 0) {
+       if (array().empty()) {
                bool popit;
                bool removeit;
-               cursor().par_->idxDelete(cursor().idx_, popit, removeit);
-               if (popit && pop() && removeit)
+               par()->idxDelete(idx(), popit, removeit);
+               if (popit && popLeft() && removeit)
                        plainErase();
                return;
        }
 
-       if (cursor().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();
 }
 
 
@@ -466,8 +556,8 @@ void MathCursor::delLine()
                return;
        }
 
-       if (cursor().par_->nrows() > 1)
-               cursor().par_->delRow(row());
+       if (par()->nrows() > 1)
+               par()->delRow(row());
 }
 
 
@@ -477,51 +567,30 @@ bool MathCursor::up(bool sel)
        macroModeClose();
        selHandle(sel);
 
-       if (selection_) {
-               int x = xarray().pos2x(cursor().pos_);
-               if (cursor().idxDown()) {
-                       cursor().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 idx, pos;
-               if (p->idxFirstUp(idx, pos)) {
-                       push(p, true);
-                       cursor().idx_ = idx;
-                       cursor().pos_ = pos;
-                       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 idx, pos;
-               if (p->idxLastUp(idx, pos)) {
-                       plainLeft();
-                       push(p, false);
-                       cursor().idx_ = idx;
-                       cursor().pos_ = pos;
-                       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(cursor().pos_);
-       if (cursor().idxUp()) {
-               cursor().pos_ = xarray().x2pos(x);
-               return true;
-       }
-       if (pop())
-               return true;
-       return false;
+       return goUp();
 }
 
 
@@ -531,223 +600,81 @@ bool MathCursor::down(bool sel)
        macroModeClose();
        selHandle(sel);
 
-       if (selection_) {
-               int x = xarray().pos2x(cursor().pos_);
-               if (cursor().idxDown()) {
-                       cursor().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 idx, pos;
-               if (p->idxFirstDown(idx, pos)) {
-                       push(p, true);
-                       cursor().idx_ = idx;
-                       cursor().pos_ = pos;
-                       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 idx, pos;
-               if (p->idxLastDown(idx, pos)) {
-                       plainLeft();
-                       push(p, false);
-                       cursor().idx_ = idx;
-                       cursor().pos_ = pos;
-                       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(cursor().pos_);
-       if (cursor().idxDown()) {
-               cursor().pos_ = xarray().x2pos(x);
-               return true;
-       }
-       if (pop())
-               return true;
-       return false;
+       return goDown();
 }
 
 
 bool MathCursor::toggleLimits()
 {
-       if (!prevIsInset())
+       if (!hasPrevAtom())
+               return false;
+       MathScriptInset * t = prevAtom()->asScriptInset();
+       if (!t)
                return false;
-       MathInset * p = prevInset();
-       int old = p->limits();
-       p->limits(old < 0 ? 1 : -1);
-       return old != p->limits();
+       int old = t->limits();
+       t->limits(old < 0 ? 1 : -1);
+       return old != t->limits();
 }
 
 
 void MathCursor::setSize(MathStyles size)
 {
-       cursor().par_->userSetSize(size);
+       par()->userSetSize(size);
 }
 
 
-
-void MathCursor::interpret(string const & s)
+void MathCursor::macroModeClose()
 {
-       //lyxerr << "interpret: '" << s << "'\n";
-       //lyxerr << "in: " << in_word_set(s) << " \n";
-
-       if (s.size() && (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();
-                               erase();
-                       } else {
-                               p = new MathScriptInset(up, !up);
-                       }
-                       insert(p);
-                       plainLeft();
-               }
-               push(p, true);
-               if (up)
-                       p->up(true);
-               else
-                       p->down(true);
-               cursor().idx_ = up ? 0 : 1;
-               cursor().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, LM_OT_UNDEF);
-       } else {
-               switch (l->token) {
-                       case LM_TK_BIGSYM: 
-                               p = new MathBigopInset(s, l->id);
-                               break;
-                               
-                       case LM_TK_SYM: {
-                               MathTextCodes code = static_cast<MathTextCodes>(l->id);
-                               if (code < 255)
-                                       insert(l->id, MathIsBOPS(code) ? LM_TC_BOPS : LM_TC_SYMB);
-                               else
-                                       p = new MathFuncInset(l->name);
-                               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->name, l->id);
-                               break;
-
-                       case  LM_TK_FUNCLIM:
-                               p = new MathFuncInset(l->name, LM_OT_FUNCLIM);
-                               break;
-
-                       case LM_TK_SPACE:
-                               p = new MathSpaceInset(l->id);
-                               break;
-
-                       case LM_TK_DOTS:
-                               p = new MathDotsInset(l->name, l->id);
-                               break;
-
-                       case LM_TK_MACRO:
-                               p = new MathMacro(MathMacroTable::provideTemplate(s));
-                               break;
-
-                       default:
-                               p = new MathFuncInset(l->name);
-                               break;
-               }
-       }
-
-       if (p) {
-               bool oldsel = selection_;
-               if (oldsel) 
-                       selCut();
-               insert(p);
-               if (p->nargs()) {
-                       plainLeft();
-                       right();  // do not push for e.g. MathBigopInset
-                       if (oldsel) 
-                               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("");
-               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;
 }
 
 
@@ -768,6 +695,8 @@ void MathCursor::selCut()
                theSelection.grab(*this);
                theSelection.erase(*this);
                selClear();
+       } else {
+               theSelection.clear();
        }
 }
 
@@ -786,16 +715,19 @@ void MathCursor::selPaste()
 {
        seldump("selPaste");
        theSelection.paste(*this);
-       selClear();
+       theSelection.grab(*this);
+       //selClear();
 }
 
 
 void MathCursor::selHandle(bool sel)
 {
-       if (sel && !selection_)
-               selStart();
-       if (!sel && selection_)
-               selClear();
+       if (sel == selection_)
+               return;
+
+       theSelection.clear();
+       Anchor_    = Cursor_;
+       selection_ = sel;
 }
 
 
@@ -805,6 +737,7 @@ void MathCursor::selStart()
        if (selection_)
                return;
 
+       theSelection.clear();
        Anchor_ = Cursor_;
        selection_ = true;
 }
@@ -812,6 +745,7 @@ void MathCursor::selStart()
 
 void MathCursor::selClear()
 {
+       seldump("selClear");
        selection_ = false;
 }
 
@@ -835,8 +769,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();
@@ -851,70 +785,51 @@ void MathCursor::drawSelection(Painter & pain) const
 
 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_; ar.next(pos))
-                               if (!ar.isInset(pos) && 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, int code)
+void MathCursor::handleDelim(string const & l, string const & r)
 {
-       MathDecorationInset * p = new MathDecorationInset(name, code);
-       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)
 {
-       x = xarray().xo() + xarray().pos2x(cursor().pos_);
+#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(cursor().pos_); 
-}
-
-
-MathTextCodes MathCursor::prevCode() const
-{
-       return array().getCode(cursor().pos_ - 1); 
-}
-
-
-MathInset * MathCursor::par() const
-{
-       return cursor().par_;
+       return *cursor().par_;
 }
 
 
@@ -924,49 +839,49 @@ InsetFormulaBase const * MathCursor::formula()
 }
 
 
-int MathCursor::pos() const
+MathCursor::idx_type MathCursor::idx() const
 {
-       return cursor().pos_;
+       return cursor().idx_;
 }
 
 
-bool MathCursor::inMacroMode() const
+MathCursor::idx_type & MathCursor::idx()
 {
-       return imacro_;
+       return cursor().idx_;
 }
 
 
-bool MathCursor::selection() const
+MathCursor::pos_type MathCursor::pos() const
 {
-       return selection_;
+       return cursor().pos_;
 }
 
 
-void MathCursor::clearLastCode()
+MathCursor::pos_type & MathCursor::pos()
 {
-       lastcode_ = LM_TC_MIN;
+       return cursor().pos_;
 }
 
 
-void MathCursor::setLastCode(MathTextCodes t)
+bool MathCursor::inMacroMode() const
 {
-       lastcode_ = t;
+       return macroNamePos() != -1;
 }
 
 
-MathTextCodes MathCursor::getLastCode() const
+bool MathCursor::selection() const
 {
-       return lastcode_;
+       return selection_;
 }
 
 
-MathInset * MathCursor::enclosing(MathInsetTypes t, int & idx) const
+MathArrayInset * MathCursor::enclosingArray(MathCursor::idx_type & idx) const
 {
        for (int i = Cursor_.size() - 1; i >= 0; --i) {
-               //lyxerr << "checking level " << i << "\n";
-               if (Cursor_[i].par_->getType() == t) {
+               MathArrayInset * p = (*Cursor_[i].par_)->asArrayInset();
+               if (p) {
                        idx = Cursor_[i].idx_;
-                       return Cursor_[i].par_;
+                       return p;
                }
        }
        return 0;
@@ -975,14 +890,27 @@ MathInset * MathCursor::enclosing(MathInsetTypes t, 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(cursor().pos_, a);
+               array().insert(pos(), a);
                if (goright) 
-                       cursor().pos_ += a.size();
+                       pos() += a.size();
        }
 }
 
@@ -1000,92 +928,86 @@ void MathCursor::normalize() const
 #endif
        MathCursor * it = const_cast<MathCursor *>(this);
 
-       if (cursor().idx_ < 0 || cursor().idx_ > cursor().par_->nargs())
-               lyxerr << "this should not really happen - 1\n";
-       it->cursor().idx_    = max(cursor().idx_, 0);
-       it->cursor().idx_    = min(cursor().idx_, cursor().par_->nargs());
+       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 (cursor().pos_ < 0 || cursor().pos_ > array().size())
-               lyxerr << "this should not really happen - 2\n";
-       it->cursor().pos_ = max(cursor().pos_, 0);
-       it->cursor().pos_ = min(cursor().pos_, array().size());
+       if (pos() > size()) {
+               lyxerr << "this should not really happen - 2: "
+                      << pos() << " " << size() << "\n";
+               dump("error 4");
+       }
+       it->pos() = min(pos(), size());
 }
 
 
-int MathCursor::col() const
+MathCursor::size_type MathCursor::size() const
 {
-       return par()->col(cursor().idx_);
+       return array().size();
 }
 
 
-int MathCursor::row() const
+MathCursor::col_type MathCursor::col() const
 {
-       return par()->row(cursor().idx_);
+       return par()->col(idx());
 }
 
 
-/*
-char MathCursorPos::getChar() const
+MathCursor::row_type MathCursor::row() const
 {
-       return array().getChar(cursor().pos_);
+       return par()->row(idx());
 }
 
 
-string MathCursorPos::readString()
+bool MathCursor::hasPrevAtom() const
 {
-       string s;
-       int code = nextCode();
-       for ( ; OK() && nextCode() == code; Next()) 
-               s += getChar();
+       return pos() > 0;
+}
 
-       return s;
+
+bool MathCursor::hasNextAtom() const
+{
+       return pos() < size();
 }
-*/
 
 
-MathInset * MathCursor::prevInset() const
+MathAtom const & MathCursor::prevAtom() const
 {
-       normalize();
-       int c = cursor().pos_;
-       if (!array().prev(c))
-               return 0;
-       return array().nextInset(c);
+       lyx::Assert(pos() > 0);
+       return array().at(pos() - 1);
 }
 
 
-MathInset * MathCursor::nextInset() const
+MathAtom & MathCursor::prevAtom()
 {
-       normalize();
-       return array().nextInset(cursor().pos_);
+       lyx::Assert(pos() > 0);
+       return array().at(pos() - 1);
 }
 
 
-MathScriptInset * MathCursor::prevScriptInset() const
+MathAtom const & MathCursor::nextAtom() const
 {
-       normalize();
-       MathInset * p = array().prevInset(cursor().pos_);
-       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 = array().prevInset(cursor().pos_);
-       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 (!cursor().par_) {
-               lyxerr << "############  par_ not valid\n";
-               return dummy;
-       }
 
-       if (cursor().idx_ < 0 || cursor().idx_ >= cursor().par_->nargs()) {
-               lyxerr << "############  idx_ " << cursor().idx_ << " not valid\n";
+       if (idx() >= par()->nargs()) {
+               lyxerr << "############  idx_ " << idx() << " not valid\n";
                return dummy;
        }
 
@@ -1099,112 +1021,77 @@ MathXArray & MathCursor::xarray() const
 }
 
 
-bool MathCursor::nextIsInset() const
-{
-       return cursor().pos_ < array().size() && MathIsInset(nextCode());
-}
-
-
-bool MathCursor::prevIsInset() const
-{
-       return cursor().pos_ > 0 && MathIsInset(prevCode());
-}
-
-
-int MathCursor::xpos() const 
-{
-       normalize();
-       return xarray().pos2x(cursor().pos_);
-}
-
-
-void MathCursor::gotoX(int x)
-{
-       cursor().pos_ = xarray().x2pos(x);      
-}
-
-
 void MathCursor::idxNext()
 {
-       cursor().par_->idxNext(cursor().idx_, cursor().pos_);
+       par()->idxNext(idx(), pos());
 }
 
 
 void MathCursor::idxPrev()
 {
-       cursor().par_->idxPrev(cursor().idx_, cursor().pos_);
+       par()->idxPrev(idx(), pos());
 }
 
 
 void MathCursor::splitCell()
 {
-       if (cursor().idx_ == cursor().par_->nargs() - 1) 
+       if (idx() == par()->nargs() - 1) 
                return;
        MathArray ar = array();
-       ar.erase(0, cursor().pos_);
-       array().erase(cursor().pos_, array().size());
-       ++cursor().idx_;
-       cursor().pos_ = 0;
+       ar.erase(0, pos());
+       array().erase(pos(), size());
+       ++idx();
+       pos() = 0;
        array().insert(0, ar);
 }
 
 
 void MathCursor::breakLine()
 {
-       MathMatrixInset * p = static_cast<MathMatrixInset *>(formula()->par());
+       // leave inner cells
+       while (popRight())
+               ;
+
+       MathMatrixInset * p = formula()->par()->asMatrixInset();
+       if (!p)
+               return;
+
        if (p->getType() == LM_OT_SIMPLE || p->getType() == LM_OT_EQUATION) {
                p->mutate(LM_OT_EQNARRAY);
-               p->addRow(0);
-               cursor().idx_ = p->nrows();
-               cursor().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);      
+               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));
                }
 
                // split cell
                splitCell();
-               p->cell(cursor().idx_).swap(p->cell(cursor().idx_ + p->ncols() - 1));
+               p->cell(idx()).swap(p->cell(idx() + p->ncols() - 1));
        }
 }
 
 
 char MathCursor::valign() const
 {
-       int idx;
-       MathGridInset * p =
-               static_cast<MathGridInset *>(enclosing(LM_OT_MATRIX, idx));
-       return p ? p->valign() : 0;
+       idx_type idx;
+       MathArrayInset * p = enclosingArray(idx);
+       return p ? p->valign() : '\0';
 }
 
 
 char MathCursor::halign() const
 {
-       int idx;
-       MathGridInset * p =
-               static_cast<MathGridInset *>(enclosing(LM_OT_MATRIX, idx));
-       return p ? p->halign(idx % p->ncols()) : 0;
-}
-
-
-MathCursorPos MathCursor::firstSelectionPos() const
-{
-       MathCursorPos anc = normalAnchor();
-       return anc < cursor() ? anc : cursor(); 
-}
-
-
-MathCursorPos MathCursor::lastSelectionPos() const
-{
-       MathCursorPos anc = normalAnchor();
-       return anc < cursor() ? cursor() : anc; 
+       idx_type idx;
+       MathArrayInset * p = enclosingArray(idx);
+       return p ? p->halign(idx % p->ncols()) : '\0';
 }
 
 
@@ -1233,6 +1120,296 @@ 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 && p->hasDown()) {
+               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_;
+       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;    
+       }
+       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 && p->hasUp()) {
+               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_;
+       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;    
+       }
+       Cursor_ = save;
+       return false;
+}
+
+
+bool MathCursor::idxLeft()
+{
+       return par()->idxLeft(idx(), pos());
+}
+
+
+bool MathCursor::idxRight()
+{
+       return par()->idxRight(idx(), pos());
+}
+
+
+void MathCursor::interpret(string const & s)
+{
+       //lyxerr << "interpret 1: '" << s << "'\n";
+       //lyxerr << "in: " << in_word_set(s) << " \n";
+
+       if (s.empty())
+               return;
+
+       if (s.size() == 1) {
+               interpret(s[0]);
+               return;
+       }
+
+       //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() > 7 && s.substr(0, 7) == "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;
+       }
+
+       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;
+       }
+
+       niceInsert(createMathInset(s.substr(1)));
+}
+
+
+void MathCursor::interpret(char c)
+{
+       //lyxerr << "interpret 2: '" << c << "'\n";
+
+       if (inMacroMode()) {
+               string name = macroName();
+
+               if (name == "\\" && c == '#') {
+                       insert(c, LM_TC_TEX);
+                       return;
+               }
+
+               if (name == "\\" && c == '\\') {
+                       backspace();
+                       interpret("\\backslash");
+                       return;
+               }
+
+               if (name == "\\#" && '1' <= c && c <= '9') {
+                       insert(c, LM_TC_TEX);
+                       macroModeClose();
+                       return;
+               }
+
+               if (isalpha(c)) {
+                       insert(c, LM_TC_TEX);
+                       return;
+               }
+
+               if (name == "\\") {
+                       insert(c, LM_TC_TEX);
+                       macroModeClose();
+                       return;
+               }
+
+               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();
+               } else if (hasNextAtom() && nextAtom()->asScriptInset()) {
+                       nextAtom()->asScriptInset()->ensure(up);
+                       pushLeft(nextAtom());
+                       pos() = 0;
+               } else {
+                       plainInsert(MathAtom(new MathScriptInset(up)));
+                       pushRight(prevAtom());
+               }
+               idx() = up;
+               selPaste();
+               return;
+       }
+
+       if (selection_)
+               selDel();
+
+       if (lastcode_ == LM_TC_TEXTRM) {
+               insert(c, LM_TC_TEXTRM);
+               return;
+       }
+
+       if (c == ' ') {
+               if (hasPrevAtom() && prevAtom()->asSpaceInset()) {
+                       prevAtom()->asSpaceInset()->incSpace();
+                       return;
+               }
+
+               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 (strchr("{}", c)) {
+               insert(c, LM_TC_TEX);
+               return;
+       }
+
+       if (strchr("#$%", c)) {
+               insert(MathAtom(new MathSpecialCharInset(c)));  
+               lastcode_ = LM_TC_VAR;
+               return;
+       }
+
+       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", "epsilon", "kappa", "lambda", "mu",
+                        "nu", "omikron", "pi", "vartheta", "rho", "sigma",
+                        "tau", "upsilon", "theta", "omega", "xi", "varphi", "zeta"};
+               static char const greeku[][26] =
+                       {"Alpha", "Beta", "chi", "Delta", "varepsilon", "Phi",
+                        "Gamma", "Eta", "Iota", "Epsilon", "Kappa", "Lambda", "Mu",
+                        "Nu", "Omikron", "Pi", "vartheta", "varrho", "Sigma", "varsigma",
+                        "Upsilon", "Theta", "Omega", "Xi", "Varphi", "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);
+
+#warning greek insert problem? look here!
+               if (lastcode_ == LM_TC_GREEK1)
+                       lastcode_ = LM_TC_VAR;
+               return; 
+       }
+
+       if (c == '\\') {
+               insert(c, LM_TC_TEX);
+               //bv->owner()->message(_("TeX mode"));
+               return; 
+       }
+
+       // no special circumstances, so insert the character without any fuss
+       insert(c, LM_TC_MIN);
+}
+
+
 
 ////////////////////////////////////////////////////////////////////////
 
@@ -1255,26 +1432,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_);
 }
 
 
@@ -1284,33 +1462,9 @@ MathCursorPos MathCursor::normalAnchor() const
        MathCursorPos normal = Anchor_[Cursor_.size() - 1];
        if (Cursor_.size() < Anchor_.size() && !(normal < cursor())) {
                // anchor is behind cursor -> move anchor behind the inset
-               normal.cell().next(normal.pos_);
+               ++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()
-{
-       return par_->idxLeft(idx_, pos_);
-}
-
-
-bool MathCursorPos::idxRight()
-{
-       return par_->idxRight(idx_, pos_);
-}