X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDocIterator.cpp;h=6e3775b4e36e8886a53123ddda16948d4a767e06;hb=26910d5ec49395d1372dd5b9259f1bf6ed23de0a;hp=49705bc96b0fce1d29113a092c610ea2f9ea3f21;hpb=4c9fe33c833fb7239a790acc847f45393983da2b;p=lyx.git diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp index 49705bc96b..6e3775b4e3 100644 --- a/src/DocIterator.cpp +++ b/src/DocIterator.cpp @@ -27,6 +27,8 @@ #include "insets/InsetTabular.h" #include "support/debug.h" +#include "support/ExceptionMessage.h" +#include "support/gettext.h" #include "support/lassert.h" #include "support/lstrings.h" @@ -42,6 +44,7 @@ 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(Buffer * buf) @@ -72,10 +75,30 @@ DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0) } +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 { - InsetMathHull * i = dynamic_cast(inset().asInsetMath()); - return i && i->getType() == hullRegexp; + InsetMath * im = inset().asInsetMath(); + if (!im) + return false; + InsetMathHull * hull = im->asHullInset(); + return hull && hull->getType() == hullRegexp; } @@ -92,7 +115,8 @@ Inset * DocIterator::nextInset() const 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()) @@ -110,7 +134,7 @@ Inset * DocIterator::prevInset() const 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(); @@ -121,11 +145,11 @@ Inset * DocIterator::prevInset() const Inset * DocIterator::realInset() const { - LASSERT(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(); } @@ -150,30 +174,43 @@ MathAtom & DocIterator::nextAtom() const Text * DocIterator::text() const { - LASSERT(!empty(), /**/); + LASSERT(!empty(), return 0); return top().text(); } Paragraph & DocIterator::paragraph() const { - if (!inTexted()) + if (!inTexted()) { LYXERR0(*this); - LASSERT(inTexted(), /**/); + LBUFERR(false); + } return top().paragraph(); } Paragraph & DocIterator::innerParagraph() const { - LASSERT(!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 { - LASSERT(!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) @@ -182,9 +219,10 @@ CursorSlice const & DocIterator::innerTextSlice() const // This case is in principe not possible. We _must_ // be inside a Text. - LASSERT(false, /**/); - static CursorSlice dummy; - return dummy; + LBUFERR(false); + // Squash warning + static const CursorSlice c; + return c; } @@ -248,13 +286,8 @@ MathData & DocIterator::cell() const Text * DocIterator::innerText() const { - 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) - if (slices_[i].text()) - return slices_[i].text(); - return 0; + LASSERT(!empty(), return 0); + return innerTextSlice().text(); } @@ -435,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) { - LASSERT(inset, /**/); + LBUFERR(inset); push_back(dit[i]); top().inset_ = inset; if (i + 1 != n) @@ -502,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) { @@ -569,29 +632,9 @@ StableDocIterator::StableDocIterator(DocIterator const & dit) DocIterator StableDocIterator::asDocIterator(Buffer * buf) const { - // this function re-creates the cache of inset pointers - //lyxerr << "converting:\n" << *this << endl; - Inset * inset = &buf->inset(); - DocIterator dit = DocIterator(buf, 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; } @@ -610,16 +653,4 @@ bool operator==(StableDocIterator const & dit1, StableDocIterator const & dit2) } -bool isLetter(DocIterator const & dit) -{ - return dit.inTexted() - && dit.inset().allowSpellCheck() - && dit.pos() != dit.lastpos() - && (dit.paragraph().isLetter(dit.pos()) - // We want to pass the ' and escape chars to ispell - || contains(from_utf8(lyxrc.spellchecker_esc_chars + '\''), - dit.paragraph().getChar(dit.pos()))) - && !dit.paragraph().isDeleted(dit.pos()); -} - } // namespace lyx