Longtable: only output the caption contents in a caption row.

[lyx.git] / src / DocIterator.cpp

diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index a059ad18d2110b52fe88153b65ef4d5669ed288e..38f2393224b1e37b1839537f12ea6b85008ec8d8 100644 (file)
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -26,6 +26,7 @@
 
 #include "insets/InsetTabular.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/ExceptionMessage.h"
 #include "support/gettext.h"
@@ -59,7 +60,7 @@ DocIterator::DocIterator(Buffer * buf, Inset * inset)
 
 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();
@@ -69,7 +70,7 @@ DocIterator doc_iterator_begin(const Buffer * buf0, const Inset * inset0)
 
 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());
 }
@@ -95,7 +96,7 @@ DocIterator DocIterator::clone(Buffer * buffer) const
 bool DocIterator::inRegexped() const
 {
        InsetMath * im = inset().asInsetMath();
-       if (!im) 
+       if (!im)
                return false;
        InsetMathHull * hull = im->asHullInset();
        return hull && hull->getType() == hullRegexp;
@@ -207,7 +208,7 @@ FontSpan DocIterator::locateWord(word_location const loc) const
        return f;
 }
 
-       
+
 CursorSlice const & DocIterator::innerTextSlice() const
 {
        LBUFERR(!empty());
@@ -226,10 +227,18 @@ CursorSlice const & DocIterator::innerTextSlice() const
 }
 
 
+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()) 
+       while (!texted.inTexted())
                texted.pop_back();
        return texted;
 }
@@ -309,6 +318,24 @@ Inset * DocIterator::innerInsetOfType(int code) const
 }
 
 
+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()
@@ -527,7 +554,7 @@ bool DocIterator::fixIfBroken()
        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();
@@ -535,7 +562,7 @@ bool DocIterator::fixIfBroken()
        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");
@@ -624,7 +651,7 @@ int DocIterator::find(MathData const & cell) const
 }
 
 
-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)
@@ -647,13 +674,13 @@ void DocIterator::cutOff(int above)
 }
 
 
-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;
@@ -671,9 +698,9 @@ ostream & operator<<(ostream & os, DocIterator const & dit)
 
 ///////////////////////////////////////////////////////
 
-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;
 }