]> git.lyx.org Git - lyx.git/blobdiff - src/mathed/math_cursor.C
Fix "pullArg" behaviour when pressing <Backspace> at the beginning of an inset
[lyx.git] / src / mathed / math_cursor.C
index 4cb9e3dea04b1e8ac30b25fc2a7e5960970aa67f..c12b10223e2f66daf339418349505741d50efce9 100644 (file)
 /*
-*  File:        math_cursor.C
-*  Purpose:     Interaction for mathed
-*  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
-*  Created:     January 1996
-*  Description: Math interaction for a WYSIWYG math editor.
-*
-*  Dependencies: Xlib, XForms
-*
-*  Copyright: 1996, Alejandro Aguilar Sierra
-*
-*   Version: 0.8beta, Mathed & Lyx project.
-*
-*   You are free to use and modify this code under the terms of
-*   the GNU General Public Licence version 2 or later.
-*/
+ *  File:        math_cursor.C
+ *  Purpose:     Interaction for mathed
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ *  Created:     January 1996
+ *  Description: Math interaction for a WYSIWYG math editor.
+ *
+ *  Dependencies: Xlib, XForms
+ *
+ *  Copyright: 1996, Alejandro Aguilar Sierra
+ *
+ *   Version: 0.8beta, Math & Lyx project.
+ *
+ *   You are free to use and modify this code under the terms of
+ *   the GNU General Public Licence version 2 or later.
+ */
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
 #include <config.h>
-#include FORMS_H_LOCATION
-#include "math_inset.h"
-#include "math_parser.h"
-#include "math_cursor.h"
-#include "math_macro.h"
-#include "math_macrotable.h"
-#include "math_root.h"
-#include "support/lstrings.h"
+#include <algorithm>
+#include <cctype>
+
 #include "debug.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "math_matrixinset.h"
-#include "math_rowst.h"
-#include "math_spaceinset.h"
-#include "math_funcinset.h"
+#include "mathed/support.h"
+#include "formulabase.h"
+#include "math_cursor.h"
+#include "math_arrayinset.h"
 #include "math_bigopinset.h"
-#include "math_fracinset.h"
 #include "math_decorationinset.h"
+#include "math_deliminset.h"
 #include "math_dotsinset.h"
-#include "math_accentinset.h"
-#include "mathed/support.h"
-
-static MathedArray * selarray = 0;
+#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_parser.h"
 
 using std::endl;
+using std::min;
+using std::max;
+using std::isalnum;
+
+#define RECTANGULAR_SELECT 1
+
+namespace {
+
+struct Selection
+{
+       void grab(MathCursor const & cursor)
+       {
+               data_.clear();
+               MathCursorPos i1;
+               MathCursorPos i2;
+               cursor.getSelection(i1, i2); 
+               if (i1.idx_ == i2.idx_)
+                       data_.push_back(MathArray(i1.cell(), i1.pos_, i2.pos_));
+               else {
+#ifdef RECTANGULAR_SELECT
+                       std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
+                       for (unsigned i = 0; i < indices.size(); ++i)
+                               data_.push_back(i1.cell(indices[i]));
+#else
+                       data_.push_back(MathArray(i1.cell(), i1.pos_, i1.cell().size()));
+                       for (int i = i1.idx_ + 1; i < i2.idx_; ++i)
+                               data_.push_back(i1.cell(i));
+                       data_.push_back(MathArray(i2.cell(), 0, i2.pos_));
+#endif
+               }
+       }
+
+       void erase(MathCursor & cursor)
+       {
+               MathCursorPos i1;
+               MathCursorPos i2;
+               cursor.getSelection(i1, i2); 
+               if (i1.idx_ == i2.idx_) {
+                       i1.cell().erase(i1.pos_, i2.pos_);
+               } else {
+#ifdef RECTANGULAR_SELECT
+                       std::vector<int> indices = i1.par_->idxBetween(i1.idx_, i2.idx_);
+                       for (unsigned i = 0; i < indices.size(); ++i)
+                               i1.cell(indices[i]).erase();
+#else
+                       i1.cell().erase(i1.pos_, i1.cell().size());
+                       for (int i = i1.idx_ + 1; i < i2.idx_; ++i)
+                               i1.cell(i).erase();
+                       i2.cell().erase(0, i2.pos_);
+
+                       int from = i1.cell().size() ? i1.idx_ + 1 : i1.idx_; 
+                       int to   = i2.cell().size() ? i2.idx_ : i2.idx_ + 1; 
+                       i1.par_->idxDeleteRange(from, to);
+#endif
+               }
+               cursor.cursor() = i1;
+       }
+
+       void paste(MathCursor & cursor) const
+       {
+#ifdef RECTANGULAR_SELECT
+               cursor.cursor().cell().push_back(glue());
+#else
+               unsigned na  = cursor.cursor().par_->nargs();
+               unsigned idx = cursor.cursor().idx_;
+               unsigned end = std::min(idx + data_.size(), na);
+               for (int i = 0; i < end - idx; ++i)
+                       cursor.cursor().cell(idx + i).push_back(data_[i]);
+               for (unsigned i = end - idx; i < data_.size(); ++i)
+                       cursor.cursor().cell(end - 1).push_back(data_[i]);
+#endif
+       }
+
+       // glues selection to one cell
+       MathArray glue() const
+       {
+               MathArray ar;
+               for (unsigned i = 0; i < data_.size(); ++i)
+                       ar.push_back(data_[i]);
+               return ar;
+       }
+
+       void clear()
+       {
+               data_.clear();
+       }
+
+       
+
+       std::vector<MathArray> data_;
+};
+
+
+Selection theSelection;
+
 
-// This was very smaller, I'll change it later
-static inline
 bool IsMacro(short tok, int id)
 {
        return tok != LM_TK_STACK &&
               tok != LM_TK_FRAC &&
               tok != LM_TK_SQRT &&
-              tok != LM_TK_WIDE &&
+              tok != LM_TK_DECORATION &&
               tok != LM_TK_SPACE &&
               tok != LM_TK_DOTS &&
               tok != LM_TK_FUNCLIM &&
               tok != LM_TK_BIGSYM &&
-              tok != LM_TK_ACCENT &&
               !(tok == LM_TK_SYM && id < 255);
 }
 
-static int const MAX_STACK_ITEMS = 32;
 
-struct MathStackXIter {
-       int i, imax;
-       MathedXIter * item;
+std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
+{
+       os << "(par: " << p.par_ << " idx: " << p.idx_
+          << " pos: " << p.pos_ << ")";
+       return os;
+}
 
-       MathStackXIter(int n = MAX_STACK_ITEMS): imax(n) {
-               item = new MathedXIter[imax];
-               i = 0;
-       }
+}
 
-       MathStackXIter(MathStackXIter & stk);
 
-       ~MathStackXIter() {
-               delete[] item;
-       }
+MathCursor::MathCursor(InsetFormulaBase * formula)
+       : formula_(formula)
+{
+       lastcode   = LM_TC_MIN;
+       macro_mode = false;
+       selection  = false;
+       first();
+}
 
-       void push(MathedXIter ** a) {
-               *a = &item[i++];
-       }
 
-       MathedXIter * pop() {
-               --i;
-               return &item[i - 1];
-       }
+void MathCursor::push(MathInset * par, bool first)
+{
+       MathCursorPos p;
+       p.par_ = par;
+       if (first)
+               par->idxFirst(p.idx_, p.pos_);
+       else
+               par->idxLast(p.idx_, p.pos_);
+       Cursor_.push_back(p);
+}
 
-       MathedXIter * Item(int idx) {
-               return (idx + 1 <= i) ? &item[i - idx - 1] : 0;
-       }
 
-       void Reset() {
-               i = 0;
-       }
+bool MathCursor::pop()
+{
+       if (Cursor_.size() <= 1)
+               return false;
+       Cursor_.pop_back();
+       return true;
+}
 
-       bool Full() {
-               return i >= MAX_STACK_ITEMS;
-       }
 
-       bool Empty() {
-               return i <= 1;
-       }
+MathInset * MathCursor::parInset(int i) const
+{
+       return Cursor_[i].par_;
+}
 
-       int Level() { return i; }
 
-} mathstk, *selstk = 0;
+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_
+                       << " idx: " << Cursor_[i].idx_
+                       << " par: " << Cursor_[i].par_ << "\n";
 
-MathStackXIter::MathStackXIter(MathStackXIter & stk)
-{
-       imax = stk.imax;
-       item = new MathedXIter[imax];
-       i = stk.i;
-       for (int k = 0; k < i; ++k) {
-               item[k].SetData(stk.item[k].getPar());
-               item[k].GoBegin();
-               item[k].goPosAbs(stk.item[k].getPos());
-       }
+       //lyxerr        << " sel: " << selection << " data: " << array() << "\n";
 }
 
 
-/***----------------  Mathed Cursor  ---------------------------***/
-
-MathedCursor::MathedCursor(MathParInset * p) // : par(p)
+void MathCursor::seldump(char const *) const
 {
-       accent   = 0;
-       anchor   = 0;
-       lastcode = LM_TC_MIN;
-       SetPar(p);
-       //    selarray = 0;
-       if (!MathMacroTable::built)
-               MathMacroTable::mathMTable.builtinMacros();
+       //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 << "\nanchor.pos_: " << anchor().pos_;
+       //lyxerr << "\n===================^^^^^^^^^^^^=====================\n\n\n";
 }
 
 
-void MathedCursor::SetPar(MathParInset * p)
+bool MathCursor::isInside(MathInset * p) const
 {
-       macro_mode = false;
-       selection  = false; // not SelClear() ?
-       mathstk.Reset();
-       mathstk.push(&cursor);
-       par = p;
-       cursor->SetData(par);
+       for (unsigned i = 0; i < Cursor_.size(); ++i) 
+               if (parInset(i) == p) 
+                       return true;
+       return false;
 }
 
 
-void MathedCursor::draw(Painter & pain, int x, int y)
+bool MathCursor::openable(MathInset * p, bool sel, bool useupdown) const
 {
-       //    lyxerr << "Cursor[" << x << " " << y << "] ";
-       //win = pm;    // win = (mathedCanvas) ? mathedCanvas: pm;
-
-       par->Metrics();
-       int w = par->Width() + 2;
-       int a = par->Ascent() + 1;
-       int h = par->Height() + 1;
-
-       if (par->GetType() > LM_OT_PAR) {
-               a += 4;
-               h += 8;
+       if (!p)
+               return false;
+       if (!(p->isActive() || (useupdown && p->isUpDownInset())))
+               return false;
+
+       if (sel) {
+               // we can't move into everything during selection
+               if (Cursor_.size() == Anchor_.size())
+                       return false;
+               if (p != Anchor_[Cursor_.size()].par_)
+                       return false;
        }
-
-       pain.rectangle(x - 1, y - a, w, h, LColor::mathframe);
-
-       par->draw(pain, x, y);
-       cursor->Adjust();
+       return true;
 }
 
 
-void MathedCursor::Redraw(Painter & pain)
+bool MathCursor::plainLeft()
 {
-       lyxerr[Debug::MATHED] << "Mathed: Redrawing!" << endl;
-       par->Metrics();
-       int w = par->Width();
-       int h = par->Height();
-       int x;
-       int y;
-       par->GetXY(x, y);
-       //mathed_set_font(LM_TC_VAR, 1);
-       pain.fillRectangle(x, y - par->Ascent(),
-       x + w, y - par->Ascent() + h,
-       LColor::mathbg);
-       par->draw(pain, x, y);
+       return array().prev(cursor().pos_);
 }
 
 
-bool MathedCursor::Left(bool sel)
+bool MathCursor::Left(bool sel)
 {
+       dump("Left 1");
        if (macro_mode) {
                // was MacroModeBack()
-               if (!imacro->GetName().empty()) {
-                       imacro->SetName(imacro->GetName()
-                                       .substr(0, imacro->GetName()
-                                               .length() - 1));
-                       imacro->Metrics();
+               if (!imacro->name().empty()) {
+                       imacro->SetName(imacro->name().substr(0, imacro->name().length()-1));
+                       imacro->Metrics(imacro->size());
                } else
                        MacroModeClose();
                return true;
        }
-
+       SelHandle(sel);
        clearLastCode();
 
-       if (sel && !selection)
-               SelStart();
-
-       if (!sel && selection)
-               SelClear();
-
-       bool result = cursor->Prev();
-
-       if (!result && !mathstk.Empty()) {
-               cursor = mathstk.pop();
-               cursor->Adjust();
-               result = true;
-               if (selection)
-                       SelClear();
-       } else if (result && cursor->IsActive()) {
-               if (cursor->IsScript()) {
-                       cursor->Prev();
-                       if (!cursor->IsScript())
-                               cursor->Next();
-                       cursor->Adjust();
-                       return true;
-               }
-
-               if (!selection) {
-                       MathParInset * p = cursor->GetActiveInset();
-                       if (!p)
-                               return result;
-
-                       p->setArgumentIdx(p->getMaxArgumentIdx());
-                       mathstk.push(&cursor);
-                       cursor->SetData(p);
-                       cursor->GoLast();
-               }
-       }
-       return result;
-}
-
-
-// Leave the inset
-bool MathedCursor::Pop()
-{
-       if (!mathstk.Empty()) {
-               cursor = mathstk.pop();
-               cursor->Next();
+       MathInset * p = prevInset();
+       if (openable(p, sel, false)) {
+               plainLeft();
+               push(p, false);
+               return true;
+       } 
+       if (plainLeft())
+               return true;
+       if (cursor().par_->idxLeft(cursor().idx_, cursor().pos_))
+               return true;
+       if (pop())
                return true;
-       }
        return false;
 }
 
 
-// Go to the inset
-bool MathedCursor::Push()
+bool MathCursor::plainRight()
 {
-       if (cursor->IsActive()) {
-               MathParInset * p = cursor->GetActiveInset();
-               if (!p)
-                       return false;
-               mathstk.push(&cursor);
-               cursor->SetData(p);
-               return true;
-       }
-       return false;
+       return array().next(cursor().pos_);
 }
 
 
-bool MathedCursor::Right(bool sel)
+bool MathCursor::Right(bool sel)
 {
+       dump("Right 1");
        if (macro_mode) {
                MacroModeClose();
                return true;
        }
-
+       SelHandle(sel);
        clearLastCode();
 
-       if (sel && !selection)
-               SelStart();
-
-       if (!sel && selection)
-               SelClear();
+       MathInset * p = nextInset();
+       if (openable(p, sel, false)) {
+               push(p, true);
+               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;
+}
 
-       bool result = false;
 
-       if (cursor->IsActive()) {
-               if (cursor->IsScript()) {
-                       cursor->Next();
-                       // A script may be followed by another script
-                       if (cursor->IsScript())
-                               cursor->Next();
-                       return true;
-               }
+void MathCursor::first()
+{
+       Cursor_.clear();
+       push(formula_->par(), true);
+}
 
-               if (!selection) {
-                       MathParInset *p = cursor->GetActiveInset();
-                       if (!p) {
-                       lyxerr << "Math error: Inset expected." << endl;
-                       return cursor->Next();
-                       }
-                       p->setArgumentIdx(0);
-                       mathstk.push(&cursor);
-                       cursor->SetData(p);
-                       result = true;
-               } else
-                       result = cursor->Next();
 
-       } else {
-               if (cursor->GetChar()!= LM_TC_CR)
-               result = cursor->Next();
-               if (!result && !mathstk.Empty()) {
-                       cursor = mathstk.pop();
-                       cursor->Next();
-                       cursor->Adjust();
-                       result = true;
-                       if (selection)
-                               SelClear();
-               }
-       }
-       return result;
+void MathCursor::last()
+{
+       Cursor_.clear();
+       push(formula_->par(), false);
 }
 
 
-void MathedCursor::SetPos(int x, int y)
+void MathCursor::SetPos(int x, int y)
 {
-       int xp = 0;
-
-       if (macro_mode)
-               MacroModeClose();
+       dump("SetPos 1");
+       //lyxerr << "MathCursor::SetPos x: " << x << " y: " << y << "\n";
 
+       MacroModeClose();
        lastcode = LM_TC_MIN;
-       mathstk.Reset();
-       mathstk.push(&cursor);
-       cursor->SetData(par);
-       cursor->fitCoord(x, y);
-
-       while (cursor->GetX()<x && cursor->OK()) {
-               if (cursor->IsActive()) {
-                       MathParInset * p = cursor->GetActiveInset();
-                       if (p->Inside(x, y)) {
-                               p->SetFocus(x, y);
-                               mathstk.push(&cursor);
-                               cursor->SetData(p);
-                               cursor->fitCoord(x, y);
-                               continue;
+       first();
+
+       cursor().par_  = formula()->par();
+
+       while (1) {
+               cursor().idx_ = -1;
+               cursor().pos_ = -1;
+               //lyxerr << "found idx: " << idx_ << " cursor: " << 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);
+                       int x1 = x - ar.xo();
+                       int y1 = y - ar.yo();
+                       int 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;
                        }
                }
-               xp = cursor->GetX();
-               cursor->ipush();
-               if (!cursor->Next() && !Pop())
+               //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 
                        break;
        }
-       if (x-xp < cursor->GetX()-x) cursor->ipop();
-       cursor->Adjust();
+       dump("SetPos 2");
 }
 
 
-void MathedCursor::Home()
+void MathCursor::Home()
 {
+       dump("Home 1");
        if (macro_mode)
                MacroModeClose();
        clearLastCode();
-       mathstk.Reset();
-       mathstk.push(&cursor);
-       cursor->GoBegin();
+       if (!cursor().par_->idxHome(cursor().idx_, cursor().pos_)) 
+               pop();
+       dump("Home 2");
 }
 
 
-void MathedCursor::End()
+void MathCursor::End()
 {
+       dump("End 1");
        if (macro_mode)
                MacroModeClose();
        clearLastCode();
-       mathstk.Reset();
-       mathstk.push(&cursor);
-       cursor->GoLast();
-}
-
-
-MathMatrixInset * create_multiline(short int type, int cols)
-{
-       int columns;
-       string align;
-       if (cols < 1)
-               cols = 1;
-
-       switch (type) {
-               case LM_OT_ALIGN:
-               case LM_OT_ALIGNN:
-                       columns = 2*cols;
-                       for (int i = 0; i < cols; ++i)
-                       align += "Rl";
-                       break;
-
-               case LM_OT_ALIGNAT:
-               case LM_OT_ALIGNATN:
-                       columns = 2*cols;
-                       for (int i = 0; i < cols; ++i)
-                       align += "rl";
-                       break;
-
-               case LM_OT_MULTLINE:
-               case LM_OT_MULTLINEN:
-                       columns = 1;
-                       align = "C";
-                       break;
-
-               case LM_OT_MPAR:
-               case LM_OT_MPARN:
-               default:
-                       columns = 3;
-                       align = "rcl";
-                       break;
+       if (!cursor().par_->idxEnd(cursor().idx_, cursor().pos_)) {
+               pop();
+               array().next(cursor().pos_);
        }
-
-       MathMatrixInset * mt = new MathMatrixInset(columns, -1);
-       mt->SetAlign(' ', align);
-       return mt;
+       dump("End 2");
 }
 
 
-void MathedCursor::Insert(byte c, MathedTextCodes t)
+void MathCursor::insert(char c, MathTextCodes t)
 {
+       //lyxerr << "inserting '" << c << "'\n";
        if (selection)
                SelDel();
 
@@ -431,107 +433,51 @@ void MathedCursor::Insert(byte c, MathedTextCodes t)
        if (macro_mode && !(MathIsAlphaFont(t) || t == LM_TC_MIN))
                MacroModeClose();
 
-       if (t == LM_TC_CR) {
-               MathParInset * p = cursor->p;
-               if (p == par && p->GetType()<LM_OT_MPAR && p->GetType()>LM_OT_MIN) {
-                       short int type = LM_OT_MPAR;
-                       int cols = 1;
-                       if (c >= '1' && c <= '9') {
-                               type = LM_OT_ALIGN;
-                               cols = c - '1' + 1;
-                       } else if (c >= 'A' && c <= 'I') {
-                               type = LM_OT_ALIGNAT;
-                               cols = c - 'A' + 1;
-                       } else if (c == 'm')
-                               type = LM_OT_MULTLINE;
-                       else if (c == 'e')
-                               type = LM_OT_MPAR;
-
-                       if (p->GetType() == LM_OT_PARN)
-                               ++type;
-                       MathMatrixInset * mt = create_multiline(type, cols);
-                       mt->SetStyle(LM_ST_DISPLAY);
-                       mt->SetType(type);
-                       mt->setData(p->GetData());
-                       p->setData(0);                          // BUG duda
-                       delete p;
-                       par = mt;
-                       p = mt;
-                       p->Metrics();
-                       int pos = cursor->getPos();
-                       cursor->SetData(par);
-                       cursor->goPosAbs(pos);
-               }
-               if (p &&  p->Permit(LMPF_ALLOW_CR)) {
-                       cursor->addRow();
-               }
-       } else if (t == LM_TC_TAB) {
-               MathParInset * p = cursor->p;
-               if (p &&  p->Permit(LMPF_ALLOW_TAB)) {
-                       if (c) {
-                               cursor->Insert(c, t);
-                               cursor->checkTabs();
-                       } else
-                               cursor->goNextColumn();
-               } else // Navigate between arguments
-               if (p && p->GetType() == LM_OT_MACRO) {
-                       if (p->getArgumentIdx() < p->getMaxArgumentIdx()) {
-                               p->setArgumentIdx(p->getArgumentIdx() + 1);
-                               cursor->SetData(p);
-                               return;
-                       }
-               }
-       } else {
-               if (macro_mode) {
-                       if (MathIsAlphaFont(t) || t == LM_TC_MIN) {
-                               // was MacroModeInsert(c);
-                               imacro->SetName(imacro->GetName() + static_cast<char>(c));
-                               return;
-                       }
+       if (macro_mode) {
+               if (MathIsAlphaFont(t) || t == LM_TC_MIN) {
+                       // was MacroModeinsert(c);
+                       imacro->SetName(imacro->name() + static_cast<char>(c));
+                       return;
                }
+       }
 
-               if (accent) {
-                       doAccent(c, t);
-               } else
-                       cursor->Insert(c, t);
+       array().insert(cursor().pos_, c, t);
+       array().next(cursor().pos_);
 
-               lastcode = t;
-               return;
-       }
-       clearLastCode();
+       lastcode = t;
 }
 
 
-void MathedCursor::Insert(MathedInset * p, int t)
+void MathCursor::insert(MathInset * p)
 {
-       if (macro_mode)
-               MacroModeClose();
+       MacroModeClose();
 
        if (selection) {
-               if (MathIsActive(t)) {
+               if (p->nargs())
                        SelCut();
-                       static_cast<MathParInset*>(p)->setData(selarray);
-               } else
+               else
                        SelDel();
        }
 
-       if (mathstk.i < MAX_STACK_ITEMS - 1) {
-               if (accent && !MathIsActive(t)) {       
-                       doAccent(p);
-               } else {
-                       cursor->Insert(p, t);
-                       if (MathIsActive(t)) {
-                               cursor->Prev();
-                               Push();
-                       }
-               }
-       } else
-               lyxerr << "Math error: Full stack." << endl;
+       array().insert(cursor().pos_, p);
+       array().next(cursor().pos_);
+}
+
+
+void MathCursor::insert(MathArray const & ar)
+{
+       MacroModeClose();
+       if (selection)
+               SelCut();
+
+       array().insert(cursor().pos_, ar);
+       cursor().pos_ += ar.size();
 }
 
 
-void MathedCursor::Delete()
+void MathCursor::Delete()
 {
+       dump("Delete 1");
        if (macro_mode)
                return;
 
@@ -540,265 +486,255 @@ void MathedCursor::Delete()
                return;
        }
 
-       if (cursor->Empty() && !mathstk.Empty()) 
-               cursor = mathstk.pop();
+       if (cursor().pos_ < array().size())
+               array().erase(cursor().pos_);
 
-       //   if (cursor->GetChar()!= LM_TC_TAB)
-       cursor->Delete();
-       cursor->checkTabs();
+       // delete empty cells if necessary
+       if (cursor().pos_ == 0 && array().size() == 0) {
+               bool popit;
+               bool removeit;
+               cursor().par_->idxDelete(cursor().idx_, popit, removeit);
+               if (popit && pop() && removeit)
+                       Delete();
+       }
+
+       dump("Delete 2");
 }
 
 
-void MathedCursor::DelLine()
+void MathCursor::DelLine()
 {
-       if (macro_mode)
-               MacroModeClose();
+       MacroModeClose();
 
        if (selection) {
                SelDel();
                return;
        }
 
-       MathParInset * p = cursor->p;
-
-       if (p && p->GetType() <= LM_OT_MATRIX && p->GetType() >= LM_OT_MPAR) {
-               cursor->delRow();
-       }
+       if (cursor().par_->nrows() > 1)
+               cursor().par_->delRow(row());
 }
 
 
-bool MathedCursor::Up(bool sel)
+bool MathCursor::Up(bool sel)
 {
-       bool result = false;
-
-       if (macro_mode)
-               MacroModeClose();
-
-       if (sel && !selection)
-               SelStart();
-
-       if (!sel && selection)
-               SelClear();
+       dump("Up 1");
+       MacroModeClose();
+       SelHandle(sel);
 
-       if (cursor->IsScript()) {
-               char cd = cursor->GetChar();
-               if (MathIsUp(cd)) {
-                       Push();
+       if (selection) {
+               int x = xarray().pos2x(cursor().pos_);
+               if (cursor().par_->idxUp(cursor().idx_, cursor().pos_)) {
+                       cursor().pos_ = xarray().x2pos(x);
                        return true;
-               } else {
-                       // A subscript may be followed by a superscript
-                       cursor->ipush();
-                       cursor->Next();
-                       if (MathIsUp(cursor->GetChar())) {
-                               Push();
-                               return true;
-                       } else  // return to the previous state
-                               cursor->ipop();
                }
+               if (pop()) 
+                       return true;
+               return false;
        }
 
-       result = cursor->Up();
-       if (!result && cursor->p) {
-               MathParInset * p = cursor->p;
-
-               if (p->GetType() == LM_OT_SCRIPT) {
-                       MathedXIter * cx = mathstk.Item(1);
-                       bool is_down = (cx->GetChar() == LM_TC_DOWN);
-                       cursor = mathstk.pop();
-                       cursor->Next();
-                       result =  (is_down) ? true: Up();
-               } else {
-                       result = (p->getArgumentIdx() > 0);
-                       if (result) {
-                               p->setArgumentIdx(p->getArgumentIdx() - 1);
-                               cursor->SetData(p);
-                       }
+       // 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().par_ = p;
+                       cursor().idx_ = idx;
+                       cursor().pos_ = pos;
+                       dump("Up 3");
+                       return true;
                }
+       }
 
-               if (!result && !mathstk.Empty()) {
-                       cursor = mathstk.pop();
-                       return Up();
+       p = prevInset();
+       if (p) {
+               int idx, pos;
+               if (p->idxLastUp(idx, pos)) {
+                       plainLeft();
+                       push(p, false);
+                       cursor().par_ = p;
+                       cursor().idx_ = idx;
+                       cursor().pos_ = pos;
+                       dump("Up 4");
+                       return true;
                }
        }
-       return result;
+
+       int x = xarray().pos2x(cursor().pos_);
+       if (cursor().idxUp()) {
+               cursor().pos_ = xarray().x2pos(x);
+               return true;
+       }
+       if (pop())
+               return true;
+       return false;
 }
 
 
-bool MathedCursor::Down(bool sel)
+bool MathCursor::Down(bool sel)
 {
-       bool result = false;
-
-       if (macro_mode)
-               MacroModeClose();
-
-       if (sel && !selection)
-               SelStart();
+       dump("Down 1");
+       MacroModeClose();
+       SelHandle(sel);
 
-       if (!sel && selection)
-               SelClear();
-
-       if (cursor->IsScript()) {
-               char cd = cursor->GetChar();
-               if (MathIsDown(cd)) {
-                       Push();
-                       return true;
-               } else {
-               // A superscript may be followed by a subscript
-               cursor->ipush();
-               cursor->Next();
-               if (MathIsDown(cursor->GetChar())) {
-                       Push();
+       if (selection) {
+               int x = xarray().pos2x(cursor().pos_);
+               if (cursor().idxDown()) {
+                       cursor().pos_ = xarray().x2pos(x);
                        return true;
-               } else
-                       cursor->ipop();
                }
+               if (pop()) 
+                       return true;
+               return false;
        }
 
-       result = cursor->Down();
-       if (!result && cursor->p) {
-       MathParInset * p= cursor->p;
-       if (p->GetType() == LM_OT_SCRIPT) {
-       MathedXIter * cx = mathstk.Item(1);
-       bool is_up = (cx->GetChar() == LM_TC_UP);
-       cursor = mathstk.pop();
-       cursor->Next();
-       result = (is_up) ? true: Down();
-       } else {
-       result = (p->getArgumentIdx() < p->getMaxArgumentIdx());
-       if (result) {
-       p->setArgumentIdx(p->getArgumentIdx() + 1);
-       cursor->SetData(p);
-       }
-       }
-       if (!result && !mathstk.Empty()) {
-       cursor = mathstk.pop();
-       return Down(sel);
-       }
+       // 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;
+               }
        }
-       return result;
-}
 
+       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;
+               }
+       }
 
-bool MathedCursor::Limits()
-{
-       if (cursor->IsInset()) {
-               MathedInset * p = cursor->GetInset();
-               bool ol = p->GetLimits();
-               p->SetLimits(!ol);
-               return (ol!= p->GetLimits());
+       int x = xarray().pos2x(cursor().pos_);
+       if (cursor().par_->idxDown(cursor().idx_, cursor().pos_)) {
+               cursor().pos_ = xarray().x2pos(x);
+               return true;
        }
+       if (pop())
+               return true;
        return false;
 }
 
 
-void MathedCursor::SetSize(short size)
+bool MathCursor::toggleLimits()
 {
-       MathParInset * p = cursor->p;
-       p->UserSetSize(size);
-       cursor->SetData(p);
+       if (!prevIsInset())
+               return false;
+       MathInset * p = prevInset();
+       int old = p->limits();
+       p->limits(old < 0 ? 1 : -1);
+       return old != p->limits();
 }
 
 
-void MathedCursor::setLabel(string const & label)
+void MathCursor::SetSize(MathStyles size)
 {
-       // ugly hack and possible bug
-       if (!cursor->setLabel(label))
-               lyxerr << "MathErr: Bad place to set labels." << endl;
+       cursor().par_->UserSetSize(size);
 }
 
 
-void MathedCursor::setNumbered()
-{      
-       // another ugly hack
-       MathedRowSt * crow = cursor->crow;
-       if (!crow)
-               return;
-       crow->setNumbered(!crow->isNumbered());
-}
 
-
-void MathedCursor::Interpret(string const & s)
+void MathCursor::Interpret(string const & s)
 {
-       MathedInset * p = 0;
-       latexkeys const * l = 0;
-       MathedTextCodes tcode = LM_TC_INSET;
+       lyxerr << "Interpret: '" << s << "'  ('" << s.substr(0, 7)  << "' " <<
+in_word_set(s) << " \n";
 
-       if (s[0] == '^' || s[0] == '_') {
-               char c = cursor->GetChar();
-               if (MathIsUp(c) && s[0] == '^' || MathIsDown(c) && s[0] == '_') {
-                       Push();
-                       return;
-               } else
+       if (s[0] == '^') {
+               MathUpDownInset * p = nearbyUpDownInset();
+               if (!p) {
+                       p = new MathScriptInset(true, false);
+                       insert(p);
+                       plainLeft();
+               }
+               push(p, true);
+               p->up(true);
+               cursor().idx_ = 0;
+               return;
+       }
 
-               // A script may be followed by a script
-               if (MathIsUp(c)  || MathIsDown(c)) {
-                       cursor->ipush();
-                       cursor->Next();
-                       c = cursor->GetChar();
-                       if (MathIsUp(c) && s[0] == '^' || MathIsDown(c) && s[0] == '_') {
-                               Push();
-                               return;
-                       } else
-                               cursor->ipop();
+       if (s[0] == '_') {
+               MathUpDownInset * p = nearbyUpDownInset();
+               if (!p) {
+                       p = new MathScriptInset(false, true);
+                       insert(p);
+                       plainLeft();
                }
-               p = new MathParInset(LM_ST_SCRIPT, "", LM_OT_SCRIPT);
-               Insert (p, (s[0] == '_') ? LM_TC_DOWN: LM_TC_UP);
+               push(p, true);
+               p->down(true);
+               cursor().idx_ = 1;
                return;
-       } else
+       }
+
        if (s[0] == '!' || s[0] == ','  || s[0] == ':' || s[0] == ';') {
-               int sp = ((s[0] == ',') ? 1:((s[0] == ':') ? 2:((s[0] == ';') ? 3: 0)));
-               p = new MathSpaceInset(sp);
-               Insert(p);
+               int sp = (s[0] == ',') ? 1:((s[0] == ':') ? 2:((s[0] == ';') ? 3: 0));
+               insert(new MathSpaceInset(sp));
                return;
-       } else
-               l = in_word_set(s);
+       }
 
-       if (!l) {
-               p = MathMacroTable::mathMTable.getMacro(s);
-               if (!p) {
-               lyxerr[Debug::MATHED] << "Macro2 " << s << ' ' << tcode << endl;
-               if (s == "root") {
+       MathInset * p = 0;
+       latexkeys const * l = in_word_set(s);
+
+       if (l == 0) {
+               if (s == "root") 
                        p = new MathRootInset;
-                       tcode = LM_TC_ACTIVE_INSET;
-               } else
-                       p = new MathFuncInset(s, LM_OT_UNDEF);
-               } else {
-                       tcode = static_cast<MathMacro*>(p)->getTCode();
-                       lyxerr[Debug::MATHED] << "Macro2 " << s << ' ' << tcode << endl;
+               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 {
-               MathedInsetTypes fractype = LM_OT_FRAC;
                switch (l->token) {
                        case LM_TK_BIGSYM: 
                                        p = new MathBigopInset(l->name, l->id);
                                        break;
                                
-                       case LM_TK_SYM: 
-                                       if (l->id<255) {
-                                               Insert(static_cast<byte>(l->id), MathIsBOPS(l->id) ?
-                                               LM_TC_BOPS: LM_TC_SYMB);        
-                                       } else {
-                                               p = new MathFuncInset(l->name);
-                                       }
-                                       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:
-                               fractype = LM_OT_STACKREL;
-                               lyxerr[Debug::MATHED] << " i:stackrel " << endl;
+                               p = new MathFracInset("stackrel");
+                               break;
 
                        case LM_TK_FRAC:
-                               p = new MathFracInset(fractype);
-                               tcode = LM_TC_ACTIVE_INSET;
+                               p = new MathFracInset("frac");
                                break;
 
                        case LM_TK_SQRT:
                                p = new MathSqrtInset;
-                               tcode = LM_TC_ACTIVE_INSET;
                                break;
 
-                       case LM_TK_WIDE:
-                               p = new MathDecorationInset(l->id);
-                               tcode = LM_TC_ACTIVE_INSET;
+                       case LM_TK_DECORATION:
+                               p = new MathDecorationInset(l->name, l->id);
                                break;
 
                        case  LM_TK_FUNCLIM:
@@ -813,14 +749,8 @@ void MathedCursor::Interpret(string const & s)
                                p = new MathDotsInset(l->name, l->id);
                                break;
 
-                       case LM_TK_ACCENT:
-                               setAccent(l->id);
-                               break;
-
                        case LM_TK_MACRO:
-                               p = MathMacroTable::mathMTable.getMacro(s);
-                               tcode = static_cast<MathMacro*>(p)->getTCode();
-                               lyxerr[Debug::MATHED] << "Macro " << s << ' ' << tcode << endl;
+                               p = new MathMacro(MathMacroTable::provideTemplate(s));
                                break;
 
                        default:
@@ -830,52 +760,41 @@ void MathedCursor::Interpret(string const & s)
        }
 
        if (p) {
-               Insert(p, tcode);
-               par->Metrics();
-       }
-}
-
-
-bool MathedCursor::pullArg()
-{
-       if (cursor->IsActive()) {
-               MathParInset * p = cursor->GetActiveInset();
-               if (!p) 
-                       return false;
-               
-               MathedArray * a = p->GetData();
-               p->setData(0);
-               Delete();
-               if (a) {
-                       cursor->Merge(a);
-                       cursor->Adjust();
+               bool oldsel = selection;
+               if (oldsel) 
+                       SelCut();
+               insert(p);
+               if (p->nargs()) {
+                       plainLeft();
+                       push(p, true);
+                       if (oldsel) 
+                               SelPaste();
                }
-
-               return true;
+               p->Metrics(p->size());
        }
-       return false;
 }
 
 
-void MathedCursor::MacroModeOpen()
+void MathCursor::MacroModeOpen()
 {
        if (!macro_mode) {
                imacro = new MathFuncInset("");
-               Insert (imacro);
+               insert(imacro);
                macro_mode = true;
        } else
-               lyxerr << "Mathed Warning: Already in macro mode" << endl;
+               lyxerr << "Math Warning: Already in macro mode" << endl;
 }
 
 
-void MathedCursor::MacroModeClose()
+void MathCursor::MacroModeClose()
 {
        if (macro_mode)  {
                macro_mode = false;
-               latexkeys const * l = in_word_set(imacro->GetName());
-               if (!imacro->GetName().empty()
-               && (!l || (l && IsMacro(l->token, l->id))) &&
-               !MathMacroTable::mathMTable.getMacro(imacro->GetName())) {
+               latexkeys const * l = in_word_set(imacro->name());
+               if (!imacro->name().empty()
+                               && (!l || (l && IsMacro(l->token, l->id)))
+                               && !MathMacroTable::hasTemplate(imacro->name()))
+               {
                        if (!l) {
                                //imacro->SetName(macrobf);
                                // This guarantees that the string will be removed by destructor
@@ -884,325 +803,598 @@ void MathedCursor::MacroModeClose()
                                imacro->SetName(l->name);
                } else {
                        Left();
-                       if (cursor->GetInset()->GetType() == LM_OT_ACCENT) {
-                               setAccent(
-                                       static_cast<MathAccentInset*>(cursor->GetInset())->getAccentCode());
-                       }
-                       cursor->Delete();
-                       if (l || MathMacroTable::mathMTable.getMacro(imacro->GetName())) {
-                               Interpret(imacro->GetName());
-                       }
-                       imacro->SetName("");
+                       array().erase(cursor().pos_);
+                       if (l || MathMacroTable::hasTemplate(imacro->name())) 
+                               Interpret(imacro->name());
+                       imacro->SetName(string());
                }
                imacro = 0;
        }
 }
 
 
-void MathedCursor::SelCopy()
+void MathCursor::SelCopy()
 {
+       seldump("SelCopy");
        if (selection) {
-               int p1 = (cursor->pos < selpos) ? cursor->pos : selpos;
-               int p2 = (cursor->pos > selpos) ? cursor->pos : selpos;
-               selarray = cursor->Copy(p1, p2);
-               cursor->Adjust();
+               theSelection.grab(*this);
                SelClear();
        }
 }
 
 
-void MathedCursor::SelCut()
+void MathCursor::SelCut()
 {
+       seldump("SelCut");
        if (selection) {
-               if (cursor->pos == selpos)
-                       return;
-
-               int p1 = (cursor->pos < selpos) ? cursor->pos : selpos;
-               int p2 = (cursor->pos > selpos) ? cursor->pos : selpos;
-               selarray = cursor->Copy(p1, p2);
-               cursor->Clean(selpos);
-               cursor->Adjust();
+               theSelection.grab(*this);
+               theSelection.erase(*this);
                SelClear();
        }
 }
 
 
-void MathedCursor::SelDel()
+void MathCursor::SelDel()
 {
-       //  lyxerr << "Deleting sel "
+       seldump("SelDel");
        if (selection) {
-               if (cursor->pos == selpos)
-                       return;
-               cursor->Clean(selpos);
-               cursor->Adjust();
+               theSelection.erase(*this);
                SelClear();
        }
 }
 
 
-void MathedCursor::SelPaste()
+void MathCursor::SelPaste()
+{
+       seldump("SelPaste");
+       theSelection.paste(*this);
+       SelClear();
+}
+
+
+void MathCursor::SelHandle(bool sel)
+{
+       if (sel && !selection)
+               SelStart();
+       if (!sel && selection)
+               SelClear();
+}
+
+
+void MathCursor::SelStart()
 {
-       // lyxerr << "paste " << selarray << " " << curor->pos;
+       seldump("SelStart");
        if (selection)
-               SelDel();
+               return;
+
+       Anchor_ = Cursor_;
+       selection = true;
+}
+
+
+void MathCursor::SelClear()
+{
+       selection = false;
+}
 
-       if (selarray) {
-               cursor->Merge(selarray);
-               cursor->Adjust();
+
+void MathCursor::drawSelection(Painter & pain) const
+{
+       if (!selection)
+               return;
+
+       MathCursorPos i1;
+       MathCursorPos i2;
+       getSelection(i1, i2);
+
+       //lyxerr << "selection from: " << i1 << " to " << i2 << "\n";
+
+       if (i1.idx_ == i2.idx_) {
+               MathXArray & c = i1.xcell();
+               int x1 = c.xo() + c.pos2x(i1.pos_);
+               int y1 = c.yo() - c.ascent();
+               int x2 = c.xo() + c.pos2x(i2.pos_);
+               int y2 = c.yo() + c.descent();
+               pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
+       } else {
+
+#if RECTANGULAR_SELECT
+               std::vector<int> 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();
+                       int y1 = c.yo() - c.ascent();
+                       int x2 = c.xo() + c.width();
+                       int y2 = c.yo() + c.descent();
+                       pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
+               }
+#else
+               // leftmost cell
+               MathXArray & c = i1.xcell();
+               int x1 = c.xo() + c.pos2x(i1.pos_);
+               int y1 = c.yo() - c.ascent();
+               int x2 = c.xo() + c.width();
+               int y2 = c.yo() + c.descent();
+               pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
+               // middle cells
+               for (int idx = i1.idx_ + 1; idx < i2.idx_; ++idx) { 
+                       MathXArray & c = i1.xcell(idx);
+                       int x1 = c.xo();
+                       int y1 = c.yo() - c.ascent();
+                       int x2 = c.xo() + c.width();
+                       int y2 = c.yo() + c.descent();
+                       pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
+               }
+               // rightmost cell
+               MathXArray & cr = i2.xcell();
+               x1 = cr.xo();
+               y1 = cr.yo() - cr.ascent();
+               x2 = cr.xo() + cr.pos2x(i2.pos_);
+               y2 = cr.yo() + cr.descent();
+               pain.fillRectangle(x1, y1, x2 - x1, y2 - y1, LColor::selection);
+#endif
        }
 }
 
 
-void MathedCursor::SelStart()
+void MathCursor::handleFont(MathTextCodes t)
 {
-       lyxerr[Debug::MATHED] << "Starting sel " << endl;
-       if (!anchor) {
-               selpos = cursor->pos;
-               selstk = new MathStackXIter(mathstk);
-               anchor = selstk->Item(-1);
-               anchor->SetData(cursor->p);
-               anchor->GoBegin();
-               anchor->goPosAbs(selpos);
-               selection = true;
+       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);
+                               }
+               }
+       } else {
+               lastcode = (lastcode == t) ? LM_TC_VAR : t;
        }
 }
 
 
-void MathedCursor::SelClear()
+void MathCursor::handleAccent(string const & name, int code)
 {
-       lyxerr[Debug::MATHED] << "Clearing sel " << endl;
-       selection = false;
-       delete selstk;
-       selstk = 0;
-       anchor = 0;
+       MathDecorationInset * p = new MathDecorationInset(name, code);
+       if (selection) {
+               SelCut();
+               p->cell(0) = theSelection.glue();
+       }
+       insert(p);
+       push(p, true);
 }
 
 
+void MathCursor::handleDelim(int l, int r)
+{
+       MathDelimInset * p = new MathDelimInset(l, r);
+       if (selection) {
+               SelCut();
+               p->cell(0) = theSelection.glue();
+       }
+       insert(p);
+       plainLeft();
+       push(p, true);
+}
+
 
-// Anchor position must be at the same level that stack.
-void MathedCursor::SelBalance()
+void MathCursor::GetPos(int & x, int & y)
 {
-       int d = mathstk.Level() - selstk->Level();
+       x = xarray().xo() + xarray().pos2x(cursor().pos_);
+       y = xarray().yo();
+}
 
-       // If unbalanced, balance them
-       while (d != 0) {
-               if (d < 0) {
-                       // lyxerr << "b[" << mathstk.Level() << " " << selstk->Level
-                       //  << " " << anchor->GetX() << " " << cursor->GetX() << "]";
-                       anchor = selstk->pop();
-                       if (anchor->GetX() >= cursor->GetX())
-                       anchor->Next();
-               } else {
-                       // lyxerr <<"a[" << mathstk.Level() << " " << selstk->Level() <<"]";
-                       Pop();
-               }
-               d = mathstk.Level() - selstk->Level();
-       }
 
-       // Once balanced the levels, check that they are at the same paragraph
-       selpos = anchor->pos;
+MathTextCodes MathCursor::nextCode() const
+{
+       return array().GetCode(cursor().pos_); 
 }
 
 
-void MathedCursor::SelGetArea(int ** xp, int ** yp, int & np)
+MathTextCodes MathCursor::prevCode() const
 {
-       static int xpoint[10];
-       static int ypoint[10];
+       return array().GetCode(cursor().pos_ - 1); 
+}
 
-       if (!selection) {
-               np = 0;
-               xpoint[0] = 0;
-               ypoint[0] = 0;
-               *xp = &xpoint[0];
-               *yp = &ypoint[0];
-               return;
+
+MathInset * MathCursor::par() const
+{
+       return cursor().par_;
+}
+
+
+InsetFormulaBase const * MathCursor::formula()
+{
+       return formula_;
+}
+
+
+int MathCursor::pos() const
+{
+       return cursor().pos_;
+}
+
+
+bool MathCursor::InMacroMode() const
+{
+       return macro_mode;
+}
+
+
+bool MathCursor::Selection() const
+{
+       return selection;
+}
+
+
+void MathCursor::clearLastCode()
+{
+       lastcode = LM_TC_MIN;
+}
+
+
+void MathCursor::setLastCode(MathTextCodes t)
+{
+       lastcode = t;
+}
+
+
+MathTextCodes MathCursor::getLastCode() const
+{
+       return lastcode;
+}
+
+
+MathInset * MathCursor::enclosing(MathInsetTypes t, int & idx) const
+{
+       for (int i = Cursor_.size() - 1; i >= 0; --i) {
+               //lyxerr << "checking level " << i << "\n";
+               if (Cursor_[i].par_->GetType() == t) {
+                       idx = Cursor_[i].idx_;
+                       return Cursor_[i].par_;
+               }
        }
+       return 0;
+}
 
-       // single row selection
-       int i = 0;
-       int a;
-       int d;
-       int a1;
-       int d1;
-
-       // Balance anchor and cursor
-       SelBalance();
-
-       int xo;
-       int yo;
-       cursor->p->GetXY(xo, yo);
-       int w = cursor->p->Width();
-       int x1;
-       int y1;
-       cursor->GetPos(x1, y1);
-       cursor->getAD(a1, d1);
-       int x;
-       int y;
-       anchor->GetPos(x, y);
-       anchor->getAD(a, d);
-
-       xpoint[i]   = x;
-       ypoint[i++] = y + d;
-       xpoint[i]   = x;
-       ypoint[i++] = y - a;
-
-       if (y != y1) {
-               xpoint[i]   = xo + w;
-               ypoint[i++] = y - a;
-
-               if (x1 < xo + w) {
-               xpoint[i]   = xo + w;
-               ypoint[i++] = y1 - a;
+
+void MathCursor::pullArg()
+{
+       // pullArg
+       dump("pullarg");
+       MathArray a = array();
+       if (pop()) {
+               array().erase(cursor().pos_);
+               array().insert(cursor().pos_, a);
        }
+}
+
+
+MathStyles MathCursor::style() const
+{
+       return xarray().style();
+}
+
+
+void MathCursor::normalize() const
+{
+#ifdef WITH_WARNINGS
+#warning This is evil!
+#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 (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());
+}
+
+
+int MathCursor::col() const
+{
+       return par()->col(cursor().idx_);
+}
+
+
+int MathCursor::row() const
+{
+       return par()->row(cursor().idx_);
+}
+
+
+/*
+char MathCursorPos::GetChar() const
+{
+       return array().GetChar(cursor().pos_);
+}
+
+
+string MathCursorPos::readString()
+{
+       string s;
+       int code = nextCode();
+       for ( ; OK() && nextCode() == code; Next()) 
+               s += GetChar();
+
+       return s;
+}
+*/
+
+
+MathInset * MathCursor::prevInset() const
+{
+       normalize();
+       int c = cursor().pos_;
+       if (!array().prev(c))
+               return 0;
+       return array().nextInset(c);
+}
+
+
+MathInset * MathCursor::nextInset() const
+{
+       normalize();
+       return array().nextInset(cursor().pos_);
+}
+
+
+MathUpDownInset * MathCursor::nearbyUpDownInset() const
+{
+       normalize();
+       MathInset * p = array().prevInset(cursor().pos_);
+       if (p && p->isUpDownInset())
+               return static_cast<MathUpDownInset *>(p);
+       p = array().nextInset(cursor().pos_);
+       if (p && p->isUpDownInset())
+               return static_cast<MathUpDownInset *>(p);
+       return 0;
+}
+
+
+MathArray & MathCursor::array() const
+{
+       static MathArray dummy;
+       if (!cursor().par_) {
+               lyxerr << "############  par_ not valid\n";
+               return dummy;
        }
 
-       xpoint[i]   = x1;
-       ypoint[i++] = y1 - a;
-       xpoint[i]   = x1;
-       ypoint[i++] = y1 + d;
-
-       if (y != y1) {
-               xpoint[i]   = xo;
-               ypoint[i++] = y1 + d;
-               if (x > xo) {
-                       xpoint[i]   = xo;
-                       ypoint[i++] = y + d;
-               }
+       if (cursor().idx_ < 0 || cursor().idx_ >= cursor().par_->nargs()) {
+               lyxerr << "############  idx_ " << cursor().idx_ << " not valid\n";
+               return dummy;
        }
-       xpoint[i]   = xpoint[0];
-       ypoint[i++] = ypoint[0];
 
-       *xp = &xpoint[0];
-       *yp = &ypoint[0];
-       np = i;
-       //    lyxerr << "AN[" << x << " " << y << " " << x1 << " " << y1 << "] ";
-       //    lyxerr << "MT[" << a << " " << d << " " << a1 << " " << d1 << "] ";
-       //    for (i = 0; i < np; ++i)
-       //      lyxerr << "XY[" << point[i].x << " " << point[i].y << "] ";
+       return cursor().cell();
 }
 
 
-void MathedCursor::setAccent(int ac)
+MathXArray & MathCursor::xarray() const
 {
-       if (ac > 0 && accent < 8) {
-               nestaccent[accent++] = ac;
-       } else
-               accent = 0;  // consumed!
+       return cursor().xcell();
 }
 
 
-int MathedCursor::getAccent() const
+bool MathCursor::nextIsInset() const
 {
-       return (accent > 0) ? nestaccent[accent - 1]: 0;
+       return cursor().pos_ < array().size() && MathIsInset(nextCode());
 }
 
 
-void MathedCursor::doAccent(byte c, MathedTextCodes t)
+bool MathCursor::prevIsInset() const
 {
-       MathedInset * ac = 0;
+       return cursor().pos_ > 0 && MathIsInset(prevCode());
+}
 
-       for (int i = accent - 1; i >= 0; --i) {
-               if (i == accent - 1)
-                       ac = new MathAccentInset(c, t, nestaccent[i]);
-               else
-                       ac = new MathAccentInset(ac, nestaccent[i]);
-       }
-       
-       if (ac)
-               cursor->Insert(ac);
 
-       accent = 0;  // consumed!
+int MathCursor::xpos() const 
+{
+       normalize();
+       return xarray().pos2x(cursor().pos_);
 }
 
 
-void MathedCursor::doAccent(MathedInset * p)
+void MathCursor::gotoX(int x)
 {
-       MathedInset * ac = 0;
+       cursor().pos_ = xarray().x2pos(x);      
+}
 
-       for (int i = accent - 1; i >= 0; --i) {
-               if (i == accent - 1)
-                       ac = new MathAccentInset(p, nestaccent[i]);
-               else
-                       ac = new MathAccentInset(ac, nestaccent[i]);
+
+void MathCursor::idxNext()
+{
+       cursor().par_->idxNext(cursor().idx_, cursor().pos_);
+}
+
+
+void MathCursor::idxPrev()
+{
+       cursor().par_->idxPrev(cursor().idx_, cursor().pos_);
+}
+
+
+void MathCursor::splitCell()
+{
+       if (cursor().idx_ == cursor().par_->nargs() - 1) 
+               return;
+       MathArray ar = array();
+       ar.erase(0, cursor().pos_);
+       array().erase(cursor().pos_, array().size());
+       ++cursor().idx_;
+       cursor().pos_ = 0;
+       array().insert(0, ar);
+}
+
+
+void MathCursor::breakLine()
+{
+       MathMatrixInset * p = static_cast<MathMatrixInset *>(formula()->par());
+       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;
+       } 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));
+               }
+
+               // split cell
+               splitCell();
+               p->cell(cursor().idx_).swap(p->cell(cursor().idx_ + p->ncols() - 1));
        }
+}
 
-       if (ac)
-               cursor->Insert(ac);
 
-       accent = 0;  // consumed!
+char MathCursor::valign() const
+{
+       int idx;
+       MathGridInset * p =
+               static_cast<MathGridInset *>(enclosing(LM_OT_MATRIX, idx));
+       return p ? p->valign() : 0;
 }
 
 
-void MathedCursor::toggleLastCode(MathedTextCodes t)
+char MathCursor::halign() const
 {
-       if (lastcode == t)
-               lastcode = LM_TC_VAR;
-       else
-               lastcode = t;
+       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(); 
 }
 
 
-void MathedCursor::GetPos(int & x, int & y)
+MathCursorPos MathCursor::lastSelectionPos() const
 {
-       cursor->GetPos(x, y);
+       MathCursorPos anc = normalAnchor();
+       return anc < cursor() ? cursor() : anc; 
 }
 
 
-short MathedCursor::GetFCode()
+void MathCursor::getSelection(MathCursorPos & i1, MathCursorPos & i2) const
 {
-       return cursor->fcode();
+       MathCursorPos anc = normalAnchor();
+       if (anc < cursor()) {
+               i1 = anc;
+               i2 = cursor();
+       } else {
+               i1 = cursor();
+               i2 = anc;
+       }
 }
 
 
-MathParInset * MathedCursor::GetPar()
+MathCursorPos & MathCursor::cursor()
 {
-       return par;
+       return Cursor_.back();
 }
 
 
-MathParInset * MathedCursor::getCurrentPar() const
+MathCursorPos const & MathCursor::cursor() const
 {
-       return cursor->p;
+       return Cursor_.back();
 }
 
 
-string const & MathedCursor::getLabel() const
+
+////////////////////////////////////////////////////////////////////////
+
+
+bool operator==(MathCursorPos const & ti, MathCursorPos const & it)
 {
-       return cursor->getLabel();
+       return ti.par_ == it.par_ && ti.idx_ == it.idx_ && ti.pos_ == it.pos_;
 }
 
 
-bool MathedCursor::IsEnd() const
+bool operator<(MathCursorPos const & ti, MathCursorPos const & it)
 {
-       return !cursor->OK();
+       if (ti.par_ != it.par_) {
+               lyxerr << "can't compare cursor and anchor in different insets\n";
+               return true;
+       }
+       if (ti.idx_ != it.idx_)
+               return ti.idx_ < it.idx_;
+       return ti.pos_ < it.pos_;
 }
 
 
-bool MathedCursor::InMacroMode()
+MathArray & MathCursorPos::cell(int idx) const
 {
-       return macro_mode;
+       return par_->cell(idx);
 }
 
+MathArray & MathCursorPos::cell() const
+{
+       return par_->cell(idx_);
+}
 
-bool MathedCursor::Selection()
+
+MathXArray & MathCursorPos::xcell(int idx) const
 {
-       return selection;
+       return par_->xcell(idx);
 }
 
 
-void MathedCursor::clearLastCode()
+MathXArray & MathCursorPos::xcell() const
 {
-       lastcode = LM_TC_MIN;
+       return par_->xcell(idx_);
 }
 
 
-void MathedCursor::setLastCode(MathedTextCodes t)
+MathCursorPos MathCursor::normalAnchor() const
 {
-       lastcode = t;
+       // use Anchor on the same level as Cursor
+       MathCursorPos normal = Anchor_[Cursor_.size() - 1];
+       if (Cursor_.size() < Anchor_.size() && !(normal < cursor())) {
+               // anchor is behind cursor -> move anchor behind the inset
+               normal.cell().next(normal.pos_);
+       }
+       //lyxerr << "normalizing: from " << Anchor_[Anchor_.size() - 1] << " to "
+       //      << normal << "\n";
+       return normal;
 }
 
 
-MathedTextCodes MathedCursor::getLastCode() const
+bool MathCursorPos::idxUp()
 {
-       return lastcode;
+       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_);
 }