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

diff --git a/src/cursor.C b/src/cursor.C
index 4dacb3674a..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"
@@ -374,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;
 }
 
@@ -403,17 +405,11 @@ void LCursor::getPos(int & x, int & y) const
 }
 
 
-Row & LCursor::textRow()
-{
-	BOOST_ASSERT(!paragraph().rows().empty());
-	return paragraph().getRow(pos(), boundary());
-}
-
-
 Row const & LCursor::textRow() const
 {
-	BOOST_ASSERT(!paragraph().rows().empty());
-	return paragraph().getRow(pos(), boundary());
+	ParagraphMetrics const & pm = bv().parMetrics(text(), pit());
+	BOOST_ASSERT(!pm.rows().empty());
+	return pm.getRow(pos(), boundary());
 }
 
 
@@ -547,8 +543,12 @@ void LCursor::info(odocstream & os) const
 		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 << "                    ";
 }
@@ -562,6 +562,7 @@ bool LCursor::selHandle(bool sel)
 
 	resetAnchor();
 	selection() = sel;
+	cap::saveSelection(*this);
 	return true;
 }
 
@@ -601,7 +602,6 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur)
 #include "mathed/InsetMathScript.h"
 #include "mathed/InsetMathUnknown.h"
 #include "mathed/MathFactory.h"
-#include "mathed/MathMacroArgument.h"
 #include "mathed/MathStream.h"
 #include "mathed/MathSupport.h"
 
@@ -769,7 +769,7 @@ bool LCursor::backspace()
 	autocorrect() = false;
 
 	if (selection()) {
-		cap::selDel(*this);
+		cap::eraseSelection(*this);
 		return true;
 	}
 
@@ -821,7 +821,7 @@ bool LCursor::erase()
 		return true;
 
 	if (selection()) {
-		cap::selDel(*this);
+		cap::eraseSelection(*this);
 		return true;
 	}
 
@@ -1203,18 +1203,18 @@ docstring LCursor::selectionAsString(bool label) const
 }
 
 
-string LCursor::currentState()
+docstring LCursor::currentState()
 {
 	if (inMathed()) {
 		odocstringstream os;
 		info(os);
-		return to_utf8(os.str());
+		return os.str();
 	}
 
 	if (inTexted())
 		return text()->currentState(*this);
 
-	return string();
+	return docstring();
 }