#include "mathed/math_data.h"
#include "mathed/math_inset.h"
+#include "insets/insettabular.h"
#include <boost/assert.hpp>
+#include <boost/current_function.hpp>
using std::endl;
// We could be able to get rid of this if only every BufferView were
// associated to a buffer on construction.
DocIterator::DocIterator()
- : inset_(0)
+ : boundary_(false), inset_(0)
{}
DocIterator::DocIterator(InsetBase & inset)
- : inset_(&inset)
+ : boundary_(false), inset_(&inset)
{}
BOOST_ASSERT(!empty());
if (pos() == lastpos())
return 0;
+ if (pos() > lastpos()) {
+ lyxerr << "Should not happen, but it does. " << endl;
+ return 0;
+ }
if (inMathed())
return nextAtom().nucleus();
return paragraph().isInset(pos()) ? paragraph().getInset(pos()) : 0;
}
+InsetBase * DocIterator::realInset() const
+{
+ BOOST_ASSERT(inTexted());
+ // if we are in a tabular, we need the cell
+ if (inset().lyxCode() == InsetBase::TABULAR_CODE) {
+ InsetTabular & tabular = static_cast<InsetTabular&>(inset());
+ return tabular.cell(idx()).get();
+ }
+ return &inset();
+}
+
+
MathAtom const & DocIterator::prevAtom() const
{
BOOST_ASSERT(!empty());
}
-LyXText * DocIterator::text() const
+LyXText * DocIterator::text()
+{
+ BOOST_ASSERT(!empty());
+ return top().text();
+}
+
+LyXText const * DocIterator::text() const
{
BOOST_ASSERT(!empty());
return top().text();
Paragraph & DocIterator::paragraph()
{
+ if (!inTexted())
+ lyxerr << *this << endl;
BOOST_ASSERT(inTexted());
return top().paragraph();
}
Row & DocIterator::textRow()
{
- return *paragraph().getRow(pos());
+ BOOST_ASSERT(!paragraph().rows().empty());
+ return paragraph().getRow(pos(), boundary_);
}
Row const & DocIterator::textRow() const
{
- return *paragraph().getRow(pos());
+ BOOST_ASSERT(!paragraph().rows().empty());
+ return paragraph().getRow(pos(), boundary_);
}
-DocIterator::par_type DocIterator::lastpar() const
+DocIterator::pit_type DocIterator::lastpit() const
{
return inMathed() ? 0 : text()->paragraphs().size() - 1;
}
}
-DocIterator::row_type DocIterator::crow() const
-{
- return paragraph().row(pos());
-}
-
-
-DocIterator::row_type DocIterator::lastcrow() const
-{
- return paragraph().rows.size();
-}
-
-
DocIterator::idx_type DocIterator::lastidx() const
{
return top().lastidx();
}
-LyXText * DocIterator::innerText() const
+LyXText * 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;
+}
+
+LyXText const * DocIterator::innerText() const
{
BOOST_ASSERT(!empty());
// go up until first non-0 text is hit
// (innermost text is 0 in mathed)
- for (int i = size() - 1; i >= 0; --i)
- if (operator[](i).text())
- return operator[](i).text();
+ for (int i = depth() - 1; i >= 0; --i)
+ if (slices_[i].text())
+ return slices_[i].text();
return 0;
}
InsetBase * DocIterator::innerInsetOfType(int code) const
{
- for (int i = size() - 1; i >= 0; --i)
- if (operator[](i).inset_->lyxCode() == code)
- return operator[](i).inset_;
+ for (int i = depth() - 1; i >= 0; --i)
+ if (slices_[i].inset_->lyxCode() == code)
+ return slices_[i].inset_;
return 0;
}
-void DocIterator::forwardPos()
+void DocIterator::forwardPos(bool ignorecollapsed)
{
//this dog bites his tail
if (empty()) {
return;
}
- CursorSlice & top = back();
+ // jump over collapsables if they are collapsed
+ // FIXME: the check for asMathInset() shouldn't be necessary
+ // but math insets do not return a sensible editable() state yet.
+ if (ignorecollapsed && nextInset() && (!nextInset()->asMathInset()
+ && nextInset()->editable() != InsetBase::HIGHLY_EDITABLE)) {
+ ++top().pos();
+ return;
+ }
+
+ CursorSlice & tip = top();
//lyxerr << "XXX\n" << *this << endl;
// this is used twice and shows up in the profiler!
// move into an inset to the right if possible
InsetBase * n = 0;
- if (top.pos() != lastp) {
+ if (tip.pos() != lastp) {
// this is impossible for pos() == size()
if (inMathed()) {
- n = (top.cell().begin() + top.pos())->nucleus();
+ n = (tip.cell().begin() + tip.pos())->nucleus();
} else {
- if (paragraph().isInset(top.pos()))
- n = paragraph().getInset(top.pos());
+ if (paragraph().isInset(tip.pos()))
+ n = paragraph().getInset(tip.pos());
}
}
}
// otherwise move on one position if possible
- if (top.pos() < lastp) {
+ if (tip.pos() < lastp) {
//lyxerr << "... next pos" << endl;
- ++top.pos();
+ ++tip.pos();
return;
}
//lyxerr << "... no next pos" << endl;
// otherwise move on one paragraph if possible
- if (top.par() < lastpar()) {
+ if (tip.pit() < lastpit()) {
//lyxerr << "... next par" << endl;
- ++top.par();
- top.pos() = 0;
+ ++tip.pit();
+ tip.pos() = 0;
return;
}
- //lyxerr << "... no next par" << endl;
+ //lyxerr << "... no next pit" << endl;
// otherwise try to move on one cell if possible
- if (top.idx() < lastidx()) {
+ if (tip.idx() < lastidx()) {
//lyxerr << "... next idx" << endl;
- ++top.idx();
- top.par() = 0;
- top.pos() = 0;
+ ++tip.idx();
+ tip.pit() = 0;
+ tip.pos() = 0;
return;
}
//lyxerr << "... no next idx" << endl;
// otherwise leave inset and jump over inset as a whole
pop_back();
// 'top' is invalid now...
- if (size())
- ++back().pos();
+ if (!empty())
+ ++top().pos();
+}
+
+
+void DocIterator::forwardPosNoDescend()
+{
+ CursorSlice & tip = top();
+ pos_type const lastp = lastpos();
+
+ // move on one position if possible
+ if (tip.pos() < lastp) {
+ //lyxerr << "... next pos" << endl;
+ ++tip.pos();
+ return;
+ }
+ //lyxerr << "... no next pos" << endl;
+
+ // otherwise move on one paragraph if possible
+ if (tip.pit() < lastpit()) {
+ //lyxerr << "... next par" << endl;
+ ++tip.pit();
+ tip.pos() = 0;
+ return;
+ }
+ //lyxerr << "... no next pit" << endl;
+
+ // otherwise try to move on one cell if possible
+ if (tip.idx() < lastidx()) {
+ //lyxerr << "... next idx" << endl;
+ ++tip.idx();
+ tip.pit() = 0;
+ tip.pos() = 0;
+ return;
+ }
+ //lyxerr << "... no next idx" << endl;
+
+ // otherwise we can't move on
}
void DocIterator::forwardPar()
{
forwardPos();
- while (!empty() && (!inTexted() || pos() != 0))
+
+#if 0
+ DocIterator cmp(*this);
+#endif
+
+ while (!empty() && (!inTexted() || pos() != 0)) {
+ if (inTexted()) {
+ pos_type const lastp = lastpos();
+ Paragraph const & par = paragraph();
+ pos_type & pos = top().pos();
+ while (pos < lastp && !par.isInset(pos))
+ ++pos;
+ }
forwardPos();
+ }
+
+#if 0
+ while (!cmp.empty() && (!cmp.inTexted() || cmp.pos() != 0))
+ cmp.forwardPos();
+ BOOST_ASSERT(cmp == *this);
+#endif
}
void DocIterator::forwardChar()
{
forwardPos();
- while (size() != 0 && pos() == lastpos())
+ while (!empty() && pos() == lastpos())
forwardPos();
}
void DocIterator::forwardInset()
{
forwardPos();
- while (size() != 0 && (pos() == lastpos() || nextInset() == 0))
+ while (!empty() && (pos() == lastpos() || nextInset() == 0))
forwardPos();
}
void DocIterator::backwardChar()
{
backwardPos();
- while (size() != 0 && pos() == lastpos())
+ while (!empty() && pos() == lastpos())
backwardPos();
}
//this dog bites his tail
if (empty()) {
push_back(CursorSlice(*inset_));
- back().idx() = lastidx();
- back().par() = lastpar();
- back().pos() = lastpos();
+ top().idx() = lastidx();
+ top().pit() = lastpit();
+ top().pos() = lastpos();
return;
}
- CursorSlice & top = back();
+ CursorSlice & tip = top();
- if (top.pos() != 0) {
- --top.pos();
- } else if (top.par() != 0) {
- --top.par();
- top.pos() = lastpos();
+ if (tip.pos() != 0) {
+ --tip.pos();
+ } else if (tip.pit() != 0) {
+ --tip.pit();
+ tip.pos() = lastpos();
return;
- } else if (top.idx() != 0) {
- --top.idx();
- top.par() = lastpar();
- top.pos() = lastpos();
+ } else if (tip.idx() != 0) {
+ --tip.idx();
+ tip.pit() = lastpit();
+ tip.pos() = lastpos();
return;
} else {
pop_back();
InsetBase * n = 0;
if (inMathed()) {
- n = (top.cell().begin() + top.pos())->nucleus();
+ n = (tip.cell().begin() + tip.pos())->nucleus();
} else {
- if (paragraph().isInset(top.pos()))
- n = paragraph().getInset(top.pos());
+ if (paragraph().isInset(tip.pos()))
+ n = paragraph().getInset(tip.pos());
}
if (n && n->isActive()) {
push_back(CursorSlice(*n));
- back().idx() = lastidx();
- back().par() = lastpar();
- back().pos() = lastpos();
+ top().idx() = lastidx();
+ top().pit() = lastpit();
+ top().pos() = lastpos();
}
}
bool DocIterator::hasPart(DocIterator const & it) const
{
// it can't be a part if it is larger
- if (it.size() > size())
+ if (it.depth() > depth())
return false;
// as inset adresses are the 'last' level
- return &it.back().inset() == &operator[](it.size() - 1).inset();
+ return &it.top().inset() == &slices_[it.depth() - 1].inset();
+}
+
+
+void DocIterator::updateInsets(InsetBase * 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);
+ size_t const n = slices_.size();
+ for (size_t i = 0 ; i < n; ++i) {
+ BOOST_ASSERT(inset);
+ dit.push_back(slices_[i]);
+ dit.top().inset_ = inset;
+ if (i + 1 != n)
+ inset = dit.nextInset();
+ }
+ //lyxerr << "converted:\n" << *this << endl;
+ operator=(dit);
}
std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
{
- for (size_t i = 0, n = dit.size(); i != n; ++i)
- os << " " << dit.operator[](i) << "\n";
+ for (size_t i = 0, n = dit.depth(); i != n; ++i)
+ os << " " << dit[i] << "\n";
return os;
}
///////////////////////////////////////////////////////
-StableDocIterator::StableDocIterator(const DocIterator & dit)
+StableDocIterator::StableDocIterator(DocIterator const & dit)
{
- data_ = dit;
+ data_ = dit.internalData();
for (size_t i = 0, n = data_.size(); i != n; ++i)
data_[i].inset_ = 0;
}
-DocIterator
-StableDocIterator::asDocIterator(InsetBase * inset) const
+DocIterator StableDocIterator::asDocIterator(InsetBase * inset) const
{
// this function re-creates the cache of inset pointers
//lyxerr << "converting:\n" << *this << endl;
DocIterator dit = DocIterator(*inset);
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' << "dit: " << dit << '\n'
+ << " lastpos: " << dit.lastpos() << endl;
+ //break;
+ BOOST_ASSERT(false);
+ }
dit.push_back(data_[i]);
- dit.back().inset_ = inset;
+ dit.top().inset_ = inset;
if (i + 1 != n)
inset = dit.nextInset();
}
os << " " << dit.data_[i] << "\n";
return os;
}
+
+
+bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2)
+{
+ return dit1.data_ == dit2.data_;
+}
+