X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdociterator.C;h=4d93aa7a0177228266c36fc14b7445103b7ba74f;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=4955cbf910951b472f91095859244187c19755d4;hpb=e89625ef28143545a511cdabc67dee8b7be1b216;p=lyx.git

diff --git a/src/dociterator.C b/src/dociterator.C
index 4955cbf910..4d93aa7a01 100644
--- a/src/dociterator.C
+++ b/src/dociterator.C
@@ -26,6 +26,9 @@
 #include <boost/assert.hpp>
 #include <boost/current_function.hpp>
 
+
+namespace lyx {
+
 using std::endl;
 
 
@@ -181,13 +184,13 @@ Row const & DocIterator::textRow() const
 }
 
 
-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();
 }
@@ -411,10 +414,6 @@ void DocIterator::forwardPar()
 {
 	forwardPos();
 
-#if 0
-	DocIterator cmp(*this);
-#endif
-
 	while (!empty() && (!inTexted() || pos() != 0)) {
 		if (inTexted()) {
 			pos_type const lastp = lastpos();
@@ -425,12 +424,6 @@ void DocIterator::forwardPar()
 		}
 		forwardPos();
 	}
-
-#if 0
-	while (!cmp.empty() && (!cmp.inTexted() || cmp.pos() != 0))
-		cmp.forwardPos();
-	BOOST_ASSERT(cmp == *this);
-#endif
 }
 
 
@@ -445,8 +438,19 @@ void DocIterator::forwardChar()
 void DocIterator::forwardInset()
 {
 	forwardPos();
-	while (!empty() && (pos() == lastpos() || nextInset() == 0))
+
+	while (!empty() && !nextInset()) {
+		if (inTexted()) {
+			pos_type const lastp = lastpos();
+			Paragraph const & par = paragraph();
+			pos_type & pos = top().pos();
+			while (pos < lastp && !par.isInset(pos))
+				++pos;
+			if (pos < lastp)
+				break;
+		}
 		forwardPos();
+	}
 }
 
 
@@ -592,3 +596,6 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
 {
 	return dit1.data_ == dit2.data_;
 }
+
+
+} // namespace lyx