#include "DocIterator.h"
-#include "debug.h"
-#include "Text.h"
+#include "support/debug.h"
+#include "InsetList.h"
#include "Paragraph.h"
+#include "Text.h"
#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
#include "insets/InsetTabular.h"
#include <boost/assert.hpp>
-#include <boost/current_function.hpp>
-using std::endl;
+#include <ostream>
+using namespace std;
namespace lyx {
}
+LyXErr & operator<<(LyXErr & os, DocIterator const & it)
+{
+ os.stream() << it;
+ return os;
+}
+
+
Inset * DocIterator::nextInset() const
{
BOOST_ASSERT(!empty());
if (pos() == lastpos())
return 0;
if (pos() > lastpos()) {
- lyxerr << "Should not happen, but it does. " << endl;
+ LYXERR0("Should not happen, but it does. ");
return 0;
}
if (inMathed())
Paragraph & DocIterator::paragraph() const
{
if (!inTexted())
- lyxerr << *this << endl;
+ LYXERR0(*this);
BOOST_ASSERT(inTexted());
return top().paragraph();
}
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))
void DocIterator::updateInsets(Inset * inset)
{
// this function re-creates the cache of inset pointers.
- // code taken in part from StableDocIterator::asDocIterator.
//lyxerr << "converting:\n" << *this << endl;
- DocIterator dit = DocIterator(*inset);
+ DocIterator dit = *this;
size_t const n = slices_.size();
+ slices_.resize(0);
for (size_t i = 0 ; i < n; ++i) {
BOOST_ASSERT(inset);
- dit.push_back(slices_[i]);
- dit.top().inset_ = inset;
+ push_back(dit[i]);
+ top().inset_ = inset;
if (i + 1 != n)
- inset = dit.nextInset();
+ inset = nextInset();
}
//lyxerr << "converted:\n" << *this << endl;
- operator=(dit);
}
if (&cs.inset() != inset) {
// the whole slice is wrong, chop off this as well
--i;
- LYXERR(Debug::DEBUG) << "fixIfBroken(): inset changed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
break;
} else if (cs.idx() > cs.lastidx()) {
cs.idx() = cs.lastidx();
cs.pit() = cs.lastpit();
cs.pos() = cs.lastpos();
- LYXERR(Debug::DEBUG) << "fixIfBroken(): idx fixed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): idx fixed");
break;
} else if (cs.pit() > cs.lastpit()) {
cs.pit() = cs.lastpit();
cs.pos() = cs.lastpos();
- LYXERR(Debug::DEBUG) << "fixIfBroken(): pit fixed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pit fixed");
break;
} else if (cs.pos() > cs.lastpos()) {
cs.pos() = cs.lastpos();
- LYXERR(Debug::DEBUG) << "fixIfBroken(): pos fixed" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pos fixed");
break;
} else if (i != n - 1 && cs.pos() != cs.lastpos()) {
// get inset which is supposed to be in the next slice
// Did we make it through the whole slice stack? Otherwise there
// was a problem at slice i, and we have to chop off above
if (i < n) {
- LYXERR(Debug::DEBUG) << "fixIfBroken(): cursor chopped at " << i << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): cursor chopped at " << i);
resize(i + 1);
return true;
} else
}
-std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
+DocIterator::idx_type DocIterator::find(MathData const & cell) const
{
- for (size_t i = 0, n = dit.depth(); i != n; ++i)
- os << " " << dit[i] << "\n";
- return os;
+ for (size_t l = 0; l != slices_.size(); ++l) {
+ if (slices_[l].asInsetMath() && &slices_[l].cell() == &cell)
+ return l;
+ }
+ return -1;
}
-bool operator<(DocIterator const & p, DocIterator const & q)
+DocIterator::idx_type DocIterator::find(InsetMath const * inset) const
{
- size_t depth = std::min(p.depth(), q.depth());
- for (size_t i = 0 ; i < depth ; ++i) {
- if (p[i] != q[i])
- return p[i] < q[i];
+ for (size_t l = 0; l != slices_.size(); ++l) {
+ if (slices_[l].asInsetMath() == inset)
+ return l;
}
- return p.depth() < q.depth();
+ return -1;
}
-bool operator>(DocIterator const & p, DocIterator const & q)
+void DocIterator::cutOff(DocIterator::idx_type above, vector<CursorSlice> & cut)
{
- return q < p;
+ cut = vector<CursorSlice>(slices_.begin() + above + 1, slices_.end());
+ slices_.resize(above + 1);
}
-bool operator<=(DocIterator const & p, DocIterator const & q)
+void DocIterator::cutOff(DocIterator::idx_type above)
{
- return !(q < p);
+ slices_.resize(above + 1);
+}
+
+
+void DocIterator::append(vector<CursorSlice> const & x)
+{
+ slices_.insert(slices_.end(), x.begin(), x.end());
+}
+
+
+void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
+{
+ slices_.push_back(CursorSlice());
+ top().idx() = idx;
+ top().pos() = pos;
+}
+
+
+ostream & operator<<(ostream & os, DocIterator const & dit)
+{
+ for (size_t i = 0, n = dit.depth(); i != n; ++i)
+ os << " " << dit[i] << "\n";
+ return os;
}
for (size_t i = 0, n = data_.size(); i != n; ++i) {
if (inset == 0) {
// FIXME
- lyxerr << BOOST_CURRENT_FUNCTION
- << " Should not happen, but does e.g. after C-n C-l C-z S-C-z\n"
- << " or when a Buffer has been concurently edited by two views"
+ 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() << endl;
+ << " lastpos: " << dit.lastpos());
dit.fixIfBroken();
break;
}
}
-std::ostream & operator<<(std::ostream & os, StableDocIterator const & dit)
+ostream & operator<<(ostream & os, StableDocIterator const & dit)
{
for (size_t i = 0, n = dit.data_.size(); i != n; ++i)
os << " " << dit.data_[i] << "\n";