#include "debug.h"
#include "lyxtext.h"
-#include "lyxrow.h"
#include "paragraph.h"
#include "mathed/MathData.h"
}
-bool DocIterator::inMathed() const
-{
- return !empty() && inset().inMathed();
-}
-
-
-bool DocIterator::inTexted() const
-{
- return !empty() && !inset().inMathed();
-}
-
-
LyXText * DocIterator::innerText()
{
BOOST_ASSERT(!empty());
return;
}
+ InsetBase * 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)) {
+ if (ignorecollapsed && nextinset && (!nextinset->asInsetMath()
+ && nextinset->editable() != InsetBase::HIGHLY_EDITABLE)) {
++top().pos();
return;
}
pos_type const lastp = lastpos();
Paragraph const & par = paragraph();
pos_type & pos = top().pos();
- while (pos < lastp && !par.isInset(pos))
- ++pos;
+ if (par.insetlist.empty())
+ pos = lastp;
+ else
+ while (pos < lastp && !par.isInset(pos))
+ ++pos;
}
forwardPos();
}