X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=5cd1c0eac3c0e84f199e6ce12cce830c4b14bc73;hb=4d5bef1bdcbe7a20d67613a793acb89f0e583bf6;hp=db9cd5d103dc76b9046f5c9f20fdbdd550b561eb;hpb=cda980db51d73297e888ae47a2393b7ce553d2be;p=lyx.git

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index db9cd5d103..5cd1c0eac3 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -76,12 +76,11 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 {
 	LASSERT(buffer->isClone(), return DocIterator());
 	Inset * inset = &buffer->inset();
-	DocIterator dit = *this;
-	dit.buffer_ = buffer;
-	dit.inset_ = inset;
+	DocIterator dit(buffer);
 	size_t const n = slices_.size();
 	for (size_t i = 0 ; i != n; ++i) {
 		LASSERT(inset, /**/);
+		dit.push_back(slices_[i]);
 		dit.top().inset_ = inset;
 		if (i + 1 != n)
 			inset = dit.nextInset();
@@ -92,8 +91,11 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 
 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;
 }
 
 
@@ -143,8 +145,8 @@ Inset * DocIterator::realInset() const
 	LASSERT(inTexted(), /**/);
 	// 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();
 }
@@ -190,6 +192,18 @@ Paragraph & DocIterator::innerParagraph() const
 }
 
 
+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(), /**/);
@@ -516,6 +530,35 @@ bool DocIterator::fixIfBroken()
 }
 
 
+void DocIterator::sanitize()
+{
+	// this function re-creates the cache of inset pointers
+	//lyxerr << "converting:\n" << *this << endl;
+	if (buffer_)
+		inset_ = &buffer_->inset();
+	Inset * inset = inset_;
+	for (size_t i = 0, n = slices_.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;
+		}
+		slices_[i].inset_ = inset;
+		if (fixIfBroken())
+			break;
+		if (i + 1 != n)
+			inset = slices_[i].inset().inMathed() ? slices_[i].cell()[slices_[i].pos()].nucleus() 
+				: slices_[i].paragraph().getInset(pos());
+	}
+	//lyxerr << "convert:\n" << *this << " to:\n" << dit << endl;
+}
+
+
 int DocIterator::find(MathData const & cell) const
 {
 	for (size_t l = 0; l != slices_.size(); ++l) {
@@ -583,29 +626,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 = DocIterator(buf);
+	dit.slices_ = data_;
+	dit.sanitize();
 	return dit;
 }