X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=425c6d6d5edc737e0726657a5e71e55b275cf217;hb=0a7705a6736a85c3c751f7b4e9998833cdb71fc9;hp=e4ea4be0b6d8176b5cb9e80d9046d4c933bc826c;hpb=036f97a02e4d8bcdd7d7a55b791617e5ad8a780b;p=lyx.git diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index e4ea4be0b6..425c6d6d5e 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * \author Alfredo Braunstein * * Full author contact details are available in file CREDITS. @@ -14,48 +14,68 @@ #include "DocIterator.h" -#include "support/debug.h" +#include "Buffer.h" #include "InsetList.h" #include "Paragraph.h" +#include "LyXRC.h" #include "Text.h" #include "mathed/MathData.h" #include "mathed/InsetMath.h" +#include "mathed/InsetMathHull.h" #include "insets/InsetTabular.h" -#include +#include "support/debug.h" +#include "support/lassert.h" +#include "support/lstrings.h" #include using namespace std; +using namespace lyx::support; namespace lyx { +DocIterator::DocIterator() + : boundary_(false), inset_(0), buffer_(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(Buffer * buf) + : boundary_(false), inset_(0), buffer_(buf) {} -DocIterator::DocIterator(Inset & inset) - : boundary_(false), inset_(&inset) +DocIterator::DocIterator(Buffer * buf, Inset * inset) + : boundary_(false), inset_(inset), buffer_(buf) {} -DocIterator doc_iterator_begin(Inset & inset) +DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0) { - DocIterator dit(inset); + Buffer * buf = const_cast(buf0); + Inset * inset = const_cast(inset0); + DocIterator dit(buf, inset ? inset : &buf->inset()); dit.forwardPos(); return dit; } -DocIterator doc_iterator_end(Inset & inset) +DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0) +{ + Buffer * buf = const_cast(buf0); + Inset * inset = const_cast(inset0); + return DocIterator(buf, inset ? inset : &buf->inset()); +} + + +bool DocIterator::inRegexped() const { - return DocIterator(inset); + InsetMathHull * i = dynamic_cast(inset().asInsetMath()); + return i && i->getType() == hullRegexp; } @@ -68,11 +88,12 @@ LyXErr & operator<<(LyXErr & os, DocIterator const & it) Inset * DocIterator::nextInset() const { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), return 0); if (pos() == lastpos()) return 0; if (pos() > lastpos()) { - LYXERR0("Should not happen, but it does. "); + LYXERR0("Should not happen, but it does: pos() = " + << pos() << ", lastpos() = " << lastpos()); return 0; } if (inMathed()) @@ -83,14 +104,14 @@ Inset * DocIterator::nextInset() const Inset * DocIterator::prevInset() const { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), return 0); if (pos() == 0) return 0; if (inMathed()) { if (cell().empty()) // FIXME: this should not happen but it does. // See bug 3189 - // http://bugzilla.lyx.org/show_bug.cgi?id=3189 + // http://www.lyx.org/trac/ticket/3189 return 0; else return prevAtom().nucleus(); @@ -101,7 +122,7 @@ Inset * DocIterator::prevInset() const Inset * DocIterator::realInset() const { - BOOST_ASSERT(inTexted()); + LASSERT(inTexted(), /**/); // if we are in a tabular, we need the cell if (inset().lyxCode() == TABULAR_CODE) { InsetTabular & tabular = static_cast(inset()); @@ -113,24 +134,24 @@ Inset * DocIterator::realInset() const MathAtom & DocIterator::prevAtom() const { - BOOST_ASSERT(!empty()); - BOOST_ASSERT(pos() > 0); + LASSERT(!empty(), /**/); + LASSERT(pos() > 0, /**/); return cell()[pos() - 1]; } MathAtom & DocIterator::nextAtom() const { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), /**/); //lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl; - BOOST_ASSERT(pos() < lastpos()); + LASSERT(pos() < lastpos(), /**/); return cell()[pos()]; } Text * DocIterator::text() const { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), /**/); return top().text(); } @@ -139,21 +160,21 @@ Paragraph & DocIterator::paragraph() const { if (!inTexted()) LYXERR0(*this); - BOOST_ASSERT(inTexted()); + LASSERT(inTexted(), /**/); return top().paragraph(); } Paragraph & DocIterator::innerParagraph() const { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), /**/); return innerTextSlice().paragraph(); } CursorSlice const & DocIterator::innerTextSlice() const { - BOOST_ASSERT(!empty()); + LASSERT(!empty(), /**/); // go up until first non-0 text is hit // (innermost text is 0 in mathed) for (int i = depth() - 1; i >= 0; --i) @@ -162,7 +183,7 @@ CursorSlice const & DocIterator::innerTextSlice() const // This case is in principe not possible. We _must_ // be inside a Text. - BOOST_ASSERT(false); + LASSERT(false, /**/); static CursorSlice dummy; return dummy; } @@ -221,20 +242,15 @@ DocIterator::col_type DocIterator::col() const MathData & DocIterator::cell() const { -// BOOST_ASSERT(inMathed()); +// LASSERT(inMathed(), /**/); return top().cell(); } Text * DocIterator::innerText() const { - 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; + LASSERT(!empty(), /**/); + return innerTextSlice().text(); } @@ -260,30 +276,27 @@ void DocIterator::forwardPos() CursorSlice & tip = top(); //lyxerr << "XXX\n" << *this << endl; - // this is used twice and shows up in the profiler! - pos_type const lastp = lastpos(); - - // move into an inset to the right if possible - Inset * n = 0; - - if (tip.pos() != lastp) { - // this is impossible for pos() == size() + // not at cell/paragraph end? + if (tip.pos() != tip.lastpos()) { + // move into an inset to the right if possible + Inset * n = 0; if (inMathed()) n = (tip.cell().begin() + tip.pos())->nucleus(); else n = paragraph().getInset(tip.pos()); + if (n && n->isActive()) { + //lyxerr << "... descend" << endl; + push_back(CursorSlice(*n)); + return; + } } - if (n && n->isActive()) { - //lyxerr << "... descend" << endl; - push_back(CursorSlice(*n)); - return; - } - + // jump to the next cell/paragraph if possible if (!tip.at_end()) { tip.forwardPos(); return; } + // otherwise leave inset and jump over inset as a whole pop_back(); // 'tip' is invalid now... @@ -298,7 +311,7 @@ void DocIterator::forwardPosIgnoreCollapsed() // FIXME: the check for asInsetMath() shouldn't be necessary // but math insets do not return a sensible editable() state yet. if (nextinset && !nextinset->asInsetMath() - && nextinset->editable() != Inset::HIGHLY_EDITABLE) { + && !nextinset->editable()) { ++top().pos(); return; } @@ -372,6 +385,7 @@ void DocIterator::backwardPos() return; } + // at inset beginning? if (top().at_begin()) { pop_back(); return; @@ -379,14 +393,16 @@ void DocIterator::backwardPos() top().backwardPos(); + // entered another cell/paragraph from the right? + if (top().pos() == top().lastpos()) + return; + // move into an inset to the left if possible Inset * n = 0; - if (inMathed()) n = (top().cell().begin() + top().pos())->nucleus(); else n = paragraph().getInset(top().pos()); - if (n && n->isActive()) { push_back(CursorSlice(*n)); top().idx() = lastidx(); @@ -415,7 +431,7 @@ void DocIterator::updateInsets(Inset * inset) size_t const n = slices_.size(); slices_.resize(0); for (size_t i = 0 ; i < n; ++i) { - BOOST_ASSERT(inset); + LASSERT(inset, /**/); push_back(dit[i]); top().inset_ = inset; if (i + 1 != n) @@ -427,6 +443,9 @@ void DocIterator::updateInsets(Inset * inset) bool DocIterator::fixIfBroken() { + if (empty()) + return false; + // Go through the slice stack from the bottom. // Check that all coordinates (idx, pit, pos) are correct and // that the inset is the one which is claimed to be there @@ -489,10 +508,10 @@ int DocIterator::find(MathData const & cell) const } -int DocIterator::find(InsetMath const * inset) const +int DocIterator::find(Inset const * inset) const { for (size_t l = 0; l != slices_.size(); ++l) { - if (slices_[l].asInsetMath() == inset) + if (&slices_[l].inset() == inset) return l; } return -1; @@ -544,11 +563,12 @@ StableDocIterator::StableDocIterator(DocIterator const & dit) } -DocIterator StableDocIterator::asDocIterator(Inset * inset) const +DocIterator StableDocIterator::asDocIterator(Buffer * buf) const { // this function re-creates the cache of inset pointers //lyxerr << "converting:\n" << *this << endl; - DocIterator dit = DocIterator(*inset); + Inset * inset = &buf->inset(); + DocIterator dit = DocIterator(buf, inset); for (size_t i = 0, n = data_.size(); i != n; ++i) { if (inset == 0) { // FIXME