X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursorSlice.cpp;h=0e46c0781fc760ac8e8783fcd099011db555151f;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=0ff99882ec0ceedd1e8f60ca435fc562dcf2893b;hpb=bc0a64efc3f423e5d21c0aaf3cb2e52c23d5510a;p=lyx.git diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp index 0ff99882ec..0e46c0781f 100644 --- a/src/CursorSlice.cpp +++ b/src/CursorSlice.cpp @@ -3,10 +3,10 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Matthias Ettrich - * \author André Pönitz - * \author Jürgen Vigna + * \author André Pönitz + * \author Jürgen Vigna * * Full author contact details are available in file CREDITS. */ @@ -15,19 +15,23 @@ #include "CursorSlice.h" -#include "debug.h" #include "Text.h" #include "Paragraph.h" +#include "support/debug.h" + #include "insets/Inset.h" #include "mathed/InsetMath.h" -#include "mathed/MathData.h" +#include "mathed/MathMacro.h" -#include +#include "support/ExceptionMessage.h" +#include "support/gettext.h" +#include "support/lassert.h" -using std::endl; +#include +using namespace std; namespace lyx { @@ -40,7 +44,7 @@ CursorSlice::CursorSlice() CursorSlice::CursorSlice(Inset & p) : inset_(&p), idx_(0), pit_(0), pos_(0) { - BOOST_ASSERT(inset_); + LBUFERR(inset_); } @@ -50,13 +54,7 @@ MathData & CursorSlice::cell() const } -Paragraph & CursorSlice::paragraph() -{ - return text()->getPar(pit_); -} - - -Paragraph const & CursorSlice::paragraph() const +Paragraph & CursorSlice::paragraph() const { return text()->getPar(pit_); } @@ -64,14 +62,17 @@ Paragraph const & CursorSlice::paragraph() const pos_type CursorSlice::lastpos() const { - BOOST_ASSERT(inset_); - return inset_->asInsetMath() ? cell().size() : paragraph().size(); + LBUFERR(inset_); + InsetMath const * math = inset_->asInsetMath(); + bool paramless_macro = math && math->asMacro() && !math->asMacro()->nargs(); + return math ? (paramless_macro ? 0 : cell().size()) + : (text()->empty() ? 0 : paragraph().size()); } pit_type CursorSlice::lastpit() const { - if (inset().inMathed()) + if (inset_->inMathed()) return 0; return text()->paragraphs().size() - 1; } @@ -79,14 +80,18 @@ pit_type CursorSlice::lastpit() const CursorSlice::row_type CursorSlice::row() const { - BOOST_ASSERT(asInsetMath()); + // LASSERT: This should only ever be called from an InsetMath. + // Should we crash in release mode, though, or try to continue? + LASSERT(asInsetMath(), /**/); return asInsetMath()->row(idx_); } CursorSlice::col_type CursorSlice::col() const { - BOOST_ASSERT(asInsetMath()); + // LASSERT: This should only ever be called from an InsetMath. + // Should we crash in release mode, though, or try to continue? + LASSERT(asInsetMath(), /**/); return asInsetMath()->col(idx_); } @@ -94,98 +99,108 @@ CursorSlice::col_type CursorSlice::col() const void CursorSlice::forwardPos() { // move on one position if possible - if (pos() < lastpos()) { + if (pos_ < lastpos()) { //lyxerr << "... next pos" << endl; - ++pos(); + ++pos_; return; } // otherwise move on one paragraph if possible - if (pit() < lastpit()) { + if (pit_ < lastpit()) { //lyxerr << "... next par" << endl; - ++pit(); - pos() = 0; + ++pit_; + pos_ = 0; return; } - // otherwise try to move on one cell if possible - if (idx() < lastidx()) { - //lyxerr << "... next idx" << endl; - ++idx(); - pit() = 0; - pos() = 0; - return; - } - BOOST_ASSERT(false); + // otherwise move on one cell + //lyxerr << "... next idx" << endl; + + LASSERT(idx_ < nargs(), return); + + ++idx_; + pit_ = 0; + pos_ = 0; +} + + +void CursorSlice::forwardIdx() +{ + LASSERT(idx_ < nargs(), return); + + ++idx_; + pit_ = 0; + pos_ = 0; } void CursorSlice::backwardPos() { - if (pos() != 0) { - --pos(); + if (pos_ != 0) { + --pos_; return; } - if (pit() != 0) { - --pit(); - pos() = lastpos(); + if (pit_ != 0) { + --pit_; + pos_ = lastpos(); return; } - if (idx() != 0) { - --idx(); - pit() = lastpit(); - pos() = lastpos(); + if (idx_ != 0) { + --idx_; + pit_ = lastpit(); + pos_ = lastpos(); return; } - BOOST_ASSERT(false); + LATTEST(false); } bool CursorSlice::at_end() const { - return idx() == lastidx() && pit() == lastpit() && pos() == lastpos(); + return idx_ == lastidx() && pit_ == lastpit() && pos_ == lastpos(); } bool CursorSlice::at_begin() const { - return idx() == 0 && pit() == 0 && pos() == 0; + return idx_ == 0 && pit_ == 0 && pos_ == 0; } bool operator==(CursorSlice const & p, CursorSlice const & q) { - return &p.inset() == &q.inset() - && p.idx() == q.idx() - && p.pit() == q.pit() - && p.pos() == q.pos(); + return p.inset_ == q.inset_ + && p.idx_ == q.idx_ + && p.pit_ == q.pit_ + && p.pos_ == q.pos_; } bool operator!=(CursorSlice const & p, CursorSlice const & q) { - return &p.inset() != &q.inset() - || p.idx() != q.idx() - || p.pit() != q.pit() - || p.pos() != q.pos(); + return p.inset_ != q.inset_ + || p.idx_ != q.idx_ + || p.pit_ != q.pit_ + || p.pos_ != q.pos_; } bool operator<(CursorSlice const & p, CursorSlice const & q) { - if (&p.inset() != &q.inset()) { - lyxerr << "can't compare cursor and anchor in different insets\n" - << "p: " << p << '\n' << "q: " << q << endl; - BOOST_ASSERT(false); + if (p.inset_ != q.inset_) { + LYXERR0("can't compare cursor and anchor in different insets\n" + << "p: " << p << '\n' << "q: " << q); + // It should be safe to continue, just registering the error. + LASSERT(false, return false); } - if (p.idx() != q.idx()) - return p.idx() < q.idx(); - if (p.pit() != q.pit()) - return p.pit() < q.pit(); - return p.pos() < q.pos(); + if (p.idx_ != q.idx_) + return p.idx_ < q.idx_; + if (p.pit_ != q.pit_) + return p.pit_ < q.pit_; + return p.pos_ < q.pos_; } @@ -201,16 +216,16 @@ bool operator<=(CursorSlice const & p, CursorSlice const & q) } -std::ostream & operator<<(std::ostream & os, CursorSlice const & item) +ostream & operator<<(ostream & os, CursorSlice const & item) { return os - << "inset: " << &item.inset() + << "inset: " << (void *)item.inset_ // << " text: " << item.text() - << " idx: " << item.idx() - << " par: " << item.pit() - << " pos: " << item.pos() -// << " x: " << item.inset().x() -// << " y: " << item.inset().y() + << " idx: " << item.idx_ + << " par: " << item.pit_ + << " pos: " << item.pos_ +// << " x: " << item.inset_->x() +// << " y: " << item.inset_->y() ; }