X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=baf529bfc84208b2579b6373d1b0a3ba23d33de9;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=e20b42ef7cf7f1e8b4e9deafc9ed82c73c21473f;hpb=b221b0e1fd3095f16546576898d730c5ebeb5354;p=lyx.git

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index e20b42ef7c..baf529bfc8 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -14,7 +14,6 @@
 
 #include <config.h>
 
-#include "Bidi.h"
 #include "Buffer.h"
 #include "BufferView.h"
 #include "CoordCache.h"
@@ -26,6 +25,7 @@
 #include "FuncCode.h"
 #include "FuncRequest.h"
 #include "Language.h"
+#include "Layout.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
@@ -35,9 +35,11 @@
 #include "TextMetrics.h"
 #include "TocBackend.h"
 
-#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/ExceptionMessage.h"
+#include "support/gettext.h"
+#include "support/lassert.h"
 
 #include "insets/InsetTabular.h"
 #include "insets/InsetText.h"
@@ -62,52 +64,34 @@ namespace lyx {
 
 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(Cursor const & c, int x, int y)
+DocIterator bruteFind(Cursor const & c, int x, int y)
 {
 	double best_dist = numeric_limits<double>::max();
 
 	DocIterator result;
 
 	DocIterator it = c;
-	it.top().pos() = 0;
+	it.pos() = 0;
 	DocIterator et = c;
-	et.top().pos() = et.top().asInsetMath()->cell(et.top().idx()).size();
+	et.pos() = et.lastpos();
 	for (size_t i = 0;; ++i) {
 		int xo;
 		int yo;
 		Inset const * inset = &it.inset();
-		map<Inset const *, Geometry> const & data =
-			c.bv().coordCache().getInsets().getData();
-		map<Inset const *, Geometry>::const_iterator I = data.find(inset);
+		CoordCache::Insets const & insetCache = c.bv().coordCache().getInsets();
 
 		// 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()) {
+		if (!insetCache.has(inset)) {
 			it.top().pos() = 0;
 			return it;
 		}
 
-		Point o = I->second.pos;
+		Point const o = insetCache.xy(inset);
 		inset->cursorPos(c.bv(), it.top(), c.boundary(), xo, yo);
 		// Convert to absolute
 		xo += o.x_;
@@ -129,135 +113,69 @@ DocIterator bruteFind2(Cursor const & c, int x, int y)
 }
 
 
-/*
-/// moves position closest to (x, y) in given box
-bool bruteFind(Cursor & cursor,
-	int x, int y, int xlow, int xhigh, int ylow, int yhigh)
-{
-	LASSERT(!cursor.empty(), return false);
-	Inset & 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 = 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.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;
-				}
-			}
-		}
-	}
+} // namespace anon
 
-	if (best_cursor != et) {
-		cursor.setCursor(best_cursor);
-		return true;
-	}
 
-	return false;
-}
-*/
+CursorData::CursorData()
+	: DocIterator(), anchor_(),
+	  selection_(false), mark_(false), word_selection_(false),
+	  current_font(inherit_font),
+	  autocorrect_(false), macromode_(false)
+{}
 
 
-/// moves position closest to (x, y) in given box
-bool bruteFind3(Cursor & 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();
+CursorData::CursorData(Buffer * buffer)
+	: DocIterator(buffer), anchor_(),
+	  selection_(false), mark_(false), word_selection_(false),
+	  current_font(inherit_font),
+	  autocorrect_(false), macromode_(false)
+{}
 
-// 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;
-	DocIterator it = doc_iterator_begin(cur.buffer());
-	it.pit() = from;
-	DocIterator et = doc_iterator_end(cur.buffer());
+CursorData::CursorData(DocIterator const & dit)
+	: DocIterator(dit), anchor_(),
+	  selection_(false), mark_(false), word_selection_(false),
+	  current_font(inherit_font),
+	  autocorrect_(false), macromode_(false)
+{}
 
-	double best_dist = numeric_limits<double>::max();
-	DocIterator best_cursor = et;
-
-	for ( ; it != et; it.forwardPos()) {
-		// avoid invalid nesting when selecting
-		if (bv.cursorStatus(it) == CUR_INSIDE
-				&& (!cur.selection() || positionable(it, cur.realAnchor()))) {
-			// If this function is ever used again, check whether this
-			// is the same as "bv.getPos(it, false)" with boundary = false.
-			Point p = bv.getPos(it);
-			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;
+
+
+ostream & operator<<(ostream & os, CursorData const & cur)
+{
+	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.depth(), n = cur.anchor_.depth(); i < n; ++i) {
+		os << "------------------------------- | " << cur.anchor_[i] << "\n";
+	}
+	os << " selection: " << cur.selection_
+//	   << " x_target: " << cur.x_target_
+	   << " boundary: " << cur.boundary() << endl;
+	return os;
 }
 
-} // namespace anon
+
+LyXErr & operator<<(LyXErr & os, CursorData const & cur)
+{
+	os.stream() << cur;
+	return os;
+}
 
 
 // be careful: this is called from the bv's constructor, too, so
 // bv functions are not yet available!
 Cursor::Cursor(BufferView & bv)
-	: DocIterator(&bv.buffer()), bv_(&bv), anchor_(),
+	: CursorData(&bv.buffer()), bv_(&bv),
 	  x_target_(-1), textTargetOffset_(0),
-	  selection_(false), mark_(false), word_selection_(false),
-	  logicalpos_(false), current_font(inherit_font)
+	  beforeDispatchPosX_(0), beforeDispatchPosY_(0)
 {}
 
 
@@ -267,6 +185,8 @@ void Cursor::reset()
 	push_back(CursorSlice(buffer()->inset()));
 	anchor_ = doc_iterator_begin(buffer());
 	anchor_.clear();
+	new_word_ = doc_iterator_begin(buffer());
+	new_word_.clear();
 	clearTargetX();
 	selection_ = false;
 	mark_ = false;
@@ -280,6 +200,25 @@ void Cursor::setCursor(DocIterator const & cur)
 }
 
 
+void Cursor::setCursorToAnchor()
+{
+	if (selection()) {
+		DocIterator normal = anchor_;
+		while (depth() < normal.depth())
+			normal.pop_back();
+		if (depth() < anchor_.depth() && top() <= anchor_[depth() - 1])
+			++normal.pos();
+		setCursor(normal);
+	}
+}
+
+
+void Cursor::setCursorData(CursorData const & data)
+{
+	CursorData::operator=(data);
+}
+
+
 bool Cursor::getStatus(FuncRequest const & cmd, FuncStatus & status) const
 {
 	Cursor cur = *this;
@@ -300,6 +239,7 @@ bool Cursor::getStatus(FuncRequest const & cmd, FuncStatus & status) const
 	bool res = false;
 	for ( ; cur.depth(); cur.pop()) {
 		//lyxerr << "\nCursor::getStatus: cmd: " << cmd << endl << *this << endl;
+		// LASSERT: Is it safe to continue here, or should we return?
 		LASSERT(cur.idx() <= cur.lastidx(), /**/);
 		LASSERT(cur.pit() <= cur.lastpit(), /**/);
 		LASSERT(cur.pos() <= cur.lastpos(), /**/);
@@ -325,27 +265,29 @@ void Cursor::saveBeforeDispatchPosXY()
 
 void Cursor::dispatch(FuncRequest const & cmd0)
 {
-	LYXERR(Debug::DEBUG, "cmd: " << cmd0 << '\n' << *this);
+	LYXERR(Debug::ACTION, "Cursor::dispatch: cmd: " << cmd0 << '\n' << *this);
 	if (empty())
 		return;
 
 	fixIfBroken();
 	FuncRequest cmd = cmd0;
 	Cursor safe = *this;
+	Cursor old = *this;
+	disp_ = DispatchResult();
+
+	beginUndoGroup();
 
-	buffer()->undo().beginUndoGroup();
-	
 	// Is this a function that acts on inset at point?
 	if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint)
 	    && nextInset()) {
 		disp_.dispatched(true);
-		disp_.update(Update::FitCursor | Update::Force);
+		disp_.screenUpdate(Update::FitCursor | Update::Force);
 		FuncRequest tmpcmd = cmd;
 		LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: "
 			<< cmd0 << endl << *this);
 		nextInset()->dispatch(*this, tmpcmd);
 		if (disp_.dispatched()) {
-			buffer()->undo().endUndoGroup();
+			endUndoGroup();
 			return;
 		}
 	}
@@ -355,20 +297,23 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 	for (; depth(); pop(), boundary(false)) {
 		LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: "
 			<< cmd0 << endl << *this);
-		LASSERT(pos() <= lastpos(), /**/);
-		LASSERT(idx() <= lastidx(), /**/);
-		LASSERT(pit() <= lastpit(), /**/);
+
+		// In any of these cases, the cursor is invalid, and we should
+		// try to save this document rather than crash.
+		LBUFERR(pos() <= lastpos());
+		LBUFERR(idx() <= lastidx());
+		LBUFERR(pit() <= lastpit());
 
 		// 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(Update::FitCursor | Update::Force);
+		disp_.screenUpdate(Update::FitCursor | Update::Force);
 		disp_.dispatched(true);
 		inset().dispatch(*this, cmd);
 		if (disp_.dispatched())
 			break;
 	}
-	
+
 	// it completely to get a 'bomb early' behaviour in case this
 	// object will be used again.
 	if (!disp_.dispatched()) {
@@ -376,21 +321,36 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 		// We might have invalidated the cursor when removing an empty
 		// paragraph while the cursor could not be moved out the inset
 		// while we initially thought we could. This might happen when
-		// a multiline inset becomes an inline inset when the second 
+		// a multiline inset becomes an inline inset when the second
 		// paragraph is removed.
 		if (safe.pit() > safe.lastpit()) {
 			safe.pit() = safe.lastpit();
 			safe.pos() = safe.lastpos();
 		}
 		operator=(safe);
-		disp_.update(Update::None);
+		disp_.screenUpdate(Update::None);
 		disp_.dispatched(false);
 	} else {
 		// restore the previous one because nested Cursor::dispatch calls
 		// are possible which would change it
 		beforeDispatchCursor_ = safe.beforeDispatchCursor_;
 	}
-	buffer()->undo().endUndoGroup();
+	endUndoGroup();
+
+	// NOTE: The code below has been copied to BufferView::dispatch.
+	// If you need to modify this, please update the other one too.
+
+	// notify insets we just left
+	if (*this != old) {
+		old.beginUndoGroup();
+		old.fixIfBroken();
+		bool badcursor = notifyCursorLeavesOrEnters(old, *this);
+		if (badcursor) {
+			fixIfBroken();
+			bv().resetInlineCompletionPos();
+		}
+		old.endUndoGroup();
+	}
 }
 
 
@@ -402,14 +362,14 @@ DispatchResult const & Cursor::result() const
 
 BufferView & Cursor::bv() const
 {
-	LASSERT(bv_, /**/);
+	LBUFERR(bv_);
 	return *bv_;
 }
 
 
 void Cursor::pop()
 {
-	LASSERT(depth() >= 1, /**/);
+	LBUFERR(depth() >= 1);
 	pop_back();
 }
 
@@ -455,7 +415,7 @@ bool Cursor::popForward()
 
 int Cursor::currentMode()
 {
-	LASSERT(!empty(), /**/);
+	LASSERT(!empty(), return Inset::UNDECIDED_MODE);
 	for (int i = depth() - 1; i >= 0; --i) {
 		int res = operator[](i).inset().currentMode();
 		bool locked_mode = operator[](i).inset().lockedMode();
@@ -468,6 +428,19 @@ int Cursor::currentMode()
 }
 
 
+bool Cursor::inCoordCache() const
+{
+	// the root inset is not in cache, but we do not need it.
+	if (depth() == 1)
+		return true;
+	CoordCache::Insets const & icache = bv_->coordCache().getInsets();
+	for (size_t i = 1 ; i < depth() ; ++i)
+		if (!icache.has(&(*this)[i].inset()))
+			return false;
+	return true;
+}
+
+
 void Cursor::getPos(int & x, int & y) const
 {
 	Point p = bv().getPos(*this);
@@ -480,7 +453,6 @@ Row const & Cursor::textRow() const
 {
 	CursorSlice const & cs = innerTextSlice();
 	ParagraphMetrics const & pm = bv().parMetrics(cs.text(), cs.pit());
-	LASSERT(!pm.rows().empty(), /**/);
 	return pm.getRow(pos(), boundary());
 }
 
@@ -488,18 +460,67 @@ Row const & Cursor::textRow() const
 void Cursor::resetAnchor()
 {
 	anchor_ = *this;
+	checkNewWordPosition();
 }
 
 
-void Cursor::setCursorToAnchor()
+void Cursor::markNewWordPosition()
 {
-	if (selection()) {
-		DocIterator normal = anchor_;
-		while (depth() < normal.depth())
-			normal.pop_back();
-		if (depth() < anchor_.depth() && top() <= anchor_[depth() - 1])
-			++normal.pos();
-		setCursor(normal);
+	if (lyxrc.spellcheck_continuously && inTexted() && new_word_.empty()) {
+		FontSpan nw = locateWord(WHOLE_WORD);
+		if (nw.size() == 1) {
+			LYXERR(Debug::DEBUG, "start new word: "
+				<< " par: " << pit()
+				<< " pos: " << nw.first);
+			new_word_ = *this;
+		}
+	}
+}
+
+
+void Cursor::clearNewWordPosition()
+{
+	if (!new_word_.empty()) {
+		LYXERR(Debug::DEBUG, "clear new word: "
+			<< " par: " << pit()
+			<< " pos: " << pos());
+		new_word_.resize(0);
+	}
+}
+
+
+void Cursor::checkNewWordPosition()
+{
+	if (!lyxrc.spellcheck_continuously || new_word_.empty())
+		return ;
+	if (!inTexted())
+		clearNewWordPosition();
+	else {
+		// forget the position of the current new word if
+		// 1) the paragraph changes or
+		// 2) the count of nested insets changes or
+		// 3) the cursor pos is out of paragraph bound
+		if (pit() != new_word_.pit() ||
+			depth() != new_word_.depth() ||
+			new_word_.pos() > new_word_.lastpos()) {
+			clearNewWordPosition();
+		} else if (new_word_.fixIfBroken())
+			// 4) or the remembered position was "broken"
+			clearNewWordPosition();
+		else {
+			FontSpan nw = locateWord(WHOLE_WORD);
+			if (!nw.empty()) {
+				FontSpan ow = new_word_.locateWord(WHOLE_WORD);
+				if (nw.intersect(ow).empty())
+					clearNewWordPosition();
+				else
+					LYXERR(Debug::DEBUG, "new word: "
+						   << " par: " << pit()
+						   << " pos: " << nw.first << ".." << nw.last);
+			} else {
+				clearNewWordPosition();
+			}
+		}
 	}
 }
 
@@ -527,7 +548,6 @@ bool Cursor::posVisRight(bool skip_inset)
 	Cursor new_cur = *this; // where we will move to
 	pos_type left_pos; // position visually left of current cursor
 	pos_type right_pos; // position visually right of current cursor
-	bool new_pos_is_RTL; // is new position we're moving to RTL?
 
 	getSurroundingPos(left_pos, right_pos);
 
@@ -538,51 +558,58 @@ bool Cursor::posVisRight(bool skip_inset)
 	new_cur.boundary(false);
 	if (!skip_inset &&
 		text()->checkAndActivateInsetVisual(new_cur, right_pos >= pos(), false)) {
-		// we actually move the cursor at the end of this function, for now
-		// we just keep track of the new position in new_cur...
+		// we actually move the cursor at the end of this
+		// function, for now we just keep track of the new
+		// position in new_cur...
 		LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos());
 	}
 
 	// Are we already at rightmost pos in row?
 	else if (text()->empty() || right_pos == -1) {
-		
+
 		new_cur = *this;
 		if (!new_cur.posVisToNewRow(false)) {
 			LYXERR(Debug::RTL, "not moving!");
 			return false;
 		}
-		
-		// we actually move the cursor at the end of this function, for now 
-		// just keep track of the new position in new_cur...
-		LYXERR(Debug::RTL, "right edge, moving: " << int(new_cur.pit()) << "," 
+
+		// we actually move the cursor at the end of this
+		// function, for now just keep track of the new
+		// position in new_cur...
+		LYXERR(Debug::RTL, "right edge, moving: " << int(new_cur.pit()) << ","
 			<< int(new_cur.pos()) << "," << (new_cur.boundary() ? 1 : 0));
 
 	}
 	// normal movement to the right
 	else {
 		new_cur = *this;
-		// Recall, if the cursor is at position 'x', that means *before* 
-		// the character at position 'x'. In RTL, "before" means "to the 
-		// right of", in LTR, "to the left of". So currently our situation
-		// is this: the position to our right is 'right_pos' (i.e., we're 
-		// currently to the left of 'right_pos'). In order to move to the 
-		// right, it depends whether or not the character at 'right_pos' is RTL.
-		new_pos_is_RTL = paragraph().getFontSettings(
+		// Recall, if the cursor is at position 'x', that
+		// means *before* the character at position 'x'. In
+		// RTL, "before" means "to the right of", in LTR, "to
+		// the left of". So currently our situation is this:
+		// the position to our right is 'right_pos' (i.e.,
+		// we're currently to the left of 'right_pos'). In
+		// order to move to the right, it depends whether or
+		// not the character at 'right_pos' is RTL.
+		bool const new_pos_is_RTL = paragraph().getFontSettings(
 			buffer()->params(), right_pos).isVisibleRightToLeft();
-		// If the character at 'right_pos' *is* LTR, then in order to move to
-		// the right of it, we need to be *after* 'right_pos', i.e., move to
-		// position 'right_pos' + 1.
+		// If the character at 'right_pos' *is* LTR, then in
+		// order to move to the right of it, we need to be
+		// *after* 'right_pos', i.e., move to position
+		// 'right_pos' + 1.
 		if (!new_pos_is_RTL) {
 			new_cur.pos() = right_pos + 1;
 			// set the boundary to true in two situations:
 			if (
-			// 1. if new_pos is now lastpos, and we're in an RTL paragraph
-			// (this means that we're moving right to the end of an LTR chunk
+			// 1. if new_pos is now lastpos, and we're in
+			// an RTL paragraph (this means that we're
+			// moving right to the end of an LTR chunk
 			// which is at the end of an RTL paragraph);
 				(new_cur.pos() == lastpos()
 				 && paragraph().isRTL(buffer()->params()))
-			// 2. if the position *after* right_pos is RTL (we want to be 
-			// *after* right_pos, not before right_pos + 1!)
+			// 2. if the position *after* right_pos is RTL
+			// (we want to be *after* right_pos, not
+			// before right_pos + 1!)
 				|| paragraph().getFontSettings(buffer()->params(),
 						new_cur.pos()).isVisibleRightToLeft()
 			)
@@ -590,23 +617,20 @@ bool Cursor::posVisRight(bool skip_inset)
 			else // set the boundary to false
 				new_cur.boundary(false);
 		}
-		// Otherwise (if the character at position 'right_pos' is RTL), then
-		// moving to the right of it is as easy as setting the new position
-		// to 'right_pos'.
+		// Otherwise (if the character at position 'right_pos'
+		// is RTL), then moving to the right of it is as easy
+		// as setting the new position to 'right_pos'.
 		else {
 			new_cur.pos() = right_pos;
 			new_cur.boundary(false);
 		}
-	
+
 	}
 
-	bool moved = (new_cur.pos() != pos()
-				  || new_cur.pit() != pit()
-				  || new_cur.boundary() != boundary()
-				  || &new_cur.inset() != &inset());
-	
+	bool const moved = new_cur != *this || new_cur.boundary() != boundary();
+
 	if (moved) {
-		LYXERR(Debug::RTL, "moving to: " << new_cur.pos() 
+		LYXERR(Debug::RTL, "moving to: " << new_cur.pos()
 			<< (new_cur.boundary() ? " (boundary)" : ""));
 		*this = new_cur;
 	}
@@ -620,7 +644,6 @@ bool Cursor::posVisLeft(bool skip_inset)
 	Cursor new_cur = *this; // where we will move to
 	pos_type left_pos; // position visually left of current cursor
 	pos_type right_pos; // position visually right of current cursor
-	bool new_pos_is_RTL; // is new position we're moving to RTL?
 
 	getSurroundingPos(left_pos, right_pos);
 
@@ -629,53 +652,60 @@ bool Cursor::posVisLeft(bool skip_inset)
 	// Are we at an inset?
 	new_cur.pos() = left_pos;
 	new_cur.boundary(false);
-	if (!skip_inset && 
+	if (!skip_inset &&
 		text()->checkAndActivateInsetVisual(new_cur, left_pos >= pos(), true)) {
-		// we actually move the cursor at the end of this function, for now 
-		// we just keep track of the new position in new_cur...
+		// we actually move the cursor at the end of this
+		// function, for now we just keep track of the new
+		// position in new_cur...
 		LYXERR(Debug::RTL, "entering inset at: " << new_cur.pos());
 	}
 
 	// Are we already at leftmost pos in row?
 	else if (text()->empty() || left_pos == -1) {
-		
+
 		new_cur = *this;
 		if (!new_cur.posVisToNewRow(true)) {
 			LYXERR(Debug::RTL, "not moving!");
 			return false;
 		}
-		
-		// we actually move the cursor at the end of this function, for now 
-		// just keep track of the new position in new_cur...
-		LYXERR(Debug::RTL, "left edge, moving: " << int(new_cur.pit()) << "," 
+
+		// we actually move the cursor at the end of this
+		// function, for now just keep track of the new
+		// position in new_cur...
+		LYXERR(Debug::RTL, "left edge, moving: " << int(new_cur.pit()) << ","
 			<< int(new_cur.pos()) << "," << (new_cur.boundary() ? 1 : 0));
 
 	}
 	// normal movement to the left
 	else {
 		new_cur = *this;
-		// Recall, if the cursor is at position 'x', that means *before* 
-		// the character at position 'x'. In RTL, "before" means "to the 
-		// right of", in LTR, "to the left of". So currently our situation
-		// is this: the position to our left is 'left_pos' (i.e., we're 
-		// currently to the right of 'left_pos'). In order to move to the 
-		// left, it depends whether or not the character at 'left_pos' is RTL.
-		new_pos_is_RTL = paragraph().getFontSettings(
+		// Recall, if the cursor is at position 'x', that
+		// means *before* the character at position 'x'. In
+		// RTL, "before" means "to the right of", in LTR, "to
+		// the left of". So currently our situation is this:
+		// the position to our left is 'left_pos' (i.e., we're
+		// currently to the right of 'left_pos'). In order to
+		// move to the left, it depends whether or not the
+		// character at 'left_pos' is RTL.
+		bool const new_pos_is_RTL = paragraph().getFontSettings(
 			buffer()->params(), left_pos).isVisibleRightToLeft();
-		// If the character at 'left_pos' *is* RTL, then in order to move to
-		// the left of it, we need to be *after* 'left_pos', i.e., move to
-		// position 'left_pos' + 1.
+		// If the character at 'left_pos' *is* RTL, then in
+		// order to move to the left of it, we need to be
+		// *after* 'left_pos', i.e., move to position
+		// 'left_pos' + 1.
 		if (new_pos_is_RTL) {
 			new_cur.pos() = left_pos + 1;
 			// set the boundary to true in two situations:
 			if (
-			// 1. if new_pos is now lastpos and we're in an LTR paragraph
-			// (this means that we're moving left to the end of an RTL chunk
+			// 1. if new_pos is now lastpos and we're in
+			// an LTR paragraph (this means that we're
+			// moving left to the end of an RTL chunk
 			// which is at the end of an LTR paragraph);
 				(new_cur.pos() == lastpos()
 				 && !paragraph().isRTL(buffer()->params()))
-			// 2. if the position *after* left_pos is not RTL (we want to be 
-			// *after* left_pos, not before left_pos + 1!)
+			// 2. if the position *after* left_pos is not
+			// RTL (we want to be *after* left_pos, not
+			// before left_pos + 1!)
 				|| !paragraph().getFontSettings(buffer()->params(),
 						new_cur.pos()).isVisibleRightToLeft()
 			)
@@ -683,134 +713,126 @@ bool Cursor::posVisLeft(bool skip_inset)
 			else // set the boundary to false
 				new_cur.boundary(false);
 		}
-		// Otherwise (if the character at position 'left_pos' is LTR), then
-		// moving to the left of it is as easy as setting the new position
-		// to 'left_pos'.
+		// Otherwise (if the character at position 'left_pos'
+		// is LTR), then moving to the left of it is as easy
+		// as setting the new position to 'left_pos'.
 		else {
 			new_cur.pos() = left_pos;
 			new_cur.boundary(false);
 		}
-	
+
 	}
 
-	bool moved = (new_cur.pos() != pos() 
-				  || new_cur.pit() != pit()
-				  || new_cur.boundary() != boundary());
+	bool const moved = new_cur != *this || new_cur.boundary() != boundary();
 
 	if (moved) {
-		LYXERR(Debug::RTL, "moving to: " << new_cur.pos() 
+		LYXERR(Debug::RTL, "moving to: " << new_cur.pos()
 			<< (new_cur.boundary() ? " (boundary)" : ""));
 		*this = new_cur;
 	}
-		
+
 	return moved;
 }
 
 
-void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos)
+namespace {
+
+// Return true on success
+bool findNonVirtual(Row const & row, Row::const_iterator & cit, bool onleft)
 {
-	// preparing bidi tables
-	Paragraph const & par = paragraph();
-	Buffer const & buf = *buffer();
+	if (onleft) {
+		while (cit != row.begin() && cit->isVirtual())
+			--cit;
+	} else {
+		while (cit != row.end() && cit->isVirtual())
+			++cit;
+	}
+	return cit != row.end() && !cit->isVirtual();
+}
+
+}
+
+void Cursor::getSurroundingPos(pos_type & left_pos, pos_type & right_pos) const
+{
+	// by default, we know nothing.
+	left_pos = -1;
+	right_pos = -1;
+
 	Row const & row = textRow();
-	Bidi bidi;
-	bidi.computeTables(par, buf, row);
-
-	LYXERR(Debug::RTL, "bidi: " << row.pos() << "--" << row.endpos());
-
-	// The cursor is painted *before* the character at pos(), or, if 'boundary'
-	// is true, *after* the character at (pos() - 1). So we already have one
-	// known position around the cursor:
-	pos_type const known_pos = boundary() && pos() > 0 ? pos() - 1 : pos();
-	
-	// edge case: if we're at the end of the paragraph, things are a little 
-	// different (because lastpos is a position which does not really "exist" 
-	// --- there's no character there yet).
-	if (known_pos == lastpos()) {
-		if (par.isRTL(buf.params())) {
-			left_pos = -1;
-			right_pos = bidi.vis2log(row.pos());
-		} else { 
-			// LTR paragraph
-			right_pos = -1;
-			left_pos = bidi.vis2log(row.endpos() - 1);
-		}
+	TextMetrics const & tm = bv_->textMetrics(text());
+	double dummy = 0;
+	Row::const_iterator cit = tm.findRowElement(row, pos(), boundary(), dummy);
+	// Handle the case of empty row
+	if (cit == row.end()) {
+		if (paragraph().isRTL(buffer()->params()))
+			right_pos = row.pos();
+		else
+			left_pos = row.pos() - 1;
 		return;
 	}
-	
-	// Whether 'known_pos' is to the left or to the right of the cursor depends
-	// on whether it is an RTL or LTR character...
-	bool const cur_is_RTL = 
-		par.getFontSettings(buf.params(), known_pos).isVisibleRightToLeft();
-	// ... in the following manner:
-	// For an RTL character, "before" means "to the right" and "after" means
-	// "to the left"; and for LTR, it's the reverse. So, 'known_pos' is to the
-	// right of the cursor if (RTL && boundary) or (!RTL && !boundary):
-	bool const known_pos_on_right = cur_is_RTL == boundary();
-
-	// So we now know one of the positions surrounding the cursor. Let's 
-	// determine the other one:	
-	if (known_pos_on_right) {
-		right_pos = known_pos;
-		// *visual* position of 'left_pos':
-		pos_type v_left_pos = bidi.log2vis(right_pos) - 1;
-		// If the position we just identified as 'left_pos' is a "skipped 
-		// separator" (a separator which is at the logical end of a row,
-		// except for the last row in a paragraph; such separators are not
-		// painted, so they "are not really there"; note that in bidi text,
-		// such a separator could appear visually in the middle of a row),
-		// set 'left_pos' to the *next* position to the left.
-		if (bidi.inRange(v_left_pos) 
-				&& bidi.vis2log(v_left_pos) + 1 == row.endpos() 
-				&& row.endpos() < lastpos()
-				&& par.isSeparator(bidi.vis2log(v_left_pos)))
-			--v_left_pos;
-
-		// calculate the logical position of 'left_pos', if in row
-		if (!bidi.inRange(v_left_pos))
-			left_pos = -1;
-		else
-			left_pos = bidi.vis2log(v_left_pos);
-		// If the position we identified as 'right_pos' is a "skipped 
-		// separator", set 'right_pos' to the *next* position to the right.
-		if (right_pos + 1 == row.endpos() && row.endpos() < lastpos() 
-				&& par.isSeparator(right_pos)) {
-			pos_type const v_right_pos = bidi.log2vis(right_pos) + 1;
-			if (!bidi.inRange(v_right_pos))
-				right_pos = -1;
-			else
-				right_pos = bidi.vis2log(v_right_pos);
-		}
-	} else { 
-		// known_pos is on the left
-		left_pos = known_pos;
-		// *visual* position of 'right_pos'
-		pos_type v_right_pos = bidi.log2vis(left_pos) + 1;
-		// If the position we just identified as 'right_pos' is a "skipped 
-		// separator", set 'right_pos' to the *next* position to the right.
-		if (bidi.inRange(v_right_pos) 
-				&& bidi.vis2log(v_right_pos) + 1 == row.endpos() 
-				&& row.endpos() < lastpos()
-				&& par.isSeparator(bidi.vis2log(v_right_pos)))
-			++v_right_pos;
-
-		// calculate the logical position of 'right_pos', if in row
-		if (!bidi.inRange(v_right_pos)) 
-			right_pos = -1;
-		else
-			right_pos = bidi.vis2log(v_right_pos);
-		// If the position we identified as 'left_pos' is a "skipped 
-		// separator", set 'left_pos' to the *next* position to the left.
-		if (left_pos + 1 == row.endpos() && row.endpos() < lastpos() 
-				&& par.isSeparator(left_pos)) {
-			pos_type const v_left_pos = bidi.log2vis(left_pos) - 1;
-			if (!bidi.inRange(v_left_pos))
-				left_pos = -1;
-			else
-				left_pos = bidi.vis2log(v_left_pos);
+
+	// skip virtual elements and exit if no non-virtual one exists
+	if (!findNonVirtual(row, cit, !cit->isRTL()))
+		return;
+
+	// if the position is at the left side of the element, we have to
+	// look at the previous element
+	if (pos() == cit->left_pos()) {
+		LYXERR(Debug::RTL, "getSurroundingPos(" << pos() << (boundary() ? "b" : "")
+			   << "), AT LEFT of *cit=" << *cit);
+		// this one is easy (see common case below)
+		right_pos = pos() - (cit->isRTL() ? 1 : 0);
+		// at the left of the row
+		if (cit == row.begin())
+			return;
+		--cit;
+		if (!findNonVirtual(row, cit, true))
+			return;
+		// [...[ is the row element, | is cursor position (! with boundary)
+		// [ 1 2 [ is a ltr row element with pos=1 and endpos=3
+		// ] 2 1] is an rtl row element with pos=1 and endpos=3
+		//    [ 1 2 [  [|3 4 [ => (2, 3)
+		// or [ 1 2 [  ]!4 3 ] => (2, 4)
+		// or ] 2 1 ]  [|3 4 [ => (1, 3)
+		// or ] 4 3 ]  ]!2 1 ] => (3, 2)
+		left_pos = cit->right_pos() - (cit->isRTL() ? 0 : 1);
+		// happens with consecutive row of same direction
+		if (left_pos == right_pos) {
+			left_pos += cit->isRTL() ? 1 : -1;
 		}
 	}
-	return;
+	// same code but with the element at the right
+	else if (pos() == cit->right_pos()) {
+		LYXERR(Debug::RTL, "getSurroundingPos(" << pos() << (boundary() ? "b" : "")
+			   << "), AT RIGHT of *cit=" << *cit);
+		// this one is easy (see common case below)
+		left_pos = pos() - (cit->isRTL() ? 0 : 1);
+		// at the right of the row
+		if (cit + 1 == row.end())
+			return;
+		++cit;
+		if (!findNonVirtual(row, cit, false))
+			return;
+		//    [ 1 2![  [ 3 4 [ => (2, 3)
+		// or [ 1 2![  ] 4 3 ] => (2, 4)
+		// or ] 2 1|]  [ 3 4 [ => (1, 3)
+		// or ] 4 3|]  ] 2 1 ] => (3, 2)
+		right_pos = cit->left_pos() - (cit->isRTL() ? 1 : 0);
+		// happens with consecutive row of same direction
+		if (right_pos == left_pos)
+			right_pos += cit->isRTL() ? -1 : 1;
+	}
+	// common case: both positions are inside the row element
+	else {
+		//    [ 1 2|3 [ => (2, 3)
+		// or ] 3|2 1 ] => (3, 2)
+		left_pos = pos() - (cit->isRTL() ? 0 : 1);
+		right_pos = pos() - (cit->isRTL() ? 1 : 0);
+	}
+
+	// Note that debug message does not catch all early returns above
+	LYXERR(Debug::RTL,"getSurroundingPos(" << pos() << (boundary() ? "b" : "")
+		   << ") => (" << left_pos << ", " << right_pos <<")");
 }
 
 
@@ -821,16 +843,15 @@ bool Cursor::posVisToNewRow(bool movingLeft)
 	Row const & row = textRow();
 	bool par_is_LTR = !par.isRTL(buf.params());
 
-	// Inside a table, determining whether to move to the next or previous row
-	// should be done based on the table's direction. 
-	int s = depth() - 1;
-	if (s >= 1 && (*this)[s].inset().asInsetTabular()) {
-		par_is_LTR = !(*this)[s].inset().asInsetTabular()->isRightToLeft(*this);
+	// Inside a table, determining whether to move to the next or
+	// previous row should be done based on the table's direction.
+	if (inset().asInsetTabular()) {
+		par_is_LTR = !inset().asInsetTabular()->isRightToLeft(*this);
 		LYXERR(Debug::RTL, "Inside table! par_is_LTR=" << (par_is_LTR ? 1 : 0));
 	}
-	
-	// if moving left in an LTR paragraph or moving right in an RTL one, 
-	// move to previous row
+
+	// if moving left in an LTR paragraph or moving right in an
+	// RTL one, move to previous row
 	if (par_is_LTR == movingLeft) {
 		if (row.pos() == 0) { // we're at first row in paragraph
 			if (pit() == 0) // no previous paragraph! don't move
@@ -844,8 +865,8 @@ bool Cursor::posVisToNewRow(bool movingLeft)
 			boundary(false);
 		}
 	}
-	// if moving left in an RTL paragraph or moving right in an LTR one, 
-	// move to next row
+	// if moving left in an RTL paragraph or moving right in an
+	// LTR one, move to next row
 	else {
 		if (row.endpos() == lastpos()) { // we're at last row in paragraph
 			if (pit() == lastpit()) // last paragraph! don't move
@@ -859,7 +880,7 @@ bool Cursor::posVisToNewRow(bool movingLeft)
 			boundary(false);
 		}
 	}
-	
+
 	// make sure we're at left-/right-most pos in new row
 	posVisToRowExtremity(!movingLeft);
 
@@ -867,127 +888,50 @@ bool Cursor::posVisToNewRow(bool movingLeft)
 }
 
 
-void Cursor::posVisToRowExtremity(bool left)  
+void Cursor::posVisToRowExtremity(bool left)
 {
-	// prepare bidi tables
-	Paragraph const & par = paragraph();
-	Buffer const & buf = *buffer();
-	Row const & row = textRow();
-	Bidi bidi;
-	bidi.computeTables(par, buf, row);
-
 	LYXERR(Debug::RTL, "entering extremity: " << pit() << "," << pos() << ","
 		<< (boundary() ? 1 : 0));
 
-	if (left) { // move to leftmost position
-		// if this is an RTL paragraph, and we're at the last row in the
-		// paragraph, move to lastpos
-		if (par.isRTL(buf.params()) && row.endpos() == lastpos())
-			pos() = lastpos();
-		else {
-			pos() = bidi.vis2log(row.pos());
-
-			// Moving to the leftmost position in the row, the cursor should
-			// normally be placed to the *left* of the leftmost position.
-			// A very common exception, though, is if the leftmost character 
-			// also happens to be the separator at the (logical) end of the row
-			// --- in this case, the separator is positioned beyond the left 
-			// margin, and we don't want to move the cursor there (moving to 
-			// the left of the separator is equivalent to moving to the next
-			// line). So, in this case we actually want to place the cursor 
-			// to the *right* of the leftmost position (the separator). 
-			// Another exception is if we're moving to the logically last 
-			// position in the row, which is *not* a separator: this means
-			// that the entire row has no separators (if there were any, the 
-			// row would have been broken there); and therefore in this case
-			// we also move to the *right* of the last position (this indicates
-			// to the user that there is no space after this position, and is 
-			// consistent with the behavior in the middle of a row --- moving
-			// right or left moves to the next/previous character; if we were
-			// to move to the *left* of this position, that would simulate 
-			// a separator which is not really there!). 
-			// Finally, there is an exception to the previous exception: if 
-			// this non-separator-but-last-position-in-row is an inset, then
-			// we *do* want to stay to the left of it anyway: this is the 
-			// "boundary" which we simulate at insets.
-			// Another exception is when row.endpos() is 0.
-			
-			// do we want to be to the right of pos?
-			// as explained above, if at last pos in row, stay to the right
-			bool const right_of_pos = row.endpos() > 0
-				&& pos() == row.endpos() - 1 && !par.isInset(pos());
-
-			// Now we know if we want to be to the left or to the right of pos,
-			// let's make sure we are where we want to be.
-			bool const new_pos_is_RTL = 
-				par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft();
-
-			if (new_pos_is_RTL != right_of_pos) {
-				++pos();
-				boundary(true);
-			}
-		}
-	} else { 
-		// move to rightmost position
-		// if this is an LTR paragraph, and we're at the last row in the
-		// paragraph, move to lastpos
-		if (!par.isRTL(buf.params()) && row.endpos() == lastpos())
-			pos() = lastpos();
-		else {
-			pos() = row.endpos() > 0 ? bidi.vis2log(row.endpos() - 1) : 0;
-
-			// Moving to the rightmost position in the row, the cursor should
-			// normally be placed to the *right* of the rightmost position.
-			// A very common exception, though, is if the rightmost character 
-			// also happens to be the separator at the (logical) end of the row
-			// --- in this case, the separator is positioned beyond the right 
-			// margin, and we don't want to move the cursor there (moving to 
-			// the right of the separator is equivalent to moving to the next
-			// line). So, in this case we actually want to place the cursor 
-			// to the *left* of the rightmost position (the separator). 
-			// Another exception is if we're moving to the logically last 
-			// position in the row, which is *not* a separator: this means
-			// that the entire row has no separators (if there were any, the 
-			// row would have been broken there); and therefore in this case
-			// we also move to the *left* of the last position (this indicates
-			// to the user that there is no space after this position, and is 
-			// consistent with the behavior in the middle of a row --- moving
-			// right or left moves to the next/previous character; if we were
-			// to move to the *right* of this position, that would simulate 
-			// a separator which is not really there!). 
-			// Finally, there is an exception to the previous exception: if 
-			// this non-separator-but-last-position-in-row is an inset, then
-			// we *do* want to stay to the right of it anyway: this is the 
-			// "boundary" which we simulate at insets.
-			// Another exception is when row.endpos() is 0.
-			
-			// do we want to be to the left of pos?
-			// as explained above, if at last pos in row, stay to the left,
-			// unless the last position is the same as the first.
-			bool const left_of_pos = row.endpos() > 0
-				&& pos() == row.endpos() - 1 && !par.isInset(pos());
-
-			// Now we know if we want to be to the left or to the right of pos,
-			// let's make sure we are where we want to be.
-			bool const new_pos_is_RTL = 
-				par.getFontSettings(buf.params(), pos()).isVisibleRightToLeft();
-
-			if (new_pos_is_RTL == left_of_pos) {
-				++pos();
-				boundary(true);
-			}
-		}
-	}
+	TextMetrics const & tm = bv_->textMetrics(text());
+	// Looking for extremities is like clicking on the left or the
+	// right of the row.
+	int x = tm.origin().x_ + (left ? 0 : textRow().width());
+	bool b = false;
+	pos() = tm.getPosNearX(textRow(), x, b);
+	boundary(b);
+
 	LYXERR(Debug::RTL, "leaving extremity: " << pit() << "," << pos() << ","
 		<< (boundary() ? 1 : 0));
 }
 
 
+bool Cursor::reverseDirectionNeeded() const
+{
+	/*
+	 * We determine the directions based on the direction of the
+	 * bottom() --- i.e., outermost --- paragraph, because that is
+	 * the only way to achieve consistency of the arrow's movements
+	 * within a paragraph, and thus avoid situations in which the
+	 * cursor gets stuck.
+	 */
+	return bottom().paragraph().isRTL(bv().buffer().params());
+}
+
+
 CursorSlice Cursor::normalAnchor() const
 {
 	if (!selection())
 		return top();
-	LASSERT(anchor_.depth() >= depth(), /**/);
+	// LASSERT: There have been several bugs around this code, that seem
+	// to involve failures to reset the anchor. We can at least not crash
+	// in release mode by resetting it ourselves.
+	if (anchor_.depth() < depth()) {
+		LYXERR0("Cursor is deeper than anchor. PLEASE REPORT.\nCursor is"
+		        << *this);
+		const_cast<DocIterator &>(anchor_) = *this;
+	}
+
 	CursorSlice normal = anchor_[depth() - 1];
 	if (depth() < anchor_.depth() && top() <= normal) {
 		// anchor is behind cursor -> move anchor behind the inset
@@ -997,12 +941,6 @@ CursorSlice Cursor::normalAnchor() const
 }
 
 
-DocIterator & Cursor::realAnchor()
-{
-	return anchor_;
-}
-
-
 CursorSlice Cursor::selBegin() const
 {
 	if (!selection())
@@ -1059,20 +997,18 @@ DocIterator Cursor::selectionEnd() const
 
 void Cursor::setSelection()
 {
-	setSelection(true);
-	// A selection with no contents is not a selection
-	// FIXME: doesnt look ok
-	if (idx() == normalAnchor().idx() && 
-	    pit() == normalAnchor().pit() && 
+	selection(true);
+	if (idx() == normalAnchor().idx() &&
+	    pit() == normalAnchor().pit() &&
 	    pos() == normalAnchor().pos())
-		setSelection(false);
+		selection(false);
 }
 
 
 void Cursor::setSelection(DocIterator const & where, int n)
 {
 	setCursor(where);
-	setSelection(true);
+	selection(true);
 	anchor_ = where;
 	pos() += n;
 }
@@ -1080,7 +1016,7 @@ void Cursor::setSelection(DocIterator const & where, int n)
 
 void Cursor::clearSelection()
 {
-	setSelection(false);
+	selection(false);
 	setWordSelection(false);
 	setMark(false);
 	resetAnchor();
@@ -1128,8 +1064,6 @@ void Cursor::info(odocstream & os) const
 		if (inset)
 			prevInset()->infoize2(os);
 	}
-	// overwite old message
-	os << "                    ";
 }
 
 
@@ -1145,38 +1079,9 @@ bool Cursor::selHandle(bool sel)
 		cap::saveSelection(*this);
 
 	resetAnchor();
-	setSelection(sel);
+	selection(sel);
 	return true;
 }
-
-
-ostream & operator<<(ostream & os, Cursor const & cur)
-{
-	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.depth(), n = cur.anchor_.depth(); i < n; ++i) {
-		os << "------------------------------- | " << cur.anchor_[i] << "\n";
-	}
-	os << " selection: " << cur.selection_
-	   << " x_target: " << cur.x_target_ << endl;
-	return os;
-}
-
-
-LyXErr & operator<<(LyXErr & os, Cursor const & cur)
-{
-	os.stream() << cur;
-	return os;
-}
-
-
 } // namespace lyx
 
 
@@ -1200,9 +1105,6 @@ LyXErr & operator<<(LyXErr & os, Cursor const & cur)
 
 namespace lyx {
 
-//#define FILEDEBUG 1
-
-
 bool Cursor::isInside(Inset const * p) const
 {
 	for (size_t i = 0; i != depth(); ++i)
@@ -1276,7 +1178,7 @@ void Cursor::plainInsert(MathAtom const & t)
 	++pos();
 	inset().setBuffer(bv_->buffer());
 	inset().initView();
-	forceBufferUpdate();
+	checkBufferStructure();
 }
 
 
@@ -1291,7 +1193,7 @@ void Cursor::insert(docstring const & str)
 void Cursor::insert(char_type c)
 {
 	//lyxerr << "Cursor::insert char '" << c << "'" << endl;
-	LASSERT(!empty(), /**/);
+	LASSERT(!empty(), return);
 	if (inMathed()) {
 		cap::selClearOrDel(*this);
 		insert(new InsetMathChar(c));
@@ -1312,9 +1214,9 @@ void Cursor::insert(MathAtom const & t)
 
 void Cursor::insert(Inset * inset0)
 {
-	LASSERT(inset0, /**/);
+	LASSERT(inset0, return);
 	if (inMathed())
-		insert(MathAtom(inset0));
+		insert(MathAtom(inset0->asInsetMath()));
 	else {
 		text()->insertInset(*this, inset0);
 		inset0->setBuffer(bv_->buffer());
@@ -1325,7 +1227,7 @@ void Cursor::insert(Inset * inset0)
 }
 
 
-void Cursor::niceInsert(docstring const & t, Parse::flags f, bool enter)
+int Cursor::niceInsert(docstring const & t, Parse::flags f, bool enter)
 {
 	MathData ar(buffer());
 	asArray(t, ar, f);
@@ -1333,6 +1235,7 @@ void Cursor::niceInsert(docstring const & t, Parse::flags f, bool enter)
 		niceInsert(ar[0]);
 	else
 		insert(ar);
+	return ar.size();
 }
 
 
@@ -1351,6 +1254,15 @@ void Cursor::niceInsert(MathAtom const & t)
 		MathData ar(buffer());
 		asArray(safe, ar);
 		insert(ar);
+	} else if (t->asMacro() && !safe.empty()) {
+		MathData ar(buffer());
+		asArray(safe, ar);
+		docstring const name = t->asMacro()->name();
+		MacroData const * data = buffer()->getMacro(name);
+		if (data && data->numargs() - data->optionals() > 0) {
+			plainInsert(MathAtom(new InsetMathBrace(ar)));
+			posBackward();
+		}
 	}
 }
 
@@ -1369,8 +1281,6 @@ void Cursor::insert(MathData const & ar)
 
 bool Cursor::backspace()
 {
-	autocorrect() = false;
-
 	if (selection()) {
 		cap::eraseSelection(*this);
 		return true;
@@ -1409,7 +1319,7 @@ bool Cursor::backspace()
 		// let's require two backspaces for 'big stuff' and
 		// highlight on the first
 		resetAnchor();
-		setSelection(true);
+		selection(true);
 		--pos();
 	} else {
 		--pos();
@@ -1421,7 +1331,6 @@ bool Cursor::backspace()
 
 bool Cursor::erase()
 {
-	autocorrect() = false;
 	if (inMacroMode())
 		return true;
 
@@ -1457,7 +1366,7 @@ bool Cursor::erase()
 	// 'clever' UI hack: only erase large items if previously slected
 	if (pos() != lastpos() && nextAtom()->nargs() > 0) {
 		resetAnchor();
-		setSelection(true);
+		selection(true);
 		++pos();
 	} else {
 		plainErase();
@@ -1476,7 +1385,6 @@ bool Cursor::up()
 	if (disp_.dispatched())
 		return true;
 	setCursor(save);
-	autocorrect() = false;
 	return false;
 }
 
@@ -1490,7 +1398,6 @@ bool Cursor::down()
 	if (disp_.dispatched())
 		return true;
 	setCursor(save);
-	autocorrect() = false;
 	return false;
 }
 
@@ -1530,7 +1437,7 @@ bool Cursor::macroModeClose()
 		// we have to resolve the macro here manually and check its arity
 		// to put the selection behind it if arity > 0.
 		MacroData const * data = buffer()->getMacro(atomAsMacro->name());
-		if (selection.size() > 0 && data && data->numargs() - data->optionals() > 0) {
+		if (!selection.empty() && data && data->numargs() - data->optionals() > 0) {
 			macroArg = true;
 			atomAsMacro->setDisplayMode(MathMacro::DISPLAY_INTERACTIVE_INIT, 1);
 		} else
@@ -1541,7 +1448,7 @@ bool Cursor::macroModeClose()
 	// insert remembered selection into first argument of a non-macro
 	else if (atom.nucleus()->nargs() > 0)
 		atom.nucleus()->cell(0).append(selection);
-	
+
 	plainInsert(atom);
 
 	// finally put the macro argument behind, if needed
@@ -1551,7 +1458,7 @@ bool Cursor::macroModeClose()
 		else
 			insert(selection);
 	}
-	
+
 	return true;
 }
 
@@ -1603,7 +1510,7 @@ bool Cursor::inMacroMode() const
 {
 	if (!inMathed())
 		return false;
-	if (pos() == 0)
+	if (pos() == 0 || cell().empty())
 		return false;
 	InsetMathUnknown const * p = prevAtom()->asUnknownInset();
 	return p && !p->final();
@@ -1662,7 +1569,9 @@ void Cursor::normalize()
 			<< pos() << ' ' << lastpos() <<  " in idx: " << idx()
 		       << " in atom: '";
 		odocstringstream os;
-		WriteStream wi(os, false, true, WriteStream::wsDefault);
+		TexRow texrow(false);
+		otexrowstream ots(os,texrow);
+		WriteStream wi(ots, false, true, WriteStream::wsDefault);
 		inset().asInsetMath()->write(wi);
 		lyxerr << to_utf8(os.str()) << endl;
 		pos() = lastpos();
@@ -1688,13 +1597,13 @@ bool Cursor::upDownInMath(bool up)
 	else if (inset().asInsetText() && xo - textTargetOffset() != x_target()) {
 		// In text mode inside the line (not left or right) possibly set a new target_x,
 		// but only if we are somewhere else than the previous target-offset.
-		
+
 		// We want to keep the x-target on subsequent up/down movements
 		// that cross beyond the end of short lines. Thus a special
 		// handling when the cursor is at the end of line: Use the new
 		// x-target only if the old one was before the end of line
 		// or the old one was after the beginning of the line
-		bool inRTL = isWithinRtlParagraph(*this);
+		bool inRTL = innerParagraph().isRTL(bv().buffer().params());
 		bool left;
 		bool right;
 		if (inRTL) {
@@ -1724,7 +1633,7 @@ bool Cursor::upDownInMath(bool up)
 				push(*const_cast<InsetMathScript*>(p));
 				idx() = p->idxOfScript(up);
 				pos() = lastpos();
-				
+
 				// we went in the right direction? Otherwise don't jump into the script
 				int x;
 				int y;
@@ -1737,7 +1646,7 @@ bool Cursor::upDownInMath(bool up)
 					return true;
 			}
 		}
-		
+
 		// try right
 		if (pos() != lastpos()) {
 			InsetMathScript const * p = nextAtom()->asScriptInset();
@@ -1745,7 +1654,7 @@ bool Cursor::upDownInMath(bool up)
 				push(*const_cast<InsetMathScript*>(p));
 				idx() = p->idxOfScript(up);
 				pos() = 0;
-				
+
 				// we went in the right direction? Otherwise don't jump into the script
 				int x;
 				int y;
@@ -1759,16 +1668,16 @@ bool Cursor::upDownInMath(bool up)
 			}
 		}
 	}
-		
+
 	// try to find an inset that knows better then we,
 	if (inset().idxUpDown(*this, up)) {
 		//lyxerr << "idxUpDown triggered" << endl;
 		// try to find best position within this inset
 		if (!selection())
-			setCursor(bruteFind2(*this, xo, yo));
+			setCursor(bruteFind(*this, xo, yo));
 		return true;
 	}
-	
+
 	// any improvement going just out of inset?
 	if (popBackward() && inMathed()) {
 		//lyxerr << "updown: popBackward succeeded" << endl;
@@ -1779,7 +1688,7 @@ bool Cursor::upDownInMath(bool up)
 		if (up ? ynew < yold : ynew > yold)
 			return true;
 	}
-	
+
 	// no success, we are probably at the document top or bottom
 	operator=(old);
 	return false;
@@ -1790,13 +1699,13 @@ bool Cursor::atFirstOrLastRow(bool up)
 {
 	TextMetrics const & tm = bv_->textMetrics(text());
 	ParagraphMetrics const & pm = tm.parMetrics(pit());
-	
+
 	int row;
 	if (pos() && boundary())
 		row = pm.pos2row(pos() - 1);
 	else
 		row = pm.pos2row(pos());
-	
+
 	if (up) {
 		if (pit() == 0 && row == 0)
 			return true;
@@ -1808,9 +1717,10 @@ bool Cursor::atFirstOrLastRow(bool up)
 	return false;
 }
 
+
 bool Cursor::upDownInText(bool up, bool & updateNeeded)
 {
-	LASSERT(text(), /**/);
+	LASSERT(text(), return false);
 
 	// where are we?
 	int xo = 0;
@@ -1825,15 +1735,17 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 		setTargetX(xo);
 	else if (xo - textTargetOffset() != x_target() &&
 					 depth() == beforeDispatchCursor_.depth()) {
-		// In text mode inside the line (not left or right) possibly set a new target_x,
-		// but only if we are somewhere else than the previous target-offset.
-		
-		// We want to keep the x-target on subsequent up/down movements
-		// that cross beyond the end of short lines. Thus a special
-		// handling when the cursor is at the end of line: Use the new
-		// x-target only if the old one was before the end of line
-		// or the old one was after the beginning of the line
-		bool inRTL = isWithinRtlParagraph(*this);
+		// In text mode inside the line (not left or right)
+		// possibly set a new target_x, but only if we are
+		// somewhere else than the previous target-offset.
+
+		// We want to keep the x-target on subsequent up/down
+		// movements that cross beyond the end of short lines.
+		// Thus a special handling when the cursor is at the
+		// end of line: Use the new x-target only if the old
+		// one was before the end of line or the old one was
+		// after the beginning of the line
+		bool inRTL = innerParagraph().isRTL(bv().buffer().params());
 		bool left;
 		bool right;
 		if (inRTL) {
@@ -1851,7 +1763,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 			xo = targetX();
 	} else
 		xo = targetX();
-		
+
 	// first get the current line
 	TextMetrics & tm = bv_->textMetrics(text());
 	ParagraphMetrics const & pm = tm.parMetrics(pit());
@@ -1860,7 +1772,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 		row = pm.pos2row(pos() - 1);
 	else
 		row = pm.pos2row(pos());
-		
+
 	if (atFirstOrLastRow(up)) {
 		// Is there a place for the cursor to go ? If yes, we
 		// can execute the DEPM, otherwise we should keep the
@@ -1873,11 +1785,11 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 				break;
 			}
 
-		// will a next dispatch follow and if there is a new 
+		// will a next dispatch follow and if there is a new
 		// dispatch will it move the cursor out ?
 		if (depth() > 1 && valid_destination) {
 			// The cursor hasn't changed yet. This happens when
-			// you e.g. move out of an inset. And to give the 
+			// you e.g. move out of an inset. And to give the
 			// DEPM the possibility of doing something we must
 			// provide it with two different cursors. (Lgb, vfr)
 			dummy = *this;
@@ -1902,19 +1814,21 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 		else
 			tm.editXY(*this, xo, yo + textRow().descent() + 1);
 		clearSelection();
-		
-		// This happens when you move out of an inset.  
-		// And to give the DEPM the possibility of doing  
-		// something we must provide it with two different  
-		// cursors. (Lgb)  
+
+		// This happens when you move out of an inset.
+		// And to give the DEPM the possibility of doing
+		// something we must provide it with two different
+		// cursors. (Lgb)
 		Cursor dummy = *this;
 		if (dummy == old)
 			++dummy.pos();
 		if (bv().checkDepm(dummy, old)) {
 			updateNeeded = true;
-			// Make sure that cur gets back whatever happened to dummy (Lgb) 
+			// Make sure that cur gets back whatever happened to dummy (Lgb)
 			operator=(dummy);
 		}
+		if (inTexted() && pos() && paragraph().isEnvSeparator(pos() - 1))
+			posBackward();
 	} else {
 		// if there is a selection, we stay out of any inset,
 		// and just jump to the right position:
@@ -1942,17 +1856,11 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 				next_row = 0;
 			}
 		}
-		top().pos() = min(tm.x2pos(pit(), next_row, xo), top().lastpos());
 
-		int const xpos = tm.x2pos(pit(), next_row, xo);
-		bool const at_end_row = xpos == tm.x2pos(pit(), next_row, tm.width());
-		bool const at_beg_row = xpos == tm.x2pos(pit(), next_row, 0);
-
-		if (at_end_row && at_beg_row)
-			// make sure the cursor ends up on this row
-			boundary(false);
-		else
-			boundary(at_end_row);
+		Row const & real_next_row = tm.parMetrics(pit()).rows()[next_row];
+		bool bound = false;
+		top().pos() = tm.getPosNearX(real_next_row, xo, bound);
+		boundary(bound);
 
 		updateNeeded |= bv().checkDepm(*this, old);
 	}
@@ -1961,7 +1869,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
 		forceBufferUpdate();
 	updateTextTargetOffset();
 	return true;
-}	
+}
 
 
 void Cursor::handleFont(string const & font)
@@ -2015,16 +1923,21 @@ void Cursor::errorMessage(docstring const & msg) const
 }
 
 
-static docstring parbreak(InsetCode code)
+namespace {
+
+docstring parbreak(Cursor const * cur)
 {
 	odocstringstream os;
 	os << '\n';
-	// only add blank line if we're not in an ERT or Listings inset
-	if (code != ERT_CODE && code != LISTINGS_CODE)
+	// only add blank line if we're not in a ParbreakIsNewline situation
+	if (!cur->inset().getLayout().parbreakIsNewline()
+	    && !cur->paragraph().layout().parbreak_is_newline)
 		os << '\n';
 	return os.str();
 }
 
+}
+
 
 docstring Cursor::selectionAsString(bool with_label) const
 {
@@ -2059,13 +1972,13 @@ docstring Cursor::selectionAsString(bool with_label) const
 	// First paragraph in selection
 	docstring result = pars[startpit].
 		asString(startpos, pars[startpit].size(), label)
-		+ parbreak(inset().lyxCode());
+		+ parbreak(this);
 
 	// The paragraphs in between (if any)
 	for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
 		Paragraph const & par = pars[pit];
 		result += par.asString(0, par.size(), label)
-			+ parbreak(inset().lyxCode());
+			+ parbreak(this);
 	}
 
 	// Last paragraph in selection
@@ -2080,6 +1993,13 @@ docstring Cursor::currentState() const
 	if (inMathed()) {
 		odocstringstream os;
 		info(os);
+#ifdef DEVEL_VERSION
+		InsetMath * math = inset().asInsetMath();
+		if (math)
+			os << _(", Inset: ") << math->id();
+		os << _(", Cell: ") << idx();
+		os << _(", Position: ") << pos();
+#endif
 		return os.str();
 	}
 
@@ -2108,31 +2028,31 @@ Encoding const * Cursor::getEncoding() const
 }
 
 
-void Cursor::undispatched()
+void Cursor::undispatched() const
 {
 	disp_.dispatched(false);
 }
 
 
-void Cursor::dispatched()
+void Cursor::dispatched() const
 {
 	disp_.dispatched(true);
 }
 
 
-void Cursor::screenUpdateFlags(Update::flags f)
+void Cursor::screenUpdateFlags(Update::flags f) const
 {
-	disp_.update(f);
+	disp_.screenUpdate(f);
 }
 
 
-void Cursor::forceBufferUpdate()
+void Cursor::forceBufferUpdate() const
 {
 	disp_.forceBufferUpdate();
 }
 
 
-void Cursor::clearBufferUpdate()
+void Cursor::clearBufferUpdate() const
 {
 	disp_.clearBufferUpdate();
 }
@@ -2144,38 +2064,38 @@ bool Cursor::needBufferUpdate() const
 }
 
 
-void Cursor::noScreenUpdate()
+void Cursor::noScreenUpdate() const
 {
-	disp_.update(Update::None);
+	disp_.screenUpdate(Update::None);
 }
 
 
 Font Cursor::getFont() const
 {
-	// The logic here should more or less match to the Cursor::setCurrentFont
-	// logic, i.e. the cursor height should give a hint what will happen
-	// if a character is entered.
-	
+	// The logic here should more or less match to the
+	// Cursor::setCurrentFont logic, i.e. the cursor height should
+	// give a hint what will happen if a character is entered.
+
 	// HACK. far from being perfect...
 
 	CursorSlice const & sl = innerTextSlice();
 	Text const & text = *sl.text();
 	Paragraph const & par = text.getPar(sl.pit());
-	
+
 	// on boundary, so we are really at the character before
 	pos_type pos = sl.pos();
 	if (pos > 0 && boundary())
 		--pos;
-	
+
 	// on space? Take the font before (only for RTL boundary stay)
 	if (pos > 0) {
 		TextMetrics const & tm = bv().textMetrics(&text);
 		if (pos == sl.lastpos()
-			|| (par.isSeparator(pos) 
+			|| (par.isSeparator(pos)
 			&& !tm.isRTLBoundary(sl.pit(), pos)))
 			--pos;
 	}
-	
+
 	// get font at the position
 	Font font = par.getFont(buffer()->params(), pos,
 		text.outerFont(sl.pit()));
@@ -2188,8 +2108,9 @@ bool Cursor::fixIfBroken()
 {
 	bool const broken_cursor = DocIterator::fixIfBroken();
 	bool const broken_anchor = anchor_.fixIfBroken();
-	
+
 	if (broken_cursor || broken_anchor) {
+		clearNewWordPosition();
 		clearSelection();
 		return true;
 	}
@@ -2197,6 +2118,17 @@ bool Cursor::fixIfBroken()
 }
 
 
+void Cursor::sanitize()
+{
+	setBuffer(&bv_->buffer());
+	DocIterator::sanitize();
+	if (selection())
+		anchor_.sanitize();
+	else
+		resetAnchor();
+}
+
+
 bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur)
 {
 	// find inset in common
@@ -2229,7 +2161,7 @@ bool notifyCursorLeavesOrEnters(Cursor const & old, Cursor & cur)
 		if (cur[i].inset().notifyCursorEnters(cur))
 			return true;
 	}
-	
+
 	return false;
 }
 
@@ -2265,9 +2197,7 @@ void Cursor::setCurrentFont()
 	// get font
 	BufferParams const & bufparams = buffer()->params();
 	current_font = par.getFontSettings(bufparams, cpos);
-	current_font.setMisspelled(false);
 	real_current_font = tm.displayFont(cpit, cpos);
-	real_current_font.setMisspelled(false);
 
 	// special case for paragraph end
 	if (cs.pos() == lastpos()
@@ -2284,28 +2214,18 @@ void Cursor::setCurrentFont()
 
 bool Cursor::textUndo()
 {
-	DocIterator dit = *this;
-	// Undo::textUndo() will modify dit.
-	if (!buffer()->undo().textUndo(dit))
+	if (!buffer()->undo().textUndo(*this))
 		return false;
-	// Set cursor
-	setCursor(dit);
-	clearSelection();
-	fixIfBroken();
+	sanitize();
 	return true;
 }
 
 
 bool Cursor::textRedo()
 {
-	DocIterator dit = *this;
-	// Undo::textRedo() will modify dit.
-	if (!buffer()->undo().textRedo(dit))
+	if (!buffer()->undo().textRedo(*this))
 		return false;
-	// Set cursor
-	setCursor(dit);
-	clearSelection();
-	fixIfBroken();
+	sanitize();
 	return true;
 }
 
@@ -2318,25 +2238,25 @@ void Cursor::finishUndo() const
 
 void Cursor::beginUndoGroup() const
 {
-	buffer()->undo().beginUndoGroup();
+	buffer()->undo().beginUndoGroup(*this);
 }
 
 
 void Cursor::endUndoGroup() const
 {
-	buffer()->undo().endUndoGroup();
+	buffer()->undo().endUndoGroup(*this);
 }
 
 
-void Cursor::recordUndo(UndoKind kind, pit_type from, pit_type to) const
+void Cursor::recordUndo(pit_type from, pit_type to) const
 {
-	buffer()->undo().recordUndo(*this, kind, from, to);
+	buffer()->undo().recordUndo(*this, from, to);
 }
 
 
-void Cursor::recordUndo(UndoKind kind, pit_type from) const
+void Cursor::recordUndo(pit_type from) const
 {
-	buffer()->undo().recordUndo(*this, kind, from);
+	buffer()->undo().recordUndo(*this, from, pit());
 }
 
 
@@ -2346,15 +2266,21 @@ void Cursor::recordUndo(UndoKind kind) const
 }
 
 
-void Cursor::recordUndoInset(UndoKind kind) const
+void Cursor::recordUndoInset(Inset const * in) const
+{
+	buffer()->undo().recordUndoInset(*this, in);
+}
+
+
+void Cursor::recordUndoFullBuffer() const
 {
-	buffer()->undo().recordUndoInset(*this, kind);
+	buffer()->undo().recordUndoFullBuffer(*this);
 }
 
 
-void Cursor::recordUndoFullDocument() const
+void Cursor::recordUndoBufferParams() const
 {
-	buffer()->undo().recordUndoFullDocument(*this);
+	buffer()->undo().recordUndoBufferParams(*this);
 }
 
 
@@ -2366,7 +2292,7 @@ void Cursor::recordUndoSelection() const
 		else
 			recordUndo();
 	} else {
-		buffer()->undo().recordUndo(*this, ATOMIC_UNDO,
+		buffer()->undo().recordUndo(*this,
 			selBegin().pit(), selEnd().pit());
 	}
 }
@@ -2377,9 +2303,15 @@ void Cursor::checkBufferStructure()
 	Buffer const * master = buffer()->masterBuffer();
 	master->tocBackend().updateItem(*this);
 	if (master != buffer() && !master->hasGuiDelegate())
-		// In case the master has no gui associated with it, 
+		// In case the master has no gui associated with it,
 		// the TocItem is not updated (part of bug 5699).
 		buffer()->tocBackend().updateItem(*this);
+
+	// If the last tracked change of the paragraph has just been
+	// deleted, then we need to recompute the buffer flag
+	// tracked_changes_present_.
+	if (inTexted() && paragraph().isChangeUpdateRequired())
+		disp_.forceChangesUpdate();
 }