Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / CursorSlice.cpp

diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp
index 42c26145898231c242cb0340551fc0a7dff543ae..af6d97894793e0e853e803d17f9aca8930d71a53 100644 (file)
--- a/src/CursorSlice.cpp
+++ b/src/CursorSlice.cpp
@@ -15,10 +15,11 @@
 
 #include "CursorSlice.h"
 
-#include "debug.h"
 #include "Text.h"
 #include "Paragraph.h"
 
+#include "support/debug.h"
+
 #include "insets/Inset.h"
 
 #include "mathed/InsetMath.h"
@@ -26,8 +27,9 @@
 
 #include <boost/assert.hpp>
 
-using std::endl;
+#include <ostream>
 
+using namespace std;
 
 namespace lyx {
 
@@ -59,7 +61,8 @@ Paragraph & CursorSlice::paragraph() const
 pos_type CursorSlice::lastpos() const
 {
        BOOST_ASSERT(inset_);
-       return inset_->asInsetMath() ? cell().size() : paragraph().size();
+       return inset_->asInsetMath() ? cell().size() 
+               : (text()->empty() ? 0 : paragraph().size());
 }
 
 
@@ -104,6 +107,19 @@ void CursorSlice::forwardPos()
 
        // otherwise move on one cell
        //lyxerr << "... next idx" << endl;
+
+       BOOST_ASSERT(idx() < nargs());
+
+       ++idx();
+       pit() = 0;
+       pos() = 0;
+}
+
+
+void CursorSlice::forwardIdx()
+{
+       BOOST_ASSERT(idx() < nargs());
+
        ++idx();
        pit() = 0;
        pos() = 0;
@@ -167,8 +183,8 @@ bool operator!=(CursorSlice const & p, CursorSlice const & q)
 bool operator<(CursorSlice const & p, CursorSlice const & q)
 {
        if (&p.inset() != &q.inset()) {
-               lyxerr << "can't compare cursor and anchor in different insets\n"
-                      << "p: " << p << '\n' << "q: " << q << endl;
+               LYXERR0("can't compare cursor and anchor in different insets\n"
+                      << "p: " << p << '\n' << "q: " << q);
                BOOST_ASSERT(false);
        }
        if (p.idx() != q.idx())
@@ -191,10 +207,10 @@ bool operator<=(CursorSlice const & p, CursorSlice const & q)
 }
 
 
-std::ostream & operator<<(std::ostream & os, CursorSlice const & item)
+ostream & operator<<(ostream & os, CursorSlice const & item)
 {
        return os
-          << "inset: " << &item.inset()
+          << "inset: " << (void *)&item.inset()
 //        << " text: " << item.text()
           << " idx: " << item.idx()
           << " par: " << item.pit()