]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetCollapsable.cpp
Enable InsetQuote in verbatim and Hebrew
[lyx.git] / src / insets / InsetCollapsable.cpp
index 5eec355c68c4adb635f03185a2a69fd2e371b453..7a4c99952ddb38d3ce705fcea4d1f2ab36ac94b5 100644 (file)
 #include "InsetCollapsable.h"
 
 #include "Buffer.h"
-#include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
 #include "Dimension.h"
-#include "DispatchResult.h"
-#include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "InsetLayout.h"
-#include "Language.h"
-#include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
-#include "output_xhtml.h"
-#include "paragraph_funcs.h"
-#include "ParagraphParameters.h"
-#include "sgml.h"
-#include "TextClass.h"
+#include "OutputParams.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
+#include "support/RefChanger.h"
 
 using namespace std;
 
 
 namespace lyx {
 
-InsetCollapsable::CollapseStatus InsetCollapsable::status(BufferView const & bv) const
+InsetCollapsable::InsetCollapsable(Buffer * buf, InsetText::UsePlain ltype)
+       : InsetText(buf, ltype), status_(Open)
 {
-       if (decoration() == InsetLayout::CONGLOMERATE)
-               return status_;
-       return auto_open_[&bv] ? Open : status_;
+       setDrawFrame(true);
+       setFrameColor(Color_collapsableframe);
 }
 
 
-InsetCollapsable::Geometry InsetCollapsable::geometry(BufferView const & bv) const
-{
-       switch (decoration()) {
-       case InsetLayout::CLASSIC:
-               if (status(bv) == Open)
-                       return openinlined_ ? LeftButton : TopButton;
-               return ButtonOnly;
+// The sole purpose of this copy constructor is to make sure
+// that the view_ map is not copied and remains empty.
+InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
+       : InsetText(rhs),
+         status_(rhs.status_),
+         labelstring_(rhs.labelstring_)
+{}
 
-       case InsetLayout::MINIMALISTIC:
-               return status(bv) == Open ? NoButton : ButtonOnly ;
 
-       case InsetLayout::CONGLOMERATE:
-               return status(bv) == Open ? SubLabel : Corners ;
+InsetCollapsable::~InsetCollapsable()
+{
+       map<BufferView const *, View>::iterator it = view_.begin();
+       map<BufferView const *, View>::iterator end = view_.end();
+       for (; it != end; ++it)
+               if (it->second.mouse_hover_)
+                       it->first->clearLastInset(this);
+}
 
-       case InsetLayout::DEFAULT:
-               break; // this shouldn't happen
-       }
 
-       // dummy return value to shut down a warning,
-       // this is dead code.
-       return NoButton;
+InsetCollapsable::CollapseStatus InsetCollapsable::status(BufferView const & bv) const
+{
+       if (decoration() == InsetLayout::CONGLOMERATE)
+               return status_;
+       return view_[&bv].auto_open_ ? Open : status_;
 }
 
 
-InsetCollapsable::Geometry InsetCollapsable::geometry() const
+InsetCollapsable::Geometry InsetCollapsable::geometry(BufferView const & bv) const
 {
        switch (decoration()) {
        case InsetLayout::CLASSIC:
-               if (status_ == Open)
-                       return openinlined_ ? LeftButton : TopButton;
+               if (status(bv) == Open)
+                       return view_[&bv].openinlined_ ? LeftButton : TopButton;
                return ButtonOnly;
 
        case InsetLayout::MINIMALISTIC:
-               return status_ == Open ? NoButton : ButtonOnly ;
+               return status(bv) == Open ? NoButton : ButtonOnly ;
 
        case InsetLayout::CONGLOMERATE:
-               return status_ == Open ? SubLabel : Corners ;
+               return status(bv) == Open ? SubLabel : Corners ;
 
        case InsetLayout::DEFAULT:
                break; // this shouldn't happen
@@ -104,64 +99,15 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 }
 
 
-InsetCollapsable::InsetCollapsable(Buffer const & buf, InsetText::UsePlain ltype)
-       : InsetText(buf, ltype), status_(Inset::Open),
-         openinlined_(false), mouse_hover_(false)
-{
-       setLayout(&buf.params().documentClass());
-       setAutoBreakRows(true);
-       setDrawFrame(true);
-       setFrameColor(Color_collapsableframe);
-}
-
-
-InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
-       : InsetText(rhs),
-         status_(rhs.status_),
-         layout_(rhs.layout_),
-         labelstring_(rhs.labelstring_),
-         button_dim(rhs.button_dim),
-         openinlined_(rhs.openinlined_),
-         auto_open_(rhs.auto_open_),
-         // the sole purpose of this copy constructor
-         mouse_hover_(false)
-{
-}
-
-
 docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 {
-       Dimension dim = dimensionCollapsed(bv);
+       Dimension const dim = dimensionCollapsed(bv);
        if (geometry(bv) == NoButton)
-               return translateIfPossible(layout_->labelstring());
+               return translateIfPossible(getLayout().labelstring());
        if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des || isOpen(bv))
                return docstring();
 
-       OutputParams rp(&buffer().params().encoding());
-       odocstringstream ods;
-       InsetText::plaintext(ods, rp);
-       docstring const content_tip = ods.str();
-       return support::wrapParas(content_tip, 4);
-}
-
-
-void InsetCollapsable::setLayout(BufferParams const & bp)
-{
-       setLayout(bp.documentClassPtr());
-}
-
-
-void InsetCollapsable::setLayout(DocumentClass const * const dc)
-{
-       if (dc) {
-               layout_ = &(dc->insetLayout(name()));
-               labelstring_ = translateIfPossible(layout_->labelstring());
-       } else {
-               layout_ = &DocumentClass::plainInsetLayout();
-               labelstring_ = _("UNDEFINED");
-       }
-
-       setButtonLabel();
+       return toolTipText();
 }
 
 
@@ -177,7 +123,7 @@ void InsetCollapsable::write(ostream & os) const
                break;
        }
        os << "\n";
-       text().write(buffer(), os);
+       text().write(os);
 }
 
 
@@ -190,29 +136,17 @@ void InsetCollapsable::read(Lexer & lex)
        if (tmp_token == "open")
                status_ = Open;
 
-       // this must be set before we enter InsetText::read()
-       setLayout(buffer().params());
        InsetText::read(lex);
-       // set button label again as the inset contents was not read yet at
-       // setLayout() time.
        setButtonLabel();
-
-       // Force default font, if so requested
-       // This avoids paragraphs in buffer language that would have a
-       // foreign language after a document language change, and it ensures
-       // that all new text in ERT and similar gets the "latex" language,
-       // since new text inherits the language from the last position of the
-       // existing text.  As a side effect this makes us also robust against
-       // bugs in LyX that might lead to font changes in ERT in .lyx files.
-       resetParagraphsFont();
 }
 
 
 Dimension InsetCollapsable::dimensionCollapsed(BufferView const & bv) const
 {
-       LASSERT(layout_, /**/);
        Dimension dim;
-       theFontMetrics(layout_->labelfont()).buttonText(
+       FontInfo labelfont(getLabelfont());
+       labelfont.realize(sane_font);
+       theFontMetrics(labelfont).buttonText(
                buttonLabel(bv), dim.wid, dim.asc, dim.des);
        return dim;
 }
@@ -220,12 +154,10 @@ Dimension InsetCollapsable::dimensionCollapsed(BufferView const & bv) const
 
 void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LASSERT(layout_, /**/);
-
-       auto_open_[mi.base.bv] =  mi.base.bv->cursor().isInside(this);
+       view_[mi.base.bv].auto_open_ = mi.base.bv->cursor().isInside(this);
 
        FontInfo tmpfont = mi.base.font;
-       mi.base.font = layout_->font();
+       mi.base.font = getFont();
        mi.base.font.realize(tmpfont);
 
        BufferView const & bv = *mi.base.bv;
@@ -242,7 +174,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        case SubLabel: {
                InsetText::metrics(mi, dim);
                // consider width of the inset label
-               FontInfo font(layout_->labelfont());
+               FontInfo font(getLabelfont());
                font.realize(sane_font);
                font.decSize();
                font.decSize();
@@ -256,13 +188,17 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        case TopButton:
        case LeftButton:
        case ButtonOnly:
+               if (hasFixedWidth()){
+                       int const mindim = view_[&bv].button_dim_.x2 - view_[&bv].button_dim_.x1;
+                       if (mi.base.textwidth < mindim)
+                               mi.base.textwidth = mindim;
+               }
                dim = dimensionCollapsed(bv);
-               if (geometry(bv) == TopButton 
-                         || geometry(bv) == LeftButton) {
+               if (geometry(bv) == TopButton || geometry(bv) == LeftButton) {
                        Dimension textdim;
                        InsetText::metrics(mi, textdim);
-                       openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
-                       if (openinlined_) {
+                       view_[&bv].openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
+                       if (view_[&bv].openinlined_) {
                                // Correct for button width.
                                dim.wid += textdim.wid;
                                dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
@@ -279,58 +215,71 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-bool InsetCollapsable::setMouseHover(bool mouse_hover)
+bool InsetCollapsable::setMouseHover(BufferView const * bv, bool mouse_hover)
+       const
 {
-       mouse_hover_ = mouse_hover;
+       view_[bv].mouse_hover_ = mouse_hover;
        return true;
 }
 
 
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-       LASSERT(layout_, /**/);
        BufferView const & bv = *pi.base.bv;
 
-       auto_open_[&bv] =  bv.cursor().isInside(this);
+       view_[&bv].auto_open_ = bv.cursor().isInside(this);
 
-       FontInfo tmpfont = pi.base.font;
-       pi.base.font = layout_->font();
-       pi.base.font.realize(tmpfont);
+       Changer dummy = pi.base.font.change(getFont(), true);
 
        // Draw button first -- top, left or only
        Dimension dimc = dimensionCollapsed(bv);
 
-       if (geometry(*pi.base.bv) == TopButton ||
-           geometry(*pi.base.bv) == LeftButton ||
-           geometry(*pi.base.bv) == ButtonOnly) {
-               button_dim.x1 = x + 0;
-               button_dim.x2 = x + dimc.width();
-               button_dim.y1 = y - dimc.asc;
-               button_dim.y2 = y + dimc.des;
-
-               pi.pain.buttonText(x, y, buttonLabel(bv), layout_->labelfont(),
-                       mouse_hover_);
+       if (geometry(bv) == TopButton ||
+           geometry(bv) == LeftButton ||
+           geometry(bv) == ButtonOnly) {
+               view_[&bv].button_dim_.x1 = x + 0;
+               view_[&bv].button_dim_.x2 = x + dimc.width();
+               view_[&bv].button_dim_.y1 = y - dimc.asc;
+               view_[&bv].button_dim_.y2 = y + dimc.des;
+
+               FontInfo labelfont = getLabelfont();
+               labelfont.setColor(labelColor());
+               labelfont.realize(pi.base.font);
+               pi.pain.buttonText(x, y, buttonLabel(bv), labelfont,
+                                  view_[&bv].mouse_hover_);
+               // Draw the change tracking cue on the label, unless RowPainter already
+               // takes care of it.
+               if (canPaintChange(bv))
+                       pi.change_.paintCue(pi, x, y, x + dimc.width(), labelfont);
        } else {
-               button_dim.x1 = 0;
-               button_dim.y1 = 0;
-               button_dim.x2 = 0;
-               button_dim.y2 = 0;
+               view_[&bv].button_dim_.x1 = 0;
+               view_[&bv].button_dim_.y1 = 0;
+               view_[&bv].button_dim_.x2 = 0;
+               view_[&bv].button_dim_.y2 = 0;
        }
 
-       Dimension const textdim = InsetText::dimension(bv);
+       Dimension const textdim = dimensionHelper(bv);
        int const baseline = y;
        int textx, texty;
-       switch (geometry(bv)) {
+       Geometry g = geometry(bv);
+       switch (g) {
        case LeftButton:
-               textx = x + dimc.width();
-               texty = baseline;
-               InsetText::draw(pi, textx, texty);
-               break;
-       case TopButton:
-               textx = x;
-               texty = baseline + dimc.des + textdim.asc;
+       case TopButton: {
+               if (g == LeftButton) {
+                       textx = x + dimc.width();
+                       texty = baseline;
+               } else {
+                       textx = x;
+                       texty = baseline + dimc.des + textdim.asc;
+               }
+               // Do not draw the cue for INSERTED -- it is already in the button and
+               // that's enough.
+               Changer dummy = (pi.change_.type == Change::INSERTED)
+                       ? make_change(pi.change_, Change())
+                       : Changer();
                InsetText::draw(pi, textx, texty);
                break;
+       }
        case ButtonOnly:
                break;
        case NoButton:
@@ -342,67 +291,71 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
        case Corners:
                textx = x;
                texty = baseline;
-               const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
-               InsetText::draw(pi, textx, texty);
-               const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
+               {       // We will take care of the frame and the change tracking cue
+                       // ourselves, below.
+                       Changer dummy = make_change(pi.change_, Change());
+                       const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
+                       InsetText::draw(pi, textx, texty);
+                       const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
+               }
 
                int desc = textdim.descent();
-               if (geometry(bv) == Corners)
+               if (g == Corners)
                        desc -= 3;
 
+               // Colour the frame according to the change type. (Like for tables.)
+               Color colour = pi.change_.changed() ? pi.change_.color()
+                                                   : Color_foreground;
                const int xx1 = x + TEXT_TO_INSET_OFFSET - 1;
                const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
-               pi.pain.line(xx1, y + desc - 4, 
-                            xx1, y + desc, 
-                       layout_->labelfont().color());
+               pi.pain.line(xx1, y + desc - 4,
+                            xx1, y + desc, colour);
                if (status_ == Open)
-                       pi.pain.line(xx1, y + desc, 
-                               xx2, y + desc,
-                               layout_->labelfont().color());
+                       pi.pain.line(xx1, y + desc,
+                                    xx2, y + desc, colour);
                else {
                        // Make status_ value visible:
                        pi.pain.line(xx1, y + desc,
-                               xx1 + 4, y + desc,
-                               layout_->labelfont().color());
+                                    xx1 + 4, y + desc, colour);
                        pi.pain.line(xx2 - 4, y + desc,
-                               xx2, y + desc,
-                               layout_->labelfont().color());
+                                    xx2, y + desc, colour);
                }
-               pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3, 
-                       y + desc - 4, layout_->labelfont().color());
+               pi.pain.line(x + textdim.wid - 3, y + desc, x + textdim.wid - 3,
+                            y + desc - 4, colour);
 
                // the label below the text. Can be toggled.
-               if (geometry(bv) == SubLabel) {
-                       FontInfo font(layout_->labelfont());
+               if (g == SubLabel) {
+                       FontInfo font(getLabelfont());
+                       if (pi.change_.changed())
+                               font.setPaintColor(colour);
                        font.realize(sane_font);
                        font.decSize();
                        font.decSize();
                        int w = 0;
                        int a = 0;
                        int d = 0;
+                       Color const col = pi.full_repaint ? Color_none : pi.backgroundColor(this);
                        theFontMetrics(font).rectText(buttonLabel(bv), w, a, d);
                        int const ww = max(textdim.wid, w);
                        pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
-                               buttonLabel(bv), font, Color_none, Color_none);
-                       desc += d;
+                                        buttonLabel(bv), font, col, Color_none);
                }
 
+               int const y1 = y - textdim.asc + 3;
                // a visual cue when the cursor is inside the inset
                Cursor const & cur = bv.cursor();
                if (cur.isInside(this)) {
-                       y -= textdim.asc;
-                       y += 3;
-                       pi.pain.line(xx1, y + 4, xx1, y, layout_->labelfont().color());
-                       pi.pain.line(xx1 + 4, y, xx1, y, layout_->labelfont().color());
-                       pi.pain.line(xx2, y + 4, xx2, y,
-                               layout_->labelfont().color());
-                       pi.pain.line(xx2 - 4, y, xx2, y,
-                               layout_->labelfont().color());
+                       pi.pain.line(xx1, y1 + 4, xx1, y1, colour);
+                       pi.pain.line(xx1 + 4, y1, xx1, y1, colour);
+                       pi.pain.line(xx2, y1 + 4, xx2, y1, colour);
+                       pi.pain.line(xx2 - 4, y1, xx2, y1, colour);
                }
+               // Strike through the inset if deleted and not already handled by
+               // RowPainter.
+               if (pi.change_.deleted() && canPaintChange(bv))
+                       pi.change_.paintCue(pi, xx1, y1, xx2, y + desc);
                break;
        }
-
-       pi.base.font = tmpfont;
 }
 
 
@@ -411,10 +364,9 @@ void InsetCollapsable::cursorPos(BufferView const & bv,
 {
        if (geometry(bv) == ButtonOnly)
                status_ = Open;
-       LASSERT(geometry(bv) != ButtonOnly, /**/);
 
        InsetText::cursorPos(bv, sl, boundary, x, y);
-       Dimension const textdim = InsetText::dimension(bv);
+       Dimension const textdim = dimensionHelper(bv);
 
        switch (geometry(bv)) {
        case LeftButton:
@@ -438,19 +390,25 @@ void InsetCollapsable::cursorPos(BufferView const & bv,
 
 bool InsetCollapsable::editable() const
 {
-       return geometry() != ButtonOnly;
+       switch (decoration()) {
+       case InsetLayout::CLASSIC:
+       case InsetLayout::MINIMALISTIC:
+               return status_ == Open;
+       default:
+               return true;
+       }
 }
 
 
-bool InsetCollapsable::descendable() const
+bool InsetCollapsable::descendable(BufferView const & bv) const
 {
-       return geometry() != ButtonOnly;
+       return geometry(bv) != ButtonOnly;
 }
 
 
-bool InsetCollapsable::hitButton(FuncRequest const & cmd) const
+bool InsetCollapsable::clickable(BufferView const & bv, int x, int y) const
 {
-       return button_dim.contains(cmd.x, cmd.y);
+       return view_[&bv].button_dim_.contains(x, y);
 }
 
 
@@ -487,8 +445,8 @@ Inset * InsetCollapsable::editXY(Cursor & cur, int x, int y)
 {
        //lyxerr << "InsetCollapsable: edit xy" << endl;
        if (geometry(cur.bv()) == ButtonOnly
-        || (button_dim.contains(x, y) 
-         && geometry(cur.bv()) != NoButton))
+           || (view_[&cur.bv()].button_dim_.contains(x, y)
+               && geometry(cur.bv()) != NoButton))
                return this;
        cur.push(*this);
        return InsetText::editXY(cur, x, y);
@@ -500,9 +458,11 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
        //lyxerr << "InsetCollapsable::doDispatch (begin): cmd: " << cmd
        //      << " cur: " << cur << " bvcur: " << cur.bv().cursor() << endl;
 
-       switch (cmd.action) {
+       bool const hitButton = clickable(cur.bv(), cmd.x(), cmd.y());
+
+       switch (cmd.action()) {
        case LFUN_MOUSE_PRESS:
-               if (hitButton(cmd)) {
+               if (hitButton) {
                        switch (cmd.button()) {
                        case mouse_button::button1:
                        case mouse_button::button3:
@@ -515,7 +475,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
                        case mouse_button::button4:
                        case mouse_button::button5:
                                // Nothing to do.
-                               cur.noUpdate();
+                               cur.noScreenUpdate();
                                break;
                        }
                } else if (geometry(cur.bv()) != ButtonOnly)
@@ -527,8 +487,8 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_MOUSE_MOTION:
        case LFUN_MOUSE_DOUBLE:
        case LFUN_MOUSE_TRIPLE:
-               if (hitButton(cmd)) 
-                       cur.noUpdate();
+               if (hitButton)
+                       cur.noScreenUpdate();
                else if (geometry(cur.bv()) != ButtonOnly)
                        InsetText::doDispatch(cur, cmd);
                else
@@ -536,17 +496,17 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_MOUSE_RELEASE:
-               if (!hitButton(cmd)) {
+               if (!hitButton) {
                        // The mouse click has to be within the inset!
                        if (geometry(cur.bv()) != ButtonOnly)
                                InsetText::doDispatch(cur, cmd);
                        else
-                               cur.undispatched();                     
+                               cur.undispatched();
                        break;
                }
                if (cmd.button() != mouse_button::button1) {
                        // Nothing to do.
-                       cur.noUpdate();
+                       cur.noScreenUpdate();
                        break;
                }
                // if we are selecting, we do not want to
@@ -556,7 +516,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
                // Left button is clicked, the user asks to
                // toggle the inset visual state.
                cur.dispatched();
-               cur.updateFlags(Update::Force | Update::FitCursor);
+               cur.screenUpdateFlags(Update::Force | Update::FitCursor);
                if (geometry(cur.bv()) == ButtonOnly) {
                        setStatus(cur, Open);
                        edit(cur, true);
@@ -572,163 +532,26 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
                else if (cmd.argument() == "close")
                        setStatus(cur, Collapsed);
                else if (cmd.argument() == "toggle" || cmd.argument().empty())
-                       if (status_ == Open) {
+                       if (status_ == Open)
                                setStatus(cur, Collapsed);
-                               if (geometry(cur.bv()) == ButtonOnly)
-                                       cur.top().forwardPos();
-                       } else
+                       else
                                setStatus(cur, Open);
                else // if assign or anything else
                        cur.undispatched();
                cur.dispatched();
                break;
 
-       case LFUN_PASTE:
-       case LFUN_CLIPBOARD_PASTE:
-       case LFUN_SELECTION_PASTE:
-       case LFUN_PRIMARY_SELECTION_PASTE: {
-               InsetText::doDispatch(cur, cmd);
-               // Since we can only store plain text, we must reset all
-               // attributes.
-               // FIXME: Change only the pasted paragraphs
-
-               resetParagraphsFont();
-               break;
-       }
-
        default:
-               if (layout_ && layout_->isForceLtr()) {
-                       // Force any new text to latex_language
-                       // FIXME: This should only be necessary in constructor, but
-                       // new paragraphs that are created by pressing enter at the
-                       // start of an existing paragraph get the buffer language
-                       // and not latex_language, so we take this brute force
-                       // approach.
-                       cur.current_font.setLanguage(latex_language);
-                       cur.real_current_font.setLanguage(latex_language);
-               }
                InsetText::doDispatch(cur, cmd);
                break;
        }
 }
 
 
-bool InsetCollapsable::allowMultiPar() const
-{
-       return layout_->isMultiPar();
-}
-
-
-void InsetCollapsable::resetParagraphsFont()
-{
-       Font font(inherit_font, buffer().params().language);
-       if (layout_->isForceLtr())
-               font.setLanguage(latex_language);
-       if (layout_->isPassThru()) {
-               ParagraphList::iterator par = paragraphs().begin();
-               ParagraphList::iterator const end = paragraphs().end();
-               while (par != end) {
-                       par->resetFonts(font);
-                       par->params().clear();
-                       ++par;
-               }
-       }
-}
-
-
 bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
-       // FIXME At present, these are being enabled and disabled according to
-       // whether PASSTHRU has been set in the InsetLayout. This makes some
-       // sense, but there are other checks that should really be done. E.g.,
-       // one should not be able to inset IndexPrint inside an optional argument!!
-       case LFUN_ACCENT_ACUTE:
-       case LFUN_ACCENT_BREVE:
-       case LFUN_ACCENT_CARON:
-       case LFUN_ACCENT_CEDILLA:
-       case LFUN_ACCENT_CIRCLE:
-       case LFUN_ACCENT_CIRCUMFLEX:
-       case LFUN_ACCENT_DOT:
-       case LFUN_ACCENT_GRAVE:
-       case LFUN_ACCENT_HUNGARIAN_UMLAUT:
-       case LFUN_ACCENT_MACRON:
-       case LFUN_ACCENT_OGONEK:
-       case LFUN_ACCENT_TIE:
-       case LFUN_ACCENT_TILDE:
-       case LFUN_ACCENT_UMLAUT:
-       case LFUN_ACCENT_UNDERBAR:
-       case LFUN_ACCENT_UNDERDOT:
-       case LFUN_APPENDIX:
-       case LFUN_BOX_INSERT:
-       case LFUN_BRANCH_INSERT:
-       case LFUN_CAPTION_INSERT:
-       case LFUN_DEPTH_DECREMENT:
-       case LFUN_DEPTH_INCREMENT:
-       case LFUN_ERT_INSERT:
-       case LFUN_FILE_INSERT:
-       case LFUN_FLEX_INSERT:
-       case LFUN_FLOAT_INSERT:
-       case LFUN_FLOAT_LIST_INSERT:
-       case LFUN_FLOAT_WIDE_INSERT:
-       case LFUN_FONT_BOLD:
-       case LFUN_FONT_BOLDSYMBOL:
-       case LFUN_FONT_TYPEWRITER:
-       case LFUN_FONT_DEFAULT:
-       case LFUN_FONT_EMPH:
-       case LFUN_FONT_NOUN:
-       case LFUN_FONT_ROMAN:
-       case LFUN_FONT_SANS:
-       case LFUN_FONT_FRAK:
-       case LFUN_FONT_ITAL:
-       case LFUN_FONT_SIZE:
-       case LFUN_FONT_STATE:
-       case LFUN_FONT_UNDERLINE:
-       case LFUN_FONT_STRIKEOUT:
-       case LFUN_FONT_UULINE:
-       case LFUN_FONT_UWAVE:
-       case LFUN_FOOTNOTE_INSERT:
-       case LFUN_HYPERLINK_INSERT:
-       case LFUN_INDEX_INSERT:
-       case LFUN_INDEX_PRINT:
-       case LFUN_INSET_INSERT:
-       case LFUN_LABEL_GOTO:
-       case LFUN_LABEL_INSERT:
-       case LFUN_LAYOUT_TABULAR:
-       case LFUN_LINE_INSERT:
-       case LFUN_MARGINALNOTE_INSERT:
-       case LFUN_MATH_DISPLAY:
-       case LFUN_MATH_INSERT:
-       case LFUN_MATH_MATRIX:
-       case LFUN_MATH_MODE:
-       case LFUN_MENU_OPEN:
-       case LFUN_NEWLINE_INSERT:
-       case LFUN_NEWPAGE_INSERT:
-       case LFUN_NOACTION:
-       case LFUN_NOMENCL_INSERT:
-       case LFUN_NOMENCL_PRINT:
-       case LFUN_NOTE_INSERT:
-       case LFUN_NOTE_NEXT:
-       case LFUN_OPTIONAL_INSERT:
-       case LFUN_PHANTOM_INSERT:
-       case LFUN_REFERENCE_NEXT:
-       case LFUN_SERVER_GOTO_FILE_ROW:
-       case LFUN_SERVER_NOTIFY:
-       case LFUN_SERVER_SET_XY:
-       case LFUN_SPACE_INSERT:
-       case LFUN_SPECIALCHAR_INSERT:
-       case LFUN_TABULAR_INSERT:
-       case LFUN_TEXTSTYLE_APPLY:
-       case LFUN_TEXTSTYLE_UPDATE:
-       case LFUN_TOC_INSERT:
-       case LFUN_WRAP_INSERT:
-               if (layout_->isPassThru()) {
-                       flag.setEnabled(false);
-                       return true;
-               }
-               return InsetText::getStatus(cur, cmd, flag);
-
+       switch (cmd.action()) {
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "open")
                        flag.setEnabled(status_ != Open);
@@ -741,14 +564,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
                        flag.setEnabled(false);
                return true;
 
-       case LFUN_LANGUAGE:
-               flag.setEnabled(!layout_->isForceLtr());
-               return InsetText::getStatus(cur, cmd, flag);
-
-       case LFUN_BREAK_PARAGRAPH:
-               flag.setEnabled(layout_->isMultiPar());
-               return true;
-
        default:
                return InsetText::getStatus(cur, cmd, flag);
        }
@@ -761,165 +576,80 @@ void InsetCollapsable::setLabel(docstring const & l)
 }
 
 
-void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
+docstring const InsetCollapsable::buttonLabel(BufferView const & bv) const
 {
-       status_ = status;
-       setButtonLabel();
-       if (status_ == Collapsed) {
-               cur.leaveInset(*this);
-               mouse_hover_ = false;
-       }
+       InsetLayout const & il = getLayout();
+       docstring const label = labelstring_.empty() ?
+               translateIfPossible(il.labelstring()) : labelstring_;
+       if (!il.contentaslabel() || geometry(bv) != ButtonOnly)
+               return label;
+       return getNewLabel(label);
 }
 
 
-docstring InsetCollapsable::floatName(
-               string const & type, BufferParams const & bp) const
+void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 {
-       FloatList const & floats = bp.documentClass().floats();
-       FloatList::const_iterator it = floats[type];
-       // FIXME UNICODE
-       return (it == floats.end()) ? from_ascii(type) : bp.B_(it->second.name());
+       status_ = status;
+       setButtonLabel();
+       if (status_ == Collapsed)
+               cur.leaveInset(*this);
 }
 
 
 InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 {
-       if (!layout_)
-               return InsetLayout::CLASSIC;
-       InsetLayout::InsetDecoration const dec = layout_->decoration();
-       switch (dec) {
-       case InsetLayout::CLASSIC:
-       case InsetLayout::MINIMALISTIC:
-       case InsetLayout::CONGLOMERATE:
-               return dec;
-       case InsetLayout::DEFAULT:
-               break;
-       }
-       if (lyxCode() == FLEX_CODE)
-               return InsetLayout::CONGLOMERATE;
-       return InsetLayout::CLASSIC;
-}
-
-
-int InsetCollapsable::latex(odocstream & os,
-                         OutputParams const & runparams) const
-{
-       // FIXME: What should we do layout_ is 0?
-       // 1) assert
-       // 2) throw an error
-       if (!layout_)
-               return 0;
-
-       // This implements the standard way of handling the LaTeX output of
-       // a collapsable inset, either a command or an environment. Standard 
-       // collapsable insets should not redefine this, non-standard ones may
-       // call this.
-       if (!layout_->latexname().empty()) {
-               if (layout_->latextype() == InsetLayout::COMMAND) {
-                       // FIXME UNICODE
-                       if (runparams.moving_arg)
-                               os << "\\protect";
-                       os << '\\' << from_utf8(layout_->latexname());
-                       if (!layout_->latexparam().empty())
-                               os << from_utf8(layout_->latexparam());
-                       os << '{';
-               } else if (layout_->latextype() == InsetLayout::ENVIRONMENT) {
-                       os << "%\n\\begin{" << from_utf8(layout_->latexname()) << "}\n";
-                       if (!layout_->latexparam().empty())
-                               os << from_utf8(layout_->latexparam());
-               }
-       }
-       OutputParams rp = runparams;
-       if (layout_->isPassThru())
-               rp.verbatim = true;
-       if (layout_->isNeedProtect())
-               rp.moving_arg = true;
-       int i = InsetText::latex(os, rp);
-       if (!layout_->latexname().empty()) {
-               if (layout_->latextype() == InsetLayout::COMMAND) {
-                       os << "}";
-               } else if (layout_->latextype() == InsetLayout::ENVIRONMENT) {
-                       os << "\n\\end{" << from_utf8(layout_->latexname()) << "}\n";
-                       i += 4;
-               }
-       }
-       return i;
+       InsetLayout::InsetDecoration const dec = getLayout().decoration();
+       return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
 }
 
 
-// FIXME It seems as if it ought to be possible to do this more simply,
-// maybe by calling InsetText::docbook() in the middle there.
-int InsetCollapsable::docbook(odocstream & os, OutputParams const & runparams) const
-{
-       ParagraphList::const_iterator const beg = paragraphs().begin();
-       ParagraphList::const_iterator par = paragraphs().begin();
-       ParagraphList::const_iterator const end = paragraphs().end();
-
-       if (!undefined())
-               sgml::openTag(os, getLayout().latexname(),
-                             par->getID(buffer(), runparams) + getLayout().latexparam());
-
-       for (; par != end; ++par) {
-               par->simpleDocBookOnePar(buffer(), os, runparams,
-                                        outerFont(distance(beg, par),
-                                                  paragraphs()));
-       }
-
-       if (!undefined())
-               sgml::closeTag(os, getLayout().latexname());
-
-       return 0;
-}
-
-
-int InsetCollapsable::xhtml(odocstream & os, OutputParams const & runparams) const
+string InsetCollapsable::contextMenu(BufferView const & bv, int x,
+       int y) const
 {
-       InsetLayout const & il = getLayout();
-       bool opened = false;
-       if (!undefined())
-               opened = html::openTag(os, il.htmltag(), il.htmlattr());
-       InsetText::xhtml(os, runparams);
-       if (opened && !undefined())
-               html::closeTag(os, il.htmltag());
-       return 0;
-}
+       string context_menu = contextMenuName();
+       string const it_context_menu = InsetText::contextMenuName();
+       if (decoration() == InsetLayout::CONGLOMERATE)
+               return context_menu + ";" + it_context_menu;
 
+       string const ic_context_menu = InsetCollapsable::contextMenuName();
+       if (ic_context_menu != context_menu)
+               context_menu += ";" + ic_context_menu;
 
-void InsetCollapsable::validate(LaTeXFeatures & features) const
-{
-       features.useInsetLayout(getLayout());
-       InsetText::validate(features);
-}
+       if (geometry(bv) == NoButton)
+               return context_menu + ";" + it_context_menu;
 
+       Dimension dim = dimensionCollapsed(bv);
+       if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+               return context_menu;
 
-bool InsetCollapsable::undefined() const
-{
-       docstring const & n = getLayout().name();
-       return n.empty() || n == DocumentClass::plainInsetLayout().name();
+       return it_context_menu;
 }
 
 
-docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
-       int y) const
+string InsetCollapsable::contextMenuName() const
 {
        if (decoration() == InsetLayout::CONGLOMERATE)
-               return from_ascii("context-conglomerate");
-
-       if (geometry(bv) == NoButton)
-               return from_ascii("context-collapsable");
-
-       Dimension dim = dimensionCollapsed(bv);
-       if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
-               return from_ascii("context-collapsable");
-
-       return InsetText::contextMenu(bv, x, y);
+               return "context-conglomerate";
+       else
+               return "context-collapsable";
 }
 
-void InsetCollapsable::tocString(odocstream & os) const
+
+bool InsetCollapsable::canPaintChange(BufferView const & bv) const
 {
-       if (!getLayout().isInToc())
-               return;
-       os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
+       // return false to let RowPainter draw the change tracking cue consistently
+       // with the surrounding text, when the inset is inline: for buttons, for
+       // non-allowMultiPar insets.
+       switch (geometry(bv)) {
+       case Corners:
+       case SubLabel:
+               return allowMultiPar();
+       case ButtonOnly:
+               return false;
+       default:
+               break;
+       }
+       return true;
 }