X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fcursor.C;h=5d72bfff899f041ceae47652e21bfcecaca1b144;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=8e2a117d0108a3ba690799458761b01967fe3482;hpb=275f6172aca2d156a6ec718cef3a7ef4a339f5e1;p=lyx.git

diff --git a/src/cursor.C b/src/cursor.C
index 8e2a117d01..5d72bfff89 100644
--- a/src/cursor.C
+++ b/src/cursor.C
@@ -13,6 +13,7 @@
 #include <config.h>
 
 #include "BufferView.h"
+#include "bufferview_funcs.h"
 #include "buffer.h"
 #include "cursor.h"
 #include "coordcache.h"
@@ -32,27 +33,25 @@
 #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 "support/limited_stack.h"
 
-#include "frontends/LyXView.h"
-#include "frontends/font_metrics.h"
-
 #include <boost/assert.hpp>
 #include <boost/bind.hpp>
 #include <boost/current_function.hpp>
 
 #include <sstream>
 #include <limits>
+#include <map>
 
-using lyx::pit_type;
+namespace lyx {
 
 using std::string;
 using std::vector;
@@ -61,7 +60,7 @@ using std::endl;
 using std::isalpha;
 #endif
 using std::min;
-using std::swap;
+using std::for_each;
 
 namespace {
 
@@ -93,13 +92,29 @@ namespace {
 		DocIterator it = c;
 		it.top().pos() = 0;
 		DocIterator et = c;
-		et.top().pos() = et.top().asMathInset()->cell(et.top().idx()).size();
-		for (int i = 0; ; ++i) {
+		et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
+		for (size_t i = 0; ; ++i) {
 			int xo;
 			int yo;
-			LCursor cur = c;
-			cur.setCursor(it);
-			cur.inset().getCursorPos(cur.top(), xo, yo);
+			InsetBase const * inset = &it.inset();
+			std::map<InsetBase const *, Point> const & data =
+				c.bv().coordCache().getInsets().getData();
+			std::map<InsetBase const *, Point>::const_iterator I = data.find(inset);
+
+			// FIXME: in the case where the inset is not in the cache, this
+			// means that no part of it is visible on screen. In this case
+			// we don't do elaborate search and we just return the forwarded
+			// DocIterator at its beginning.
+			if (I == data.end()) {
+				it.top().pos() = 0;
+				return it;
+			}
+
+			Point o = I->second;
+			inset->cursorPos(c.bv(), 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'
@@ -122,28 +137,41 @@ namespace {
 		int x, int y, int xlow, int xhigh, int ylow, int yhigh)
 	{
 		BOOST_ASSERT(!cursor.empty());
-		CursorSlice bottom = cursor[0];
-
-		DocIterator it = doc_iterator_begin(bottom.inset());
-		DocIterator const et = doc_iterator_end(bottom.inset());
+		InsetBase & inset = cursor[0].inset();
+		BufferView & bv = cursor.bv();
+
+		CoordCache::InnerParPosCache const & cache =
+			bv.coordCache().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()) {
+		for ( ; it != et; it.forwardPos(true)) {
 			// avoid invalid nesting when selecting
-			if (bv_funcs::status(&cursor.bv(), it) == bv_funcs::CUR_INSIDE
-			    && (!cursor.selection() || positionable(it, cursor.anchor_))) {
-				Point p = bv_funcs::getPos(it);
+			if (!cursor.selection() || positionable(it, cursor.anchor_)) {
+				Point p = bv_funcs::getPos(bv, it, false);
 				int xo = p.x_;
 				int yo = p.y_;
 				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;
+					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;
+						//	lyxerr << "*" << endl;
 						best_dist   = d;
 						best_cursor = it;
 					}
@@ -151,7 +179,6 @@ namespace {
 			}
 		}
 
-		//lyxerr << "best_dist: " << best_dist << " cur:\n" << best_cursor << endl;
 		if (best_cursor != et) {
 			cursor.setCursor(best_cursor);
 			return true;
@@ -160,6 +187,67 @@ namespace {
 		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(bv, 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
 
 
@@ -167,7 +255,7 @@ namespace {
 // 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)
 {}
 
 
@@ -211,7 +299,7 @@ void LCursor::dispatch(FuncRequest const & cmd0)
 		// The common case is 'LFUN handled, need update', so make the
 		// LFUN handler's life easier by assuming this as default value.
 		// The handler can reset the update and val flags if necessary.
-		disp_.update(true);
+		disp_.update(Update::FitCursor | Update::Force);
 		disp_.dispatched(true);
 		inset().dispatch(*this, cmd);
 		if (disp_.dispatched())
@@ -222,6 +310,7 @@ void LCursor::dispatch(FuncRequest const & cmd0)
 	if (!disp_.dispatched()) {
 		lyxerr[Debug::DEBUG] << "RESTORING OLD CURSOR!" << endl;
 		operator=(safe);
+		disp_.update(Update::None);
 		disp_.dispatched(false);
 	}
 }
@@ -286,11 +375,12 @@ bool LCursor::popRight()
 {
 	BOOST_ASSERT(!empty());
 	//lyxerr << "Leaving inset to the right" << endl;
+	const pos_type lp = (depth() > 1) ? (*this)[depth() - 2].lastpos() : 0;
 	inset().notifyCursorLeaves(*this);
 	if (depth() == 1)
 		return false;
 	pop();
-	++pos();
+	pos() += lastpos() - lp + 1;
 	return true;
 }
 
@@ -309,15 +399,17 @@ int LCursor::currentMode()
 
 void LCursor::getPos(int & x, int & y) const
 {
-	Point p = bv_funcs::getPos(*this);
+	Point p = bv_funcs::getPos(bv(), *this, boundary());
 	x = p.x_;
 	y = p.y_;
 }
 
 
-void LCursor::paste(string const & data)
+Row const & LCursor::textRow() const
 {
-	dispatch(FuncRequest(LFUN_PASTE, data));
+	ParagraphMetrics const & pm = bv().parMetrics(text(), pit());
+	BOOST_ASSERT(!pm.rows().empty());
+	return pm.getRow(pos(), boundary());
 }
 
 
@@ -378,7 +470,9 @@ DocIterator LCursor::selectionBegin() const
 {
 	if (!selection())
 		return *this;
-	return anchor() < top() ? anchor_ : *this;
+	DocIterator di = (anchor() < top() ? anchor_ : *this);
+	di.resize(depth());
+	return di;
 }
 
 
@@ -386,7 +480,12 @@ DocIterator LCursor::selectionEnd() const
 {
 	if (!selection())
 		return *this;
-	return anchor() > top() ? anchor_ : *this;
+	DocIterator di = (anchor() > top() ? anchor_ : *this);
+	if (di.depth() > depth()) {
+		di.resize(depth());
+		++di.pos();
+	}
+	return di;
 }
 
 
@@ -402,15 +501,12 @@ void LCursor::setSelection()
 }
 
 
-void LCursor::setSelection(DocIterator const & where, size_t n)
+void LCursor::setSelection(DocIterator const & where, int n)
 {
 	setCursor(where);
 	selection() = true;
 	anchor_ = where;
 	pos() += n;
-	// Open all collapsed insets
-	for (int i = depth() - 1; i >= 0; --i)
-		operator[](i).inset().setStatus(*this, InsetBase::Open);
 }
 
 
@@ -419,7 +515,6 @@ void LCursor::clearSelection()
 	selection() = false;
 	mark() = false;
 	resetAnchor();
-	bv().unsetXSel();
 }
 
 
@@ -442,27 +537,33 @@ void LCursor::clearTargetX()
 
 
 
-void LCursor::info(std::ostream & os) const
+void LCursor::info(odocstream & os) const
 {
 	for (int i = 1, n = depth(); i < n; ++i) {
 		operator[](i).inset().infoize(os);
 		os << "  ";
 	}
-	if (pos() != 0)
-		prevInset()->infoize2(os);
+	if (pos() != 0) {
+		InsetBase const * inset = prevInset();
+		// prevInset() can return 0 in certain case.
+		if (inset)
+			prevInset()->infoize2(os);
+	}
 	// overwite old message
 	os << "                    ";
 }
 
 
-void LCursor::selHandle(bool sel)
+bool LCursor::selHandle(bool sel)
 {
 	//lyxerr << "LCursor::selHandle" << endl;
 	if (sel == selection())
-		return;
+		return false;
 
 	resetAnchor();
 	selection() = sel;
+	cap::saveSelection(*this);
+	return true;
 }
 
 
@@ -485,25 +586,27 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 	return os;
 }
 
-
+} // namespace lyx
 
 
 ///////////////////////////////////////////////////////////////////
 //
 // 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/InsetMathGrid.h"
+#include "mathed/InsetMathScript.h"
+#include "mathed/InsetMathUnknown.h"
+#include "mathed/MathFactory.h"
+#include "mathed/MathStream.h"
+#include "mathed/MathSupport.h"
+
+
+namespace lyx {
 
 //#define FILEDEBUG 1
 
@@ -565,7 +668,7 @@ void LCursor::plainErase()
 
 void LCursor::markInsert()
 {
-	insert(char(0));
+	insert(char_type(0));
 }
 
 
@@ -582,21 +685,21 @@ void LCursor::plainInsert(MathAtom const & t)
 }
 
 
-void LCursor::insert(string const & str)
+void LCursor::insert(docstring const & str)
 {
 	for_each(str.begin(), str.end(),
-		 boost::bind(static_cast<void(LCursor::*)(char)>
+		 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));
+		cap::selClearOrDel(*this);
+		insert(new InsetMathChar(c));
 	} else {
 		text()->insertChar(*this, c);
 	}
@@ -607,7 +710,7 @@ void LCursor::insert(MathAtom const & t)
 {
 	//lyxerr << "LCursor::insert MathAtom '" << t << "'" << endl;
 	macroModeClose();
-	lyx::cap::selClearOrDel(*this);
+	cap::selClearOrDel(*this);
 	plainInsert(t);
 }
 
@@ -621,7 +724,7 @@ void LCursor::insert(InsetBase * inset)
 }
 
 
-void LCursor::niceInsert(string const & t)
+void LCursor::niceInsert(docstring const & t)
 {
 	MathArray ar;
 	asArray(t, ar);
@@ -635,7 +738,7 @@ void LCursor::niceInsert(string const & t)
 void LCursor::niceInsert(MathAtom const & t)
 {
 	macroModeClose();
-	string const safe = lyx::cap::grabAndEraseSelection(*this);
+	docstring const safe = cap::grabAndEraseSelection(*this);
 	plainInsert(t);
 	// enter the new inset and move the contents of the selection if possible
 	if (t->isActive()) {
@@ -643,7 +746,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);
 	}
 }
 
@@ -652,7 +758,7 @@ void LCursor::insert(MathArray const & ar)
 {
 	macroModeClose();
 	if (selection())
-		lyx::cap::eraseSelection(*this);
+		cap::eraseSelection(*this);
 	cell().insert(pos(), ar);
 	pos() += ar.size();
 }
@@ -663,19 +769,31 @@ bool LCursor::backspace()
 	autocorrect() = false;
 
 	if (selection()) {
-		lyx::cap::selDel(*this);
+		cap::eraseSelection(*this);
 		return true;
 	}
 
 	if (pos() == 0) {
-		if (inset().nargs() == 1 && depth() == 1 && lastpos() == 0)
+		// If empty cell, and not part of a big cell
+		if (lastpos() == 0 && inset().nargs() == 1) {
+			popLeft();
+			// Directly delete empty cell: [|[]] => [|] 
+			if (inMathed()) {
+				plainErase();
+				resetAnchor();
+				return true;
+			}
+			// [|], can not delete from inside
 			return false;
-		pullArg();
-		return true;
+		} else {
+			// move to left
+			popLeft();
+			return true;
+		}
 	}
 
 	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;
@@ -703,7 +821,7 @@ bool LCursor::erase()
 		return true;
 
 	if (selection()) {
-		lyx::cap::selDel(*this);
+		cap::eraseSelection(*this);
 		return true;
 	}
 
@@ -714,18 +832,25 @@ bool LCursor::erase()
 	// special behaviour when in last position of cell
 	if (pos() == lastpos()) {
 		bool one_cell = inset().nargs() == 1;
-		if (one_cell && depth() == 1 && lastpos() == 0)
+		if (one_cell && lastpos() == 0) {
+			popLeft();
+			// Directly delete empty cell: [|[]] => [|] 
+			if (inMathed()) {
+				plainErase();
+				resetAnchor();
+				return true;
+			}
+			// [|], can not delete from inside
 			return false;
+		}
 		// remove markup
-		if (one_cell)
-			pullArg();
-		else
+		if (!one_cell)
 			inset().idxGlue(idx());
 		return true;
 	}
 
 	// '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();
@@ -761,36 +886,39 @@ bool LCursor::down()
 }
 
 
-void LCursor::macroModeClose()
+bool LCursor::macroModeClose()
 {
 	if (!inMacroMode())
-		return;
-	MathUnknownInset * p = activeMacro();
+		return false;
+	InsetMathUnknown * p = activeMacro();
 	p->finalize();
-	string const s = p->name();
+	docstring 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
+	docstring const name = s.substr(1);
 	InsetBase const * macro = innerInsetOfType(InsetBase::MATHMACRO_CODE);
 	if (macro && macro->getInsetName() == name)
 		lyxerr << "can't enter recursive macro" << endl;
 
-	plainInsert(createMathInset(name));
+	InsetMathNest * const in = inset().asInsetMath()->asNestInset();
+	if (in && in->interpretString(*this, s))
+		return true;
+	plainInsert(createInsetMath(name));
+	return true;
 }
 
 
-string LCursor::macroName()
+docstring LCursor::macroName()
 {
-	return inMacroMode() ? activeMacro()->name() : string();
+	return inMacroMode() ? activeMacro()->name() : docstring();
 }
 
 
@@ -798,7 +926,7 @@ void LCursor::handleNest(MathAtom const & a, int c)
 {
 	//lyxerr << "LCursor::handleNest: " << c << endl;
 	MathAtom t = a;
-	asArray(lyx::cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
+	asArray(cap::grabAndEraseSelection(*this), t.nucleus()->cell(c));
 	insert(t);
 	posLeft();
 	pushLeft(*nextInset());
@@ -818,9 +946,6 @@ 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);
@@ -832,12 +957,12 @@ bool LCursor::inMacroMode() const
 {
 	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;
 }
@@ -875,22 +1000,23 @@ 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);
-		lyxerr << endl;
+		odocstringstream os;
+		WriteStream wi(os, false, true);
+		inset().asInsetMath()->write(wi);
+		lyxerr << to_utf8(os.str()) << endl;
+		pos() = lastpos();
 	}
-	pos() = min(pos(), lastpos());
 }
 
 
@@ -905,7 +1031,8 @@ bool LCursor::goUpDown(bool up)
 	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
@@ -915,30 +1042,34 @@ 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;
 			}
 		}
 	}
 
+// 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;
@@ -954,6 +1085,7 @@ bool LCursor::goUpDown(bool up)
 		//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())
 				setCursor(bruteFind2(*this, xo, yo));
@@ -961,14 +1093,15 @@ bool LCursor::goUpDown(bool up)
 		}
 
 		// 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(*this, xo, yo, 0, bv().workWidth(), ylow, yhigh);
 		}
 
 		// any improvement so far?
+		//lyxerr << "updown: popLeft succeeded" << endl;
 		int xnew;
 		int ynew;
 		getPos(xnew, ynew);
@@ -978,16 +1111,17 @@ bool LCursor::goUpDown(bool up)
 
 	// we should not come here.
 	BOOST_ASSERT(false);
+#endif
 }
 
 
 void LCursor::handleFont(string const & font)
 {
 	lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION << ": " << font << endl;
-	string safe;
+	docstring safe;
 	if (selection()) {
 		macroModeClose();
-		safe = lyx::cap::grabAndEraseSelection(*this);
+		safe = cap::grabAndEraseSelection(*this);
 	}
 
 	if (lastpos() != 0) {
@@ -1001,7 +1135,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(from_utf8(font));
 			at.nucleus()->cell(0) = MathArray(bt, bt + pos());
 			cell().erase(bt, bt + pos());
 			popLeft();
@@ -1016,26 +1150,26 @@ 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);
+	theLyXFunc().setMessage(msg);
 }
 
 
-void LCursor::errorMessage(string const & msg) const
+void LCursor::errorMessage(docstring const & msg) const
 {
-	bv().owner()->getLyXFunc().setErrorMessage(msg);
+	theLyXFunc().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 ...
 		pit_type startpit = selBegin().pit();
@@ -1047,12 +1181,12 @@ string LCursor::selectionAsString(bool label) const
 			return pars[startpit].asString(buffer, startpos, endpos, label);
 
 		// First paragraph in selection
-		string result = pars[startpit].
+		docstring result = pars[startpit].
 			asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
 
 		// The paragraphs in between (if any)
 		for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
-			Paragraph & par = pars[pit];
+			Paragraph const & par = pars[pit];
 			result += par.asString(buffer, 0, par.size(), label) + "\n\n";
 		}
 
@@ -1062,17 +1196,17 @@ string LCursor::selectionAsString(bool label) const
 		return result;
 	}
 
-#ifdef WITH_WARNINGS
-#warning and mathed?
-#endif
-	return string();
+	if (inMathed())
+		return cap::grabSelection(*this);
+
+	return docstring();
 }
 
 
-string LCursor::currentState()
+docstring LCursor::currentState()
 {
 	if (inMathed()) {
-		std::ostringstream os;
+		odocstringstream os;
 		info(os);
 		return os.str();
 	}
@@ -1080,13 +1214,13 @@ string LCursor::currentState()
 	if (inTexted())
 		return text()->currentState(*this);
 
-	return string();
+	return docstring();
 }
 
 
-string LCursor::getPossibleLabel()
+docstring LCursor::getPossibleLabel()
 {
-	return inMathed() ? "eq:" : text()->getPossibleLabel(*this);
+	return inMathed() ? from_ascii("eq:") : text()->getPossibleLabel(*this);
 }
 
 
@@ -1122,15 +1256,15 @@ void LCursor::dispatched()
 }
 
 
-void LCursor::needsUpdate()
+void LCursor::updateFlags(Update::flags f)
 {
-	disp_.update(true);
+	disp_.update(f);
 }
 
 
 void LCursor::noUpdate()
 {
-	disp_.update(false);
+	disp_.update(Update::None);
 }
 
 
@@ -1190,3 +1324,6 @@ void LCursor::fixIfBroken()
 		lyxerr << "correcting cursor to level " << depth() << endl;
 	}
 }
+
+
+} // namespace lyx