Move richtext escaping to its own postprocessing routine.

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 310b85131ba8e1e3fe16eeaf69e58713d62cfc47..35b23a98b72f147018160be7941fc18002805c98 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -42,6 +42,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)
@@ -530,6 +531,36 @@ 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;
+               }
+               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) {
@@ -597,29 +628,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;
 }