}
-Inset * DocIterator::nextInset()
+Inset * DocIterator::nextInset() const
{
BOOST_ASSERT(!empty());
if (pos() == lastpos())
}
-Inset * DocIterator::prevInset()
+Inset * DocIterator::prevInset() const
{
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
-{
- 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;
}
}
-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
}
-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();