X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=57286d9a6cbac47bd7cb11d551aa822720a528bb;hb=994844cb34eb1071f3b653fc220a719cde20d00c;hp=35b23a98b72f147018160be7941fc18002805c98;hpb=6b2232a29c682d8e62d1d2b963bb1a70bee4330b;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 35b23a98b7..57286d9a6c 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -27,6 +27,8 @@
 #include "insets/InsetTabular.h"
 
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
+#include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
 
@@ -80,7 +82,7 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 	DocIterator dit(buffer);
 	size_t const n = slices_.size();
 	for (size_t i = 0 ; i != n; ++i) {
-		LASSERT(inset, /**/);
+		LBUFERR(inset);
 		dit.push_back(slices_[i]);
 		dit.top().inset_ = inset;
 		if (i + 1 != n)
@@ -143,7 +145,7 @@ Inset * DocIterator::prevInset() const
 
 Inset * DocIterator::realInset() const
 {
-	LASSERT(inTexted(), /**/);
+	LASSERT(inTexted(), return 0);
 	// if we are in a tabular, we need the cell
 	if (inset().lyxCode() == TABULAR_CODE) {
 		InsetTabular * tabular = inset().asInsetTabular();
@@ -172,23 +174,24 @@ MathAtom & DocIterator::nextAtom() const
 
 Text * DocIterator::text() const
 {
-	LASSERT(!empty(), /**/);
+	LASSERT(!empty(), return 0);
 	return top().text();
 }
 
 
 Paragraph & DocIterator::paragraph() const
 {
-	if (!inTexted())
+	if (!inTexted()) {
 		LYXERR0(*this);
-	LASSERT(inTexted(), /**/);
+		LBUFERR(false);
+	}
 	return top().paragraph();
 }
 
 
 Paragraph & DocIterator::innerParagraph() const
 {
-	LASSERT(!empty(), /**/);
+	LBUFERR(!empty());
 	return innerTextSlice().paragraph();
 }
 
@@ -207,18 +210,28 @@ FontSpan DocIterator::locateWord(word_location const loc) const
 	
 CursorSlice const & DocIterator::innerTextSlice() const
 {
-	LASSERT(!empty(), /**/);
+	LBUFERR(!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];
 
-	// This case is in principe not possible. We _must_
+	// This case is in principle not possible. We _must_
 	// be inside a Text.
-	LASSERT(false, /**/);
-	static CursorSlice dummy;
-	return dummy;
+	LBUFERR(false);
+	// Squash warning
+	static const CursorSlice c;
+	return c;
+}
+
+
+DocIterator DocIterator::getInnerText() const
+{
+	DocIterator texted = *this;
+	while (!texted.inTexted())
+		texted.pop_back();
+	return texted;
 }
 
 
@@ -282,7 +295,7 @@ MathData & DocIterator::cell() const
 
 Text * DocIterator::innerText() const
 {
-	LASSERT(!empty(), /**/);
+	LASSERT(!empty(), return 0);
 	return innerTextSlice().text();
 }
 
@@ -445,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
@@ -456,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.
@@ -464,7 +512,7 @@ void DocIterator::updateInsets(Inset * inset)
 	size_t const n = slices_.size();
 	slices_.resize(0);
 	for (size_t i = 0 ; i < n; ++i) {
-		LASSERT(inset, /**/);
+		LBUFERR(inset);
 		push_back(dit[i]);
 		top().inset_ = inset;
 		if (i + 1 != n)
@@ -551,6 +599,11 @@ void DocIterator::sanitize()
 			fixIfBroken();
 			break;
 		}
+		if (!inset->isActive()) {
+			LYXERR0("Inset found on cursor stack is not active.");
+			fixIfBroken();
+			break;
+		}
 		push_back(sl[i]);
 		top().inset_ = inset;
 		if (fixIfBroken())
@@ -618,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;
 }