X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_cursor.C;h=ca2b35904f9b371e1554971a37f62b03d1bc05e3;hb=28c690f63c66d66beb2635fe5d28a6dd45d3c911;hp=51eeedf525eac21c0568fe42ea8135355639bfc5;hpb=4a40b711f2fe6ce8638a15f5bc7644a581cab016;p=lyx.git

diff --git a/src/mathed/math_cursor.C b/src/mathed/math_cursor.C
index 51eeedf525..ca2b35904f 100644
--- a/src/mathed/math_cursor.C
+++ b/src/mathed/math_cursor.C
@@ -20,909 +20,816 @@
 #endif
 
 #include <config.h>
+#include <algorithm>
 #include <cctype>
 
-#include "math_inset.h"
-#include "math_arrayinset.h"
-#include "math_parser.h"
-#include "math_cursor.h"
-#include "math_macro.h"
-#include "math_macroarg.h"
-#include "math_macrotable.h"
-#include "math_root.h"
 #include "support/lstrings.h"
+#include "support/LAssert.h"
 #include "debug.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "math_matrixinset.h"
-#include "math_grid.h"
-#include "math_spaceinset.h"
-#include "math_funcinset.h"
-#include "math_bigopinset.h"
-#include "math_fracinset.h"
-#include "math_decorationinset.h"
-#include "math_dotsinset.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_macrotemplate.h"
-#include "math_sqrtinset.h"
+#include "math_matrixinset.h"
 #include "math_scriptinset.h"
-#include "mathed/support.h"
-#include "formulabase.h"
+#include "math_spaceinset.h"
+#include "math_specialcharinset.h"
+#include "math_parser.h"
 
+#define FILEDEBUG 0
 
 using std::endl;
 using std::min;
 using std::max;
+using std::swap;
 using std::isalnum;
 
-
 namespace {
 
-MathArray selarray;
+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_;
+};
+
 
-bool IsMacro(short tok, int id)
+Selection theSelection;
+
+
+#if FILEDEBUG
+std::ostream & operator<<(std::ostream & os, MathCursorPos const & p)
 {
-	return tok != LM_TK_STACK &&
-	       tok != LM_TK_FRAC &&
-	       tok != LM_TK_SQRT &&
-	       tok != LM_TK_DECORATION &&
-	       tok != LM_TK_SPACE &&
-	       tok != LM_TK_DOTS &&
-	       tok != LM_TK_FUNCLIM &&
-	       tok != LM_TK_BIGSYM &&
-	       !(tok == LM_TK_SYM && id < 255);
+	os << "(par: " << p.par_ << " idx: " << p.idx_ << " pos: " << p.pos_ << ")";
+	return os;
 }
+#endif
 
 }
 
-MathCursor::MathCursor(InsetFormulaBase * formula)
-	: formula_(formula)
+
+MathCursor::MathCursor(InsetFormulaBase * formula, bool left)
+	: formula_(formula), lastcode_(LM_TC_VAR), selection_(false)
 {
-	lastcode   = LM_TC_MIN;
-	macro_mode = false;
-	first();
+	left ? first() : last();
+}
+
+
+void MathCursor::push(MathAtom & t)
+{
+	//cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
+	MathCursorPos p;
+	p.par_ = &t;
+	Cursor_.push_back(p);
 }
 
 
-void MathCursor::push(MathInset * par, bool first)
+void MathCursor::pushLeft(MathAtom & t)
 {
-	path_.push_back(MathIter());
-	path_.back().par_    = par_;
-	path_.back().idx_    = idx_;
-	path_.back().cursor_ = cursor_;
-	dump("Pushed:");
-	par_ = par;
-	first ? par_->idxFirst(idx_, cursor_) : par_->idxLast(idx_, cursor_);
+	//cerr << "Entering atom "; t->write(cerr, false); cerr << " left\n";
+	push(t);
+	t->idxFirst(idx(), pos());
 }
 
 
-bool MathCursor::pop()
+void MathCursor::pushRight(MathAtom & t)
 {
-	if (path_.empty())
+	//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;
-	par_    = path_.back().par_;
-	idx_    = path_.back().idx_;
-	cursor_ = path_.back().cursor_;
-	dump("Popped:");
-	path_.pop_back();
+	//if (nextInset())
+	//	nextInset()->removeEmptyScripts();
+	Cursor_.pop_back();
+	//if (nextAtom())
+	//	nextAtom()->removeEmptyScripts();
 	return true;
 }
 
 
-MathInset * MathCursor::parInset(int i) const
+bool MathCursor::popRight()
 {
-	return path_[i].par_;
+	//cerr << "Leaving atom "; par()->write(cerr, false); cerr << " right\n";
+	if (Cursor_.size() <= 1)
+		return false;
+	//if (nextInset())
+	//	nextInset()->removeEmptyScripts();
+	Cursor_.pop_back();
+	//if (nextInset())
+	//	nextInset()->removeEmptyScripts();
+	posRight();
+	return true;
 }
 
+
+
+#if FILEDEBUG
 void MathCursor::dump(char const * what) const
 {
-	return;
+	lyxerr << "MC: " << what << "\n";
+	for (unsigned i = 0; i < Cursor_.size(); ++i)
+		lyxerr << "  i: " << i 
+			<< " 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 << "MC: " << what
-		<< " cursor: " << cursor_
-		<< " anchor: " << anchor_
-		<< " idx: " << idx_
-		<< " par: " << par_
-		<< " sel: " << selection
-		<< " data: " << array()
-		<< "\n";
+	lyxerr	<< " sel: " << selection_ << "\n";
 }
 
+
 void MathCursor::seldump(char const * str) const
 {
-	lyxerr << "SEL: " << str << ": '" << selarray << "'\n";
-	dump("   Pos");
-	return;
-
-	lyxerr << "\n\n\\n=================vvvvvvvvvvvvv=======================   "
-		<<  str << "\nselarray: " << selarray;
-	for (unsigned int i = 0; i < path_.size(); ++i) 
-		lyxerr << path_[i].par_ << "\n'" << path_[i].par_->cell(0) << "'\n";
-	lyxerr << "\ncursor: " << cursor_;
-	lyxerr << "\nanchor: " << anchor_;
+	//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 {}
 
-bool MathCursor::isInside(MathInset * p) const
+#endif
+
+
+bool MathCursor::isInside(MathInset const * p) const
 {
-	for (unsigned i = 0; i < path_.size(); ++i) 
-		if (parInset(i) == p) 
+	for (unsigned i = 0; i < Cursor_.size(); ++i) 
+		if (Cursor_[i].par_->nucleus() == p) 
 			return true;
-	return par_ == p;
+	return false;
 }
 
 
-bool MathCursor::Left(bool sel)
+bool MathCursor::openable(MathAtom const & t, bool sel) const
 {
-	dump("Left 1");
-	if (macro_mode) {
-		// was MacroModeBack()
-		if (!imacro->name().empty()) {
-			imacro->SetName(imacro->name().substr(0, imacro->name().length()-1));
-			imacro->Metrics(imacro->size());
-		} else
-			MacroModeClose();
-		return true;
+	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;
 	}
-	clearLastCode();
-	SelHandle(sel);
+	return true;
+}
 
-	bool result = false;
 
-	if (selection) {
-		result = array().prev(cursor_);
-		if (!result && pop()) {
-			anchor_ = cursor_;
-			result = array().next(anchor_);
-		}
-	} else {
-		MathInset * p = prevInset();
-		if (p && p->isActive()) {
-			// We have to move deeper into the previous inset
-			array().prev(cursor_);
-			push(p, false);
-			result = true;
-		} else {
-			// The common case, where we are not 
-			// entering a deeper inset
-			result = array().prev(cursor_);
-			if (!result) {
-				if (par_->idxLeft(idx_, cursor_)) {
-					result = true;
-				} else if (pop()) {
-					result = 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;
 	}
-	dump("Left 2");
-	return result;
+
+	return t->nargs() && t->covers(x, y);
 }
 
 
-bool MathCursor::plainRight()
+bool MathCursor::posLeft()
 {
-	return array().next(cursor_);
+	if (pos() == 0)
+		return false;
+
+	--pos();
+
+	return true;
 }
 
 
-bool MathCursor::Right(bool sel)
+bool MathCursor::posRight()
 {
-	dump("Right 1");
-	if (macro_mode) {
-		MacroModeClose();
+	if (pos() == size())
+		return false;
+
+	++pos();
+
+	return true;
+}
+
+
+bool MathCursor::left(bool sel)
+{
+	dump("Left 1");
+	if (inMacroMode()) {
+		macroModeClose();
+		lastcode_ = LM_TC_VAR;
 		return true;
 	}
+	selHandle(sel);
+	lastcode_ = LM_TC_VAR;
 
-	clearLastCode();
-	SelHandle(sel);
+	if (hasPrevAtom() && openable(prevAtom(), sel)) {
+		pushRight(prevAtom());
+		return true;
+	} 
+	
+	return posLeft() || idxLeft() || popLeft();
+}
 
-	bool result = false;
 
-	if (selection) {
-		result = array().next(cursor_);
-		if (!result && pop()) {
-			anchor_ = cursor_;
-			result = array().next(cursor_);
-		}
-	} else {
-		MathInset * p = nextInset();
-		if (p && p->isActive()) {
-			push(p, true);
-			result = true;
-		} else {
-			result = array().next(cursor_);
-			if (!result) {
-				if (par_->idxRight(idx_, cursor_)) {
-					result = true;
-				} else if (pop()) {
-					result = true;
-					array().next(cursor_);
-				}
-			}
-		}
+bool MathCursor::right(bool sel)
+{
+	dump("Right 1");
+	if (inMacroMode()) {
+		macroModeClose();
+		lastcode_ = LM_TC_VAR;
+		return true;
+	}
+	selHandle(sel);
+	lastcode_ = LM_TC_VAR;
+
+	if (hasNextAtom() && openable(nextAtom(), sel)) {
+		pushLeft(nextAtom());
+		return true;
 	}
-	dump("Right 2");
-	return result;
+
+	return posRight() || idxRight() || popRight();
 }
 
 
 void MathCursor::first()
 {
-	selection  = false;
-	par_       = formula_->par();
-	idx_       = 0;
-	cursor_    = 0;
-	anchor_    = 0;
-	par_->idxFirst(idx_, cursor_);
+	Cursor_.clear();
+	pushLeft(formula_->par());
 }
 
 
 void MathCursor::last()
 {
-	selection  = false;
-	par_       = formula_->par();
-	idx_       = 0;
-	cursor_    = 0;
-	anchor_    = 0;
-	par_->idxLast(idx_, cursor_);
+	first();
+	end();
 }
 
 
-void MathCursor::SetPos(int x, int y)
+void MathCursor::setPos(int x, int y)
 {
-	dump("SetPos 1");
-	//lyxerr << "MathCursor::SetPos x: " << x << " y: " << y << "\n";
+	//dump("setPos 1");
+	//lyxerr << "MathCursor::setPos x: " << x << " y: " << y << "\n";
 
-	MacroModeClose();
-	lastcode = LM_TC_MIN;
-	path_.clear();
+	macroModeClose();
+	lastcode_ = LM_TC_VAR;
+	first();
 
-	par_    = formula()->par();
+	cursor().par_  = &formula_->par();
 
 	while (1) {
-		idx_    = -1;
-		cursor_ = -1;
-		//lyxerr << "found idx: " << idx_ << " cursor: " << cursor_  << "\n";
+		idx() = 0;
+		cursor().pos_ = 0;
+		//lyxerr << "found idx: " << idx() << " cursor: " << pos()  << "\n";
 		int distmin = 1 << 30; // large enough
-		for (int i = 0; i < par_->nargs(); ++i) {
-			MathXArray const & ar = par_->xcell(i);
+		for (unsigned int i = 0; i < par()->nargs(); ++i) {
+			MathXArray const & ar = par()->xcell(i);
 			int x1 = x - ar.xo();
 			int y1 = y - ar.yo();
-			int c  = ar.x2pos(x1);
+			MathXArray::size_type c  = ar.x2pos(x1);
 			int xx = abs(x1 - ar.pos2x(c));
 			int yy = abs(y1);
 			//lyxerr << "idx: " << i << " xx: " << xx << " yy: " << yy
 			//	<< " c: " << c  << " xo: " << ar.xo() << "\n";
 			if (yy + xx <= distmin) {
 				distmin = yy + xx;
-				idx_     = i;
-				cursor_  = c;
+				idx()   = i;
+				pos()   = c;
 			}
 		}
-		lyxerr << "found idx: " << idx_ << " cursor: " << cursor_  << "\n";
-		MathInset * n = nextInset();
-		MathInset * p = prevInset();
-		if (n && (n->isActive() || n->isUpDownInset()) && n->covers(x, y))
-			push(n, true);
-		else if (p && (p->isActive() || p->isUpDownInset()) && p->covers(x, y)) {
-			array().prev(cursor_);
-			push(p, false);
-		} else 
+		//lyxerr << "found idx: " << idx() << " cursor: "
+		//	<< pos()  << "\n";
+		if (hasNextAtom() && positionable(nextAtom(), x, y))
+			pushLeft(nextAtom());
+		else if (hasPrevAtom() && positionable(prevAtom(), x, y))
+			pushRight(prevAtom());
+		else 
 			break;
 	}
-	dump("SetPos 2");
+	//dump("setPos 2");
 }
 
 
-void MathCursor::Home()
+void MathCursor::home(bool sel)
 {
-	dump("Home 1");
-	if (macro_mode)
-		MacroModeClose();
-	clearLastCode();
-	if (!par_->idxHome(idx_, cursor_)) {
-		pop();
-	}
-	dump("Home 2");
+	dump("home 1");
+	selHandle(sel);
+	macroModeClose();
+	lastcode_ = LM_TC_VAR;
+	if (!par()->idxHome(idx(), pos())) 
+		popLeft();
+	dump("home 2");
 }
 
 
-void MathCursor::End()
+void MathCursor::end(bool sel)
 {
-	dump("End 1");
-	if (macro_mode)
-		MacroModeClose();
-	clearLastCode();
-	if (!par_->idxEnd(idx_, cursor_)) {
-		pop();
-		array().next(cursor_);
-	}
-	dump("End 2");
+	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";
-	if (selection)
-		SelDel();
+	plainInsert(MathAtom(new MathCharInset(c, t)));
+}
 
-	if (t == LM_TC_MIN)
-		t = lastcode;
 
-	if (macro_mode && !(MathIsAlphaFont(t) || t == LM_TC_MIN))
-		MacroModeClose();
+void MathCursor::insert(MathAtom const & t)
+{
+	macroModeClose();
 
-	if (macro_mode) {
-		if (MathIsAlphaFont(t) || t == LM_TC_MIN) {
-			// was MacroModeinsert(c);
-			imacro->SetName(imacro->name() + static_cast<char>(c));
-			return;
-		}
+	if (selection_) {
+		if (t->nargs())
+			selCut();
+		else
+			selDel();
 	}
 
-	array().insert(cursor_, c, t);
-	array().next(cursor_);
+	plainInsert(t);
+}
+
 
-	lastcode = t;
+void MathCursor::niceInsert(MathAtom const & t) 
+{
+	selCut();
+	insert(t); // inserting invalidates the pointer!
+	MathAtom const & p = prevAtom();
+	if (p->nargs()) {
+		posLeft();
+		right();  // do not push for e.g. MathSymbolInset
+		selPaste();
+	}
+	p->metrics(p->size());
 }
 
 
-void MathCursor::insert(MathInset * p)
+void MathCursor::insert(MathArray const & ar)
 {
-	MacroModeClose();
+	macroModeClose();
+	if (selection_)
+		selCut();
 
-	if (selection) {
-		if (p->nargs())
-			SelCut();
-		else
-			SelDel();
-	}
+	array().insert(pos(), ar);
+	pos() += ar.size();
+}
 
-	array().insert(cursor_, p);
-	array().next(cursor_);
+
+void MathCursor::paste(MathArray const & ar)
+{
+	Anchor_ = Cursor_;
+	selection_ = true;
+	array().insert(pos(), ar);
+	pos() += ar.size();
 }
 
 
-void MathCursor::Delete()
+void MathCursor::backspace()
 {
-	dump("Delete 1");
-	if (macro_mode)
+	if (pos() == 0) {
+		pullArg(false);
 		return;
+	}	
 
-	if (selection) {
-		SelDel();
+	if (selection_) {
+		selDel();
 		return;
 	}
 
-	if (cursor_ < array().size())
-		array().erase(cursor_);
+	MathScriptInset * p = prevAtom()->asScriptInset();
+	if (p) {
+		p->removeScript(p->hasUp());
+		// Don't delete if there is anything left 
+		if (p->hasUp() || p->hasDown())
+			return;
+	}
+
+	--pos();
+	plainErase();
+}
+
+
+void MathCursor::erase()
+{
+	if (inMacroMode())
+		return;
+
+	if (selection_) {
+		selDel();
+		return;
+	}
 
 	// delete empty cells if necessary
-	if (cursor_ == 0 && array().size() == 0) {
+	if (array().empty()) {
 		bool popit;
 		bool removeit;
-		par_->idxDelete(idx_, popit, removeit);
-		if (popit && pop() && removeit)
-			Delete();
+		par()->idxDelete(idx(), popit, removeit);
+		if (popit && popLeft() && removeit)
+			plainErase();
+		return;
 	}
 
-#ifdef WITH_WARNINGS
-#warning pullArg disabled
-#endif
-	//if (cursor_ == 0 && !path_.empty()) {
-	//	lyxerr << "Delete: popping...\n";
-	//	pop();
-	//}
+	if (pos() == size())
+		return;
 
-	dump("Delete 2");
+	MathScriptInset * p = nextAtom()->asScriptInset();
+	if (p) {
+		p->removeScript(p->hasUp());
+		// Don't delete if there is anything left 
+		if (p->hasUp() || p->hasDown())
+			return;
+	}
+
+	plainErase();
 }
 
 
-void MathCursor::DelLine()
+void MathCursor::delLine()
 {
-	MacroModeClose();
+	macroModeClose();
 
-	if (selection) {
-		SelDel();
+	if (selection_) {
+		selDel();
 		return;
 	}
 
-	if (par_->nrows() > 1)
-		par_->delRow(row());
+	if (par()->nrows() > 1)
+		par()->delRow(row());
 }
 
 
-bool MathCursor::Up(bool sel)
+bool MathCursor::up(bool sel)
 {
-	dump("Up 1");
-	MacroModeClose();
-	SelHandle(sel);
-	SelClear();
+	dump("up 1");
+	macroModeClose();
+	selHandle(sel);
 
-	// check whether we could move into an inset on the right or on the left
-	MathInset * p = nextInset();
-	if (p) {
-		int idx, cursor;
-		if (p->idxFirstUp(idx, cursor)) {
-			push(p, true);
-			par_ = p;
-			idx_    = idx;
-			cursor_ = cursor;
-			dump("Up 3");
-			return true;
+	if (!selection_) {
+		// check whether we could move into a superscript 
+		if (hasPrevAtom()) {
+			MathAtom & p = prevAtom();
+			if (p->asScriptInset() && p->asScriptInset()->hasUp()) {
+				pushRight(p);
+				idx() = 1;
+				pos() = size();
+				return true;
+			}
 		}
-	}
 
-	p = prevInset();
-	if (p) {
-		int idx, cursor;
-		if (p->idxLastUp(idx, cursor)) {
-			array().prev(cursor_);
-			push(p, false);
-			par_ = p;
-			idx_    = idx;
-			cursor_ = cursor;
-			dump("Up 4");
-			return true;
+		if (hasNextAtom()) {
+			MathAtom & n = nextAtom();
+			if (n->asScriptInset() && n->asScriptInset()->hasUp()) {
+				pushLeft(n);
+				idx() = 1;
+				pos() = 0;
+				return true;
+			}
 		}
 	}
 
-
-	int x = xarray().pos2x(cursor_);
-	bool result = par_->idxUp(idx_, cursor_);
-	if (!result && pop()) {
-		result = par_->idxUp(idx_, cursor_);
-	}
-	cursor_ = xarray().x2pos(x);
-
-	dump("Up 2");
-	return result;
+	return goUp();
 }
 
 
-bool MathCursor::Down(bool sel)
+bool MathCursor::down(bool sel)
 {
-	dump("Down 1");
-	MacroModeClose();
-	SelHandle(sel);
-	SelClear();
+	dump("down 1");
+	macroModeClose();
+	selHandle(sel);
 
-	// check whether we could move into an inset on the right or on the left
-	MathInset * p = nextInset();
-	if (p) {
-		int idx, cursor;
-		if (p->idxFirstDown(idx, cursor)) {
-			push(p, true);
-			idx_    = idx;
-			cursor_ = cursor;
-			dump("Down 3");
-			return true;
+	if (!selection_) {
+		// check whether we could move into a subscript 
+		if (hasPrevAtom()) {
+			MathAtom & p = prevAtom();
+			if (p->asScriptInset() && p->asScriptInset()->hasDown()) {
+				pushRight(p);
+				idx() = 0;
+				pos() = size();
+				return true;
+			}
 		}
-	}
 
-	p = prevInset();
-	if (p) {
-		int idx, cursor;
-		if (p->idxLastDown(idx, cursor)) {
-			array().prev(cursor_);
-			push(p, false);
-			idx_    = idx;
-			cursor_ = cursor;
-			dump("Down 4");
-			return true;
+		if (hasNextAtom()) {
+			MathAtom & n = nextAtom();
+			if (n->asScriptInset() && n->asScriptInset()->hasDown()) {
+				pushLeft(n);
+				idx() = 0;
+				pos() = 0;
+				return true;
+			}
 		}
 	}
 
-	int x = xarray().pos2x(cursor_);
-	bool result = par_->idxDown(idx_, cursor_);
-	if (!result && pop()) {
-		result = par_->idxDown(idx_, cursor_);
-	}
-	cursor_ = xarray().x2pos(x);
-
-	dump("Down 2");
-	return result;
+	return goDown();
 }
 
 
 bool MathCursor::toggleLimits()
 {
-	if (!prevIsInset())
+	if (!hasPrevAtom())
+		return false;
+	MathScriptInset * t = prevAtom()->asScriptInset();
+	if (!t)
 		return false;
-	MathInset * p = prevInset();
-	int old = p->limits();
-	p->limits(old < 0 ? 1 : -1);
-	return old != p->limits();
+	int old = t->limits();
+	t->limits(old < 0 ? 1 : -1);
+	return old != t->limits();
 }
 
 
-void MathCursor::SetSize(MathStyles size)
+void MathCursor::setSize(MathStyles size)
 {
-	par_->UserSetSize(size);
+	par()->userSetSize(size);
 }
 
 
-
-void MathCursor::Interpret(string const & s)
+void MathCursor::macroModeClose()
 {
-	lyxerr << "Interpret: '" << s << "'  ('" << s.substr(0, 7)  << "' " <<
-in_word_set(s) << " \n";
-
-	if (s[0] == '^') {
-		MathUpDownInset * p = nearbyUpDownInset();
-		if (!p) {
-			p = new MathScriptInset(true, false);
-			insert(p);
-			array().prev(cursor_);
-		}
-		push(p, true);
-		p->up(true);
-		idx_ = 0;
-		return;
-	}
-
-	if (s[0] == '_') {
-		MathUpDownInset * p = nearbyUpDownInset();
-		if (!p) {
-			p = new MathScriptInset(false, true);
-			insert(p);
-			array().prev(cursor_);
-		}
-		push(p, true);
-		p->down(true);
-		idx_ = 1;
-		return;
+	string s = macroName();
+	if (s.size()) {
+		size_type old = pos();
+		pos() -= s.size();
+		array().erase(pos(), old);
+		interpret(s);
 	}
+}
 
-	if (s[0] == '!' || s[0] == ','  || s[0] == ':' || s[0] == ';') {
-		int sp = (s[0] == ',') ? 1:((s[0] == ':') ? 2:((s[0] == ';') ? 3: 0));
-		insert(new MathSpaceInset(sp));
-		return;
-	}
 
-	MathInset * p = 0;
-	latexkeys const * l = in_word_set(s);
-
-	if (l == 0) {
-		if (s == "root") 
-			p = new MathRootInset;
-		else if (MathMacroTable::hasTemplate(s))
-			p = new MathMacro(MathMacroTable::provideTemplate(s));
-		else if (s.size() > 7 && s.substr(0, 7) == "matrix ") {
-			int m = 1;
-			int n = 1;
-			string v_align;
-			string h_align;
-			std::istringstream is(s.substr(7).c_str());
-			is >> m >> n >> v_align >> h_align;
-			m = std::max(1, m);
-			n = std::max(1, n);
-			MathArrayInset * pp = new MathArrayInset(m, n);
-			pp->valign(v_align[0]);
-			pp->halign(h_align);
-			p = pp;
-		}
-		else
-			p = new MathFuncInset(s, LM_OT_UNDEF);
-	} else {
-		switch (l->token) {
-			case LM_TK_BIGSYM: 
-					p = new MathBigopInset(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:
-				p = new MathFracInset("stackrel");
-				break;
-
-			case LM_TK_FRAC:
-				p = new MathFracInset("frac");
-				break;
-
-			case LM_TK_SQRT:
-				p = new MathSqrtInset;
-				break;
-
-			case LM_TK_DECORATION:
-				p = new MathDecorationInset(l->name, l->id);
-				break;
-
-			case  LM_TK_FUNCLIM:
-				p = new MathFuncInset(l->name, LM_OT_FUNCLIM);
-				break;
-
-			case LM_TK_SPACE:
-				p = new MathSpaceInset(l->id);
-				break;
-
-			case LM_TK_DOTS:
-				p = new MathDotsInset(l->name, l->id);
-				break;
-
-			case LM_TK_MACRO:
-				p = new MathMacro(MathMacroTable::provideTemplate(s));
-				break;
-
-			default:
-				p = new MathFuncInset(l->name);
-				break;
-		}
-	}
-
-	if (p) {
-		bool oldsel = selection;
-		if (oldsel) 
-			SelCut();
-		insert(p);
-		if (p->nargs()) {
-			array().prev(cursor_);
-			push(p, true);
-			if (oldsel) 
-				SelPaste();
-		}
-		p->Metrics(p->size());
+int MathCursor::macroNamePos() const
+{
+	for (int i = pos() - 1; i >= 0; --i) { 
+		MathAtom & p = array().at(i);
+		if (p->code() == LM_TC_TEX && p->getChar() == '\\')
+			return i;
 	}
+	return -1;
 }
 
 
-void MathCursor::MacroModeOpen()
+string MathCursor::macroName() const
 {
-	if (!macro_mode) {
-		imacro = new MathFuncInset("");
-		insert(imacro);
-		macro_mode = true;
-	} else
-		lyxerr << "Math Warning: Already in macro mode" << endl;
+	string s;
+	for (int i = macroNamePos(); i >= 0 && i < int(pos()); ++i) 
+		s += array().at(i)->getChar();
+	return s;
 }
 
 
-void MathCursor::MacroModeClose()
+void MathCursor::selCopy()
 {
-	if (macro_mode)  {
-		macro_mode = false;
-		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
-				imacro->SetType(LM_OT_UNDEF);
-			} else
-				imacro->SetName(l->name);
-		} else {
-			Left();
-			array().erase(cursor_);
-			if (l || MathMacroTable::hasTemplate(imacro->name())) 
-				Interpret(imacro->name());
-			imacro->SetName(string());
-		}
-		imacro = 0;
+	seldump("selCopy");
+	if (selection_) {
+		theSelection.grab(*this);
+		selClear();
 	}
 }
 
 
-void MathCursor::SelCopy()
+void MathCursor::selCut()
 {
-	seldump("SelCopy");
-	if (selection) {
-		int const p1 = min(cursor_, anchor_);
-		int const p2 = max(cursor_, anchor_);
-		selarray = array();
-		selarray.erase(p2, selarray.size());
-		selarray.erase(0, p1);
-		SelClear();
+	seldump("selCut");
+	if (selection_) {
+		theSelection.grab(*this);
+		theSelection.erase(*this);
+		selClear();
+	} else {
+		theSelection.clear();
 	}
 }
 
-void MathCursor::SelCut()
+
+void MathCursor::selDel()
 {
-	seldump("SelCut");
-	if (selection) {
-		int const p1 = min(cursor_, anchor_);
-		int const p2 = max(cursor_, anchor_);
-		cursor_ = p1;  // move cursor to a same position
-		selarray = array();
-		selarray.erase(p2, selarray.size());
-		selarray.erase(0, p1);
-		array().erase(p1, p2);
-		SelClear();
+	seldump("selDel");
+	if (selection_) {
+		theSelection.erase(*this);
+		selClear();
 	}
 }
 
 
-void MathCursor::SelDel()
+void MathCursor::selPaste()
 {
-	seldump("SelDel");
-	if (selection) {
-		int const p1 = min(cursor_, anchor_);
-		int const p2 = max(cursor_, anchor_);
-		array().erase(p1, p2);
-		SelClear();
-	}
+	seldump("selPaste");
+	theSelection.paste(*this);
+	theSelection.grab(*this);
+	//selClear();
 }
 
 
-void MathCursor::SelPaste()
+void MathCursor::selHandle(bool sel)
 {
-	seldump("SelPaste");
-	array().insert(cursor_, selarray);
-	cursor_ += selarray.size();
-	SelClear();
-}
+	if (sel == selection_)
+		return;
 
-void MathCursor::SelHandle(bool sel)
-{
-	if (sel && !selection)
-		SelStart();
-	if (!sel && selection)
-		SelClear();
+	theSelection.clear();
+	Anchor_    = Cursor_;
+	selection_ = sel;
 }
 
 
-void MathCursor::SelStart()
+void MathCursor::selStart()
 {
-	seldump("SelStart");
-	if (selection)
+	seldump("selStart");
+	if (selection_)
 		return;
 
-	anchor_   = cursor_;
-	selection = true;
+	theSelection.clear();
+	Anchor_ = Cursor_;
+	selection_ = true;
 }
 
 
-void MathCursor::SelClear()
+void MathCursor::selClear()
 {
-	selection = false;
+	seldump("selClear");
+	selection_ = false;
 }
 
 
-
-void MathCursor::SelGetArea(int * xpoint, int * ypoint, int & n)
+void MathCursor::drawSelection(Painter & pain) const
 {
-	if (!selection) {
-		n = 0;
-		xpoint[0] = 0;
-		ypoint[0] = 0;
+	if (!selection_)
 		return;
-	}
 
-	// Balance anchor and cursor
-	int xo;
-	int yo;
-	par()->GetXY(xo, yo);
-	int w = par()->width();
-	// cursor
-	int x1 = xarray().xo() + xarray().pos2x(cursor_);
-	int y1 = xarray().yo();
-	//int a1 = xarray().ascent();
-	//int d1 = xarray().descent();
-
-	// anchor
-	int x  = xarray().xo() + xarray().pos2x(anchor_);
-	int y  = xarray().yo();
-	int a  = xarray().ascent();
-	int d  = xarray().descent();
-
-	// single row selection
-	n = 0;
-	xpoint[n]   = x;
-	ypoint[n++] = y + d;
-	xpoint[n]   = x;
-	ypoint[n++] = y - a;
-
-	if (y != y1) {
-		xpoint[n]   = xo + w;
-		ypoint[n++] = y - a;
-
-		if (x1 < xo + w) {
-			xpoint[n]   = xo + w;
-			ypoint[n++] = y1 - a;
-		}
-	}
+	MathCursorPos i1;
+	MathCursorPos i2;
+	getSelection(i1, i2);
+
+	//lyxerr << "selection from: " << i1 << " to " << i2 << "\n";
 
-	xpoint[n]   = x1;
-	ypoint[n++] = y1 - a;
-	xpoint[n]   = x1;
-	ypoint[n++] = y1 + d;
-
-	if (y != y1) {
-		xpoint[n]   = xo;
-		ypoint[n++] = y1 + d;
-		if (x > xo) {
-			xpoint[n]   = xo;
-			ypoint[n++] = y + d;
+	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);
 		}
 	}
-	xpoint[n]   = xpoint[0];
-	ypoint[n++] = ypoint[0];
-
-	//lyxerr << "AN[" << x << " " << y << " " << x1 << " " << y1 << "]\n";
-	//lyxerr << "MT[" << a << " " << d << " " << a1 << " " << d1 << "]\n";
-	//for (i = 0; i < np; ++i)
-	//	lyxerr << "XY[" << xpoint[i] << " " << ypoint[i] << "]\n";
 }
 
 
 void MathCursor::handleFont(MathTextCodes t)
 {
-	if (selection)	{
-		int const p1 = std::min(cursor_, anchor_);
-		int const p2 = std::max(cursor_, anchor_);
-		MathArray & ar = array();
-		for (int pos = p1; pos != p2; 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 {
-		if (lastcode == t)
-			lastcode = LM_TC_VAR;
-		else
-			lastcode = 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::handleAccent(string const & name, int code)
+void MathCursor::handleDelim(string const & l, string const & r)
 {
-	MathDecorationInset * p = new MathDecorationInset(name, code);
-	if (selection) {
-		SelCut();
-		p->cell(0) = selarray;
-	}
-	insert(p);
-	push(p, true);
+	handleNest(new MathDelimInset(l, r));
 }
 
-void MathCursor::handleDelim(int l, int r)
+
+void MathCursor::handleNest(MathInset * p)
 {
-	MathDelimInset * p = new MathDelimInset(l, r);
-	if (selection) {
-		SelCut();
-		p->cell(0) = selarray;
+	if (selection_) {
+		selCut();
+		p->cell(0) = theSelection.glue();
 	}
-	insert(p);
-	push(p, true);
+	insert(MathAtom(p)); // this invalidates p!
+	pushRight(prevAtom());
 }
 
 
-void MathCursor::GetPos(int & x, int & y)
+void MathCursor::getPos(int & x, int & y)
 {
-	x = xarray().xo() + xarray().pos2x(cursor_);
+#ifdef WITH_WARNINGS
+#warning This should probably take cellXOffset and cellYOffset into account
+#endif
+	x = xarray().xo() + xarray().pos2x(pos());
 	y = xarray().yo();
 }
 
 
-MathTextCodes MathCursor::nextCode() const
-{
-	return array().GetCode(cursor_); 
-}
-
-
-MathTextCodes MathCursor::prevCode() const
-{
-	return array().GetCode(cursor_ - 1); 
-}
-
-
-MathInset * MathCursor::par() const
+MathAtom & MathCursor::par() const
 {
-	return par_;
+	return *cursor().par_;
 }
 
 
@@ -932,68 +839,79 @@ InsetFormulaBase const * MathCursor::formula()
 }
 
 
-int MathCursor::pos() const
+MathCursor::idx_type MathCursor::idx() const
 {
-	return cursor_;
+	return cursor().idx_;
 }
 
 
-bool MathCursor::InMacroMode() const
+MathCursor::idx_type & MathCursor::idx()
 {
-	return macro_mode;
+	return cursor().idx_;
 }
 
 
-bool MathCursor::Selection() const
+MathCursor::pos_type MathCursor::pos() const
 {
-	return selection;
+	return cursor().pos_;
 }
 
 
-void MathCursor::clearLastCode()
+MathCursor::pos_type & MathCursor::pos()
 {
-	lastcode = LM_TC_MIN;
+	return cursor().pos_;
 }
 
 
-void MathCursor::setLastCode(MathTextCodes t)
+bool MathCursor::inMacroMode() const
 {
-	lastcode = t;
+	return macroNamePos() != -1;
 }
 
 
-MathTextCodes MathCursor::getLastCode() const
+bool MathCursor::selection() const
 {
-	return lastcode;
+	return selection_;
 }
 
 
-MathInset * MathCursor::enclosing(MathInsetTypes t, int & idx) const
+MathArrayInset * MathCursor::enclosingArray(MathCursor::idx_type & idx) const
 {
-	if (par_->GetType() == t) {
-		//lyxerr << "enclosing par is current\n";
-		idx = idx_;
-		return par_;
-	}
-	for (int i = path_.size() - 1; i >= 0; --i) {
-		lyxerr << "checking level " << i << "\n";
-		if (path_[i].par_->GetType() == t) {
-			idx = path_[i].idx_;
-			return path_[i].par_;
+	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()
+
+void MathCursor::pullArg(bool goright)
 {
-	// pullArg
+	dump("pullarg");
 	MathArray a = array();
-	if (!Left())
+
+	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;
-	normalize();
-	array().erase(cursor_);
-	array().insert(cursor_, a);
+	}
+
+	if (popLeft()) {
+		plainErase();
+		array().insert(pos(), a);
+		if (goright) 
+			pos() += a.size();
+	}
 }
 
 
@@ -1010,185 +928,543 @@ void MathCursor::normalize() const
 #endif
 	MathCursor * it = const_cast<MathCursor *>(this);
 
-	if (idx_ < 0 || idx_ > par_->nargs())
-		lyxerr << "this should not really happen - 1\n";
-	it->idx_    = max(idx_, 0);
- 	it->idx_    = min(idx_, par_->nargs());
+ 	if (idx() >= par()->nargs()) {
+		lyxerr << "this should not really happen - 1: "
+		       << idx() << " " << par()->nargs() << "\n";
+		dump("error 2");
+	}
+ 	it->idx()    = min(idx(), par()->nargs() - 1);
 
-	if (cursor_ < 0 || cursor_ > array().size())
-		lyxerr << "this should not really happen - 2\n";
-	it->cursor_ = max(cursor_, 0);
-	it->cursor_ = min(cursor_, array().size());
+	if (pos() > size()) {
+		lyxerr << "this should not really happen - 2: "
+		       << pos() << " " << size() << "\n";
+		dump("error 4");
+	}
+	it->pos() = min(pos(), size());
 }
 
 
-int MathCursor::col() const
+MathCursor::size_type MathCursor::size() const
 {
-	return par_->col(idx_);
+	return array().size();
 }
 
 
-int MathCursor::row() const
+MathCursor::col_type MathCursor::col() const
 {
-	return par_->row(idx_);
+	return par()->col(idx());
 }
 
 
-/*
-char MathIter::GetChar() const
+MathCursor::row_type MathCursor::row() const
 {
-	return array().GetChar(cursor_);
+	return par()->row(idx());
 }
 
 
-string MathIter::readString()
+bool MathCursor::hasPrevAtom() const
 {
-	string s;
-	int code = nextCode();
-	for ( ; OK() && nextCode() == code; Next()) 
-		s += GetChar();
-
-	return s;
+	return pos() > 0;
 }
-*/
 
-MathInset * MathCursor::prevInset() const
+
+bool MathCursor::hasNextAtom() const
 {
-	normalize();
-	int c = cursor_;
-	if (!array().prev(c))
-		return 0;
-	return array().nextInset(c);
+	return pos() < size();
 }
 
 
-MathInset * MathCursor::nextInset() const
+MathAtom const & MathCursor::prevAtom() const
 {
-	normalize();
-	return array().nextInset(cursor_);
+	lyx::Assert(pos() > 0);
+	return array().at(pos() - 1);
 }
 
 
-MathUpDownInset * MathCursor::nearbyUpDownInset() const
+MathAtom & MathCursor::prevAtom()
 {
-	normalize();
-	MathInset * p = array().prevInset(cursor_);
-	if (p && p->isUpDownInset())
-		return static_cast<MathUpDownInset *>(p);
-	p = array().nextInset(cursor_);
-	if (p && p->isUpDownInset())
-		return static_cast<MathUpDownInset *>(p);
-	return 0;
+	lyx::Assert(pos() > 0);
+	return array().at(pos() - 1);
 }
 
 
-MathArray & MathCursor::array() const
+MathAtom const & MathCursor::nextAtom() const
 {
-	static MathArray dummy;
-	if (!par_) {
-		lyxerr << "############  par_ not valid\n";
-		return dummy;
-	}
-
-	if (idx_ < 0 || idx_ >= par_->nargs()) {
-		lyxerr << "############  idx_ " << idx_ << " not valid\n";
-		return dummy;
-	}
-
-	return par_->cell(idx_);
+	lyx::Assert(pos() < size());
+	return array().at(pos());
 }
 
 
-MathXArray & MathCursor::xarray() const
+MathAtom & MathCursor::nextAtom()
 {
-	return par_->xcell(idx_);
+	lyx::Assert(pos() < size());
+	return array().at(pos());
 }
 
 
-
-bool MathCursor::nextIsInset() const
+MathArray & MathCursor::array() const
 {
-	return cursor_ < array().size() && MathIsInset(nextCode());
-}
+	static MathArray dummy;
 
+	if (idx() >= par()->nargs()) {
+		lyxerr << "############  idx_ " << idx() << " not valid\n";
+		return dummy;
+	}
 
-bool MathCursor::prevIsInset() const
-{
-	return cursor_ > 0 && MathIsInset(prevCode());
+	return cursor().cell();
 }
 
 
-int MathCursor::xpos() const 
+MathXArray & MathCursor::xarray() const
 {
-	normalize();
-	return xarray().pos2x(cursor_);
+	return cursor().xcell();
 }
 
-void MathCursor::gotoX(int x)
-{
-	cursor_ = xarray().x2pos(x);	
-}
 
 void MathCursor::idxNext()
 {
-	par_->idxNext(idx_, cursor_);
+	par()->idxNext(idx(), pos());
 }
 
+
 void MathCursor::idxPrev()
 {
-	par_->idxPrev(idx_, cursor_);
+	par()->idxPrev(idx(), pos());
 }
 
+
 void MathCursor::splitCell()
 {
-	if (idx_ == par_->nargs() - 1) 
+	if (idx() == par()->nargs() - 1) 
 		return;
 	MathArray ar = array();
-	ar.erase(0, cursor_);
-	array().erase(cursor_, array().size());
-	++idx_;
-	cursor_ = 0;
+	ar.erase(0, pos());
+	array().erase(pos(), size());
+	++idx();
+	pos() = 0;
 	array().insert(0, ar);
 }
 
+
 void MathCursor::breakLine()
 {
-	MathMatrixInset * p = static_cast<MathMatrixInset *>(formula()->par());
-	if (p->GetType() == LM_OT_SIMPLE || p->GetType() == LM_OT_EQUATION) {
+	// leave inner cells
+	while (popRight())
+		;
+
+	MathMatrixInset * p = formula()->par()->asMatrixInset();
+	if (!p)
+		return;
+
+	if (p->getType() == LM_OT_SIMPLE || p->getType() == LM_OT_EQUATION) {
 		p->mutate(LM_OT_EQNARRAY);
-		p->addRow(row());
-		idx_ = p->nrows();
-		cursor_ = 0;
+		idx() = 0;
+		pos() = size();
 	} else {
 		p->addRow(row());
 
 		// split line
-		const int r = row();
-		for (int c = col() + 1; c < p->ncols(); ++c) {
-			const int i1 = p->index(r, c);
-			const int i2 = p->index(r + 1, c);	
+		const row_type r = row();
+		for (col_type c = col() + 1; c < p->ncols(); ++c) {
+			const MathMatrixInset::idx_type i1 = p->index(r, c);
+			const MathMatrixInset::idx_type i2 = p->index(r + 1, c);	
 			lyxerr << "swapping cells " << i1 << " and " << i2 << "\n";
 			p->cell(i1).swap(p->cell(i2));
 		}
 
 		// split cell
 		splitCell();
-		p->cell(idx_).swap(p->cell(idx_ + p->ncols() - 1));
+		p->cell(idx()).swap(p->cell(idx() + p->ncols() - 1));
 	}
 }
 
+
 char MathCursor::valign() const
 {
-	int idx;
-	MathGridInset * p =
-		static_cast<MathGridInset *>(enclosing(LM_OT_MATRIX, idx));
-	return p ? p->valign() : 0;
+	idx_type idx;
+	MathArrayInset * p = enclosingArray(idx);
+	return p ? p->valign() : '\0';
 }
 
+
 char MathCursor::halign() const
 {
-	int idx;
-	MathGridInset * p =
-		static_cast<MathGridInset *>(enclosing(LM_OT_MATRIX, idx));
-	return p ? p->halign(idx % p->ncols()) : 0;
+	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;
+}
+
+