]> 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 5e2451b55e12ee1bcd1313cfb8914a86ac8b332a..ca2b35904f9b371e1554971a37f62b03d1bc05e3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  *  File:        math_cursor.C
  *  Purpose:     Interaction for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     January 1996
  *  Description: Math interaction for a WYSIWYG math editor.
  *
@@ -9,7 +9,7 @@
  *
  *  Copyright: 1996, Alejandro Aguilar Sierra
  *
- *   Version: 0.8beta, Mathed & Lyx project.
+ *   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_root.h"
+#include <algorithm>
+#include <cctype>
+
 #include "support/lstrings.h"
+#include "support/LAssert.h"
 #include "debug.h"
 #include "LColor.h"
 #include "Painter.h"
+#include "support.h"
+#include "formulabase.h"
+#include "math_cursor.h"
+#include "math_factory.h"
+#include "math_arrayinset.h"
+#include "math_charinset.h"
+#include "math_deliminset.h"
+#include "math_matrixinset.h"
+#include "math_scriptinset.h"
+#include "math_spaceinset.h"
+#include "math_specialcharinset.h"
+#include "math_parser.h"
 
-static LyxArrayBase * selarray = 0;
+#define FILEDEBUG 0
 
 using std::endl;
+using std::min;
+using std::max;
+using std::swap;
+using std::isalnum;
+
+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 {
+                       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]));
+               }
+       }
+
+       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 {
+                       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();
+               }
+               cursor.cursor() = i1;
+       }
+
+       void paste(MathCursor & cursor) const
+       {
+               MathArray ar = glue();
+               cursor.paste(ar);
+       }
+
+       // 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;
+
+
+#if FILEDEBUG
+std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
+{
+       os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
+       return os;
+}
+#endif
 
-static inline
-bool IsAlpha(char c)
-{
-   return ('A' <= c  && c <= 'Z' || 'a' <= c  && c <= 'z');
 }
 
-// This was very smaller, I'll change it later 
-static inline
-bool IsMacro(short tok, int id)
+
+MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
+       : formula_(formula), lastcode_(LM_TC_VAR), selection_(false)
 {
-   return (tok != LM_TK_STACK && tok != LM_TK_FRAC && tok != LM_TK_SQRT
-          && tok != LM_TK_WIDE
-          && 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));
+       left ? first() : last();
 }
 
 
-// Yes, mathed isn't using string yet.
-static inline
-char * strnew(char const * s)
+void MathCursor::push(MathAtom & t)
 {
-    char * s1 = new char[strlen(s)+1];
-    strcpy(s1, s);
-    return s1;
-}
-
-
-
-static int const MAX_STACK_ITEMS = 32;
-
-
-struct MathStackXIter {
-    
-    int i, imax;
-    MathedXIter * item;
-    
-    MathStackXIter(int n = MAX_STACK_ITEMS): imax(n) {
-       item = new MathedXIter[imax];
-       i = 0;
-    }
-    
-    MathStackXIter(MathStackXIter & stk);
-    
-    ~MathStackXIter() {
-       delete[] item;
-    }
-   
-    void push(MathedXIter ** a) {
-       *a = &item[i++];
-    }
-      
-    MathedXIter * pop() {
-       --i;
-       return &item[i - 1];
-    }
-      
-    MathedXIter * Item(int idx) {
-       return (idx + 1 <= i) ? &item[i - idx - 1] : 0;
-    }
-
-    void Reset() {
-       i = 0;
-    }
-   
-    bool Full() {
-       return i >= MAX_STACK_ITEMS;
-    }
-   
-    bool Empty() {
-       return i <= 1;
-    }
-
-    int Level() { return i; } 
-    
-} mathstk, *selstk = 0;
-
-
-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());
-    }
-}
-
-
-/***----------------  Mathed Cursor  ---------------------------***/
-  
-MathedCursor::MathedCursor(MathParInset * p) // : par(p)
-{
-    accent = 0;
-    anchor = 0;
-    lastcode = LM_TC_MIN;
-    SetPar(p);
-//    selarray = 0;     
-    if (!MathMacroTable::built)
-       MathMacroTable::mathMTable.builtinMacros();
-}
-
-
-void MathedCursor::SetPar(MathParInset * p)
-{
-   win = 0;
-   is_visible = False;
-   macro_mode = false;
-   selection = false; // not SelClear() ?
-   mathstk.Reset();
-   mathstk.push(&cursor);
-   par = p;
-   cursor->SetData(par);
-}
-
-
-void MathedCursor::draw(Painter & pain, int x, int y)
-{
-       //    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; }
-       
-       pain.rectangle(x - 1, y - a, w, h, LColor::mathframe);
-       
-       par->draw(pain, x, y);
-       cursor->Adjust();
-}
-
-
-void MathedCursor::Redraw(Painter & pain)
-{  
-       lyxerr[Debug::MATHED] << "Mathed: Redrawing!" << endl;
-       par->Metrics();
-       int w = par->Width(), h = par->Height();
-       int x, 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);
-}
-
-
-bool MathedCursor::Left(bool sel)
-{
-   if (macro_mode) {
-      MacroModeBack();
-      return true;
-   }
-    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();
+       //cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
+       MathCursorPos p;
+       p.par_ = &t;
+       Cursor_.push_back(p);
+}
+
+
+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;
+}
+
+
+bool MathCursor::popRight()
+{
+       //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
+{
+       lyxerr << "MC: " << what << "\n";
+       for (unsigned i = 0; i < Cursor_.size(); ++i)
+               lyxerr << "  i: " << i 
+                       << " Cursor: pos: " << Cursor_[i].pos_
+                       << " idx: " << Cursor_[i].idx_
+                       << " par: " << Cursor_[i].par_ << "\n";
+
+       for (unsigned i = 0; i < Anchor_.size(); ++i)
+               lyxerr << "  i: " << i 
+                       << " Anchor: pos: " << Anchor_[i].pos_
+                       << " idx: " << Anchor_[i].idx_
+                       << " par: " << Anchor_[i].par_ << "\n";
+
+       lyxerr  << " sel: " << selection_ << "\n";
+}
+
+
+void MathCursor::seldump(char const * str) const
+{
+       //lyxerr << "SEL: " << str << ": '" << theSelection << "'\n";
+       //dump("   Pos");
+
+       lyxerr << "\n\n\n=================vvvvvvvvvvvvv=======================   "
+               <<  str << "\ntheSelection: " << selection_
+               << " '" << theSelection.glue() << "'\n";
+       for (unsigned int i = 0; i < Cursor_.size(); ++i) 
+               lyxerr << Cursor_[i].par_ << "\n'" << Cursor_[i].cell() << "'\n";
+       lyxerr << "\n";
+       for (unsigned int i = 0; i < Anchor_.size(); ++i) 
+               lyxerr << Anchor_[i].par_ << "\n'" << Anchor_[i].cell() << "'\n";
+       //lyxerr << "\ncursor.pos_: " << pos();
+       //lyxerr << "\nanchor.pos_: " << anchor().pos_;
+       lyxerr << "\n===================^^^^^^^^^^^^=====================\n\n\n";
+}
+
+#else
+
+void MathCursor::seldump(char const *) const {}
+void MathCursor::dump(char const *) const {}
+
+#endif
+
+
+bool MathCursor::isInside(MathInset const * p) const
+{
+       for (unsigned i = 0; i < Cursor_.size(); ++i) 
+               if (Cursor_[i].par_->nucleus() == p) 
+                       return true;
+       return false;
+}
+
+
+bool MathCursor::openable(MathAtom const & t, bool sel) const
+{
+       if (!t->isActive())
+               return false;
+
+       if (t->asScriptInset())
+               return false;
+
+       if (sel) {
+               // we can't move into anything new during selection
+               if (Cursor_.size() == Anchor_.size())
+                       return false;
+               if (&t != Anchor_[Cursor_.size()].par_)
+                       return false;
        }
-     } 
-   return result;  
-}
-
-
-// Leave the inset
-bool MathedCursor::Pop()
-{
-   if (!mathstk.Empty()) {
-      cursor = mathstk.pop();
-      cursor->Next(); 
-      return true;
-   }
-   return false;
-}
-
-
-// Go to the inset 
-bool MathedCursor::Push()
-{ 
-   if (cursor->IsActive()) {
-      MathParInset * p = cursor->GetActiveInset();
-       if (!p) return false;
-      mathstk.push(&cursor);
-      cursor->SetData(p);
-      return true;
-   }
-   return false;
-}  
-
-
-bool MathedCursor::Right(bool sel)
-{  
-   if (macro_mode) {
-      MacroModeClose();
-      return true;
-   } 
-    clearLastCode();
-   if (sel && !selection) SelStart();
-   if (!sel && selection) SelClear();
-   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;
-      }
-      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 MathedCursor::SetPos(int x, int y)
-{
-    int xp = 0;
-    
-    if (macro_mode) 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;
-           }
+       return true;
+}
+
+
+bool MathCursor::positionable(MathAtom const & t, int x, int y) const
+{
+       if (selection_) {
+               // we can't move into anything new during selection
+               if (Cursor_.size() == Anchor_.size())
+                       return 0;
+               //if (t != Anchor_[Cursor_.size()].par_)
+               //      return 0;
        }
-       xp = cursor->GetX();
-       cursor->ipush();
-       if (!cursor->Next() && !Pop()) 
-         break;
-    }
-    if (x-xp < cursor->GetX()-x) cursor->ipop();
-    cursor->Adjust();
+
+       return t->nargs() && t->covers(x, y);
 }
-   
 
-void MathedCursor::Home()
+
+bool MathCursor::posLeft()
 {
-   if (macro_mode) MacroModeClose();
-    clearLastCode();
-   mathstk.Reset();
-   mathstk.push(&cursor);
-   cursor->GoBegin();
+       if (pos() == 0)
+               return false;
+
+       --pos();
+
+       return true;
 }
 
 
-void MathedCursor::End()
+bool MathCursor::posRight()
 {
-   if (macro_mode) MacroModeClose();
-    clearLastCode();
-   mathstk.Reset();
-   mathstk.push(&cursor);
-   cursor->GoLast();
+       if (pos() == size())
+               return false;
+
+       ++pos();
+
+       return true;
 }
 
 
-void MathedCursor::Insert(byte c, MathedTextCodes t)
-{  
-   if (selection) SelDel();
-   
-   if (t == LM_TC_MIN)
-      t = lastcode;
-    
-   if (macro_mode && !(MathIsAlphaFont(t) || t == LM_TC_MIN))
-      MacroModeClose();
+bool MathCursor::left(bool sel)
+{
+       dump("Left 1");
+       if (inMacroMode()) {
+               macroModeClose();
+               lastcode_ = LM_TC_VAR;
+               return true;
+       }
+       selHandle(sel);
+       lastcode_ = LM_TC_VAR;
+
+       if (hasPrevAtom() && openable(prevAtom(), sel)) {
+               pushRight(prevAtom());
+               return true;
+       } 
        
-   if (t == LM_TC_CR) {
-      MathParInset * p = cursor->p;
-      if (p == par && p->GetType()<LM_OT_MPAR && p->GetType()>LM_OT_MIN) {
-        MathMatrixInset * mt = new MathMatrixInset(3, 0);
-        mt->SetAlign(' ', "rcl");
-        mt->SetStyle(LM_ST_DISPLAY);
-        mt->SetType((p->GetType() == LM_OT_PARN) ? LM_OT_MPARN: LM_OT_MPAR);
-        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) {
-              MacroModeInsert(c);
-              return;
-          }
-       } 
-       if (accent) {
-              doAccent(c, t);
-       } else 
-        cursor->Insert(c, t);
-       lastcode = t;
-       
-       return;
-   }
-    clearLastCode();
-}
-
-
-void MathedCursor::Insert(MathedInset * p, int t)
-{
-   if (macro_mode) MacroModeClose();
-   if (selection) {
-      if (MathIsActive(t)) {
-        SelCut();
-        static_cast<MathParInset*>(p)->SetData(selarray);
-      } 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;
-}
-
-
-void MathedCursor::Delete() 
-{   
-   if (macro_mode) return;
-   if (selection) {
-      SelDel();
-      return;
-   }
-   if (cursor->Empty() && !mathstk.Empty()) {
-      cursor = mathstk.pop();
-   } 
-//   if (cursor->GetChar()!= LM_TC_TAB)
-    cursor->Delete();
-    cursor->checkTabs();
-}
-
-
-void MathedCursor::DelLine()
-{  
-    if (macro_mode) MacroModeClose();
-    if (selection) {
-       SelDel();
-       return;
-    }
-    MathParInset *p= cursor->p;
-    if (p &&  (p->GetType()<= LM_OT_MATRIX && p->GetType()>= LM_OT_MPAR)) {
-       cursor->delRow();
-    }
-}
-
-
-bool MathedCursor::Up(bool sel)
-{
-    bool result = false;
-   
-    if (macro_mode) MacroModeClose();
-    
-    if (sel && !selection) SelStart();
-    if (!sel && selection) SelClear();
-    
-
-    if (cursor->IsScript()) {
-       char cd = cursor->GetChar();
-       if (MathIsUp(cd)) {
-           Push();
-           return true;
-       } else {
-           // A subscript may be followed by a superscript
-           cursor->ipush();
-           cursor->Next();
-           if (MathIsUp(cursor->GetChar())) {
-               Push();
+       return posLeft() || idxLeft() || popLeft();
+}
+
+
+bool MathCursor::right(bool sel)
+{
+       dump("Right 1");
+       if (inMacroMode()) {
+               macroModeClose();
+               lastcode_ = LM_TC_VAR;
                return true;
-           } else  // return to the previous state
-             cursor->ipop();
-      }
-   }    
-     
-    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);
-           }
        }
-       if (!result && !mathstk.Empty()) {
-           cursor = mathstk.pop();
-           return Up();
-       }     
-    }
-    return result;
-}
-
-
-bool MathedCursor::Down(bool sel)
-{
-    bool result = false;
-   
-    if (macro_mode) MacroModeClose();
-    
-    if (sel && !selection) SelStart();
-    if (!sel && selection) SelClear();
-//    if (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();
+       selHandle(sel);
+       lastcode_ = LM_TC_VAR;
+
+       if (hasNextAtom() && openable(nextAtom(), sel)) {
+               pushLeft(nextAtom());
                return true;
-           } else
-             cursor->ipop();
-      }
-   }
-     
-    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);
-       }    
-    }
-    return result;
+
+       return posRight() || idxRight() || popRight();
+}
+
+
+void MathCursor::first()
+{
+       Cursor_.clear();
+       pushLeft(formula_->par());
+}
+
+
+void MathCursor::last()
+{
+       first();
+       end();
+}
+
+
+void MathCursor::setPos(int x, int y)
+{
+       //dump("setPos 1");
+       //lyxerr << "MathCursor::setPos x: " << x << " y: " << y << "\n";
+
+       macroModeClose();
+       lastcode_ = LM_TC_VAR;
+       first();
+
+       cursor().par_  = &formula_->par();
+
+       while (1) {
+               idx() = 0;
+               cursor().pos_ = 0;
+               //lyxerr << "found idx: " << idx() << " cursor: " << pos()  << "\n";
+               int distmin = 1 << 30; // large enough
+               for (unsigned int i = 0; i < par()->nargs(); ++i) {
+                       MathXArray const & ar = par()->xcell(i);
+                       int x1 = x - ar.xo();
+                       int y1 = y - ar.yo();
+                       MathXArray::size_type c  = ar.x2pos(x1);
+                       int xx = abs(x1 - ar.pos2x(c));
+                       int yy = abs(y1);
+                       //lyxerr << "idx: " << i << " xx: " << xx << " yy: " << yy
+                       //      << " c: " << c  << " xo: " << ar.xo() << "\n";
+                       if (yy + xx <= distmin) {
+                               distmin = yy + xx;
+                               idx()   = i;
+                               pos()   = c;
+                       }
+               }
+               //lyxerr << "found idx: " << idx() << " cursor: "
+               //      << pos()  << "\n";
+               if (hasNextAtom() && positionable(nextAtom(), x, y))
+                       pushLeft(nextAtom());
+               else if (hasPrevAtom() && positionable(prevAtom(), x, y))
+                       pushRight(prevAtom());
+               else 
+                       break;
+       }
+       //dump("setPos 2");
+}
+
+
+void MathCursor::home(bool sel)
+{
+       dump("home 1");
+       selHandle(sel);
+       macroModeClose();
+       lastcode_ = LM_TC_VAR;
+       if (!par()->idxHome(idx(), pos())) 
+               popLeft();
+       dump("home 2");
+}
+
+
+void MathCursor::end(bool sel)
+{
+       dump("end 1");
+       selHandle(sel);
+       macroModeClose();
+       lastcode_ = LM_TC_VAR;
+       if (!par()->idxEnd(idx(), pos()))
+               popRight();
+       dump("end 2");
+}
+
+
+void MathCursor::plainErase()
+{
+       array().erase(pos());
+}
+
+
+void MathCursor::plainInsert(MathAtom const & t)
+{
+       array().insert(pos(), t);
+       ++pos();
+}
+
+
+void MathCursor::insert(char c, MathTextCodes t)
+{
+       //lyxerr << "inserting '" << c << "'\n";
+       plainInsert(MathAtom(new MathCharInset(c, t)));
+}
+
+
+void MathCursor::insert(MathAtom const & t)
+{
+       macroModeClose();
+
+       if (selection_) {
+               if (t->nargs())
+                       selCut();
+               else
+                       selDel();
+       }
+
+       plainInsert(t);
 }
 
 
-bool MathedCursor::Limits()
+void MathCursor::niceInsert(MathAtom const & t) 
 {
-   if (cursor->IsInset()) {
-      MathedInset * p = cursor->GetInset();
-      bool ol = p->GetLimits();
-      p->SetLimits(!ol);
-      return (ol!= p->GetLimits());
-   }
-   return false;
+       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());
 }
 
 
-void MathedCursor::SetSize(short size)
+void MathCursor::insert(MathArray const & ar)
 {
-    MathParInset * p = cursor->p;
-    p->UserSetSize(size);
-    cursor->SetData(p);
+       macroModeClose();
+       if (selection_)
+               selCut();
+
+       array().insert(pos(), ar);
+       pos() += ar.size();
 }
 
 
-void MathedCursor::setLabel(string const & label)
-{  // ugly hack and possible bug
-    if (!cursor->setLabel(label))
-           lyxerr << "MathErr: Bad place to set labels." << endl;
+void MathCursor::paste(MathArray const & ar)
+{
+       Anchor_ = Cursor_;
+       selection_ = true;
+       array().insert(pos(), ar);
+       pos() += ar.size();
 }
 
 
-void MathedCursor::setNumbered()
-{  // another ugly hack
-    MathedRowSt * crow = cursor->crow;
-    if (!crow) return;    
-    crow->setNumbered(!crow->isNumbered());
+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 MathedCursor::Interpret(string const & s)
+void MathCursor::erase()
 {
-    MathedInset * p = 0;
-    latexkeys * l = 0;
-    MathedTextCodes tcode = LM_TC_INSET;
-    
-    if (s[0] == '^' || s[0] == '_') {
-       char c = cursor->GetChar();
-       if (MathIsUp(c) && s[0] == '^' || MathIsDown(c) && s[0] == '_') {
-           Push();
-           return;
-       } else // 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();
+       if (inMacroMode())
+               return;
+
+       if (selection_) {
+               selDel();
                return;
-           } else
-             cursor->ipop();
        }
-       p = new MathParInset(LM_ST_SCRIPT, "", LM_OT_SCRIPT);
-       Insert (p, (s[0] == '_') ? LM_TC_DOWN: LM_TC_UP); 
-       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);
-         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") {
-               p = new MathRootInset();
-               tcode = LM_TC_ACTIVE_INSET;
-           } else
-             p = new MathFuncInset(s, LM_OT_UNDEF);
-       } else {
-           tcode = static_cast<MathMacro*>(p)->getTCode();
-           lyxerr << "Macro2 " << s << ' ' << tcode << "  " ;
+
+       // delete empty cells if necessary
+       if (array().empty()) {
+               bool popit;
+               bool removeit;
+               par()->idxDelete(idx(), popit, removeit);
+               if (popit && popLeft() && removeit)
+                       plainErase();
+               return;
+       }
+
+       if (pos() == size())
+               return;
+
+       MathScriptInset * p = nextAtom()->asScriptInset();
+       if (p) {
+               p->removeScript(p->hasUp());
+               // Don't delete if there is anything left 
+               if (p->hasUp() || p->hasDown())
+                       return;
        }
-    } 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_STACK:
-           fractype = LM_OT_STACKREL;
-           lyxerr[Debug::MATHED] << " i:stackrel " << endl;
-        case LM_TK_FRAC: 
-        {       
-            p = new MathFracInset(fractype);
-            tcode = LM_TC_ACTIVE_INSET;
-            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;
-            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_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;
-           break;
-        default:
-        {
-            p = new MathFuncInset(l->name);
-            break;
-        }
+
+       plainErase();
+}
+
+
+void MathCursor::delLine()
+{
+       macroModeClose();
+
+       if (selection_) {
+               selDel();
+               return;
        }
-    }
-    if (p) {
-       Insert(p, tcode);
-       par->Metrics();
-    }
+
+       if (par()->nrows() > 1)
+               par()->delRow(row());
 }
 
 
-bool MathedCursor::pullArg()
-{ 
-    if (cursor->IsActive()) {
-       MathParInset * p = cursor->GetActiveInset();
-       if (!p) { 
-           return false;
+bool MathCursor::up(bool sel)
+{
+       dump("up 1");
+       macroModeClose();
+       selHandle(sel);
+
+       if (!selection_) {
+               // check whether we could move into a superscript 
+               if (hasPrevAtom()) {
+                       MathAtom & p = prevAtom();
+                       if (p->asScriptInset() && p->asScriptInset()->hasUp()) {
+                               pushRight(p);
+                               idx() = 1;
+                               pos() = size();
+                               return true;
+                       }
+               }
+
+               if (hasNextAtom()) {
+                       MathAtom & n = nextAtom();
+                       if (n->asScriptInset() && n->asScriptInset()->hasUp()) {
+                               pushLeft(n);
+                               idx() = 1;
+                               pos() = 0;
+                               return true;
+                       }
+               }
        }
-       LyxArrayBase * a = p->GetData();
-       p->SetData(0);
-       Delete();
-       if (a) {
-           cursor->Merge(a);
-           cursor->Adjust();
+
+       return goUp();
+}
+
+
+bool MathCursor::down(bool sel)
+{
+       dump("down 1");
+       macroModeClose();
+       selHandle(sel);
+
+       if (!selection_) {
+               // check whether we could move into a subscript 
+               if (hasPrevAtom()) {
+                       MathAtom & p = prevAtom();
+                       if (p->asScriptInset() && p->asScriptInset()->hasDown()) {
+                               pushRight(p);
+                               idx() = 0;
+                               pos() = size();
+                               return true;
+                       }
+               }
+
+               if (hasNextAtom()) {
+                       MathAtom & n = nextAtom();
+                       if (n->asScriptInset() && n->asScriptInset()->hasDown()) {
+                               pushLeft(n);
+                               idx() = 0;
+                               pos() = 0;
+                               return true;
+                       }
+               }
        }
-       
-       return true;
-    }
-    return false;
-}  
-
-void MathedCursor::MacroModeOpen()
-{
-   if (!macro_mode)  {
-      macroln = 0;
-      macrobf[0] = '\0';
-      imacro = new MathFuncInset(&macrobf[0]);
-      Insert (imacro);
-      macro_mode = true;
-   } else
-          lyxerr << "Mathed Warning: Already in macro mode" << endl;
-}
-
-
-void MathedCursor::MacroModeClose()
-{
-   if (macro_mode)  {
-      macro_mode = false;
-      latexkeys * l = in_word_set(macrobf, macroln);
-      if (macroln > 0 && (!l || (l && IsMacro(l->token, l->id))) && 
-         !MathMacroTable::mathMTable.getMacro(macrobf)) {
-         if (!l) {
-                 //imacro->SetName(strnew(macrobf));
-           imacro->SetName(macrobf);
-             // This guarantees that the string will be removed by destructor
-           imacro->SetType(LM_OT_UNDEF);
-         } else 
-           imacro->SetName(l->name);
-      } else {
-         Left();
-        imacro->SetName("");
-        if (cursor->GetInset()->GetType() == LM_OT_ACCENT) {
-            setAccent(static_cast<MathAccentInset*>(cursor->GetInset())->getAccentCode());
-        }
-        cursor->Delete();
-        if (l || MathMacroTable::mathMTable.getMacro(macrobf)) {
-           Interpret(macrobf);
-        }
-      }
-      imacro = 0;
-   }  
-}
-
-
-void MathedCursor::MacroModeBack()
-{
-   if (macro_mode) {
-     if (macroln>0) {
-       macrobf[--macroln] = '\0';
-       imacro->Metrics();
-     } else 
-       MacroModeClose();
-   } else
-          lyxerr << "Mathed Warning: we are not in macro mode" << endl;
-}
-
-
-void MathedCursor::MacroModeInsert(char c)
-{
-   if (macro_mode) {
-      macrobf[macroln + 1] = macrobf[macroln];
-      macrobf[macroln++] = c;
-      imacro->Metrics();
-   } else
-          lyxerr << "Mathed Warning: we are not in macro mode" << endl;
-}
-
-
-void MathedCursor::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();
-       SelClear();
-    }
-}
-
-
-void MathedCursor::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();
-       SelClear();
-    }
+
+       return goDown();
 }
 
 
-void MathedCursor::SelDel()
+bool MathCursor::toggleLimits()
 {
-//    lyxerr << "Deleting sel "
-    if (selection) {    
-       if (cursor->pos == selpos) return;
-       cursor->Clean(selpos);
-       cursor->Adjust();
-       SelClear();
-    }
+       if (!hasPrevAtom())
+               return false;
+       MathScriptInset * t = prevAtom()->asScriptInset();
+       if (!t)
+               return false;
+       int old = t->limits();
+       t->limits(old < 0 ? 1 : -1);
+       return old != t->limits();
 }
 
 
-void MathedCursor::SelPaste()
+void MathCursor::setSize(MathStyles size)
 {
-//    lyxerr << "paste " << selarray << " " << curor->pos;
-    if (selection) SelDel();
-    if (selarray) {
-       cursor->Merge(selarray);
-       cursor->Adjust();
-    }
+       par()->userSetSize(size);
 }
 
 
-void MathedCursor::SelStart()
+void MathCursor::macroModeClose()
 {
-       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;
-       
-    }
-}
-
-
-void MathedCursor::SelClear()
-{   
-       lyxerr[Debug::MATHED] << "Clearing sel " << endl;
-    selection = false;
-    delete selstk;
-    selstk = 0;
-    anchor = 0;
-}
-
-
-
-// Anchor position must be at the same level that stack.
-void MathedCursor::SelBalance()
-{
-    int d = mathstk.Level() - selstk->Level();
-
-    // 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;
-} 
-
-
-void MathedCursor::SelGetArea(int ** xp, int ** yp, int & np)
-{   
-    static int xpoint[10];
-    static int ypoint[10];
-
-    if (!selection) {
-       np = 0;
-       xpoint[0] = 0;
-       ypoint[0] = 0;
-       *xp = &xpoint[0];
-       *yp = &ypoint[0];
-       return;
-    }
-    
-    // single row selection
-    int i = 0, x, y, a, d, xo, yo, x1, y1, a1, d1;
-
-    // Balance anchor and cursor
-    SelBalance();
-    cursor->p->GetXY(xo, yo);
-    int w = cursor->p->Width();
-    cursor->GetPos(x1, y1);
-    cursor->getAD(a1, d1);
-    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;
-           }
-    }
-
-    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;
-           }
-    }
-    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 << "] ";
-    
-}
-
-
-void MathedCursor::setAccent(int ac)
-{
-       if (ac > 0 && accent < 8) {
-               nestaccent[accent++] = ac;
-       } else
-         accent = 0;  // consumed!
-}
-
-int MathedCursor::getAccent() const
-{
-       return (accent > 0) ? nestaccent[accent - 1]: 0;
-}
-
-
-void MathedCursor::doAccent(byte c, MathedTextCodes t)
-{
-       MathedInset * ac = 0;
-       
-       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]);
+       string s = macroName();
+       if (s.size()) {
+               size_type old = pos();
+               pos() -= s.size();
+               array().erase(pos(), old);
+               interpret(s);
        }
-       if (ac) 
-         cursor->Insert(ac);
-       
-       accent = 0;  // consumed!
 }
 
 
-void MathedCursor::doAccent(MathedInset * p)
+int MathCursor::macroNamePos() const
 {
-       MathedInset * ac = 0;
-       
-       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]);
+       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;
+}
+
+
+string MathCursor::macroName() const
+{
+       string s;
+       for (int i = macroNamePos(); i >= 0 && i < int(pos()); ++i) 
+               s += array().at(i)->getChar();
+       return s;
+}
+
+
+void MathCursor::selCopy()
+{
+       seldump("selCopy");
+       if (selection_) {
+               theSelection.grab(*this);
+               selClear();
        }
-       if (ac) 
-         cursor->Insert(ac);
-       
-       accent = 0;  // consumed!
 }
 
+
+void MathCursor::selCut()
+{
+       seldump("selCut");
+       if (selection_) {
+               theSelection.grab(*this);
+               theSelection.erase(*this);
+               selClear();
+       } else {
+               theSelection.clear();
+       }
+}
+
+
+void MathCursor::selDel()
+{
+       seldump("selDel");
+       if (selection_) {
+               theSelection.erase(*this);
+               selClear();
+       }
+}
+
+
+void MathCursor::selPaste()
+{
+       seldump("selPaste");
+       theSelection.paste(*this);
+       theSelection.grab(*this);
+       //selClear();
+}
+
+
+void MathCursor::selHandle(bool sel)
+{
+       if (sel == selection_)
+               return;
+
+       theSelection.clear();
+       Anchor_    = Cursor_;
+       selection_ = sel;
+}
+
+
+void MathCursor::selStart()
+{
+       seldump("selStart");
+       if (selection_)
+               return;
+
+       theSelection.clear();
+       Anchor_ = Cursor_;
+       selection_ = true;
+}
+
+
+void MathCursor::selClear()
+{
+       seldump("selClear");
+       selection_ = false;
+}
+
+
+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 {
+               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();
+                       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);
+               }
+       }
+}
+
+
+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 (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::handleDelim(string const & l, string const & r)
+{
+       handleNest(new MathDelimInset(l, r));
+}
+
+
+void MathCursor::handleNest(MathInset * p)
+{
+       if (selection_) {
+               selCut();
+               p->cell(0) = theSelection.glue();
+       }
+       insert(MathAtom(p)); // this invalidates p!
+       pushRight(prevAtom());
+}
+
+
+void MathCursor::getPos(int & x, int & y)
+{
+#ifdef WITH_WARNINGS
+#warning This should probably take cellXOffset and cellYOffset into account
+#endif
+       x = xarray().xo() + xarray().pos2x(pos());
+       y = xarray().yo();
+}
+
+
+MathAtom & MathCursor::par() const
+{
+       return *cursor().par_;
+}
+
+
+InsetFormulaBase const * MathCursor::formula()
+{
+       return formula_;
+}
+
+
+MathCursor::idx_type MathCursor::idx() const
+{
+       return cursor().idx_;
+}
+
+
+MathCursor::idx_type & MathCursor::idx()
+{
+       return cursor().idx_;
+}
+
+
+MathCursor::pos_type MathCursor::pos() const
+{
+       return cursor().pos_;
+}
+
+
+MathCursor::pos_type & MathCursor::pos()
+{
+       return cursor().pos_;
+}
+
+
+bool MathCursor::inMacroMode() const
+{
+       return macroNamePos() != -1;
+}
+
+
+bool MathCursor::selection() const
+{
+       return selection_;
+}
+
+
+MathArrayInset * MathCursor::enclosingArray(MathCursor::idx_type & idx) const
+{
+       for (int i = Cursor_.size() - 1; i >= 0; --i) {
+               MathArrayInset * p = (*Cursor_[i].par_)->asArrayInset();
+               if (p) {
+                       idx = Cursor_[i].idx_;
+                       return p;
+               }
+       }
+       return 0;
+}
+
+
+void MathCursor::pullArg(bool goright)
+{
+       dump("pullarg");
+       MathArray a = array();
+
+       MathScriptInset const * p = par()->asScriptInset();
+       if (p) {
+               // special handling for scripts
+               const bool up = p->hasUp();
+               popLeft();
+               MathScriptInset * q = nextAtom()->asScriptInset();
+               if (q)
+                       q->removeScript(up);
+               ++pos();
+               array().insert(pos(), a);
+               return;
+       }
+
+       if (popLeft()) {
+               plainErase();
+               array().insert(pos(), a);
+               if (goright) 
+                       pos() += a.size();
+       }
+}
+
+
+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 (idx() >= par()->nargs()) {
+               lyxerr << "this should not really happen - 1: "
+                      << idx() << " " << par()->nargs() << "\n";
+               dump("error 2");
+       }
+       it->idx()    = min(idx(), par()->nargs() - 1);
+
+       if (pos() > size()) {
+               lyxerr << "this should not really happen - 2: "
+                      << pos() << " " << size() << "\n";
+               dump("error 4");
+       }
+       it->pos() = min(pos(), size());
+}
+
+
+MathCursor::size_type MathCursor::size() const
+{
+       return array().size();
+}
+
+
+MathCursor::col_type MathCursor::col() const
+{
+       return par()->col(idx());
+}
+
+
+MathCursor::row_type MathCursor::row() const
+{
+       return par()->row(idx());
+}
+
+
+bool MathCursor::hasPrevAtom() const
+{
+       return pos() > 0;
+}
+
+
+bool MathCursor::hasNextAtom() const
+{
+       return pos() < size();
+}
+
+
+MathAtom const & MathCursor::prevAtom() const
+{
+       lyx::Assert(pos() > 0);
+       return array().at(pos() - 1);
+}
+
+
+MathAtom & MathCursor::prevAtom()
+{
+       lyx::Assert(pos() > 0);
+       return array().at(pos() - 1);
+}
+
+
+MathAtom const & MathCursor::nextAtom() const
+{
+       lyx::Assert(pos() < size());
+       return array().at(pos());
+}
+
+
+MathAtom & MathCursor::nextAtom()
+{
+       lyx::Assert(pos() < size());
+       return array().at(pos());
+}
+
+
+MathArray & MathCursor::array() const
+{
+       static MathArray dummy;
+
+       if (idx() >= par()->nargs()) {
+               lyxerr << "############  idx_ " << idx() << " not valid\n";
+               return dummy;
+       }
+
+       return cursor().cell();
+}
+
+
+MathXArray & MathCursor::xarray() const
+{
+       return cursor().xcell();
+}
+
+
+void MathCursor::idxNext()
+{
+       par()->idxNext(idx(), pos());
+}
+
+
+void MathCursor::idxPrev()
+{
+       par()->idxPrev(idx(), pos());
+}
+
+
+void MathCursor::splitCell()
+{
+       if (idx() == par()->nargs() - 1) 
+               return;
+       MathArray ar = array();
+       ar.erase(0, pos());
+       array().erase(pos(), size());
+       ++idx();
+       pos() = 0;
+       array().insert(0, ar);
+}
+
+
+void MathCursor::breakLine()
+{
+       // 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);
+               idx() = 0;
+               pos() = size();
+       } else {
+               p->addRow(row());
+
+               // split line
+               const row_type r = row();
+               for (col_type c = col() + 1; c < p->ncols(); ++c) {
+                       const MathMatrixInset::idx_type i1 = p->index(r, c);
+                       const MathMatrixInset::idx_type i2 = p->index(r + 1, c);        
+                       lyxerr << "swapping cells " << i1 << " and " << i2 << "\n";
+                       p->cell(i1).swap(p->cell(i2));
+               }
+
+               // split cell
+               splitCell();
+               p->cell(idx()).swap(p->cell(idx() + p->ncols() - 1));
+       }
+}
+
+
+char MathCursor::valign() const
+{
+       idx_type idx;
+       MathArrayInset * p = enclosingArray(idx);
+       return p ? p->valign() : '\0';
+}
+
+
+char MathCursor::halign() const
+{
+       idx_type idx;
+       MathArrayInset * p = enclosingArray(idx);
+       return p ? p->halign(idx % p->ncols()) : '\0';
+}
+
+
+void MathCursor::getSelection(MathCursorPos & i1, MathCursorPos & i2) const
+{
+       MathCursorPos anc = normalAnchor();
+       if (anc < cursor()) {
+               i1 = anc;
+               i2 = cursor();
+       } else {
+               i1 = cursor();
+               i2 = anc;
+       }
+}
+
+
+MathCursorPos & MathCursor::cursor()
+{
+       return Cursor_.back();
+}
+
+
+MathCursorPos const & MathCursor::cursor() const
+{
+       return Cursor_.back();
+}
+
+
+int MathCursor::cellXOffset() const
+{
+       return par()->cellXOffset(idx());
+}
+
+
+int MathCursor::cellYOffset() const
+{
+       return par()->cellYOffset(idx());
+}
+
+
+int MathCursor::xpos() const
+{
+       return cellXOffset() + xarray().pos2x(pos());
+}
+
+
+int MathCursor::ypos() const
+{
+       return cellYOffset();
+}
+
+
+
+void MathCursor::gotoX(int x) 
+{
+       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);
+}
+
+
+
+////////////////////////////////////////////////////////////////////////
+
+
+bool operator==(MathCursorPos const & ti, MathCursorPos const & it)
+{
+       return ti.par_ == it.par_ && ti.idx_ == it.idx_ && ti.pos_ == it.pos_;
+}
+
+
+bool operator<(MathCursorPos const & ti, MathCursorPos const & it)
+{
+       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_;
+}
+
+
+MathArray & MathCursorPos::cell(MathCursor::idx_type idx) const
+{
+       return (*par_)->cell(idx);
+}
+
+
+MathArray & MathCursorPos::cell() const
+{
+       return (*par_)->cell(idx_);
+}
+
+
+MathXArray & MathCursorPos::xcell(MathCursor::idx_type idx) const
+{
+       return (*par_)->xcell(idx);
+}
+
+
+MathXArray & MathCursorPos::xcell() const
+{
+       return (*par_)->xcell(idx_);
+}
+
+
+MathCursorPos MathCursor::normalAnchor() const
+{
+       // use Anchor on the same level as Cursor
+       MathCursorPos normal = Anchor_[Cursor_.size() - 1];
+       if (Cursor_.size() < Anchor_.size() && !(normal < cursor())) {
+               // anchor is behind cursor -> move anchor behind the inset
+               ++normal.pos_;
+       }
+       return normal;
+}
+
+