if (pos() == lastpos())
return 0;
if (pos() > lastpos()) {
- LYXERR0("Should not happen, but it does. ");
+ LYXERR0("Should not happen, but it does: pos() = "
+ << pos() << ", lastpos() = " << lastpos());
return 0;
}
if (inMathed())
Text * DocIterator::innerText() const
{
LASSERT(!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;
+ return innerTextSlice().text();
}
// FIXME: the check for asInsetMath() shouldn't be necessary
// but math insets do not return a sensible editable() state yet.
if (nextinset && !nextinset->asInsetMath()
- && nextinset->editable() != Inset::HIGHLY_EDITABLE) {
+ && !nextinset->editable()) {
++top().pos();
return;
}
}
-bool isLetter(DocIterator const & dit)
-{
- return dit.inTexted()
- && dit.inset().allowSpellCheck()
- && dit.pos() != dit.lastpos()
- && (dit.paragraph().isLetter(dit.pos())
- // We want to pass the ' and escape chars to ispell
- || contains(from_utf8(lyxrc.spellchecker_esc_chars + '\''),
- dit.paragraph().getChar(dit.pos())))
- && !dit.paragraph().isDeleted(dit.pos());
-}
-
} // namespace lyx