]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insetcollapsable.C
Rename LatexRunParams::fragile as moving_arg.
[lyx.git] / src / insets / insetcollapsable.C
index 9e573c273ad8782151ab96a998cc244e6039a121..92e80458e69effd11a1b178f1e198e0b49da4426 100644 (file)
@@ -1,45 +1,52 @@
-/* This file is part of
- * ======================================================
- * 
- *           LyX, The Document Processor
- *      
- *          Copyright 1998-2001 The LyX Team.
+/**
+ * \file insetcollapsable.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * ======================================================
+ * \author Alejandro Aguilar Sierra
+ * \author Jürgen Vigna
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "insetcollapsable.h"
-#include "gettext.h"
-#include "lyxfont.h"
+#include "insettext.h"
+
 #include "BufferView.h"
-#include "Painter.h"
-#include "insets/insettext.h"
-#include "support/LOstream.h"
-#include "support/lstrings.h"
 #include "debug.h"
+#include "dimension.h"
+#include "gettext.h"
+#include "lyxfont.h"
+#include "lyxlex.h"
 #include "lyxtext.h"
+#include "WordLangTuple.h"
+#include "funcrequest.h"
+#include "buffer.h"
+
+#include "frontends/font_metrics.h"
+#include "frontends/Painter.h"
+#include "frontends/LyXView.h"
 
-class LyXText;
+#include "support/LAssert.h"
+#include "support/LOstream.h"
 
+using std::vector;
 using std::ostream;
 using std::endl;
 using std::max;
 
 
-InsetCollapsable::InsetCollapsable(bool collapsed)
-       : UpdatableInset(), collapsed_(collapsed), 
+InsetCollapsable::InsetCollapsable(BufferParams const & bp, bool collapsed)
+       : UpdatableInset(), collapsed_(collapsed), inset(bp),
          button_length(0), button_top_y(0), button_bottom_y(0),
-         label("Label"), draw_label(label), autocollapse(true), 
-         widthCollapsed(0), oldWidth(0), need_update(FULL),
-         inlined(false), change_label_with_text(false)
-         
-
+         label("Label"),
+#if 0
+       autocollapse(false),
+#endif
+         oldWidth(0), in_update(false), first_after_edit(false)
 {
        inset.setOwner(this);
        inset.setAutoBreakRows(true);
@@ -49,6 +56,21 @@ InsetCollapsable::InsetCollapsable(bool collapsed)
 }
 
 
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & in, bool same_id)
+       : UpdatableInset(in, same_id), collapsed_(in.collapsed_),
+         framecolor(in.framecolor), labelfont(in.labelfont), inset(in.inset),
+         button_length(0), button_top_y(0), button_bottom_y(0),
+         label(in.label),
+#if 0
+         autocollapse(in.autocollapse),
+#endif
+         oldWidth(0), in_update(false), first_after_edit(false)
+{
+       inset.init(&(in.inset), same_id);
+       inset.setOwner(this);
+}
+
+
 bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
 {
        if (!insetAllowed(in->lyxCode())) {
@@ -62,232 +84,132 @@ bool InsetCollapsable::insertInset(BufferView * bv, Inset * in)
 
 void InsetCollapsable::write(Buffer const * buf, ostream & os) const
 {
-       os << "collapsed " << tostr(collapsed_) << "\n";
+       os << "collapsed " << (collapsed_ ? "true" : "false") << "\n";
        inset.writeParagraphData(buf, os);
 }
 
 
-
 void InsetCollapsable::read(Buffer const * buf, LyXLex & lex)
 {
-       if (lex.IsOK()) {
+       if (lex.isOK()) {
                lex.next();
-               string const token = lex.GetString();
+               string const token = lex.getString();
                if (token == "collapsed") {
                        lex.next();
-                       collapsed_ = lex.GetBool();
+                       collapsed_ = lex.getBool();
                } else {
                        lyxerr << "InsetCollapsable::Read: Missing collapsed!"
                               << endl;
+                       // Take countermeasures
+                       lex.pushToken(token);
                }
        }
        inset.read(buf, lex);
-       if (collapsed_ && change_label_with_text) {
-               draw_label = get_new_label();
-       } else {
-               draw_label = label;
-       }
-}
-
-
-int InsetCollapsable::ascent_collapsed(Painter & pain, LyXFont const &) const
-{
-       int width = 0;
-       int ascent = 0;
-       int descent = 0;
-       pain.buttonText(0, 0, draw_label, labelfont, false, 
-                       width, ascent, descent);
-       return ascent;
-}
-
-
-int InsetCollapsable::descent_collapsed(Painter & pain, LyXFont const &) const
-{
-       int width = 0;
-       int ascent = 0;
-       int descent = 0;
-       pain.buttonText(0, 0, draw_label, labelfont, false, 
-                       width, ascent, descent);
-       return descent;
-}
-
-
-int InsetCollapsable::width_collapsed(Painter & pain, LyXFont const &) const
-{
-       int width;
-       int ascent;
-       int descent;
-       pain.buttonText(TEXT_TO_INSET_OFFSET, 0, draw_label, labelfont, false,
-                       width, ascent, descent);
-       return width + (2*TEXT_TO_INSET_OFFSET);
 }
 
 
-int InsetCollapsable::ascent(BufferView * bv, LyXFont const & font) const
+void InsetCollapsable::dimension_collapsed(Dimension & dim) const
 {
-       return ascent_collapsed(bv->painter(), font);
+       font_metrics::buttonText(label, labelfont, dim.w, dim.a, dim.d);
+       dim.w += 2 * TEXT_TO_INSET_OFFSET;
 }
 
 
-int InsetCollapsable::descent(BufferView * bv, LyXFont const & font) const
+int InsetCollapsable::height_collapsed() const
 {
-       if (collapsed_) 
-               return descent_collapsed(bv->painter(), font);
-
-       return descent_collapsed(bv->painter(), font)
-               + inset.descent(bv, font)
-               + inset.ascent(bv, font)
-               + TEXT_TO_BOTTOM_OFFSET;
+       Dimension dim;
+       font_metrics::buttonText(label, labelfont, dim.w, dim.a, dim.d);
+       return dim.a + dim.d;
 }
 
 
-int InsetCollapsable::width(BufferView * bv, LyXFont const & font) const
+void InsetCollapsable::dimension(BufferView * bv, LyXFont const & font,
+       Dimension & dim) const
 {
-       widthCollapsed = width_collapsed(bv->painter(), font);
-
-       if (collapsed_) 
-               return widthCollapsed;
-
-       return (inset.width(bv, font) > widthCollapsed) ?
-               inset.width(bv, font) : widthCollapsed;
+       dimension_collapsed(dim);
+       if (collapsed_)
+               return;
+       Dimension insetdim;
+       inset.dimension(bv, font, insetdim);
+       dim.d += insetdim.height() + TEXT_TO_BOTTOM_OFFSET;
+       dim.w = max(dim.w, insetdim.width());
 }
 
 
-void InsetCollapsable::draw_collapsed(Painter & pain, LyXFont const &,
-                                      int baseline, float & x) const
+void InsetCollapsable::draw_collapsed(Painter & pain,
+                                     int baseline, float & x) const
 {
-       int width = 0;
        pain.buttonText(int(x) + TEXT_TO_INSET_OFFSET,
-                       baseline, draw_label, labelfont, true, width);
-       x += width + TEXT_TO_INSET_OFFSET;
+                       baseline, label, labelfont);
+       Dimension dim;
+       dimension_collapsed(dim);
+       x += dim.w;
 }
 
 
-void InsetCollapsable::draw(BufferView * bv, LyXFont const & f, 
-                            int baseline, float & x, bool cleared) const
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
+                            int baseline, float & x, bool inlined) const
 {
+       lyx::Assert(bv);
+       cache(bv);
+
        if (nodraw())
                return;
 
-       Painter & pain = bv->painter();
+       Dimension dim_collapsed;
+       dimension_collapsed(dim_collapsed);
 
-       if (!widthCollapsed)
-               widthCollapsed = width_collapsed(pain, f);
+       Painter & pain = bv->painter();
 
-       button_length = widthCollapsed;
-       button_top_y = -ascent(bv, f);
-       button_bottom_y = -ascent(bv, f) + ascent_collapsed(pain,f) +
-               descent_collapsed(pain, f);
+       button_length   = dim_collapsed.width();
+       button_top_y    = -ascent(bv, f);
+       button_bottom_y = -ascent(bv, f) + dim_collapsed.height();
 
-       if (collapsed_) {
-               draw_collapsed(pain, f, baseline, x);
-               x += TEXT_TO_INSET_OFFSET;
+       if (!isOpen()) {
+               draw_collapsed(pain, baseline, x);
                return;
        }
 
        float old_x = x;
 
-#if 0
-       UpdatableInset::draw(bv, f, baseline, x, cleared);
-#else
        if (!owner())
-               x += static_cast<float>(scroll());
-#endif
-       if (!cleared && (inset.need_update == InsetText::FULL ||
-                        inset.need_update == InsetText::INIT ||
-                        top_x != int(x) ||
-                        top_baseline != baseline))
-       {
-#if 1
-               // we don't need anymore to clear here we just have to tell
-               // the underlying LyXText that it should do the RowClear!
-               inset.setUpdateStatus(bv, InsetText::FULL);
-               bv->text->status(bv, LyXText::CHANGED_IN_DRAW);
-               return;
-#else
-               int w =  owner() ? width(bv, f) : pain.paperWidth();
-               int h = ascent(bv, f) + descent(bv, f);
-               int const tx = (needFullRow() && !owner()) ? 0 : int(x);
-               int const ty = max(0, baseline - ascent(bv, f));
-
-               if ((ty + h) > pain.paperHeight())
-                       h = pain.paperHeight();
-               if ((top_x + w) > pain.paperWidth())
-                       w = pain.paperWidth();
-               if (baseline < 0)
-                       h += (baseline - ascent(bv, f));
-               pain.fillRectangle(tx, ty - 1, w, h + 2);
-               cleared = true;
-#endif
-       }
+               x += scroll();
 
        top_x = int(x);
        top_baseline = baseline;
 
-       int const bl = baseline - ascent(bv, f) + ascent_collapsed(pain, f);
-
-       draw_collapsed(pain, f, bl, old_x);
-       inset.draw(bv, f, 
-                  bl + descent_collapsed(pain, f) + inset.ascent(bv, f),
-                  x, cleared);
-       need_update = NONE;
-}
-
+       int const bl = baseline - ascent(bv, f) + dim_collapsed.ascent();
 
-void InsetCollapsable::edit(BufferView * bv, int xp, int yp,
-                            unsigned int button)
-{
-       UpdatableInset::edit(bv, xp, yp, button);
-
-       if (collapsed_) {
-               draw_label = label;
-               collapsed_ = false;
-               if (!bv->lockInset(this))
-                       return;
-               bv->updateInset(this, false);
-               inset.edit(bv, 0, 0, button);
+       if (inlined) {
+               inset.draw(bv, f, baseline, x);
        } else {
-               if (!bv->lockInset(this))
-                       return;
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + yp -
-                   (ascent_collapsed(bv->painter(), font) +
-                    descent_collapsed(bv->painter(), font) +
-                    inset.ascent(bv, font));
-               inset.edit(bv, xp, yy, button);
+               draw_collapsed(pain, bl, old_x);
+               int const yy = bl + dim_collapsed.descent() + inset.ascent(bv, f);
+               inset.draw(bv, f, yy, x);
+               // contained inset may be shorter than the button
+               if (x < top_x + button_length + TEXT_TO_INSET_OFFSET)
+                       x = top_x + button_length + TEXT_TO_INSET_OFFSET;
        }
 }
 
 
-void InsetCollapsable::edit(BufferView * bv, bool front)
+void InsetCollapsable::draw(BufferView * bv, LyXFont const & f,
+                           int baseline, float & x) const
 {
-       UpdatableInset::edit(bv, front);
-
-       if (collapsed_) {
-               draw_label = label;
-               collapsed_ = false;
-               if (!bv->lockInset(this))
-                       return;
-               bv->updateInset(this, false);
-               inset.edit(bv, front);
-       } else {
-               if (!bv->lockInset(this))
-                       return;
-               inset.edit(bv, front);
-       }
+       // by default, we are not inlined-drawing
+       draw(bv, f, baseline, x, false);
 }
 
 
 Inset::EDITABLE InsetCollapsable::editable() const
 {
-       if (collapsed_)
-               return IS_EDITABLE;
-       return HIGHLY_EDITABLE;
+       return collapsed_ ? IS_EDITABLE : HIGHLY_EDITABLE;
 }
 
 
 void InsetCollapsable::insetUnlock(BufferView * bv)
 {
+#if 0
        if (autocollapse) {
                if (change_label_with_text) {
                        draw_label = get_new_label();
@@ -296,144 +218,180 @@ void InsetCollapsable::insetUnlock(BufferView * bv)
                }
                collapsed_ = true;
        }
+#endif
        inset.insetUnlock(bv);
        if (scroll())
                scroll(bv, 0.0F);
-       bv->updateInset(this, false);
+       bv->updateInset(this);
 }
 
 
-void InsetCollapsable::insetButtonPress(BufferView * bv, int x, int y,
-                                       int button)
+FuncRequest InsetCollapsable::adjustCommand(FuncRequest const & cmd)
 {
-       if (!collapsed_ && (y > button_bottom_y)) {
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + y -
-                   (ascent_collapsed(bv->painter(), font) +
-                    descent_collapsed(bv->painter(), font) +
-                    inset.ascent(bv, font));
-               inset.insetButtonPress(bv, x, yy, button);
-       }
+       LyXFont font(LyXFont::ALL_SANE);
+       FuncRequest cmd1 = cmd;
+       cmd1.y = ascent(cmd.view(), font) + cmd.y -
+           (height_collapsed() + inset.ascent(cmd.view(), font));
+       return cmd1;
 }
 
 
-void InsetCollapsable::insetButtonRelease(BufferView * bv,
-                                         int x, int y, int button)
+void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
 {
-       if ((x >= 0)  && (x < button_length) &&
-           (y >= button_top_y) &&  (y <= button_bottom_y)) {
+       bool ret = false;
+       BufferView * bv = cmd.view();
+
+       if (collapsed_ && cmd.button() != mouse_button::button3) {
+               collapsed_ = false;
+               inset.setUpdateStatus(bv, InsetText::FULL);
+               bv->updateInset(this);
+               bv->buffer()->markDirty();
+               return;
+       }
+
+       if ((cmd.button() != mouse_button::button3) && (cmd.x < button_length) &&
+           (cmd.y >= button_top_y) && (cmd.y <= button_bottom_y))
+       {
                if (collapsed_) {
-                       draw_label = label;
                        collapsed_ = false;
-                       inset.insetButtonRelease(bv, 0, 0, button);
-                       bv->updateInset(this, false);
+                       inset.setUpdateStatus(bv, InsetText::FULL);
+                       bv->updateInset(this);
+                       bv->buffer()->markDirty();
                } else {
-                       if (change_label_with_text) {
-                               draw_label = get_new_label();
-                       } else {
-                               draw_label = label;
-                       }
                        collapsed_ = true;
                        bv->unlockInset(this);
-                       bv->updateInset(this, false);
+                       bv->updateInset(this);
+                       bv->buffer()->markDirty();
                }
-       } else if (!collapsed_ && (y > button_top_y)) {
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + y -
-                   (ascent_collapsed(bv->painter(), font) +
-                    descent_collapsed(bv->painter(), font) +
-                    inset.ascent(bv, font));
-               inset.insetButtonRelease(bv, x, yy, button);
+       } else if (!collapsed_ && (cmd.y > button_bottom_y)) {
+               ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
        }
+       if (cmd.button() == mouse_button::button3 && !ret)
+               showInsetDialog(bv);
 }
 
 
-void InsetCollapsable::insetMotionNotify(BufferView * bv,
-                                        int x, int y, int state)
+int InsetCollapsable::latex(Buffer const * buf, ostream & os,
+                           LatexRunParams const & runparams) const
 {
-       if (x > button_bottom_y) {
-               LyXFont font(LyXFont::ALL_SANE);
-               int yy = ascent(bv, font) + y -
-                   (ascent_collapsed(bv->painter(), font) +
-                    descent_collapsed(bv->painter(), font) +
-                    inset.ascent(bv, font));
-               inset.insetMotionNotify(bv, x, yy, state);
-       }
+       return inset.latex(buf, os, runparams);
 }
 
 
-void InsetCollapsable::insetKeyPress(XKeyEvent * xke)
+int InsetCollapsable::ascii(Buffer const * buf, ostream & os, int ll) const
 {
-       inset.insetKeyPress(xke);
+       return inset.ascii(buf, os, ll);
 }
 
 
-int InsetCollapsable::latex(Buffer const * buf, ostream & os,
-                           bool fragile, bool free_spc) const
+int InsetCollapsable::linuxdoc(Buffer const * buf, ostream & os) const
 {
-       return inset.latex(buf, os, fragile, free_spc);
+       return inset.linuxdoc(buf, os);
 }
 
 
-int InsetCollapsable::getMaxWidth(BufferView * bv,
-                                 UpdatableInset const * inset) const
+int InsetCollapsable::docbook(Buffer const * buf, ostream & os, bool mixcont) const
 {
-       int const w = UpdatableInset::getMaxWidth(bv, inset);
-
-       if (w < 0) {
-               // What does a negative max width signify? (Lgb)
-               // Use the max width of the draw-area (Jug)
-               return w;
-       }
-       // should be at least 30 pixels !!!
-       return max(30, w - widthCollapsed);
+       return inset.docbook(buf, os, mixcont);
 }
 
 
-void InsetCollapsable::update(BufferView * bv, LyXFont const & font,
-                             bool reinit)
+void InsetCollapsable::update(BufferView * bv, bool reinit)
 {
-#if 0
-       if (reinit) {
-               need_update = FULL;
-               if (owner())
-                       owner()->update(bv, font, true);
-               return;
-       }
-       if (!widthCollapsed) {
-               widthCollapsed = width_collapsed(bv->painter(), font);
-               inset.resizeLyXText(bv);
-               need_update = FULL;
-               if (owner()) {
-                       owner()->update(bv, font);
-                       return;
+       if (in_update) {
+               if (reinit && owner()) {
+                       owner()->update(bv, true);
                }
+               return;
        }
-       if (oldWidth != width(bv, font)) {
-               oldWidth = width(bv, font);
-               inset.resizeLyXText(bv);
-               need_update = FULL;
-               if (owner()) {
-                       owner()->update(bv, font);
-                       return;
-               }
+       in_update = true;
+       inset.update(bv, reinit);
+       if (reinit && owner()) {
+               owner()->update(bv, true);
        }
-#else
-       if (!widthCollapsed)
-               widthCollapsed = width_collapsed(bv->painter(), font);
-       inset.update(bv, font, reinit);
-#endif
-}
+       in_update = false;
+}
+
+
+Inset::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
+{
+       //lyxerr << "InsetCollapsable::localDispatch: " << cmd.action << "\n";
+       BufferView * bv = cmd.view();
+       switch (cmd.action) {
+               case LFUN_INSET_EDIT: {
+                       if (!cmd.argument.empty()) {
+                               UpdatableInset::localDispatch(cmd);
+                               if (collapsed_) {
+                                       collapsed_ = false;
+                                       if (bv->lockInset(this)) {
+                                               inset.setUpdateStatus(bv, InsetText::FULL);
+                                               bv->updateInset(this);
+                                               bv->buffer()->markDirty();
+                                               inset.localDispatch(cmd);
+                                               first_after_edit = true;
+                                       }
+                               } else {
+                                       if (bv->lockInset(this))
+                                               inset.localDispatch(cmd);
+                               }
+                               return DISPATCHED;
+                       }
 
+#ifdef WITH_WARNINGS
+#warning Fix this properly in BufferView_pimpl::workAreaButtonRelease
+#endif
+                       if (cmd.button() == mouse_button::button3)
+                               return DISPATCHED;
+
+                       UpdatableInset::localDispatch(cmd);
+
+                       if (collapsed_) {
+                               collapsed_ = false;
+                               // set this only here as it should be recollapsed only if
+                               // it was already collapsed!
+                               first_after_edit = true;
+                               if (!bv->lockInset(this))
+                                       return DISPATCHED;
+                               bv->updateInset(this);
+                               bv->buffer()->markDirty();
+                               inset.localDispatch(cmd);
+                       } else {
+                               FuncRequest cmd1 = cmd;
+                               if (!bv->lockInset(this))
+                                       return DISPATCHED;
+                               if (cmd.y <= button_bottom_y) {
+                                       cmd1.y = 0;
+                               } else {
+                                       LyXFont font(LyXFont::ALL_SANE);
+                                       cmd1.y = ascent(bv, font) + cmd.y -
+                                               (height_collapsed() + inset.ascent(bv, font));
+                               }
+                               inset.localDispatch(cmd);
+                       }
+                       return DISPATCHED;
+               }
 
-UpdatableInset::RESULT
-InsetCollapsable::localDispatch(BufferView * bv, kb_action action,
-                               string const & arg)
-{
-       UpdatableInset::RESULT result = inset.localDispatch(bv, action, arg);
-       if (result == FINISHED)
-               bv->unlockInset(this);
-       return result;
+               case LFUN_MOUSE_PRESS:
+                       if (!collapsed_ && cmd.y > button_bottom_y)
+                               inset.localDispatch(adjustCommand(cmd));
+                       return DISPATCHED;
+
+               case LFUN_MOUSE_MOTION:
+                       if (!collapsed_ && cmd.y > button_bottom_y)
+                               inset.localDispatch(adjustCommand(cmd));
+                       return DISPATCHED;
+
+               case LFUN_MOUSE_RELEASE:
+                       lfunMouseRelease(cmd);
+                       return DISPATCHED;
+
+               default:
+                       UpdatableInset::RESULT result = inset.localDispatch(cmd);
+                       if (result >= FINISHED)
+                               bv->unlockInset(this);
+                       first_after_edit = false;
+                       return result;
+       }
 }
 
 
@@ -458,13 +416,13 @@ bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
 
 bool InsetCollapsable::updateInsetInInset(BufferView * bv, Inset *in)
 {
-       if (&inset == in)
+       if (in == this)
                return true;
        return inset.updateInsetInInset(bv, in);
 }
 
 
-unsigned int InsetCollapsable::insetInInsetY()
+int InsetCollapsable::insetInInsetY() const
 {
        return inset.insetInInsetY() - (top_baseline - inset.y());
 }
@@ -476,27 +434,15 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 }
 
 
-void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
-{
-       inset.getCursorPos(bv, x , y);
-}
-
-
-void InsetCollapsable::toggleInsetCursor(BufferView * bv)
-{
-       inset.toggleInsetCursor(bv);
-}
-
-
-void InsetCollapsable::showInsetCursor(BufferView * bv, bool show)
+void InsetCollapsable::getCursor(BufferView & bv, int & x, int & y) const
 {
-       inset.showInsetCursor(bv, show);
+       inset.getCursor(bv, x, y);
 }
 
 
-void InsetCollapsable::hideInsetCursor(BufferView * bv)
+void InsetCollapsable::getCursorPos(BufferView * bv, int & x, int & y) const
 {
-       inset.hideInsetCursor(bv);
+       inset.getCursorPos(bv, x , y);
 }
 
 
@@ -518,18 +464,12 @@ UpdatableInset * InsetCollapsable::getFirstLockingInsetOfType(Inset::Code c)
 
 
 void InsetCollapsable::setFont(BufferView * bv, LyXFont const & font,
-                               bool toggleall, bool selectall)
+                              bool toggleall, bool selectall)
 {
        inset.setFont(bv, font, toggleall, selectall);
 }
 
 
-bool InsetCollapsable::doClearArea() const
-{
-       return inset.doClearArea();
-}
-
-
 LyXText * InsetCollapsable::getLyXText(BufferView const * bv,
                                       bool const recursive) const
 {
@@ -551,7 +491,7 @@ void InsetCollapsable::resizeLyXText(BufferView * bv, bool force) const
 }
 
 
-std::vector<string> const InsetCollapsable::getLabelList() const
+vector<string> const InsetCollapsable::getLabelList() const
 {
        return inset.getLabelList();
 }
@@ -562,7 +502,7 @@ bool InsetCollapsable::nodraw() const
        return inset.nodraw();
 }
 
+
 int InsetCollapsable::scroll(bool recursive) const
 {
        int sx = UpdatableInset::scroll(false);
@@ -574,15 +514,9 @@ int InsetCollapsable::scroll(bool recursive) const
 }
 
 
-Paragraph * InsetCollapsable::getParFromID(int id) const
+ParagraphList * InsetCollapsable::getParagraphs(int i) const
 {
-       return inset.getParFromID(id);
-}
-
-
-Paragraph * InsetCollapsable::firstParagraph() const
-{
-       return inset.firstParagraph();
+       return inset.getParagraphs(i);
 }
 
 
@@ -599,47 +533,98 @@ Inset * InsetCollapsable::getInsetFromID(int id_arg) const
        return inset.getInsetFromID(id_arg);
 }
 
-void InsetCollapsable::open(BufferView * bv, bool flag)
+
+void InsetCollapsable::open(BufferView * bv)
+{
+       if (!collapsed_) return;
+
+       collapsed_ = false;
+       bv->updateInset(this);
+}
+
+
+void InsetCollapsable::close(BufferView * bv) const
 {
-       if (flag == !collapsed_)
+       if (collapsed_)
                return;
-       collapsed_ = !flag;
-       if (collapsed_ && change_label_with_text) {
-               draw_label = get_new_label();
-       } else {
-               draw_label = label;
-       }
-       bv->updateInset(this, false);
+
+       collapsed_ = true;
+       bv->updateInset(const_cast<InsetCollapsable *>(this));
 }
 
 
-void InsetCollapsable::setLabel(string const & l, bool flag)
+void InsetCollapsable::setLabel(string const & l) const
 {
        label = l;
-       change_label_with_text = flag;
-       if (collapsed_ && change_label_with_text) {
-               draw_label = get_new_label();
-       } else {
-               draw_label = label;
-       }
 }
 
 
-string InsetCollapsable::get_new_label() const
+void InsetCollapsable::markErased()
 {
-       string la;
+       inset.markErased();
+}
 
-       int n = std::min(10, inset.paragraph()->size());
-       int i,j;
-       for(i=0,j=0; i < n && j < inset.paragraph()->size(); ++j) {
-               if (inset.paragraph()->isInset(j))
-                       continue;
-               la += inset.paragraph()->getChar(j);
-               ++i;
-       }
-       if ((i > 0) && (j < inset.paragraph()->size()))
-               la += "...";
-       if (la.empty())
-               la = label;
-       return la;
+
+bool InsetCollapsable::nextChange(BufferView * bv, lyx::pos_type & length)
+{
+       bool found = inset.nextChange(bv, length);
+
+       if (first_after_edit && !found)
+               close(bv);
+       else if (!found)
+               first_after_edit = false;
+       return found;
+}
+
+
+bool InsetCollapsable::searchForward(BufferView * bv, string const & str,
+                                    bool cs, bool mw)
+{
+       bool found = inset.searchForward(bv, str, cs, mw);
+       if (first_after_edit && !found)
+               close(bv);
+       else if (!found)
+               first_after_edit = false;
+       return found;
+}
+
+
+bool InsetCollapsable::searchBackward(BufferView * bv, string const & str,
+                                     bool cs, bool mw)
+{
+       bool found = inset.searchBackward(bv, str, cs, mw);
+       if (first_after_edit && !found)
+               close(bv);
+       else if (!found)
+               first_after_edit = false;
+       return found;
+}
+
+
+WordLangTuple const
+InsetCollapsable::selectNextWordToSpellcheck(BufferView * bv, float & value) const
+{
+       WordLangTuple word = inset.selectNextWordToSpellcheck(bv, value);
+       if (first_after_edit && word.word().empty())
+               close(bv);
+       first_after_edit = false;
+       return word;
+}
+
+
+void InsetCollapsable::addPreview(grfx::PreviewLoader & loader) const
+{
+       inset.addPreview(loader);
+}
+
+
+void InsetCollapsable::cache(BufferView * bv) const
+{
+       view_ = bv->owner()->view();
+}
+
+
+BufferView * InsetCollapsable::view() const
+{
+       return view_.lock().get();
 }