X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FDocIterator.cpp;h=fe1250ff335bf5d91330d12c79ca7bf5c60f241a;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=9783db14a10d9562df0444c144ced76037b4f87b;hpb=e93444e7e9d6f1aeabd356d414d4e5af3cea8569;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 9783db14a1..fe1250ff33 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -26,6 +26,7 @@
 
 #include "insets/InsetTabular.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/gettext.h"
@@ -207,7 +208,7 @@ FontSpan DocIterator::locateWord(word_location const loc) const
 	return f;
 }
 
-	
+
 CursorSlice const & DocIterator::innerTextSlice() const
 {
 	LBUFERR(!empty());
@@ -226,6 +227,23 @@ CursorSlice const & DocIterator::innerTextSlice() const
 }
 
 
+docstring DocIterator::paragraphGotoArgument() const
+{
+	CursorSlice const & s = innerTextSlice();
+	return convert<docstring>(s.paragraph().id()) + ' ' +
+		convert<docstring>(s.pos());
+}
+
+
+DocIterator DocIterator::getInnerText() const
+{
+	DocIterator texted = *this;
+	while (!texted.inTexted())
+		texted.pop_back();
+	return texted;
+}
+
+
 pit_type DocIterator::lastpit() const
 {
 	return inMathed() ? 0 : text()->paragraphs().size() - 1;
@@ -300,6 +318,24 @@ Inset * DocIterator::innerInsetOfType(int code) const
 }
 
 
+bool DocIterator::posBackward()
+{
+	if (pos() == 0)
+		return false;
+	--pos();
+	return true;
+}
+
+
+bool DocIterator::posForward()
+{
+	if (pos() == lastpos())
+		return false;
+	++pos();
+	return true;
+}
+
+
 // This duplicates code above, but is in the critical path.
 // So please think twice before adding stuff
 void DocIterator::forwardPos()
@@ -526,7 +562,7 @@ bool DocIterator::fixIfBroken()
 	size_t n = slices_.size();
 	for (; i != n; ++i) {
 		CursorSlice & cs = slices_[i];
-		if (&cs.inset() != inset) {
+		if (&cs.inset() != inset || cs.nargs() == 0) {
 			// the whole slice is wrong, chop off this as well
 			--i;
 			LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
@@ -590,8 +626,7 @@ void DocIterator::sanitize()
 			fixIfBroken();
 			break;
 		}
-		if ((inset->inMathed() && !inset->isActive())
-		    || (!inset->inMathed() && !inset->editable())) {
+		if (!inset->isActive()) {
 			LYXERR0("Inset found on cursor stack is not active.");
 			fixIfBroken();
 			break;
@@ -663,9 +698,9 @@ ostream & operator<<(ostream & os, DocIterator const & dit)
 
 ///////////////////////////////////////////////////////
 
-StableDocIterator::StableDocIterator(DocIterator const & dit)
+StableDocIterator::StableDocIterator(DocIterator const & dit) :
+	data_(dit.internalData())
 {
-	data_ = dit.internalData();
 	for (size_t i = 0, n = data_.size(); i != n; ++i)
 		data_[i].inset_ = 0;
 }