* gcc does not like missing characters in keywords

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 0e8ca6ea8c91ee264e81266ec7398d0d44070a38..7b7a59d2014d0d4fc86c1e776c5069d86314f355 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -15,8 +15,9 @@
 #include "DocIterator.h"
 
 #include "debug.h"
-#include "Text.h"
+#include "InsetList.h"
 #include "Paragraph.h"
+#include "Text.h"
 
 #include "mathed/MathData.h"
 #include "mathed/InsetMath.h"
@@ -58,7 +59,7 @@ DocIterator doc_iterator_end(Inset & inset)
 }
 
 
-Inset * DocIterator::nextInset()
+Inset * DocIterator::nextInset() const
 {
        BOOST_ASSERT(!empty());
        if (pos() == lastpos())
@@ -73,29 +74,12 @@ Inset * DocIterator::nextInset()
 }
 
 
-Inset * DocIterator::prevInset()
+Inset * DocIterator::prevInset() const
 {
        BOOST_ASSERT(!empty());
        if (pos() == 0)
                return 0;
-       if (inMathed())
-               if (cell().empty())
-                       // FIXME: this should not happen but it does.
-                       // See bug 3189
-                       // http://bugzilla.lyx.org/show_bug.cgi?id=3189
-                       return 0;
-               else
-                       return prevAtom().nucleus();
-       return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
-}
-
-
-Inset const * DocIterator::prevInset() const
-{
-       BOOST_ASSERT(!empty());
-       if (pos() == 0)
-               return 0;
-       if (inMathed())
+       if (inMathed()) {
                if (cell().empty())
                        // FIXME: this should not happen but it does.
                        // See bug 3189
@@ -103,6 +87,7 @@ Inset const * DocIterator::prevInset() const
                        return 0;
                else
                        return prevAtom().nucleus();
+       }
        return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
 }
 
@@ -111,7 +96,7 @@ Inset * DocIterator::realInset() const
 {
        BOOST_ASSERT(inTexted());
        // if we are in a tabular, we need the cell
-       if (inset().lyxCode() == Inset::TABULAR_CODE) {
+       if (inset().lyxCode() == TABULAR_CODE) {
                InsetTabular & tabular = static_cast<InsetTabular&>(inset());
                return tabular.cell(idx()).get();
        }
@@ -119,15 +104,7 @@ Inset * DocIterator::realInset() const
 }
 
 
-MathAtom const & DocIterator::prevAtom() const
-{
-       BOOST_ASSERT(!empty());
-       BOOST_ASSERT(pos() > 0);
-       return cell()[pos() - 1];
-}
-
-
-MathAtom & DocIterator::prevAtom()
+MathAtom & DocIterator::prevAtom() const
 {
        BOOST_ASSERT(!empty());
        BOOST_ASSERT(pos() > 0);
@@ -135,7 +112,7 @@ MathAtom & DocIterator::prevAtom()
 }
 
 
-MathAtom const & DocIterator::nextAtom() const
+MathAtom & DocIterator::nextAtom() const
 {
        BOOST_ASSERT(!empty());
        //lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl;
@@ -144,29 +121,14 @@ MathAtom const & DocIterator::nextAtom() const
 }
 
 
-MathAtom & DocIterator::nextAtom()
-{
-       BOOST_ASSERT(!empty());
-       //lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl;
-       BOOST_ASSERT(pos() < lastpos());
-       return cell()[pos()];
-}
-
-
-Text * DocIterator::text()
-{
-       BOOST_ASSERT(!empty());
-       return top().text();
-}
-
-Text const * DocIterator::text() const
+Text * DocIterator::text() const
 {
        BOOST_ASSERT(!empty());
        return top().text();
 }
 
 
-Paragraph & DocIterator::paragraph()
+Paragraph & DocIterator::paragraph() const
 {
        if (!inTexted())
                lyxerr << *this << endl;
@@ -175,26 +137,27 @@ Paragraph & DocIterator::paragraph()
 }
 
 
-Paragraph const & DocIterator::paragraph() const
+Paragraph & DocIterator::innerParagraph() const
 {
-       BOOST_ASSERT(inTexted());
-       return top().paragraph();
+       BOOST_ASSERT(!empty());
+       return innerTextSlice().paragraph();
 }
 
 
-Paragraph const & DocIterator::innerParagraph() const
+CursorSlice const & DocIterator::innerTextSlice() const
 {
        BOOST_ASSERT(!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].paragraph();
+                       return slices_[i];
 
        // This case is in principe not possible. We _must_
-       // be inside a Paragraph.
+       // be inside a Text.
        BOOST_ASSERT(false);
-       return paragraph();
+       static CursorSlice dummy;
+       return dummy;
 }
 
 
@@ -249,32 +212,14 @@ DocIterator::col_type DocIterator::col() const
 }
 
 
-MathData const & DocIterator::cell() const
-{
-//     BOOST_ASSERT(inMathed());
-       return top().cell();
-}
-
-
-MathData & DocIterator::cell()
+MathData & DocIterator::cell() const
 {
 //     BOOST_ASSERT(inMathed());
        return top().cell();
 }
 
 
-Text * DocIterator::innerText()
-{
-       BOOST_ASSERT(!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].text();
-       return 0;
-}
-
-Text const * DocIterator::innerText() const
+Text * DocIterator::innerText() const
 {
        BOOST_ASSERT(!empty());
        // go up until first non-0 text is hit
@@ -359,7 +304,7 @@ void DocIterator::forwardPar()
                        pos_type const lastp = lastpos();
                        Paragraph const & par = paragraph();
                        pos_type & pos = top().pos();
-                       if (par.insetlist.empty())
+                       if (par.insetList().empty())
                                pos = lastp;
                        else
                                while (pos < lastp && !par.isInset(pos))
@@ -370,18 +315,6 @@ void DocIterator::forwardPar()
 }
 
 
-void DocIterator::forwardIdx()
-{
-       CursorSlice & tip = top();
-
-       //prevent endless loops
-       BOOST_ASSERT(tip.idx() < tip.nargs());
-       ++tip.idx();
-       tip.pit() = 0;
-       tip.pos() = 0;
-}
-
-
 void DocIterator::forwardChar()
 {
        forwardPos();