This should be the last of the commits refactoring the InsetLayout code.

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index b50d89356bbd7b4c067a2832616ab4747e287050..bd891f6b4bc56ff01e182662a89b89bf61705b39 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -42,6 +42,7 @@
 #include <sstream>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -54,12 +55,16 @@ InsetCaption::InsetCaption(InsetCaption const & ic)
        setFrameColor(Color_captionframe);
 }
 
+
 InsetCaption::InsetCaption(BufferParams const & bp)
        : InsetText(bp), textclass_(bp.getTextClass())
 {
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_captionframe);
+       //FIXME Do we need to set all paragraphs here? or will there
+       //always only be one?
+       paragraphs().back().layout(bp.getTextClass().emptyLayout());
 }
 
 
@@ -101,7 +106,7 @@ void InsetCaption::cursorPos(BufferView const & bv,
 
 void InsetCaption::setCustomLabel(docstring const & label)
 {
-       if (!support::isAscii(label) || label.empty())
+       if (!isAscii(label) || label.empty())
                // This must be a user defined layout. We cannot translate
                // this, since gettext accepts only ascii keys.
                custom_label_ = label;
@@ -110,14 +115,16 @@ void InsetCaption::setCustomLabel(docstring const & label)
 }
 
 
-void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstIterator const &) const
+void InsetCaption::addToToc(Buffer const & buf,
+       ParConstIterator const & cpit) const
 {
        if (type_.empty())
                return;
 
-       ParConstIterator pit = par_const_iterator_begin(*this);
+       ParConstIterator pit = cpit;
+       pit.push_back(*this);
 
-       Toc & toc = toclist[type_];
+       Toc & toc = buf.tocBackend().toc(type_);
        docstring const str = full_label_ + ". " + pit->asString(buf, false);
        toc.push_back(TocItem(pit, 0, str));
 }
@@ -161,10 +168,10 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetCaption::edit(Cursor & cur, bool left)
+void InsetCaption::edit(Cursor & cur, bool front, EntryDirection entry_from)
 {
        cur.push(*this);
-       InsetText::edit(cur, left);
+       InsetText::edit(cur, front, entry_from);
 }
 
 
@@ -183,6 +190,7 @@ bool InsetCaption::insetAllowed(InsetCode code) const
        case WRAP_CODE:
        case CAPTION_CODE:
        case NEWPAGE_CODE:
+       case MATHMACRO_CODE:
                return false;
        default:
                return InsetText::insetAllowed(code);
@@ -270,10 +278,11 @@ int InsetCaption::getOptArg(Buffer const & buf, odocstream & os,
 
 void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it)
 {
-       using support::bformat;
        TextClass const & tclass = buf.params().getTextClass();
        Counters & cnts = tclass.counters();
        string const & type = cnts.current_float();
+       // Memorize type for addToToc().
+       type_ = type;
        if (type.empty())
                full_label_ = buf.B_("Senseless!!! ");
        else {