X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=f396ef5869f931b2c92454baa49f55a131106402;hb=0b17cb113523fb23c43064709e9b6606fe80914c;hp=40c4ae4adc278a5f91cc11a0b5343685efb4bfe6;hpb=6192345f60bd77c9223c1649956d6814d48ca26b;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 40c4ae4adc..f396ef5869 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -17,6 +17,7 @@
 #include "Buffer.h"
 #include "InsetList.h"
 #include "Paragraph.h"
+#include "LyXRC.h"
 #include "Text.h"
 
 #include "mathed/MathData.h"
@@ -27,10 +28,12 @@
 
 #include "support/debug.h"
 #include "support/lassert.h"
+#include "support/lstrings.h"
 
 #include <ostream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -69,6 +72,23 @@ DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0)
 }
 
 
+DocIterator DocIterator::clone(Buffer * buffer) const
+{
+	LASSERT(buffer->isClone(), return DocIterator());
+	Inset * inset = &buffer->inset();
+	DocIterator dit(buffer);
+	size_t const n = slices_.size();
+	for (size_t i = 0 ; i != n; ++i) {
+		LASSERT(inset, /**/);
+		dit.push_back(slices_[i]);
+		dit.top().inset_ = inset;
+		if (i + 1 != n)
+			inset = dit.nextInset();
+	}
+	return dit;
+}
+
+
 bool DocIterator::inRegexped() const
 {
 	InsetMathHull * i = dynamic_cast<InsetMathHull *>(inset().asInsetMath());
@@ -89,7 +109,8 @@ Inset * DocIterator::nextInset() const
 	if (pos() == lastpos())
 		return 0;
 	if (pos() > lastpos()) {
-		LYXERR0("Should not happen, but it does. ");
+		LYXERR0("Should not happen, but it does: pos() = "
+			<< pos() << ", lastpos() = " << lastpos());
 		return 0;
 	}
 	if (inMathed())
@@ -107,7 +128,7 @@ Inset * DocIterator::prevInset() const
 		if (cell().empty())
 			// FIXME: this should not happen but it does.
 			// See bug 3189
-			// http://bugzilla.lyx.org/show_bug.cgi?id=3189
+			// http://www.lyx.org/trac/ticket/3189
 			return 0;
 		else
 			return prevAtom().nucleus();
@@ -246,12 +267,7 @@ MathData & DocIterator::cell() const
 Text * DocIterator::innerText() const
 {
 	LASSERT(!empty(), /**/);
-	// go up until first non-0 text is hit
-	// (innermost text is 0 in mathed)
-	for (int i = depth() - 1; i >= 0; --i)
-		if (slices_[i].text())
-			return slices_[i].text();
-	return 0;
+	return innerTextSlice().text();
 }
 
 
@@ -312,7 +328,7 @@ void DocIterator::forwardPosIgnoreCollapsed()
 	// FIXME: the check for asInsetMath() shouldn't be necessary
 	// but math insets do not return a sensible editable() state yet.
 	if (nextinset && !nextinset->asInsetMath()
-	    && nextinset->editable() != Inset::HIGHLY_EDITABLE) {
+	    && !nextinset->editable()) {
 		++top().pos();
 		return;
 	}