X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=57286d9a6cbac47bd7cb11d551aa822720a528bb;hb=4089ff1ec36292a37866c81d844e9ebd6dffd850;hp=e574115c31be85de4349a1ef7ab1e60db2e19f2a;hpb=17e435c47e36effd36d25cec900369e04f6acb4e;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index e574115c31..57286d9a6c 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -226,6 +226,15 @@ CursorSlice const & DocIterator::innerTextSlice() const
 }
 
 
+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;
@@ -449,6 +458,28 @@ void DocIterator::backwardPos()
 }
 
 
+#if 0
+// works, but currently not needed
+void DocIterator::backwardInset()
+{
+	backwardPos();
+
+	while (!empty() && !nextInset()) {
+		if (inTexted()) {
+			pos_type const lastp = lastpos();
+			Paragraph const & par = paragraph();
+			pos_type & pos = top().pos();
+			while (pos > 0 && (pos == lastp || !par.isInset(pos)))
+				--pos;
+			if (pos > 0)
+				break;
+		}
+		backwardPos();
+	}
+}
+#endif
+
+
 bool DocIterator::hasPart(DocIterator const & it) const
 {
 	// it can't be a part if it is larger
@@ -460,6 +491,19 @@ bool DocIterator::hasPart(DocIterator const & it) const
 }
 
 
+bool DocIterator::allowSpellCheck() const
+{
+	/// spell check is disabled if the iterator position
+	/// is inside of an inset which disables the spell checker
+	size_t const n = depth();
+	for (size_t i = 0; i < n; ++i) {
+		if (!slices_[i].inset_->allowSpellCheck())
+			return false;
+	}
+	return true;
+}
+
+
 void DocIterator::updateInsets(Inset * inset)
 {
 	// this function re-creates the cache of inset pointers.
@@ -555,8 +599,8 @@ void DocIterator::sanitize()
 			fixIfBroken();
 			break;
 		}
-		if (!inset->editable()) {
-			LYXERR0("Inset found on cursor stack is not editable.");
+		if (!inset->isActive()) {
+			LYXERR0("Inset found on cursor stack is not active.");
 			fixIfBroken();
 			break;
 		}
@@ -627,9 +671,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;
 }