X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=f396ef5869f931b2c92454baa49f55a131106402;hb=b7ab77c2480f31bc39ae076d83f212674ecb63b9;hp=51433d47814b617463aa30273e78d02b75c2a7f6;hpb=1ec0b390f5eab86253f121e5a098ce4f3c97a98b;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 51433d4781..f396ef5869 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -72,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());
@@ -92,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())
@@ -110,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();
@@ -249,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();
 }
 
 
@@ -315,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;
 	}
@@ -610,16 +623,4 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
 }
 
 
-bool isLetter(DocIterator const & dit)
-{
-	return dit.inTexted()
-		&& dit.inset().allowSpellCheck()
-		&& dit.pos() != dit.lastpos()
-		&& (dit.paragraph().isLetter(dit.pos())
-		    // We want to pass the ' and escape chars to ispell
-		    || contains(from_utf8(lyxrc.spellchecker_esc_chars + '\''),
-				dit.paragraph().getChar(dit.pos())))
-		&& !dit.paragraph().isDeleted(dit.pos());
-}
-
 } // namespace lyx