X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=a94fdc2800800580fe1c0e8f2b78d8585828f28b;hb=12a6d463703010a006b2dcd15ccddafa6335fa59;hp=0339843e9df8848161c45f034ba90204678cbeb5;hpb=c4762f94524c53ffc2200016678b4d032013b366;p=lyx.git

diff --git a/src/cursor.C b/src/cursor.C
index 0339843e9d..a94fdc2800 100644
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -15,6 +15,7 @@
 #include "BufferView.h"
 #include "buffer.h"
 #include "cursor.h"
+#include "coordcache.h"
 #include "CutAndPaste.h"
 #include "debug.h"
 #include "dispatchresult.h"
@@ -31,22 +32,30 @@
 #include "paragraph_funcs.h"
 #include "pariterator.h"
 
-#include "insets/updatableinset.h"
 #include "insets/insettabular.h"
 #include "insets/insettext.h"
 
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
-#include "mathed/math_macrotable.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathMacroTable.h"
+#include "mathed/MathParser.h"
 
 #include "support/limited_stack.h"
-#include "support/std_sstream.h"
 
-#include "frontends/LyXView.h"
+#include "frontends/Application.h"
+#include "frontends/font_metrics.h"
 
 #include <boost/assert.hpp>
+#include <boost/bind.hpp>
+#include <boost/current_function.hpp>
 
-using lyx::par_type;
+#include <sstream>
+#include <limits>
+
+using lyx::char_type;
+using lyx::docstring;
+using lyx::pit_type;
 
 using std::string;
 using std::vector;
@@ -55,12 +64,187 @@ using std::endl;
 using std::isalpha;
 #endif
 using std::min;
-using std::swap;
+using std::for_each;
+
+namespace {
+
+	bool
+	positionable(DocIterator const & cursor, DocIterator const & anchor)
+	{
+		// avoid deeper nested insets when selecting
+		if (cursor.depth() > anchor.depth())
+			return false;
+
+		// anchor might be deeper, should have same path then
+		for (size_t i = 0; i < cursor.depth(); ++i)
+			if (&cursor[i].inset() != &anchor[i].inset())
+				return false;
+
+		// position should be ok.
+		return true;
+	}
+
+
+	// Find position closest to (x, y) in cell given by iter.
+	// Used only in mathed
+	DocIterator bruteFind2(LCursor const & c, int x, int y)
+	{
+		double best_dist = std::numeric_limits<double>::max();
+
+		DocIterator result;
+
+		DocIterator it = c;
+		it.top().pos() = 0;
+		DocIterator et = c;
+		et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
+		for (size_t i = 0; ; ++i) {
+			int xo;
+			int yo;
+			InsetBase const * inset = &it.inset();
+			Point o = theCoords.getInsets().xy(inset);
+			inset->cursorPos(it.top(), c.boundary(), xo, yo);
+			// Convert to absolute
+			xo += o.x_;
+			yo += o.y_;
+			double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
+			// '<=' in order to take the last possible position
+			// this is important for clicking behind \sum in e.g. '\sum_i a'
+			lyxerr[Debug::DEBUG] << "i: " << i << " d: " << d
+				<< " best: " << best_dist << endl;
+			if (d <= best_dist) {
+				best_dist = d;
+				result = it;
+			}
+			if (it == et)
+				break;
+			it.forwardPos();
+		}
+		return result;
+	}
+
+
+	/// moves position closest to (x, y) in given box
+	bool bruteFind(LCursor & cursor,
+		int x, int y, int xlow, int xhigh, int ylow, int yhigh)
+	{
+		BOOST_ASSERT(!cursor.empty());
+		InsetBase & inset = cursor[0].inset();
+
+		CoordCache::InnerParPosCache const & cache = theCoords.getParPos().find(cursor.bottom().text())->second;
+		// Get an iterator on the first paragraph in the cache
+		DocIterator it(inset);
+		it.push_back(CursorSlice(inset));
+		it.pit() = cache.begin()->first;
+		// Get an iterator after the last paragraph in the cache
+		DocIterator et(inset);
+		et.push_back(CursorSlice(inset));
+		et.pit() = boost::prior(cache.end())->first;
+		if (et.pit() >= et.lastpit())
+			et = doc_iterator_end(inset);
+		else
+			++et.pit();
+
+		double best_dist = std::numeric_limits<double>::max();;
+		DocIterator best_cursor = et;
+
+		for ( ; it != et; it.forwardPos(true)) {
+			// avoid invalid nesting when selecting
+			if (!cursor.selection() || positionable(it, cursor.anchor_)) {
+				Point p = bv_funcs::getPos(it, false);
+				int xo = p.x_;
+				int yo = p.y_;
+				if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
+					double const dx = xo - x;
+					double const dy = yo - y;
+					double const d = dx * dx + dy * dy;
+					// '<=' in order to take the last possible position
+					// this is important for clicking behind \sum in e.g. '\sum_i a'
+					if (d <= best_dist) {
+						//	lyxerr << "*" << endl;
+						best_dist   = d;
+						best_cursor = it;
+					}
+				}
+			}
+		}
+
+		if (best_cursor != et) {
+			cursor.setCursor(best_cursor);
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/// moves position closest to (x, y) in given box
+	bool bruteFind3(LCursor & cur, int x, int y, bool up)
+	{
+		BufferView & bv = cur.bv();
+		int ylow  = up ? 0 : y + 1;
+		int yhigh = up ? y - 1 : bv.workHeight();
+		int xlow = 0;
+		int xhigh = bv.workWidth();
+
+// FIXME: bit more work needed to get 'from' and 'to' right.
+		pit_type from = cur.bottom().pit();
+		//pit_type to = cur.bottom().pit();
+		//lyxerr << "Pit start: " << from << endl;
+
+		//lyxerr << "bruteFind3: x: " << x << " y: " << y
+		//	<< " xlow: " << xlow << " xhigh: " << xhigh
+		//	<< " ylow: " << ylow << " yhigh: " << yhigh
+		//	<< endl;
+		InsetBase & inset = bv.buffer()->inset();
+		DocIterator it = doc_iterator_begin(inset);
+		it.pit() = from;
+		DocIterator et = doc_iterator_end(inset);
+
+		double best_dist = std::numeric_limits<double>::max();
+		DocIterator best_cursor = et;
+
+		for ( ; it != et; it.forwardPos()) {
+			// avoid invalid nesting when selecting
+			if (bv_funcs::status(&bv, it) == bv_funcs::CUR_INSIDE
+			    && (!cur.selection() || positionable(it, cur.anchor_))) {
+				Point p = bv_funcs::getPos(it, false);
+				int xo = p.x_;
+				int yo = p.y_;
+				if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
+					double const dx = xo - x;
+					double const dy = yo - y;
+					double const d = dx * dx + dy * dy;
+					//lyxerr << "itx: " << xo << " ity: " << yo << " d: " << d
+					//	<< " dx: " << dx << " dy: " << dy
+					//	<< " idx: " << it.idx() << " pos: " << it.pos()
+					//	<< " it:\n" << it
+					//	<< endl;
+					// '<=' in order to take the last possible position
+					// this is important for clicking behind \sum in e.g. '\sum_i a'
+					if (d <= best_dist) {
+						//lyxerr << "*" << endl;
+						best_dist   = d;
+						best_cursor = it;
+					}
+				}
+			}
+		}
+
+		//lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
+		if (best_cursor == et)
+			return false;
+		cur.setCursor(best_cursor);
+		return true;
+	}
 
+} // namespace anon
 
+
+// be careful: this is called from the bv's constructor, too, so
+// bv functions are not yet available!
 LCursor::LCursor(BufferView & bv)
 	: DocIterator(), bv_(&bv), anchor_(), x_target_(-1),
-	  selection_(false), mark_(false)
+	  selection_(false), mark_(false), logicalpos_(false)
 {}
 
 
@@ -75,28 +259,31 @@ void LCursor::reset(InsetBase & inset)
 }
 
 
-void LCursor::setCursor(DocIterator const & cur, bool sel)
+// this (intentionally) does neither touch anchor nor selection status
+void LCursor::setCursor(DocIterator const & cur)
 {
-	// this (intentionally) does not touch the anchor
 	DocIterator::operator=(cur);
-	selection() = sel;
 }
 
 
-DispatchResult LCursor::dispatch(FuncRequest const & cmd0)
+void LCursor::dispatch(FuncRequest const & cmd0)
 {
-	lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+	lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION
+			     << " cmd: " << cmd0 << '\n'
+			     << *this << endl;
 	if (empty())
-		return DispatchResult();
+		return;
 
+	fixIfBroken();
 	FuncRequest cmd = cmd0;
 	LCursor safe = *this;
 
-	for ( ; size(); pop()) {
-		//lyxerr << "\nLCursor::dispatch: cmd: " << cmd0 << endl << *this << endl;
+	for (; depth(); pop()) {
+		lyxerr[Debug::DEBUG] << "LCursor::dispatch: cmd: "
+			<< cmd0 << endl << *this << endl;
 		BOOST_ASSERT(pos() <= lastpos());
 		BOOST_ASSERT(idx() <= lastidx());
-		BOOST_ASSERT(par() <= lastpar());
+		BOOST_ASSERT(pit() <= lastpit());
 
 		// The common case is 'LFUN handled, need update', so make the
 		// LFUN handler's life easier by assuming this as default value.
@@ -110,38 +297,16 @@ DispatchResult LCursor::dispatch(FuncRequest const & cmd0)
 	// it completely to get a 'bomb early' behaviour in case this
 	// object will be used again.
 	if (!disp_.dispatched()) {
-		lyxerr << "RESTORING OLD CURSOR!" << endl;
+		lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
 		operator=(safe);
 		disp_.dispatched(false);
 	}
-	return disp_;
 }
 
 
-bool LCursor::getStatus(FuncRequest const & cmd, FuncStatus & status)
+DispatchResult LCursor::result() const
 {
-	// This is, of course, a mess. Better create a new doc iterator and use
-	// this in Inset::getStatus. This might require an additional
-	// BufferView * arg, though (which should be avoided)
-	LCursor safe = *this;
-	bool res = false;
-	for ( ; size(); pop()) {
-		//lyxerr << "\nLCursor::getStatus: cmd: " << cmd << endl << *this << endl;
-		BOOST_ASSERT(pos() <= lastpos());
-		BOOST_ASSERT(idx() <= lastidx());
-		BOOST_ASSERT(par() <= lastpar());
-
-		// The inset's getStatus() will return 'true' if it made
-		// a definitive decision on whether it want to handle the
-		// request or not. The result of this decision is put into
-		// the 'status' parameter.
-		if (inset().getStatus(*this, cmd, status)) {
-			res = true;
-			break;
-		}
-	}
-	operator=(safe);
-	return res;
+	return disp_;
 }
 
 
@@ -162,7 +327,7 @@ Buffer & LCursor::buffer() const
 
 void LCursor::pop()
 {
-	BOOST_ASSERT(size() >= 1);
+	BOOST_ASSERT(depth() >= 1);
 	pop_back();
 }
 
@@ -210,7 +375,7 @@ bool LCursor::popRight()
 int LCursor::currentMode()
 {
 	BOOST_ASSERT(!empty());
-	for (int i = size() - 1; i >= 0; --i) {
+	for (int i = depth() - 1; i >= 0; --i) {
 		int res = operator[](i).inset().currentMode();
 		if (res != InsetBase::UNDECIDED_MODE)
 			return res;
@@ -219,37 +384,11 @@ int LCursor::currentMode()
 }
 
 
-void LCursor::getDim(int & asc, int & des) const
-{
-	if (inMathed()) {
-		BOOST_ASSERT(inset().asMathInset());
-		//inset().asMathInset()->getCursorDim(asc, des);
-		asc = 10;
-		des = 10;
-	} else if (inTexted()) {
-		Row const & row = textRow();
-		asc = row.baseline();
-		des = row.height() - asc;
-	} else {
-		lyxerr << "should this happen?" << endl;
-		asc = 10;
-		des = 10;
-	}
-}
-
-
 void LCursor::getPos(int & x, int & y) const
 {
-	x = 0;
-	y = 0;
-	if (!empty())
-		inset().getCursorPos(*this, x, y);
-}
-
-
-void LCursor::paste(string const & data)
-{
-	dispatch(FuncRequest(LFUN_PASTE, data));
+	Point p = bv_funcs::getPos(*this, boundary());
+	x = p.x_;
+	y = p.y_;
 }
 
 
@@ -280,9 +419,9 @@ bool LCursor::posRight()
 
 CursorSlice LCursor::anchor() const
 {
-	BOOST_ASSERT(anchor_.size() >= size());
-	CursorSlice normal = anchor_[size() - 1];
-	if (size() < anchor_.size() && back() <= normal) {
+	BOOST_ASSERT(anchor_.depth() >= depth());
+	CursorSlice normal = anchor_[depth() - 1];
+	if (depth() < anchor_.depth() && top() <= normal) {
 		// anchor is behind cursor -> move anchor behind the inset
 		++normal.pos();
 	}
@@ -293,16 +432,16 @@ CursorSlice LCursor::anchor() const
 CursorSlice LCursor::selBegin() const
 {
 	if (!selection())
-		return back();
-	return anchor() < back() ? anchor() : back();
+		return top();
+	return anchor() < top() ? anchor() : top();
 }
 
 
 CursorSlice LCursor::selEnd() const
 {
 	if (!selection())
-		return back();
-	return anchor() > back() ? anchor() : back();
+		return top();
+	return anchor() > top() ? anchor() : top();
 }
 
 
@@ -310,7 +449,9 @@ DocIterator LCursor::selectionBegin() const
 {
 	if (!selection())
 		return *this;
-	return anchor() < back() ? anchor_ : *this;
+	DocIterator di = (anchor() < top() ? anchor_ : *this);
+	di.resize(depth());
+	return di;
 }
 
 
@@ -318,23 +459,31 @@ DocIterator LCursor::selectionEnd() const
 {
 	if (!selection())
 		return *this;
-	return anchor() > back() ? anchor_ : *this;
+	DocIterator di = (anchor() > top() ? anchor_ : *this);
+	if (di.depth() > depth()) {
+		di.resize(depth());
+		++di.pos();
+	}
+	return di;
 }
 
 
 void LCursor::setSelection()
 {
 	selection() = true;
-	// a selection with no contents is not a selection
+	// A selection with no contents is not a selection
+#ifdef WITH_WARNINGS
 #warning doesnt look ok
-	if (par() == anchor().par() && pos() == anchor().pos())
+#endif
+	if (pit() == anchor().pit() && pos() == anchor().pos())
 		selection() = false;
 }
 
 
 void LCursor::setSelection(DocIterator const & where, size_t n)
 {
-	setCursor(where, true);
+	setCursor(where);
+	selection() = true;
 	anchor_ = where;
 	pos() += n;
 }
@@ -345,7 +494,6 @@ void LCursor::clearSelection()
 	selection() = false;
 	mark() = false;
 	resetAnchor();
-	bv().unsetXSel();
 }
 
 
@@ -384,12 +532,8 @@ void LCursor::info(std::ostream & os) const
 void LCursor::selHandle(bool sel)
 {
 	//lyxerr << "LCursor::selHandle" << endl;
-	if (sel == selection()) {
-#warning Alfredo: This is too strong (Andre)
-		//if (!sel)
-		//	noUpdate();
+	if (sel == selection())
 		return;
-	}
 
 	resetAnchor();
 	selection() = sel;
@@ -398,15 +542,16 @@ void LCursor::selHandle(bool sel)
 
 std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 {
-	for (size_t i = 0, n = cur.size(); i != n; ++i) {
-		os << " " << cur.operator[](i) << " | ";
-		if (i < cur.anchor_.size())
+	os << "\n cursor:                                | anchor:\n";
+	for (size_t i = 0, n = cur.depth(); i != n; ++i) {
+		os << " " << cur[i] << " | ";
+		if (i < cur.anchor_.depth())
 			os << cur.anchor_[i];
 		else
 			os << "-------------------------------";
 		os << "\n";
 	}
-	for (size_t i = cur.size(), n = cur.anchor_.size(); i < n; ++i) {
+	for (size_t i = cur.depth(), n = cur.anchor_.depth(); i < n; ++i) {
 		os << "------------------------------- | " << cur.anchor_[i] << "\n";
 	}
 	os << " selection: " << cur.selection_
@@ -421,31 +566,42 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 //
 // The part below is the non-integrated rest of the original math
 // cursor. This should be either generalized for texted or moved
-// back to mathed (in most cases to MathNestInset).
+// back to mathed (in most cases to InsetMathNest).
 //
 ///////////////////////////////////////////////////////////////////
 
-#include "mathed/math_charinset.h"
-#include "mathed/math_factory.h"
-#include "mathed/math_gridinset.h"
-#include "mathed/math_macroarg.h"
-#include "mathed/math_mathmlstream.h"
-#include "mathed/math_scriptinset.h"
-#include "mathed/math_support.h"
-#include "mathed/math_unknowninset.h"
+#include "mathed/InsetMathChar.h"
+#include "mathed/MathFactory.h"
+#include "mathed/InsetMathGrid.h"
+#include "mathed/MathMacroArgument.h"
+#include "mathed/MathMLStream.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/MathSupport.h"
+#include "mathed/InsetMathUnknown.h"
 
 //#define FILEDEBUG 1
 
 
 bool LCursor::isInside(InsetBase const * p)
 {
-	for (unsigned i = 0; i < depth(); ++i)
+	for (size_t i = 0; i != depth(); ++i)
 		if (&operator[](i).inset() == p)
 			return true;
 	return false;
 }
 
 
+void LCursor::leaveInset(InsetBase const & inset)
+{
+	for (size_t i = 0; i != depth(); ++i) {
+		if (&operator[](i).inset() == &inset) {
+			resize(i);
+			return;
+		}
+	}
+}
+
+
 bool LCursor::openable(MathAtom const & t) const
 {
 	if (!t->isActive())
@@ -458,7 +614,7 @@ bool LCursor::openable(MathAtom const & t) const
 		return true;
 
 	// we can't move into anything new during selection
-	if (depth() >= anchor_.size())
+	if (depth() >= anchor_.depth())
 		return false;
 	if (!ptr_cmp(t.nucleus(), &anchor_[depth()].inset()))
 		return false;
@@ -467,27 +623,10 @@ bool LCursor::openable(MathAtom const & t) const
 }
 
 
-bool positionable(DocIterator const & cursor,
-	DocIterator const & anchor)
-{
-	// avoid deeper nested insets when selecting
-	if (cursor.size() > anchor.size())
-		return false;
-
-	// anchor might be deeper, should have same path then
-	for (size_t i = 0; i < cursor.size(); ++i)
-		if (&cursor[i].inset() != &anchor[i].inset())
-			return false;
-
-	// position should be ok.
-	return true;
-}
-
-
 void LCursor::setScreenPos(int x, int y)
 {
 	x_target() = x;
-	bruteFind(x, y, 0, bv().workWidth(), 0, bv().workHeight());
+	bruteFind(*this, x, y, 0, bv().workWidth(), 0, bv().workHeight());
 }
 
 
@@ -500,7 +639,7 @@ void LCursor::plainErase()
 
 void LCursor::markInsert()
 {
-	insert(char(0));
+	insert(char_type(0));
 }
 
 
@@ -519,19 +658,19 @@ void LCursor::plainInsert(MathAtom const & t)
 
 void LCursor::insert(string const & str)
 {
-	//lyxerr << "LCursor::insert str '" << str << "'" << endl;
-	for (string::const_iterator it = str.begin(); it != str.end(); ++it)
-		insert(*it);
+	for_each(str.begin(), str.end(),
+		 boost::bind(static_cast<void(LCursor::*)(char_type)>
+			     (&LCursor::insert), this, _1));
 }
 
 
-void LCursor::insert(char c)
+void LCursor::insert(char_type c)
 {
 	//lyxerr << "LCursor::insert char '" << c << "'" << endl;
 	BOOST_ASSERT(!empty());
 	if (inMathed()) {
 		lyx::cap::selClearOrDel(*this);
-		insert(new MathCharInset(c));
+		insert(new InsetMathChar(c));
 	} else {
 		text()->insertChar(*this, c);
 	}
@@ -540,11 +679,10 @@ void LCursor::insert(char c)
 
 void LCursor::insert(MathAtom const & t)
 {
-	//lyxerr << "LCursor::insert MathAtom: " << endl;
+	//lyxerr << "LCursor::insert MathAtom '" << t << "'" << endl;
 	macroModeClose();
 	lyx::cap::selClearOrDel(*this);
 	plainInsert(t);
-	lyxerr << "LCursor::insert MathAtom: cur:\n" << *this << endl;
 }
 
 
@@ -571,7 +709,7 @@ void LCursor::niceInsert(string const & t)
 void LCursor::niceInsert(MathAtom const & t)
 {
 	macroModeClose();
-	string safe = lyx::cap::grabAndEraseSelection(*this);
+	string const safe = lyx::cap::grabAndEraseSelection(*this);
 	plainInsert(t);
 	// enter the new inset and move the contents of the selection if possible
 	if (t->isActive()) {
@@ -579,7 +717,10 @@ void LCursor::niceInsert(MathAtom const & t)
 		// be careful here: don't use 'pushLeft(t)' as this we need to
 		// push the clone, not the original
 		pushLeft(*nextInset());
-		paste(safe);
+		// We may not use niceInsert here (recursion)
+		MathArray ar;
+		asArray(safe, ar);
+		insert(ar);
 	}
 }
 
@@ -611,7 +752,7 @@ bool LCursor::backspace()
 	}
 
 	if (inMacroMode()) {
-		MathUnknownInset * p = activeMacro();
+		InsetMathUnknown * p = activeMacro();
 		if (p->name().size() > 1) {
 			p->setName(p->name().substr(0, p->name().size() - 1));
 			return true;
@@ -661,7 +802,7 @@ bool LCursor::erase()
 	}
 
 	// 'clever' UI hack: only erase large items if previously slected
-	if (pos() != lastpos() && inset().nargs() > 0) {
+	if (pos() != lastpos() && nextAtom()->nargs() > 0) {
 		resetAnchor();
 		selection() = true;
 		++pos();
@@ -679,7 +820,7 @@ bool LCursor::up()
 	DocIterator save = *this;
 	if (goUpDown(true))
 		return true;
-	setCursor(save, false);
+	setCursor(save);
 	autocorrect() = false;
 	return selection();
 }
@@ -691,34 +832,39 @@ bool LCursor::down()
 	DocIterator save = *this;
 	if (goUpDown(false))
 		return true;
-	setCursor(save, false);
+	setCursor(save);
 	autocorrect() = false;
 	return selection();
 }
 
 
-void LCursor::macroModeClose()
+bool LCursor::macroModeClose()
 {
 	if (!inMacroMode())
-		return;
-	MathUnknownInset * p = activeMacro();
+		return false;
+	InsetMathUnknown * p = activeMacro();
 	p->finalize();
-	string s = p->name();
+	string const s = p->name();
 	--pos();
 	cell().erase(pos());
 
 	// do nothing if the macro name is empty
 	if (s == "\\")
-		return;
-
-	string const name = s.substr(1);
+		return false;
 
 	// prevent entering of recursive macros
+	// FIXME: this is only a weak attempt... only prevents immediate
+	// recursion
+	string const name = s.substr(1);
 	InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
 	if (macro && macro->getInsetName() == name)
 		lyxerr << "can't enter recursive macro" << endl;
 
-	niceInsert(createMathInset(name));
+	InsetMathNest * const in = inset().asInsetMath()->asNestInset();
+	if (in && in->interpret(*this, s))
+		return true;
+	plainInsert(createInsetMath(name));
+	return true;
 }
 
 
@@ -750,16 +896,28 @@ int LCursor::targetX() const
 }
 
 
+void LCursor::setTargetX()
+{
+	// For now this is good enough. A better solution would be to
+	// avoid this rebreak by setting cursorX only after drawing
+	bottom().text()->redoParagraph(bottom().pit());
+	int x;
+	int y;
+	getPos(x, y);
+	x_target_ = x;
+}
+
+
 bool LCursor::inMacroMode() const
 {
-	if (!pos() != 0)
+	if (pos() == 0)
 		return false;
-	MathUnknownInset const * p = prevAtom()->asUnknownInset();
+	InsetMathUnknown const * p = prevAtom()->asUnknownInset();
 	return p && !p->final();
 }
 
 
-MathUnknownInset * LCursor::activeMacro()
+InsetMathUnknown * LCursor::activeMacro()
 {
 	return inMacroMode() ? prevAtom().nucleus()->asUnknownInset() : 0;
 }
@@ -797,22 +955,22 @@ void LCursor::touch()
 
 void LCursor::normalize()
 {
-	if (idx() >= nargs()) {
+	if (idx() > lastidx()) {
 		lyxerr << "this should not really happen - 1: "
 		       << idx() << ' ' << nargs()
 		       << " in: " << &inset() << endl;
+		idx() = lastidx();
 	}
-	idx() = min(idx(), lastidx());
 
 	if (pos() > lastpos()) {
 		lyxerr << "this should not really happen - 2: "
 			<< pos() << ' ' << lastpos() <<  " in idx: " << idx()
 		       << " in atom: '";
 		WriteStream wi(lyxerr, false, true);
-		inset().asMathInset()->write(wi);
+		inset().asInsetMath()->write(wi);
 		lyxerr << endl;
+		pos() = lastpos();
 	}
-	pos() = min(pos(), lastpos());
 }
 
 
@@ -823,11 +981,12 @@ bool LCursor::goUpDown(bool up)
 	// matters. So fiddle around with it only if you think you know
 	// what you are doing!
 
-  int xo = 0;
+	int xo = 0;
 	int yo = 0;
 	getPos(xo, yo);
 
-	// check if we had something else in mind, if not, this is the future goal
+	// check if we had something else in mind, if not, this is the future
+	// target
 	if (x_target() == -1)
 		x_target() = xo;
 	else
@@ -837,152 +996,82 @@ bool LCursor::goUpDown(bool up)
 	if (!selection()) {
 		// try left
 		if (pos() != 0) {
-			MathScriptInset const * p = prevAtom()->asScriptInset();
+			InsetMathScript const * p = prevAtom()->asScriptInset();
 			if (p && p->has(up)) {
 				--pos();
-				push(inset());
-				idx() = up; // the superscript has index 1
+				push(*const_cast<InsetMathScript*>(p));
+				idx() = p->idxOfScript(up);
 				pos() = lastpos();
-				//lyxerr << "updown: handled by scriptinset to the left" << endl;
 				return true;
 			}
 		}
 
 		// try right
 		if (pos() != lastpos()) {
-			MathScriptInset const * p = nextAtom()->asScriptInset();
+			InsetMathScript const * p = nextAtom()->asScriptInset();
 			if (p && p->has(up)) {
-				push(inset());
-				idx() = up;
+				push(*const_cast<InsetMathScript*>(p));
+				idx() = p->idxOfScript(up);
 				pos() = 0;
-				//lyxerr << "updown: handled by scriptinset to the right" << endl;
 				return true;
 			}
 		}
 	}
 
-	// try current cell for e.g. text insets
-	if (inset().idxUpDown2(*this, up))
-		return true;
+// FIXME: Switch this on for more robust movement
+#if 0
 
+	return bruteFind3(*this, xo, yo, up);
+
+#else
 	//xarray().boundingBox(xlow, xhigh, ylow, yhigh);
 	//if (up)
 	//	yhigh = yo - 4;
 	//else
 	//	ylow = yo + 4;
-	//if (bruteFind(xo, yo, xlow, xhigh, ylow, yhigh)) {
+	//if (bruteFind(*this, xo, yo, xlow, xhigh, ylow, yhigh)) {
 	//	lyxerr << "updown: handled by brute find in the same cell" << endl;
 	//	return true;
 	//}
 
 	// try to find an inset that knows better then we
-	while (1) {
+	while (true) {
 		//lyxerr << "updown: We are in " << &inset() << " idx: " << idx() << endl;
 		// ask inset first
 		if (inset().idxUpDown(*this, up)) {
+			//lyxerr << "idxUpDown triggered" << endl;
 			// try to find best position within this inset
 			if (!selection())
-				bruteFind2(xo, yo);
+				setCursor(bruteFind2(*this, xo, yo));
 			return true;
 		}
 
 		// no such inset found, just take something "above"
-		//lyxerr << "updown: handled by strange case" << endl;
 		if (!popLeft()) {
+			//lyxerr << "updown: popleft failed (strange case)" << endl;
 			int ylow  = up ? 0 : yo + 1;
 			int yhigh = up ? yo - 1 : bv().workHeight();
-			return bruteFind(xo, yo, 0, bv().workWidth(), ylow, yhigh);
+			return bruteFind(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
 		}
 
 		// any improvement so far?
-		int xnew, ynew;
+		//lyxerr << "updown: popLeft succeeded" << endl;
+		int xnew;
+		int ynew;
 		getPos(xnew, ynew);
 		if (up ? ynew < yo : ynew > yo)
 			return true;
 	}
-}
-
-
-bool LCursor::bruteFind(int x, int y, int xlow, int xhigh, int ylow, int yhigh)
-{
-	BOOST_ASSERT(!empty());
-	par_type beg, end;
-	CursorSlice bottom = operator[](0);
-	LyXText * text = bottom.text();
-	BOOST_ASSERT(text);
-	getParsInRange(text->paragraphs(), ylow, yhigh, beg, end);
-
-	DocIterator it = doc_iterator_begin(bv().buffer()->inset());
-	DocIterator et = doc_iterator_end(bv().buffer()->inset());
-	//lyxerr << "x: " << x << " y: " << y << endl;
-	//lyxerr << "xlow: " << xlow << " ylow: " << ylow << endl;
-	//lyxerr << "xhigh: " << xhigh << " yhigh: " << yhigh << endl;
-
-	it.par() = beg;
-	//et.par() = text->parOffset(end);
-
-	double best_dist = 10e10;
-	DocIterator best_cursor = it;
-
-	for ( ; it != et; it.forwardPos()) {
-		// avoid invalid nesting when selecting
-		if (!selection() || positionable(it, anchor_)) {
-			int xo = 0, yo = 0;
-			LCursor cur = *this;
-			cur.setCursor(it, false);
-			cur.inset().getCursorPos(cur, xo, yo);
-			if (xlow <= xo && xo <= xhigh && ylow <= yo && yo <= yhigh) {
-				double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
-				//lyxerr << "xo: " << xo << " yo: " << yo << " d: " << d << endl;
-				// '<=' in order to take the last possible position
-				// this is important for clicking behind \sum in e.g. '\sum_i a'
-				if (d <= best_dist) {
-					//lyxerr << "*" << endl;
-					best_dist   = d;
-					best_cursor = it;
-				}
-			}
-		}
-	}
 
-	//lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
-	if (best_dist < 1e10)
-		setCursor(best_cursor, false);
-	return best_dist < 1e10;
-}
-
-
-void LCursor::bruteFind2(int x, int y)
-{
-	double best_dist = 1e10;
-
-	DocIterator it = *this;
-	it.back().pos() = 0;
-	DocIterator et = *this;
-	et.back().pos() = et.back().asMathInset()->cell(et.back().idx()).size();
-	for (int i = 0; ; ++i) {
-		int xo, yo;
-		LCursor cur = *this;
-		cur.setCursor(it, false);
-		cur.inset().getCursorPos(cur, xo, yo);
-		double d = (x - xo) * (x - xo) + (y - yo) * (y - yo);
-		// '<=' in order to take the last possible position
-		// this is important for clicking behind \sum in e.g. '\sum_i a'
-		lyxerr << "i: " << i << " d: " << d << " best: " << best_dist << endl;
-		if (d <= best_dist) {
-			best_dist = d;
-			setCursor(it, false);
-		}
-		if (it == et)
-			break;
-		it.forwardPos();
-	}
+	// we should not come here.
+	BOOST_ASSERT(false);
+#endif
 }
 
 
 void LCursor::handleFont(string const & font)
 {
-	lyxerr << "LCursor::handleFont: " << font << endl;
+	lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
 	string safe;
 	if (selection()) {
 		macroModeClose();
@@ -1000,7 +1089,7 @@ void LCursor::handleFont(string const & font)
 		} else {
 			// cursor in between. split cell
 			MathArray::iterator bt = cell().begin();
-			MathAtom at = createMathInset(font);
+			MathAtom at = createInsetMath(font);
 			at.nucleus()->cell(0) = MathArray(bt, bt + pos());
 			cell().erase(bt, bt + pos());
 			popLeft();
@@ -1015,56 +1104,56 @@ void LCursor::handleFont(string const & font)
 }
 
 
-void LCursor::message(string const & msg) const
+void LCursor::message(docstring const & msg) const
 {
-	bv().owner()->getLyXFunc().setMessage(msg);
+	theApp->lyxFunc().setMessage(msg);
 }
 
 
-void LCursor::errorMessage(string const & msg) const
+void LCursor::errorMessage(docstring const & msg) const
 {
-	bv().owner()->getLyXFunc().setErrorMessage(msg);
+	theApp->lyxFunc().setErrorMessage(msg);
 }
 
 
-string LCursor::selectionAsString(bool label) const
+docstring LCursor::selectionAsString(bool label) const
 {
 	if (!selection())
-		return string();
+		return docstring();
 
 	if (inTexted()) {
 		Buffer const & buffer = *bv().buffer();
-		ParagraphList & pars = text()->paragraphs();
+		ParagraphList const & pars = text()->paragraphs();
 
 		// should be const ...
-		par_type startpit = selBegin().par();
-		par_type endpit = selEnd().par();
+		pit_type startpit = selBegin().pit();
+		pit_type endpit = selEnd().pit();
 		size_t const startpos = selBegin().pos();
 		size_t const endpos = selEnd().pos();
 
 		if (startpit == endpit)
-			return pars[startpit].asString(buffer, startpos, endpos, label);
+			return lyx::from_utf8(pars[startpit].asString(buffer, startpos, endpos, label));
 
 		// First paragraph in selection
 		string result = pars[startpit].
 			asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
 
 		// The paragraphs in between (if any)
-		for (par_type pit = startpit + 1; pit != endpit; ++pit) {
-			Paragraph & par = pars[pit];
+		for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
+			Paragraph const & par = pars[pit];
 			result += par.asString(buffer, 0, par.size(), label) + "\n\n";
 		}
 
 		// Last paragraph in selection
 		result += pars[endpit].asString(buffer, 0, endpos, label);
 
-		return result;
+		return lyx::from_utf8(result);
 	}
 
-#ifdef WITH_WARNINGS
-#warning and mathed?
-#endif
-	return string();
+	if (inMathed())
+		return lyx::from_utf8(lyx::cap::grabSelection(*this));
+
+	return docstring();
 }
 
 
@@ -1077,7 +1166,7 @@ string LCursor::currentState()
 	}
 
 	if (inTexted())
-	 return text()->currentState(*this);
+		return text()->currentState(*this);
 
 	return string();
 }
@@ -1098,13 +1187,13 @@ Encoding const * LCursor::getEncoding() const
 	int s = 0;
 	// go up until first non-0 text is hit
 	// (innermost text is 0 in mathed)
-	for (s = size() - 1; s >= 0; --s)
+	for (s = depth() - 1; s >= 0; --s)
 		if (operator[](s).text())
 			break;
 	CursorSlice const & sl = operator[](s);
-	LyXText & text = *sl.text();
-	LyXFont font = text.getPar(sl.par()).getFont(
-		bv().buffer()->params(), sl.pos(), outerFont(sl.par(), text.paragraphs()));
+	LyXText const & text = *sl.text();
+	LyXFont font = text.getPar(sl.pit()).getFont(
+		bv().buffer()->params(), sl.pos(), outerFont(sl.pit(), text.paragraphs()));
 	return font.language()->encoding();
 }
 
@@ -1121,7 +1210,71 @@ void LCursor::dispatched()
 }
 
 
+void LCursor::needsUpdate()
+{
+	disp_.update(true);
+}
+
+
 void LCursor::noUpdate()
 {
 	disp_.update(false);
 }
+
+
+LyXFont LCursor::getFont() const
+{
+	// HACK. far from being perfect...
+	int s = 0;
+	// go up until first non-0 text is hit
+	// (innermost text is 0 in mathed)
+	for (s = depth() - 1; s >= 0; --s)
+		if (operator[](s).text())
+			break;
+	CursorSlice const & sl = operator[](s);
+	LyXText const & text = *sl.text();
+	LyXFont font = text.getPar(sl.pit()).getFont(
+		bv().buffer()->params(),
+		sl.pos(),
+		outerFont(sl.pit(), text.paragraphs()));
+
+	return font;
+}
+
+
+void LCursor::fixIfBroken()
+{
+	// find out last good level
+	LCursor copy = *this;
+	size_t newdepth = depth();
+	while (!copy.empty()) {
+		if (copy.idx() > copy.lastidx()) {
+			lyxerr << "wrong idx " << copy.idx()
+			       << ", max is " << copy.lastidx()
+			       << " at level " << copy.depth()
+			       << ". Trying to correct this."  << endl;
+			newdepth = copy.depth() - 1;
+		}
+		else if (copy.pit() > copy.lastpit()) {
+			lyxerr << "wrong pit " << copy.pit()
+			       << ", max is " << copy.lastpit()
+			       << " at level " << copy.depth()
+			       << ". Trying to correct this."  << endl;
+			newdepth = copy.depth() - 1;
+		}
+		else if (copy.pos() > copy.lastpos()) {
+			lyxerr << "wrong pos " << copy.pos()
+			       << ", max is " << copy.lastpos()
+			       << " at level " << copy.depth()
+			       << ". Trying to correct this."  << endl;
+			newdepth = copy.depth() - 1;
+		}
+		copy.pop();
+	}
+	// shrink cursor to a size where everything is valid, possibly
+	// leaving insets
+	while (depth() > newdepth) {
+		pop();
+		lyxerr << "correcting cursor to level " << depth() << endl;
+	}
+}