#include "insets/InsetTabular.h"
+#include "support/convert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/gettext.h"
DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
{
- Buffer * buf = const_cast<Buffer *>(buf0);
+ Buffer * buf = const_cast<Buffer *>(buf0);
Inset * inset = const_cast<Inset *>(inset0);
DocIterator dit(buf, inset ? inset : &buf->inset());
dit.forwardPos();
DocIterator doc_iterator_end(const Buffer * buf0, const Inset * inset0)
{
- Buffer * buf = const_cast<Buffer *>(buf0);
+ Buffer * buf = const_cast<Buffer *>(buf0);
Inset * inset = const_cast<Inset *>(inset0);
return DocIterator(buf, inset ? inset : &buf->inset());
}
bool DocIterator::inRegexped() const
{
InsetMath * im = inset().asInsetMath();
- if (!im)
+ if (!im)
return false;
InsetMathHull * hull = im->asHullInset();
return hull && hull->getType() == hullRegexp;
return f;
}
-
+
CursorSlice const & DocIterator::innerTextSlice() const
{
LBUFERR(!empty());
}
+docstring DocIterator::paragraphGotoArgument() const
+{
+ CursorSlice const & s = innerTextSlice();
+ return convert<docstring>(s.paragraph().id()) + ' ' +
+ convert<docstring>(s.pos());
+}
+
+
+DocIterator DocIterator::getInnerText() const
+{
+ DocIterator texted = *this;
+ while (!texted.inTexted())
+ texted.pop_back();
+ return texted;
+}
+
+
pit_type DocIterator::lastpit() const
{
return inMathed() ? 0 : text()->paragraphs().size() - 1;
}
+bool DocIterator::posBackward()
+{
+ if (pos() == 0)
+ return false;
+ --pos();
+ return true;
+}
+
+
+bool DocIterator::posForward()
+{
+ if (pos() == lastpos())
+ return false;
+ ++pos();
+ return true;
+}
+
+
// This duplicates code above, but is in the critical path.
// So please think twice before adding stuff
void DocIterator::forwardPos()
if (empty())
return false;
- // Go through the slice stack from the bottom.
+ // 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 n = slices_.size();
for (; i != n; ++i) {
CursorSlice & cs = slices_[i];
- if (&cs.inset() != inset) {
+ if (&cs.inset() != inset || ! cs.inset().isActive()) {
// the whole slice is wrong, chop off this as well
--i;
LYXERR(Debug::DEBUG, "fixIfBroken(): inset changed");
}
-int DocIterator::find(Inset const * inset) const
+int DocIterator::find(Inset const * inset) const
{
for (size_t l = 0; l != slices_.size(); ++l) {
if (&slices_[l].inset() == inset)
}
-void DocIterator::append(vector<CursorSlice> const & x)
+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)
+void DocIterator::append(DocIterator::idx_type idx, pos_type pos)
{
slices_.push_back(CursorSlice());
top().idx() = idx;
///////////////////////////////////////////////////////
-StableDocIterator::StableDocIterator(DocIterator const & dit)
+StableDocIterator::StableDocIterator(DocIterator const & dit) :
+ data_(dit.internalData())
{
- data_ = dit.internalData();
for (size_t i = 0, n = data_.size(); i != n; ++i)
data_[i].inset_ = 0;
}