#include "DocIterator.h"
#include "debug.h"
-#include "Text.h"
+#include "InsetList.h"
#include "Paragraph.h"
+#include "Text.h"
#include "mathed/MathData.h"
#include "mathed/InsetMath.h"
}
-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
+MathData & DocIterator::cell() const
{
// BOOST_ASSERT(inMathed());
return top().cell();
}
-MathData & DocIterator::cell()
-{
-// 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
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))
}
-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();
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);
}
if (&cs.inset() != inset) {
// the whole slice is wrong, chop off this as well
--i;
- LYXERR(Debug::DEBUG) << "fixIfBroken(): inset changed" << endl;
+ 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" << endl;
+ 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" << endl;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): pit fixed");
break;
} else if (cs.pos() > cs.lastpos()) {
cs.pos() = cs.lastpos();
- LYXERR(Debug::DEBUG) << "fixIfBroken(): pos fixed" << endl;
+ 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
// 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;
+ LYXERR(Debug::DEBUG, "fixIfBroken(): cursor chopped at " << i);
resize(i + 1);
return true;
} else
}
+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, std::vector<CursorSlice> & cut)
+{
+ cut = std::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(std::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;
+}
+
+
std::ostream & operator<<(std::ostream & os, DocIterator const & dit)
{
for (size_t i = 0, n = dit.depth(); i != n; ++i)
projects / lyx.git / blobdiff