X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=a059ad18d2110b52fe88153b65ef4d5669ed288e;hb=37d30288af89e760f642e823fe8c7e9d78e5045d;hp=6115bf287992a0f7760ee9095bf816b675c6abc9;hpb=c18baee46900b95e1a6092a85abca7d682235d32;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 6115bf2879..a059ad18d2 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"
 
@@ -42,6 +44,7 @@ DocIterator::DocIterator()
 	: boundary_(false), inset_(0), buffer_(0)
 {}
 
+
 // We could be able to get rid of this if only every BufferView were
 // associated to a buffer on construction.
 DocIterator::DocIterator(Buffer * buf)
@@ -72,10 +75,30 @@ 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) {
+		LBUFERR(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());
-	return i && i->getType() == hullRegexp;
+	InsetMath * im = inset().asInsetMath();
+	if (!im) 
+		return false;
+	InsetMathHull * hull = im->asHullInset();
+	return hull && hull->getType() == hullRegexp;
 }
 
 
@@ -92,7 +115,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 +134,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();
@@ -121,11 +145,11 @@ 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 = static_cast<InsetTabular&>(inset());
-		return tabular.cell(idx()).get();
+		InsetTabular * tabular = inset().asInsetTabular();
+		return tabular->cell(idx()).get();
 	}
 	return &inset();
 }
@@ -150,41 +174,64 @@ 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();
 }
 
 
+FontSpan DocIterator::locateWord(word_location const loc) const
+{
+	FontSpan f = FontSpan();
+
+	if (!top().text()->empty()) {
+		f.first = pos();
+		top().paragraph().locateWord(f.first, f.last, loc);
+	}
+	return f;
+}
+
+	
 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;
 }
 
 
@@ -248,13 +295,8 @@ 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;
+	LASSERT(!empty(), return 0);
+	return innerTextSlice().text();
 }
 
 
@@ -416,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
@@ -427,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.
@@ -435,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)
@@ -502,6 +579,41 @@ bool DocIterator::fixIfBroken()
 }
 
 
+void DocIterator::sanitize()
+{
+	// keep a copy of the slices
+	vector<CursorSlice> const sl = slices_;
+	slices_.clear();
+	if (buffer_)
+		inset_ = &buffer_->inset();
+	Inset * inset = inset_;
+	// re-add the slices one by one, and adjust the inset pointer.
+	for (size_t i = 0, n = sl.size(); i != n; ++i) {
+		if (inset == 0) {
+			// FIXME
+			LYXERR0(" Should not happen, but does e.g. after "
+				"C-n C-l C-z S-C-z\n"
+				<< " or when a Buffer has been concurrently edited by two views"
+				<< '\n' << "dit: " << *this << '\n'
+				<< " lastpos: " << slices_[i].lastpos());
+			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())
+			break;
+		if (i + 1 != n)
+			inset = nextInset();
+	}
+}
+
+
 int DocIterator::find(MathData const & cell) const
 {
 	for (size_t l = 0; l != slices_.size(); ++l) {
@@ -569,29 +681,9 @@ StableDocIterator::StableDocIterator(DocIterator const & dit)
 
 DocIterator StableDocIterator::asDocIterator(Buffer * buf) const
 {
-	// this function re-creates the cache of inset pointers
-	//lyxerr << "converting:\n" << *this << endl;
-	Inset * inset = &buf->inset();
-	DocIterator dit = DocIterator(buf, inset);
-	for (size_t i = 0, n = data_.size(); i != n; ++i) {
-		if (inset == 0) {
-			// FIXME
-			LYXERR0(" Should not happen, but does e.g. after "
-				"C-n C-l C-z S-C-z\n"
-				<< " or when a Buffer has been concurrently edited by two views"
-				<< '\n' << "dit: " << dit << '\n'
-				<< " lastpos: " << dit.lastpos());
-			dit.fixIfBroken();
-			break;
-		}
-		dit.push_back(data_[i]);
-		dit.top().inset_ = inset;
-		if (dit.fixIfBroken())
-			break;
-		if (i + 1 != n)
-			inset = dit.nextInset();
-	}
-	//lyxerr << "convert:\n" << *this << " to:\n" << dit << endl;
+	DocIterator dit(buf);
+	dit.slices_ = data_;
+	dit.sanitize();
 	return dit;
 }
 
@@ -610,9 +702,4 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
 }
 
 
-bool isLetter(DocIterator const & dit)
-{
-	return dit.inTexted() && dit.paragraph().isLetter(dit.pos());
-}
-
 } // namespace lyx