X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fdociterator.C;h=565a43f8945f26ca1f81e5ed50c36953cf378433;hb=37d42d45f3f4a5d3e916a080af50b37ae4a9d118;hp=97630288c3e1adc8458721c18387b6d63957998a;hpb=303a6c126c3b00a831053897cba7a18615ef60eb;p=lyx.git diff --git a/src/dociterator.C b/src/dociterator.C index 97630288c3..565a43f894 100644 --- a/src/dociterator.C +++ b/src/dociterator.C @@ -3,8 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author unknown - * \author Lars Gullik Bjønnes + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -21,15 +20,23 @@ #include "mathed/math_data.h" #include "mathed/math_inset.h" +#include "insets/insettabular.h" #include +#include 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) +// We could be able to get rid of this if only every BufferView were +// associated to a buffer on construction. +DocIterator::DocIterator() + : boundary_(false), inset_(0) +{} + + +DocIterator::DocIterator(InsetBase & inset) + : boundary_(false), inset_(&inset) {} @@ -47,16 +54,16 @@ DocIterator doc_iterator_end(InsetBase & inset) } -DocIterator::DocIterator(InsetBase & inset) : inset_(&inset) -{} - - InsetBase * DocIterator::nextInset() { BOOST_ASSERT(!empty()); if (pos() == lastpos()) return 0; - if (inMathed()) + 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; } @@ -67,7 +74,7 @@ InsetBase * DocIterator::prevInset() BOOST_ASSERT(!empty()); if (pos() == 0) return 0; - if (inMathed()) + if (inMathed()) return prevAtom().nucleus(); return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0; } @@ -78,12 +85,24 @@ InsetBase const * DocIterator::prevInset() const BOOST_ASSERT(!empty()); if (pos() == 0) return 0; - if (inMathed()) + if (inMathed()) return prevAtom().nucleus(); return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 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(inset()); + return tabular.cell(idx()).get(); + } + return &inset(); +} + + MathAtom const & DocIterator::prevAtom() const { BOOST_ASSERT(!empty()); @@ -103,6 +122,7 @@ MathAtom & DocIterator::prevAtom() MathAtom const & DocIterator::nextAtom() const { BOOST_ASSERT(!empty()); + //lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl; BOOST_ASSERT(pos() < lastpos()); return cell()[pos()]; } @@ -111,12 +131,19 @@ 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()]; } -LyXText * DocIterator::text() const +LyXText * DocIterator::text() +{ + BOOST_ASSERT(!empty()); + return top().text(); +} + +LyXText const * DocIterator::text() const { BOOST_ASSERT(!empty()); return top().text(); @@ -125,6 +152,8 @@ LyXText * DocIterator::text() const Paragraph & DocIterator::paragraph() { + if (!inTexted()) + lyxerr << *this << endl; BOOST_ASSERT(inTexted()); return top().paragraph(); } @@ -139,17 +168,19 @@ Paragraph const & DocIterator::paragraph() const 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; } @@ -161,18 +192,6 @@ DocIterator::pos_type DocIterator::lastpos() const } -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(); @@ -238,28 +257,39 @@ bool DocIterator::inTexted() const } -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()) { @@ -267,7 +297,16 @@ void DocIterator::forwardPos() 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! @@ -276,13 +315,13 @@ void DocIterator::forwardPos() // 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()); } } @@ -293,28 +332,28 @@ void DocIterator::forwardPos() } // 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; @@ -322,31 +361,86 @@ void DocIterator::forwardPos() // 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()) - forwardPos(); + while (!empty() && pos() == lastpos()) + forwardPos(); } void DocIterator::forwardInset() { - forwardPos(); - while (size() != 0 && (pos() == lastpos() || nextInset() == 0)) + forwardPos(); + while (!empty() && (pos() == lastpos() || nextInset() == 0)) forwardPos(); } @@ -354,8 +448,8 @@ void DocIterator::forwardInset() void DocIterator::backwardChar() { backwardPos(); - while (size() != 0 && pos() == lastpos()) - backwardPos(); + while (!empty() && pos() == lastpos()) + backwardPos(); } @@ -364,24 +458,24 @@ void DocIterator::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(); @@ -390,27 +484,57 @@ void DocIterator::backwardPos() // move into an inset to the left if possible 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.depth() > depth()) + return false; + + // as inset adresses are the 'last' level + 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; } @@ -418,23 +542,31 @@ std::ostream & operator<<(std::ostream & os, DocIterator const & dit) /////////////////////////////////////////////////////// -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(); } @@ -450,3 +582,9 @@ std::ostream & operator<<(std::ostream & os, StableDocIterator const & dit) return os; } + +bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2) +{ + return dit1.data_ == dit2.data_; +} +