X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=6e3775b4e36e8886a53123ddda16948d4a767e06;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=a29f364aa3deab5f974dc6adcb64f25a646bca12;hpb=1bf7b59d60a30aed7d418cb63e9f12610635f7e6;p=lyx.git diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index a29f364aa3..6e3775b4e3 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,49 +14,91 @@ #include "DocIterator.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 "support/debug.h" - -#include +#include "support/ExceptionMessage.h" +#include "support/gettext.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()); +} + + +DocIterator DocIterator::clone(Buffer * buffer) const +{ + LASSERT(buffer->isClone(), return DocIterator()); + Inset * inset = &buffer->inset(); + DocIterator dit(buffer); + size_t const n = slices_.size(); + for (size_t i = 0 ; i != n; ++i) { + LBUFERR(inset); + dit.push_back(slices_[i]); + dit.top().inset_ = inset; + if (i + 1 != n) + inset = dit.nextInset(); + } + return dit; +} + + +bool DocIterator::inRegexped() const { - return DocIterator(inset); + InsetMath * im = inset().asInsetMath(); + if (!im) + return false; + InsetMathHull * hull = im->asHullInset(); + return hull && hull->getType() == hullRegexp; } @@ -69,11 +111,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()) @@ -84,14 +127,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(); @@ -102,11 +145,11 @@ Inset * DocIterator::prevInset() const Inset * DocIterator::realInset() const { - BOOST_ASSERT(inTexted()); + LASSERT(inTexted(), return 0); // if we are in a tabular, we need the cell if (inset().lyxCode() == TABULAR_CODE) { - InsetTabular & tabular = static_cast(inset()); - return tabular.cell(idx()).get(); + InsetTabular * tabular = inset().asInsetTabular(); + return tabular->cell(idx()).get(); } return &inset(); } @@ -114,47 +157,60 @@ 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 0); return top().text(); } Paragraph & DocIterator::paragraph() const { - if (!inTexted()) + if (!inTexted()) { LYXERR0(*this); - BOOST_ASSERT(inTexted()); + LBUFERR(false); + } return top().paragraph(); } Paragraph & DocIterator::innerParagraph() const { - BOOST_ASSERT(!empty()); + LBUFERR(!empty()); return innerTextSlice().paragraph(); } +FontSpan DocIterator::locateWord(word_location const loc) const +{ + FontSpan f = FontSpan(); + + if (!top().text()->empty()) { + f.first = pos(); + top().paragraph().locateWord(f.first, f.last, loc); + } + return f; +} + + CursorSlice const & DocIterator::innerTextSlice() const { - BOOST_ASSERT(!empty()); + LBUFERR(!empty()); // go up until first non-0 text is hit // (innermost text is 0 in mathed) for (int i = depth() - 1; i >= 0; --i) @@ -163,9 +219,10 @@ CursorSlice const & DocIterator::innerTextSlice() const // This case is in principe not possible. We _must_ // be inside a Text. - BOOST_ASSERT(false); - static CursorSlice dummy; - return dummy; + LBUFERR(false); + // Squash warning + static const CursorSlice c; + return c; } @@ -222,20 +279,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 0); + return innerTextSlice().text(); } @@ -261,30 +313,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... @@ -299,7 +348,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; } @@ -373,6 +422,7 @@ void DocIterator::backwardPos() return; } + // at inset beginning? if (top().at_begin()) { pop_back(); return; @@ -380,14 +430,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(); @@ -416,7 +468,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); + LBUFERR(inset); push_back(dit[i]); top().inset_ = inset; if (i + 1 != n) @@ -483,6 +535,36 @@ bool DocIterator::fixIfBroken() } +void DocIterator::sanitize() +{ + // keep a copy of the slices + vector const sl = slices_; + slices_.clear(); + if (buffer_) + inset_ = &buffer_->inset(); + Inset * inset = inset_; + // re-add the slices one by one, and adjust the inset pointer. + for (size_t i = 0, n = sl.size(); i != n; ++i) { + if (inset == 0) { + // FIXME + 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: " << *this << '\n' + << " lastpos: " << slices_[i].lastpos()); + fixIfBroken(); + break; + } + push_back(sl[i]); + top().inset_ = inset; + if (fixIfBroken()) + break; + if (i + 1 != n) + inset = nextInset(); + } +} + + int DocIterator::find(MathData const & cell) const { for (size_t l = 0; l != slices_.size(); ++l) { @@ -493,10 +575,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; @@ -548,30 +630,11 @@ 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); - for (size_t i = 0, n = data_.size(); i != n; ++i) { - if (inset == 0) { - // FIXME - 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()); - dit.fixIfBroken(); - break; - } - dit.push_back(data_[i]); - dit.top().inset_ = inset; - if (dit.fixIfBroken()) - break; - if (i + 1 != n) - inset = dit.nextInset(); - } - //lyxerr << "convert:\n" << *this << " to:\n" << dit << endl; + DocIterator dit(buf); + dit.slices_ = data_; + dit.sanitize(); return dit; }