X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdociterator.C;h=47e7526e5e00d0af03eaa4357c73f84ac0bd3f4d;hb=3ef684e752bb5afdbfdea51d4c3df4afe1461916;hp=76de0484dcd300129aaeabc87413ae15af9f5567;hpb=1fa17d538965d48451609aa1d601ebc4bded1e5c;p=lyx.git

diff --git a/src/dociterator.C b/src/dociterator.C
index 76de0484dc..47e7526e5e 100644
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -18,24 +18,29 @@
 #include "lyxrow.h"
 #include "paragraph.h"
 
-#include "mathed/math_data.h"
-#include "mathed/math_inset.h"
+#include "mathed/MathData.h"
+#include "mathed/InsetMath.h"
+
+#include "insets/insettabular.h"
 
 #include <boost/assert.hpp>
 #include <boost/current_function.hpp>
 
+
+namespace lyx {
+
 using std::endl;
 
 
 // We could be able to get rid of this if only every BufferView were
 // associated to a buffer on construction.
 DocIterator::DocIterator()
-	: inset_(0)
+	: boundary_(false), inset_(0)
 {}
 
 
 DocIterator::DocIterator(InsetBase & inset)
-	: inset_(&inset)
+	: boundary_(false), inset_(&inset)
 {}
 
 
@@ -90,6 +95,18 @@ InsetBase const * DocIterator::prevInset() const
 }
 
 
+InsetBase * DocIterator::realInset() const
+{
+	BOOST_ASSERT(inTexted());
+	// if we are in a tabular, we need the cell
+	if (inset().lyxCode() == InsetBase::TABULAR_CODE) {
+		InsetTabular & tabular = static_cast<InsetTabular&>(inset());
+		return tabular.cell(idx()).get();
+	}
+	return &inset();
+}
+
+
 MathAtom const & DocIterator::prevAtom() const
 {
 	BOOST_ASSERT(!empty());
@@ -139,7 +156,7 @@ LyXText const * DocIterator::text() const
 
 Paragraph & DocIterator::paragraph()
 {
-	if (!inTexted()) 
+	if (!inTexted())
 		lyxerr << *this << endl;
 	BOOST_ASSERT(inTexted());
 	return top().paragraph();
@@ -156,24 +173,24 @@ Paragraph const & DocIterator::paragraph() const
 Row & DocIterator::textRow()
 {
 	BOOST_ASSERT(!paragraph().rows().empty());
-	return paragraph().getRow(pos());
+	return paragraph().getRow(pos(), boundary_);
 }
 
 
 Row const & DocIterator::textRow() const
 {
 	BOOST_ASSERT(!paragraph().rows().empty());
-	return paragraph().getRow(pos());
+	return paragraph().getRow(pos(), boundary_);
 }
 
 
-DocIterator::pit_type DocIterator::lastpit() const
+pit_type DocIterator::lastpit() const
 {
 	return inMathed() ? 0 : text()->paragraphs().size() - 1;
 }
 
 
-DocIterator::pos_type DocIterator::lastpos() const
+pos_type DocIterator::lastpos() const
 {
 	return inMathed() ? cell().size() : paragraph().size();
 }
@@ -276,7 +293,7 @@ InsetBase * DocIterator::innerInsetOfType(int code) const
 }
 
 
-void DocIterator::forwardPos()
+void DocIterator::forwardPos(bool ignorecollapsed)
 {
 	//this dog bites his tail
 	if (empty()) {
@@ -284,6 +301,15 @@ void DocIterator::forwardPos()
 		return;
 	}
 
+	// jump over collapsables if they are collapsed
+	// FIXME: the check for asInsetMath() shouldn't be necessary
+	// but math insets do not return a sensible editable() state yet.
+	if (ignorecollapsed && nextInset() && (!nextInset()->asInsetMath()
+	    && nextInset()->editable() != InsetBase::HIGHLY_EDITABLE)) {
+		++top().pos();
+		return;
+	}
+
 	CursorSlice & tip = top();
 	//lyxerr << "XXX\n" << *this << endl;
 
@@ -376,7 +402,11 @@ void DocIterator::forwardPosNoDescend()
 	}
 	//lyxerr << "... no next idx" << endl;
 
-	// otherwise we can't move on
+	// otherwise leave inset and jump over inset as a whole
+	pop_back();
+	// 'top' is invalid now...
+	if (!empty())
+		++top().pos();
 }
 
 
@@ -387,7 +417,7 @@ void DocIterator::forwardPar()
 #if 0
 	DocIterator cmp(*this);
 #endif
-	
+
 	while (!empty() && (!inTexted() || pos() != 0)) {
 		if (inTexted()) {
 			pos_type const lastp = lastpos();
@@ -490,6 +520,25 @@ bool DocIterator::hasPart(DocIterator const & it) const
 }
 
 
+void DocIterator::updateInsets(InsetBase * inset)
+{
+	// this function re-creates the cache of inset pointers.
+	// code taken in part from StableDocIterator::asDocIterator.
+	//lyxerr << "converting:\n" << *this << endl;
+	DocIterator dit = DocIterator(*inset);
+	size_t const n = slices_.size();
+	for (size_t i = 0 ; i < n; ++i) {
+		BOOST_ASSERT(inset);
+		dit.push_back(slices_[i]);
+		dit.top().inset_ = inset;
+		if (i + 1 != n)
+			inset = dit.nextInset();
+	}
+	//lyxerr << "converted:\n" << *this << endl;
+	operator=(dit);
+}
+
+
 std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
 {
 	for (size_t i = 0, n = dit.depth(); i != n; ++i)
@@ -540,3 +589,12 @@ std::ostream & operator<<(std::ostream & os, StableDocIterator const & dit)
 		os << " " << dit.data_[i] << "\n";
 	return os;
 }
+
+
+bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
+{
+	return dit1.data_ == dit2.data_;
+}
+
+
+} // namespace lyx