* Licence details can be found in the file COPYING.
*
* \author André Pönitz
+ * \author Alfredo Braunstein
*
* Full author contact details are available in file CREDITS.
*/
#include <boost/assert.hpp>
#include <boost/current_function.hpp>
+using std::endl;
-namespace lyx {
-using std::endl;
+namespace lyx {
// We could be able to get rid of this if only every BufferView were
}
-Inset * DocIterator::nextInset()
+Inset * DocIterator::nextInset() const
{
BOOST_ASSERT(!empty());
if (pos() == lastpos())
}
-Inset * DocIterator::prevInset()
-{
- BOOST_ASSERT(!empty());
- 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
- return 0;
- else
- return prevAtom().nucleus();
- return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
-}
-
-
-Inset const * DocIterator::prevInset() const
+Inset * DocIterator::prevInset() const
{
BOOST_ASSERT(!empty());
if (pos() == 0)
return 0;
- if (inMathed())
+ if (inMathed()) {
if (cell().empty())
// FIXME: this should not happen but it does.
// See bug 3189
return 0;
else
return prevAtom().nucleus();
+ }
return paragraph().isInset(pos() - 1) ? paragraph().getInset(pos() - 1) : 0;
}
{
BOOST_ASSERT(inTexted());
// if we are in a tabular, we need the cell
- if (inset().lyxCode() == Inset::TABULAR_CODE) {
+ if (inset().lyxCode() == TABULAR_CODE) {
InsetTabular & tabular = static_cast<InsetTabular&>(inset());
return tabular.cell(idx()).get();
}
}
-MathAtom const & DocIterator::prevAtom() const
-{
- BOOST_ASSERT(!empty());
- BOOST_ASSERT(pos() > 0);
- return cell()[pos() - 1];
-}
-
-
-MathAtom & DocIterator::prevAtom()
+MathAtom & DocIterator::prevAtom() const
{
BOOST_ASSERT(!empty());
BOOST_ASSERT(pos() > 0);
}
-MathAtom const & DocIterator::nextAtom() const
-{
- BOOST_ASSERT(!empty());
- //lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl;
- BOOST_ASSERT(pos() < lastpos());
- return cell()[pos()];
-}
-
-
-MathAtom & DocIterator::nextAtom()
+MathAtom & DocIterator::nextAtom() const
{
BOOST_ASSERT(!empty());
//lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl;
}
-Text * DocIterator::text()
-{
- BOOST_ASSERT(!empty());
- return top().text();
-}
-
-Text const * DocIterator::text() const
+Text * DocIterator::text() const
{
BOOST_ASSERT(!empty());
return top().text();
}
-Paragraph & DocIterator::paragraph()
+Paragraph & DocIterator::paragraph() const
{
if (!inTexted())
lyxerr << *this << endl;
}
-Paragraph const & DocIterator::paragraph() const
+Paragraph & DocIterator::innerParagraph() const
{
- BOOST_ASSERT(inTexted());
- return top().paragraph();
+ BOOST_ASSERT(!empty());
+ return innerTextSlice().paragraph();
}
-Paragraph const & DocIterator::innerParagraph() const
+CursorSlice const & DocIterator::innerTextSlice() 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].paragraph();
+ return slices_[i];
// This case is in principe not possible. We _must_
- // be inside a Paragraph.
+ // be inside a Text.
BOOST_ASSERT(false);
- return paragraph();
+ static CursorSlice dummy;
+ return dummy;
}
}
-MathData const & DocIterator::cell() const
-{
-// BOOST_ASSERT(inMathed());
- return top().cell();
-}
-
-
-MathData & DocIterator::cell()
+MathData & DocIterator::cell() const
{
// BOOST_ASSERT(inMathed());
return top().cell();
}
-Text * 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;
-}
-
-Text const * DocIterator::innerText() const
+Text * DocIterator::innerText() const
{
BOOST_ASSERT(!empty());
// go up until first non-0 text is hit
return;
}
- // otherwise 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;
+ if (!tip.at_end()) {
+ tip.forwardPos();
return;
}
- //lyxerr << "... no next idx" << endl;
-
// otherwise leave inset and jump over inset as a whole
pop_back();
- // 'top' is invalid now...
- 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 leave inset and jump over inset as a whole
- pop_back();
- // 'top' is invalid now...
+ // 'tip' is invalid now...
if (!empty())
++top().pos();
}
}
-void DocIterator::forwardIdx()
-{
- CursorSlice & tip = top();
-
- //prevent endless loops
- BOOST_ASSERT(tip.idx() < lastidx());
-
- ++tip.idx();
- tip.pit() = 0;
- tip.pos() = 0;
-}
-
-
void DocIterator::forwardChar()
{
forwardPos();
return;
}
- CursorSlice & tip = top();
-
- if (tip.pos() != 0) {
- --tip.pos();
- } else if (tip.pit() != 0) {
- --tip.pit();
- tip.pos() = lastpos();
- return;
- } else if (tip.idx() != 0) {
- --tip.idx();
- tip.pit() = lastpit();
- tip.pos() = lastpos();
- return;
- } else {
+ if (top().at_begin()) {
pop_back();
return;
}
+ top().backwardPos();
+
// move into an inset to the left if possible
Inset * n = 0;
if (inMathed()) {
- n = (tip.cell().begin() + tip.pos())->nucleus();
+ n = (top().cell().begin() + top().pos())->nucleus();
} else {
- if (paragraph().isInset(tip.pos()))
- n = paragraph().getInset(tip.pos());
+ if (paragraph().isInset(top().pos()))
+ n = paragraph().getInset(top().pos());
}
if (n && n->isActive()) {
bool DocIterator::fixIfBroken()
{
- bool fixed = false;
-
- for (size_t i = slices_.size() - 1; i != 0; --i)
- if (!slices_[i].isValid()) {
- pop_back();
- fixed = true;
+ // 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
+ Inset * inset = &slices_[0].inset();
+ size_t i = 0;
+ size_t n = slices_.size();
+ for (; i != n; ++i) {
+ CursorSlice & cs = slices_[i];
+ if (&cs.inset() != inset) {
+ // the whole slice is wrong, chop off this as well
+ --i;
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): inset changed" << endl;
+ break;
+ } else if (cs.idx() > cs.lastidx()) {
+ cs.idx() = cs.lastidx();
+ cs.pit() = cs.lastpit();
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): idx fixed" << endl;
+ break;
+ } else if (cs.pit() > cs.lastpit()) {
+ cs.pit() = cs.lastpit();
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): pit fixed" << endl;
+ break;
+ } else if (cs.pos() > cs.lastpos()) {
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): pos fixed" << endl;
+ break;
+ } else if (i != n - 1 && cs.pos() != cs.lastpos()) {
+ // get inset which is supposed to be in the next slice
+ if (cs.inset().inMathed())
+ inset = (cs.cell().begin() + cs.pos())->nucleus();
+ else if (cs.paragraph().isInset(cs.pos()))
+ inset = cs.paragraph().getInset(cs.pos());
+ else {
+ // there are slices left, so there must be another inset
+ break;
+ }
}
-
- // The top level CursorSlice should always be valid.
- BOOST_ASSERT(slices_[0].isValid());
-
- if (idx() > lastidx()) {
- lyxerr << "wrong idx " << idx()
- << ", max is " << lastidx()
- << " at level " << depth()
- << ". Trying to correct this." << endl;
- lyxerr << "old: " << *this << endl;
- for (size_t i = idx(); i != lastidx(); --i)
- pop_back();
- idx() = lastidx();
- pit() = lastpit();
- pos() = lastpos();
- fixed = true;
- }
- else if (pit() > lastpit()) {
- lyxerr << "wrong pit " << pit()
- << ", max is " << lastpit()
- << " at level " << depth()
- << ". Trying to correct this." << endl;
- lyxerr << "old: " << *this << endl;
- pit() = lastpit();
- pos() = 0;
- fixed = true;
- }
- else if (pos() > lastpos()) {
- lyxerr << "wrong pos " << pos()
- << ", max is " << lastpos()
- << " at level " << depth()
- << ". Trying to correct this." << endl;
- lyxerr << "old: " << *this << endl;
- pos() = lastpos();
- fixed = true;
}
- if (fixed) {
- lyxerr << "new: " << *this << endl;
- }
- return fixed;
+
+ // Did we make it through the whole slice stack? Otherwise there
+ // was a problem at slice i, and we have to chop off above
+ if (i < n) {
+ LYXERR(Debug::DEBUG) << "fixIfBroken(): cursor chopped at " << i << endl;
+ resize(i + 1);
+ return true;
+ } else
+ return false;
}
projects / lyx.git / blobdiff