Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index a55fc70b5ae41d0a436fd6d8df61092b022458df..57286d9a6cbac47bd7cb11d551aa822720a528bb 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -82,7 +82,7 @@ DocIterator DocIterator::clone(Buffer * buffer) const
        DocIterator dit(buffer);
        size_t const n = slices_.size();
        for (size_t i = 0 ; i != n; ++i) {
-               LBUFERR(inset, _("Iterator slice not properly initialized!"));
+               LBUFERR(inset);
                dit.push_back(slices_[i]);
                dit.top().inset_ = inset;
                if (i + 1 != n)
@@ -183,7 +183,7 @@ Paragraph & DocIterator::paragraph() const
 {
        if (!inTexted()) {
                LYXERR0(*this);
-               LBUFERR(false, _("DocIterator::paragraph() called outside Text."));
+               LBUFERR(false);
        }
        return top().paragraph();
 }
@@ -191,7 +191,7 @@ Paragraph & DocIterator::paragraph() const
 
 Paragraph & DocIterator::innerParagraph() const
 {
-       LBUFERR(!empty(), _("Empty DocIterator."));
+       LBUFERR(!empty());
        return innerTextSlice().paragraph();
 }
 
@@ -210,22 +210,31 @@ FontSpan DocIterator::locateWord(word_location const loc) const
        
 CursorSlice const & DocIterator::innerTextSlice() const
 {
-       LBUFERR(!empty(), _(""));
+       LBUFERR(!empty());
        // go up until first non-0 text is hit
        // (innermost text is 0 in mathed)
        for (int i = depth() - 1; i >= 0; --i)
                if (slices_[i].text())
                        return slices_[i];
 
-       // This case is in principe not possible. We _must_
+       // This case is in principle not possible. We _must_
        // be inside a Text.
-       LBUFERR(false, _(""));
+       LBUFERR(false);
        // Squash warning
        static const CursorSlice c;
        return c;
 }
 
 
+DocIterator DocIterator::getInnerText() const
+{
+       DocIterator texted = *this;
+       while (!texted.inTexted())
+               texted.pop_back();
+       return texted;
+}
+
+
 pit_type DocIterator::lastpit() const
 {
        return inMathed() ? 0 : text()->paragraphs().size() - 1;
@@ -449,6 +458,28 @@ void DocIterator::backwardPos()
 }
 
 
+#if 0
+// works, but currently not needed
+void DocIterator::backwardInset()
+{
+       backwardPos();
+
+       while (!empty() && !nextInset()) {
+               if (inTexted()) {
+                       pos_type const lastp = lastpos();
+                       Paragraph const & par = paragraph();
+                       pos_type & pos = top().pos();
+                       while (pos > 0 && (pos == lastp || !par.isInset(pos)))
+                               --pos;
+                       if (pos > 0)
+                               break;
+               }
+               backwardPos();
+       }
+}
+#endif
+
+
 bool DocIterator::hasPart(DocIterator const & it) const
 {
        // it can't be a part if it is larger
@@ -460,6 +491,19 @@ bool DocIterator::hasPart(DocIterator const & it) const
 }
 
 
+bool DocIterator::allowSpellCheck() const
+{
+       /// spell check is disabled if the iterator position
+       /// is inside of an inset which disables the spell checker
+       size_t const n = depth();
+       for (size_t i = 0; i < n; ++i) {
+               if (!slices_[i].inset_->allowSpellCheck())
+                       return false;
+       }
+       return true;
+}
+
+
 void DocIterator::updateInsets(Inset * inset)
 {
        // this function re-creates the cache of inset pointers.
@@ -468,7 +512,7 @@ void DocIterator::updateInsets(Inset * inset)
        size_t const n = slices_.size();
        slices_.resize(0);
        for (size_t i = 0 ; i < n; ++i) {
-               LBUFERR(inset, _("Improperly initialized DocIterator."));
+               LBUFERR(inset);
                push_back(dit[i]);
                top().inset_ = inset;
                if (i + 1 != n)
@@ -555,6 +599,11 @@ void DocIterator::sanitize()
                        fixIfBroken();
                        break;
                }
+               if (!inset->isActive()) {
+                       LYXERR0("Inset found on cursor stack is not active.");
+                       fixIfBroken();
+                       break;
+               }
                push_back(sl[i]);
                top().inset_ = inset;
                if (fixIfBroken())
@@ -622,9 +671,9 @@ ostream & operator<<(ostream & os, DocIterator const & dit)
 
 ///////////////////////////////////////////////////////
 
-StableDocIterator::StableDocIterator(DocIterator const & dit)
+StableDocIterator::StableDocIterator(DocIterator const & dit) :
+       data_(dit.internalData())
 {
-       data_ = dit.internalData();
        for (size_t i = 0, n = data_.size(); i != n; ++i)
                data_[i].inset_ = 0;
 }