X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=38f2393224b1e37b1839537f12ea6b85008ec8d8;hb=7309ae50b4c40bdbd5c4e45962f132ec0e1a4249;hp=fdb61876d6ca3975e9b0b417f1dea9804fb86bd8;hpb=b9aabe6d891b5347586bdfaeff407552213f94bb;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index fdb61876d6..38f2393224 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -60,7 +60,7 @@ DocIterator::DocIterator(Buffer * buf, Inset * inset)
 
 DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
 {
-	Buffer * buf = const_cast<Buffer *>(buf0);	
+	Buffer * buf = const_cast<Buffer *>(buf0);
 	Inset * inset = const_cast<Inset *>(inset0);
 	DocIterator dit(buf, inset ? inset : &buf->inset());
 	dit.forwardPos();
@@ -70,7 +70,7 @@ DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
 
 DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0)
 {
-	Buffer * buf = const_cast<Buffer *>(buf0);	
+	Buffer * buf = const_cast<Buffer *>(buf0);
 	Inset * inset = const_cast<Inset *>(inset0);
 	return DocIterator(buf, inset ? inset : &buf->inset());
 }
@@ -96,7 +96,7 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 bool DocIterator::inRegexped() const
 {
 	InsetMath * im = inset().asInsetMath();
-	if (!im) 
+	if (!im)
 		return false;
 	InsetMathHull * hull = im->asHullInset();
 	return hull && hull->getType() == hullRegexp;
@@ -318,6 +318,24 @@ Inset * DocIterator::innerInsetOfType(int code) const
 }
 
 
+bool DocIterator::posBackward()
+{
+	if (pos() == 0)
+		return false;
+	--pos();
+	return true;
+}
+
+
+bool DocIterator::posForward()
+{
+	if (pos() == lastpos())
+		return false;
+	++pos();
+	return true;
+}
+
+
 // This duplicates code above, but is in the critical path.
 // So please think twice before adding stuff
 void DocIterator::forwardPos()
@@ -536,7 +554,7 @@ bool DocIterator::fixIfBroken()
 	if (empty())
 		return false;
 
-	// Go through the slice stack from the bottom. 
+	// Go through the slice stack from the bottom.
 	// Check that all coordinates (idx, pit, pos) are correct and
 	// that the inset is the one which is claimed to be there
 	Inset * inset = &slices_[0].inset();
@@ -544,7 +562,7 @@ bool DocIterator::fixIfBroken()
 	size_t n = slices_.size();
 	for (; i != n; ++i) {
 		CursorSlice & cs = slices_[i];
-		if (&cs.inset() != inset) {
+		if (&cs.inset() != inset || ! cs.inset().isActive()) {
 			// the whole slice is wrong, chop off this as well
 			--i;
 			LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
@@ -633,7 +651,7 @@ int DocIterator::find(MathData const & cell) const
 }
 
 
-int DocIterator::find(Inset const * inset) const 
+int DocIterator::find(Inset const * inset) const
 {
 	for (size_t l = 0; l != slices_.size(); ++l) {
 		if (&slices_[l].inset() == inset)
@@ -656,13 +674,13 @@ void DocIterator::cutOff(int above)
 }
 
 
-void DocIterator::append(vector<CursorSlice> const & x) 
+void DocIterator::append(vector<CursorSlice> const & x)
 {
 	slices_.insert(slices_.end(), x.begin(), x.end());
 }
 
 
-void DocIterator::append(DocIterator::idx_type idx, pos_type pos) 
+void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
 {
 	slices_.push_back(CursorSlice());
 	top().idx() = idx;