Move isMultiCell() to Cursor, and use it.

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 5697e5339772cef1d0ead742b50729be5fc4f134..8d2a857cff7f89d7c06f5d45a7790681a0cd135d 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -24,7 +24,6 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "InsetList.h"
 #include "MetricsInfo.h"
 #include "output_latex.h"
@@ -37,6 +36,7 @@
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <sstream>
@@ -54,14 +54,14 @@ InsetCaption::InsetCaption(Buffer const & buf)
        setDrawFrame(true);
        setFrameColor(Color_captionframe);
        // There will always be only one
-       paragraphs().back().setLayout(buf.params().documentClass().emptyLayout());
+       paragraphs().back().setLayout(buf.params().documentClass().plainLayout());
 }
 
 
 void InsetCaption::write(ostream & os) const
 {
        os << "Caption\n";
-       text_.write(buffer(), os);
+       text().write(buffer(), os);
 }
 
 
@@ -102,17 +102,20 @@ void InsetCaption::setCustomLabel(docstring const & label)
 }
 
 
-void InsetCaption::addToToc(ParConstIterator const & cpit) const
+void InsetCaption::addToToc(DocIterator const & cpit)
 {
        if (type_.empty())
                return;
 
-       ParConstIterator pit = cpit;
-       pit.push_back(*this);
+       DocIterator pit = cpit;
+       pit.push_back(CursorSlice(*this));
 
        Toc & toc = buffer().tocBackend().toc(type_);
-       docstring const str = full_label_ + ". " + pit->asString(false);
+       docstring const str = full_label_ + ". " + text().getPar(0).asString();
        toc.push_back(TocItem(pit, 0, str));
+
+       // Proceed with the rest of the inset.
+       InsetText::addToToc(cpit);
 }
 
 
@@ -190,12 +193,11 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
        switch (cmd.action) {
 
        case LFUN_BREAK_PARAGRAPH:
-       case LFUN_BREAK_PARAGRAPH_SKIP:
-               status.enabled(false);
+               status.setEnabled(false);
                return true;
 
        case LFUN_OPTIONAL_INSERT:
-               status.enabled(cur.paragraph().insetList().find(OPTARG_CODE) == -1);
+               status.setEnabled(cur.paragraph().insetList().find(OPTARG_CODE) == -1);
                return true;
 
        case LFUN_INSET_TOGGLE:
@@ -280,27 +282,28 @@ int InsetCaption::getCaptionText(odocstream & os,
 
 void InsetCaption::updateLabels(ParIterator const & it)
 {
-       DocumentClass const & tclass = buffer().params().documentClass();
+       Buffer const & master = *buffer().masterBuffer();
+       DocumentClass const & tclass = master.params().documentClass();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();
        // Memorize type for addToToc().
        type_ = type;
        in_subfloat_ = cnts.isSubfloat();
        if (type.empty())
-               full_label_ = buffer().B_("Senseless!!! ");
+               full_label_ = master.B_("Senseless!!! ");
        else {
                // FIXME: life would be _much_ simpler if listings was
                // listed in Floating.
                docstring name;
                if (type == "listing")
-                       name = buffer().B_("Listing");
+                       name = master.B_("Listing");
                else
-                       name = buffer().B_(tclass.floats().getType(type).name());
+                       name = master.B_(tclass.floats().getType(type).name());
                docstring counter = from_utf8(type);
                if (in_subfloat_) {
                        counter = "sub-" + from_utf8(type);
                        name = bformat(_("Sub-%1$s"),
-                                      buffer().B_(tclass.floats().getType(type).name()));
+                                      master.B_(tclass.floats().getType(type).name()));
                }
                if (cnts.hasCounter(counter)) {
                        cnts.step(counter);