#include "CursorSlice.h"
-#include "debug.h"
#include "Text.h"
#include "Paragraph.h"
+#include "support/debug.h"
+
#include "insets/Inset.h"
#include "mathed/InsetMath.h"
#include <boost/assert.hpp>
-using std::endl;
+#include <ostream>
+using namespace std;
namespace lyx {
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());
}
// 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;
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())
}
-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()