* 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 "DocIterator.h"
-#include "debug.h"
-#include "LyXText.h"
+#include "support/debug.h"
+#include "InsetList.h"
#include "Paragraph.h"
+#include "Text.h"
#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
#include "insets/InsetTabular.h"
#include <boost/assert.hpp>
-#include <boost/current_function.hpp>
+#include <ostream>
-namespace lyx {
+using namespace std;
-using std::endl;
+namespace lyx {
// We could be able to get rid of this if only every BufferView were
{}
-DocIterator::DocIterator(InsetBase & inset)
+DocIterator::DocIterator(Inset & inset)
: boundary_(false), inset_(&inset)
{}
-DocIterator doc_iterator_begin(InsetBase & inset)
+DocIterator doc_iterator_begin(Inset & inset)
{
DocIterator dit(inset);
dit.forwardPos();
}
-DocIterator doc_iterator_end(InsetBase & inset)
+DocIterator doc_iterator_end(Inset & inset)
{
return DocIterator(inset);
}
-InsetBase * DocIterator::nextInset()
+LyXErr & operator<<(LyXErr & os, DocIterator const & it)
+{
+ os.stream() << it;
+ return os;
+}
+
+
+Inset * DocIterator::nextInset() const
{
BOOST_ASSERT(!empty());
if (pos() == lastpos())
return 0;
if (pos() > lastpos()) {
- lyxerr << "Should not happen, but it does. " << endl;
+ LYXERR0("Should not happen, but it does. ");
return 0;
}
if (inMathed())
}
-InsetBase * 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;
-}
-
-
-InsetBase 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;
}
-InsetBase * DocIterator::realInset() const
+Inset * DocIterator::realInset() const
{
BOOST_ASSERT(inTexted());
// if we are in a tabular, we need the cell
- if (inset().lyxCode() == InsetBase::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
+MathAtom & DocIterator::nextAtom() const
{
BOOST_ASSERT(!empty());
//lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl;
}
-MathAtom & DocIterator::nextAtom()
+Text * DocIterator::text() const
{
BOOST_ASSERT(!empty());
- //lyxerr << "lastpos: " << lastpos() << " next atom:\n" << *this << endl;
- BOOST_ASSERT(pos() < lastpos());
- return cell()[pos()];
+ return top().text();
}
-LyXText * DocIterator::text()
+Paragraph & DocIterator::paragraph() const
{
- BOOST_ASSERT(!empty());
- return top().text();
+ if (!inTexted())
+ LYXERR0(*this);
+ BOOST_ASSERT(inTexted());
+ return top().paragraph();
}
-LyXText const * DocIterator::text() const
+
+Paragraph & DocIterator::innerParagraph() const
{
BOOST_ASSERT(!empty());
- return top().text();
+ return innerTextSlice().paragraph();
}
-Paragraph & DocIterator::paragraph()
+CursorSlice const & DocIterator::innerTextSlice() const
{
- if (!inTexted())
- lyxerr << *this << endl;
- BOOST_ASSERT(inTexted());
- return top().paragraph();
-}
-
+ 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 const & DocIterator::paragraph() const
-{
- BOOST_ASSERT(inTexted());
- return top().paragraph();
+ // This case is in principe not possible. We _must_
+ // be inside a Text.
+ BOOST_ASSERT(false);
+ 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();
}
-LyXText * 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;
-}
-
-LyXText const * DocIterator::innerText() const
+Text * DocIterator::innerText() const
{
BOOST_ASSERT(!empty());
// go up until first non-0 text is hit
}
-InsetBase * DocIterator::innerInsetOfType(int code) const
+Inset * DocIterator::innerInsetOfType(int code) const
{
for (int i = depth() - 1; i >= 0; --i)
if (slices_[i].inset_->lyxCode() == code)
return;
}
- InsetBase * const nextinset = nextInset();
+ Inset * const nextinset = nextInset();
// jump over collapsables if they are collapsed
// FIXME: the check for asInsetMath() shouldn't be necessary
// but math insets do not return a sensible editable() state yet.
if (ignorecollapsed && nextinset && (!nextinset->asInsetMath()
- && nextinset->editable() != InsetBase::HIGHLY_EDITABLE)) {
+ && nextinset->editable() != Inset::HIGHLY_EDITABLE)) {
++top().pos();
return;
}
pos_type const lastp = lastpos();
// move into an inset to the right if possible
- InsetBase * n = 0;
+ Inset * n = 0;
if (tip.pos() != lastp) {
// this is impossible for pos() == size()
return;
}
- // otherwise move on one position if possible
- if (tip.pos() < lastp) {
- //lyxerr << "... next pos" << endl;
- ++tip.pos();
+ if (!tip.at_end()) {
+ tip.forwardPos();
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...
- 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();
}
pos_type const lastp = lastpos();
Paragraph const & par = paragraph();
pos_type & pos = top().pos();
- if (par.insetlist.empty())
+ if (par.insetList().empty())
pos = lastp;
else
while (pos < lastp && !par.isInset(pos))
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
- InsetBase * n = 0;
+ 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()) {
}
-void DocIterator::updateInsets(InsetBase * inset)
+void DocIterator::updateInsets(Inset * inset)
{
// this function re-creates the cache of inset pointers.
- // code taken in part from StableDocIterator::asDocIterator.
//lyxerr << "converting:\n" << *this << endl;
- DocIterator dit = DocIterator(*inset);
+ DocIterator dit = *this;
size_t const n = slices_.size();
+ slices_.resize(0);
for (size_t i = 0 ; i < n; ++i) {
BOOST_ASSERT(inset);
- dit.push_back(slices_[i]);
- dit.top().inset_ = inset;
+ push_back(dit[i]);
+ top().inset_ = inset;
if (i + 1 != n)
- inset = dit.nextInset();
+ inset = nextInset();
}
//lyxerr << "converted:\n" << *this << endl;
- operator=(dit);
}
-std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
+bool DocIterator::fixIfBroken()
+{
+ // 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");
+ 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");
+ break;
+ } else if (cs.pit() > cs.lastpit()) {
+ cs.pit() = cs.lastpit();
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pit fixed");
+ break;
+ } else if (cs.pos() > cs.lastpos()) {
+ cs.pos() = cs.lastpos();
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pos fixed");
+ 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;
+ }
+ }
+ }
+
+ // 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);
+ resize(i + 1);
+ return true;
+ } else
+ return false;
+}
+
+
+DocIterator::idx_type DocIterator::find(MathData const & cell) const
+{
+ for (size_t l = 0; l != slices_.size(); ++l) {
+ if (slices_[l].asInsetMath() && &slices_[l].cell() == &cell)
+ return l;
+ }
+ return -1;
+}
+
+
+DocIterator::idx_type DocIterator::find(InsetMath const * inset) const
+{
+ for (size_t l = 0; l != slices_.size(); ++l) {
+ if (slices_[l].asInsetMath() == inset)
+ return l;
+ }
+ return -1;
+}
+
+
+void DocIterator::cutOff(DocIterator::idx_type above, vector<CursorSlice> & cut)
+{
+ cut = vector<CursorSlice>(slices_.begin() + above + 1, slices_.end());
+ slices_.resize(above + 1);
+}
+
+
+void DocIterator::cutOff(DocIterator::idx_type above)
+{
+ slices_.resize(above + 1);
+}
+
+
+void DocIterator::append(vector<CursorSlice> const & x)
+{
+ slices_.insert(slices_.end(), x.begin(), x.end());
+}
+
+
+void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
+{
+ slices_.push_back(CursorSlice());
+ top().idx() = idx;
+ top().pos() = pos;
+}
+
+
+ostream & operator<<(ostream & os, DocIterator const & dit)
{
for (size_t i = 0, n = dit.depth(); i != n; ++i)
os << " " << dit[i] << "\n";
}
-
///////////////////////////////////////////////////////
StableDocIterator::StableDocIterator(DocIterator const & dit)
}
-DocIterator StableDocIterator::asDocIterator(InsetBase * inset) const
+DocIterator StableDocIterator::asDocIterator(Inset * inset) const
{
// this function re-creates the cache of inset pointers
//lyxerr << "converting:\n" << *this << endl;
for (size_t i = 0, n = data_.size(); i != n; ++i) {
if (inset == 0) {
// FIXME
- lyxerr << BOOST_CURRENT_FUNCTION
- << " Should not happen, but does e.g. after C-n C-l C-z S-C-z"
+ 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() << endl;
- //break;
- BOOST_ASSERT(false);
+ << " 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();
}
}
-std::ostream & operator<<(std::ostream & os, StableDocIterator const & dit)
+ostream & operator<<(ostream & os, StableDocIterator const & dit)
{
for (size_t i = 0, n = dit.data_.size(); i != n; ++i)
os << " " << dit.data_[i] << "\n";