]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetCollapsable.cpp
Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...
[lyx.git] / src / insets / InsetCollapsable.cpp
index 9105cb018514103df1bac1a27470d63833233df8..c255d24709b367f42d91db9bcd62cfe43fc6e094 100644 (file)
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FloatList.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "InsetLayout.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/lassert.h"
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 
+using namespace std;
 
-namespace lyx {
-
-using std::endl;
-using std::max;
-using std::ostream;
-using std::string;
 
+namespace lyx {
 
 InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 {
+       if (decoration() == InsetLayout::Conglomerate)
+               return status_;
        return autoOpen_ ? Open : status_;
 }
 
@@ -55,20 +55,19 @@ InsetCollapsable::CollapseStatus InsetCollapsable::status() const
 InsetCollapsable::Geometry InsetCollapsable::geometry() const
 {
        switch (decoration()) {
-       case Classic:
-               if (status() == Open) {
-                       if (openinlined_)
-                               return LeftButton;
-                       else
-                               return TopButton;
-               } else
-                       return ButtonOnly;
+       case InsetLayout::Classic:
+               if (status() == Open)
+                       return openinlined_ ? LeftButton : TopButton;
+               return ButtonOnly;
 
-       case Minimalistic:
+       case InsetLayout::Minimalistic:
                return status() == Open ? NoButton : ButtonOnly ;
 
-       case Conglomerate:
+       case InsetLayout::Conglomerate:
                return status() == Open ? SubLabel : Corners ;
+
+       case InsetLayout::Default:
+               break; // this shouldn't happen
        }
 
        // dummy return value to shut down a warning,
@@ -77,14 +76,17 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 }
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp,
-               CollapseStatus status, InsetLayout const * il)
-       : InsetText(bp), layout_(il), status_(status),
+InsetCollapsable::InsetCollapsable(Buffer const & buf,
+               CollapseStatus status)
+       : InsetText(buf), status_(status),
          openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
+       DocumentClass const & dc = buf.params().documentClass();
+       setLayout(&dc);
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
+       paragraphs().back().setLayout(dc.emptyLayout());
 }
 
 
@@ -102,22 +104,58 @@ InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
 }
 
 
-void  InsetCollapsable::setLayout(BufferParams const & bp)
+docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
+{
+       Dimension dim = dimensionCollapsed();
+       if (geometry() == NoButton)
+               return translateIfPossible(layout_->labelstring());
+       if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+               return docstring();
+
+       docstring default_tip;
+       switch (status_) {
+       case Open:
+               default_tip = _("Left-click to collapse the inset");
+               break;
+       case Collapsed:
+               default_tip = _("Left-click to open the inset");
+               break;
+       }
+
+       OutputParams rp(&buffer().params().encoding());
+       odocstringstream ods;
+       InsetText::plaintext(ods, rp);
+       docstring content_tip = ods.str();
+       // shorten it if necessary
+       if (content_tip.size() > 200)
+               content_tip = content_tip.substr(0, 200) + "...";
+       if (!isOpen() && !content_tip.empty())
+               return content_tip + '\n' + default_tip;
+       return default_tip;
+}
+
+
+void InsetCollapsable::setLayout(BufferParams const & bp)
 {
-       setLayout(bp.getTextClass().insetlayout(name()));
+       setLayout(bp.documentClassPtr());
 }
 
 
-void InsetCollapsable::setLayout(InsetLayout const & il)
+void InsetCollapsable::setLayout(DocumentClass const * const dc)
 {
-       layout_ = &il;
-       labelstring_ = layout_->labelstring;
+       if (dc) {
+               layout_ = &(dc->insetLayout(name()));
+               labelstring_ = translateIfPossible(layout_->labelstring());
+       } else {
+               layout_ = &DocumentClass::emptyInsetLayout();
+               labelstring_ = _("UNDEFINED");
+       }
 
        setButtonLabel();
 }
 
 
-void InsetCollapsable::write(Buffer const & buf, ostream & os) const
+void InsetCollapsable::write(ostream & os) const
 {
        os << "status ";
        switch (status_) {
@@ -129,44 +167,23 @@ void InsetCollapsable::write(Buffer const & buf, ostream & os) const
                break;
        }
        os << "\n";
-       text_.write(buf, os);
+       text_.write(buffer(), os);
 }
 
 
-void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
+void InsetCollapsable::read(Lexer & lex)
 {
-       bool token_found = false;
-       if (lex.isOK()) {
-               lex.next();
-               string const token = lex.getString();
-               if (token == "status") {
-                       lex.next();
-                       string const tmp_token = lex.getString();
-
-                       if (tmp_token == "collapsed") {
-                               status_ = Collapsed;
-                               token_found = true;
-                       } else if (tmp_token == "open") {
-                               status_ = Open;
-                               token_found = true;
-                       } else {
-                               lyxerr << "InsetCollapsable::read: Missing status!"
-                                      << endl;
-                               // Take countermeasures
-                               lex.pushToken(token);
-                       }
-               } else {
-                       LYXERR0("InsetCollapsable::read: Missing 'status'-tag!");
-                       // take countermeasures
-                       lex.pushToken(token);
-               }
-       }
-       InsetText::read(buf, lex);
+       lex.setContext("InsetCollapsable::read");
+       string tmp_token;
+       status_ = Collapsed;
+       lex >> "status" >> tmp_token;
+       if (tmp_token == "open")
+               status_ = Open;
 
-       setLayout(buf.params());
+       // this must be set before we enter InsetText::read()
+       setLayout(buffer().params());
 
-       if (!token_found)
-               status_ = isOpen() ? Open : Collapsed;
+       InsetText::read(lex);
 
        // Force default font, if so requested
        // This avoids paragraphs in buffer language that would have a
@@ -181,9 +198,9 @@ void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
 
 Dimension InsetCollapsable::dimensionCollapsed() const
 {
-       BOOST_ASSERT(layout_);
+       LASSERT(layout_, /**/);
        Dimension dim;
-       theFontMetrics(layout_->labelfont).buttonText(
+       theFontMetrics(layout_->labelfont()).buttonText(
                labelstring_, dim.wid, dim.asc, dim.des);
        return dim;
 }
@@ -191,12 +208,12 @@ Dimension InsetCollapsable::dimensionCollapsed() const
 
 void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       BOOST_ASSERT(layout_);
+       LASSERT(layout_, /**/);
 
        autoOpen_ = mi.base.bv->cursor().isInside(this);
 
        FontInfo tmpfont = mi.base.font;
-       mi.base.font = layout_->font;
+       mi.base.font = layout_->font();
        mi.base.font.realize(tmpfont);
 
        switch (geometry()) {
@@ -211,7 +228,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(layout_->labelfont());
                font.realize(sane_font);
                font.decSize();
                font.decSize();
@@ -226,8 +243,7 @@ void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
        case LeftButton:
        case ButtonOnly:
                dim = dimensionCollapsed();
-               if (geometry() == TopButton
-                || geometry() == LeftButton) {
+               if (geometry() == TopButton || geometry() == LeftButton) {
                        Dimension textdim;
                        InsetText::metrics(mi, textdim);
                        openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
@@ -257,14 +273,14 @@ bool InsetCollapsable::setMouseHover(bool mouse_hover)
 
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-       BOOST_ASSERT(layout_);
+       LASSERT(layout_, /**/);
 
        autoOpen_ = pi.base.bv->cursor().isInside(this);
        ColorCode const old_color = pi.background_color;
        pi.background_color = backgroundColor();
 
        FontInfo tmpfont = pi.base.font;
-       pi.base.font = layout_->font;
+       pi.base.font = layout_->font();
        pi.base.font.realize(tmpfont);
 
        // Draw button first -- top, left or only
@@ -278,7 +294,7 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                button_dim.y1 = y - dimc.asc;
                button_dim.y2 = y + dimc.des;
 
-               pi.pain.buttonText(x, y, labelstring_, layout_->labelfont,
+               pi.pain.buttonText(x, y, labelstring_, layout_->labelfont(),
                        mouse_hover_);
        } else {
                button_dim.x1 = 0;
@@ -324,26 +340,26 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                const int xx2 = x + textdim.wid - TEXT_TO_INSET_OFFSET + 1;
                pi.pain.line(xx1, y + desc - 4, 
                             xx1, y + desc, 
-                       layout_->labelfont.color());
+                       layout_->labelfont().color());
                if (status_ == Open)
                        pi.pain.line(xx1, y + desc, 
                                xx2, y + desc,
-                               layout_->labelfont.color());
+                               layout_->labelfont().color());
                else {
                        // Make status_ value visible:
                        pi.pain.line(xx1, y + desc,
                                xx1 + 4, y + desc,
-                               layout_->labelfont.color());
+                               layout_->labelfont().color());
                        pi.pain.line(xx2 - 4, y + desc,
                                xx2, y + desc,
-                               layout_->labelfont.color());
+                               layout_->labelfont().color());
                }
-               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, layout_->labelfont().color());
 
                // the label below the text. Can be toggled.
                if (geometry() == SubLabel) {
-                       FontInfo font(layout_->labelfont);
+                       FontInfo font(layout_->labelfont());
                        font.realize(sane_font);
                        font.decSize();
                        font.decSize();
@@ -362,12 +378,12 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
                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(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());
+                               layout_->labelfont().color());
                        pi.pain.line(xx2 - 4, y, xx2, y,
-                               layout_->labelfont.color());
+                               layout_->labelfont().color());
                }
                break;
        }
@@ -382,7 +398,7 @@ void InsetCollapsable::cursorPos(BufferView const & bv,
 {
        if (geometry() == ButtonOnly)
                status_ = Open;
-       BOOST_ASSERT(geometry() != ButtonOnly);
+       LASSERT(geometry() != ButtonOnly, /**/);
 
        InsetText::cursorPos(bv, sl, boundary, x, y);
        Dimension const textdim = InsetText::dimension(bv);
@@ -430,7 +446,7 @@ docstring const InsetCollapsable::getNewLabel(docstring const & l) const
        docstring label;
        pos_type const max_length = 15;
        pos_type const p_siz = paragraphs().begin()->size();
-       pos_type const n = std::min(max_length, p_siz);
+       pos_type const n = min(max_length, p_siz);
        pos_type i = 0;
        pos_type j = 0;
        for (; i < n && j < p_siz; ++j) {
@@ -446,11 +462,11 @@ docstring const InsetCollapsable::getNewLabel(docstring const & l) const
 }
 
 
-void InsetCollapsable::edit(Cursor & cur, bool left)
+void InsetCollapsable::edit(Cursor & cur, bool front, EntryDirection entry_from)
 {
        //lyxerr << "InsetCollapsable: edit left/right" << endl;
        cur.push(*this);
-       InsetText::edit(cur, left);
+       InsetText::edit(cur, front, entry_from);
 }
 
 
@@ -473,21 +489,28 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        switch (cmd.action) {
        case LFUN_MOUSE_PRESS:
-               if (cmd.button() == mouse_button::button1 
-                && hitButton(cmd) 
-                && geometry() != NoButton) {
-                       // reset selection if necessary (see bug 3060)
-                       if (cur.selection())
-                               cur.bv().cursor().clearSelection();
-                       else
-                               cur.noUpdate();
-                       cur.dispatched();
-                       break;
+               if (hitButton(cmd) && geometry() != NoButton) {
+                       switch (cmd.button()) {
+                       case mouse_button::button1:
+                               // reset selection if necessary (see bug 3060)
+                               if (cur.selection())
+                                       cur.bv().cursor().clearSelection();
+                               else
+                                       cur.noUpdate();
+                               cur.dispatched();
+                               return;
+                       case mouse_button::none:
+                       case mouse_button::button2:
+                       case mouse_button::button3:
+                       case mouse_button::button4:
+                       case mouse_button::button5:
+                               // Nothing to do.
+                               cur.undispatched();
+                               return;
+                       }
                }
-               if (geometry() == NoButton)
-                       InsetText::doDispatch(cur, cmd);
-               else if (geometry() != ButtonOnly 
-                    && !hitButton(cmd))
+               if (geometry() == NoButton 
+                       || (geometry() != ButtonOnly && !hitButton(cmd)))
                        InsetText::doDispatch(cur, cmd);
                else
                        cur.undispatched();
@@ -506,54 +529,30 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_MOUSE_RELEASE:
-               if (cmd.button() == mouse_button::button3) {
-                       // There is no button to right click:
-                       if (geometry() == Corners ||
-                           geometry() == SubLabel ||
-                           geometry() == NoButton)  {
-                               if (status_ == Open)
-                                       setStatus(cur, Collapsed);
-                               else
-                                       setStatus(cur, Open);
-                               break;
-                       } else {
-                               // Open the Inset 
-                               // configuration dialog
-                               showInsetDialog(&cur.bv());
-                               break;
-                       }
-               }
-
-               if (geometry() == NoButton) {
+               if (geometry() == NoButton || !hitButton(cmd)) {
                        // The mouse click has to be within the inset!
                        InsetText::doDispatch(cur, cmd);
                        break;
                }
-
-               if (cmd.button() == mouse_button::button1 && hitButton(cmd)) {
-                       // if we are selecting, we do not want to
-                       // toggle the inset.
-                       if (cur.selection())
-                               break;
-                       // Left button is clicked, the user asks to
-                       // toggle the inset visual state.
+               if (cmd.button() != mouse_button::button1) {
                        cur.dispatched();
-                       cur.updateFlags(Update::Force | Update::FitCursor);
-                       if (geometry() == ButtonOnly) {
-                               setStatus(cur, Open);
-                               edit(cur, true);
-                       }
-                       else {
-                               setStatus(cur, Collapsed);
-                       }
-                       cur.bv().cursor() = cur;
                        break;
                }
-
-               // The mouse click is within the opened inset.
-               if (geometry() == TopButton
-                || geometry() == LeftButton)
-                       InsetText::doDispatch(cur, cmd);
+               // if we are selecting, we do not want to
+               // toggle the inset.
+               if (cur.selection())
+                       break;
+               // Left button is clicked, the user asks to
+               // toggle the inset visual state.
+               cur.dispatched();
+               cur.updateFlags(Update::Force | Update::FitCursor);
+               if (geometry() == ButtonOnly) {
+                       setStatus(cur, Open);
+                       edit(cur, true);
+               }
+               else
+                       setStatus(cur, Collapsed);
+               cur.bv().cursor() = cur;
                break;
 
        case LFUN_INSET_TOGGLE:
@@ -586,7 +585,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
        }
 
        default:
-               if (layout_ && layout_->forceltr) {
+               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
@@ -604,7 +603,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 bool InsetCollapsable::allowMultiPar() const
 {
-       return layout_->multipar;
+       return layout_->isMultiPar();
 }
 
 
@@ -612,9 +611,9 @@ void InsetCollapsable::resetParagraphsFont()
 {
        Font font;
        font.fontInfo() = inherit_font;
-       if (layout_->forceltr)
+       if (layout_->isForceLtr())
                font.setLanguage(latex_language);
-       if (layout_->passthru) {
+       if (layout_->isPassThru()) {
                ParagraphList::iterator par = paragraphs().begin();
                ParagraphList::iterator const end = paragraphs().end();
                while (par != end) {
@@ -642,7 +641,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_ACCENT_HUNGARIAN_UMLAUT:
        case LFUN_ACCENT_MACRON:
        case LFUN_ACCENT_OGONEK:
-       case LFUN_ACCENT_SPECIAL_CARON:
        case LFUN_ACCENT_TIE:
        case LFUN_ACCENT_TILDE:
        case LFUN_ACCENT_UMLAUT:
@@ -652,14 +650,10 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_BIBITEM_INSERT:
        case LFUN_BOX_INSERT:
        case LFUN_BRANCH_INSERT:
-       case LFUN_NEW_LINE:
+       case LFUN_NEWLINE_INSERT:
        case LFUN_CAPTION_INSERT:
-       case LFUN_CLEARPAGE_INSERT:
-       case LFUN_CLEARDOUBLEPAGE_INSERT:
        case LFUN_DEPTH_DECREMENT:
        case LFUN_DEPTH_INCREMENT:
-       case LFUN_DOTS_INSERT:
-       case LFUN_END_OF_SENTENCE_PERIOD_INSERT:
        case LFUN_ENVIRONMENT_INSERT:
        case LFUN_ERT_INSERT:
        case LFUN_FILE_INSERT:
@@ -682,18 +676,14 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_STATE:
        case LFUN_FONT_UNDERLINE:
        case LFUN_FOOTNOTE_INSERT:
-       case LFUN_HFILL_INSERT:
        case LFUN_HYPERLINK_INSERT:
-       case LFUN_HYPHENATION_POINT_INSERT:
        case LFUN_INDEX_INSERT:
        case LFUN_INDEX_PRINT:
        case LFUN_INSET_INSERT:
        case LFUN_LABEL_GOTO:
        case LFUN_LABEL_INSERT:
-       case LFUN_LIGATURE_BREAK_INSERT:
        case LFUN_LINE_INSERT:
        case LFUN_NEWPAGE_INSERT:
-       case LFUN_PAGEBREAK_INSERT:
        case LFUN_LAYOUT:
        case LFUN_LAYOUT_PARAGRAPH:
        case LFUN_LAYOUT_TABULAR:
@@ -703,7 +693,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_MATH_MATRIX:
        case LFUN_MATH_MODE:
        case LFUN_MENU_OPEN:
-       case LFUN_MENU_SEPARATOR_INSERT:
        case LFUN_NOACTION:
        case LFUN_NOMENCL_INSERT:
        case LFUN_NOMENCL_PRINT:
@@ -719,30 +708,35 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_SERVER_NOTIFY:
        case LFUN_SERVER_SET_XY:
        case LFUN_SPACE_INSERT:
+       case LFUN_SPECIALCHAR_INSERT:
        case LFUN_TABULAR_INSERT:
        case LFUN_TOC_INSERT:
        case LFUN_WRAP_INSERT:
-       if (layout_->passthru) {
-               flag.enabled(false);
-               return true;
-       } else
+               if (layout_->isPassThru()) {
+                       flag.enabled(false);
+                       return true;
+               }
                return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_INSET_TOGGLE:
-               if (cmd.argument() == "open" || cmd.argument() == "close" ||
-                   cmd.argument() == "toggle")
+               if (cmd.argument() == "open")
+                       flag.enabled(status_ != Open);
+               else if (cmd.argument() == "close")
+                       flag.enabled(status_ == Open);
+               else if (cmd.argument() == "toggle" || cmd.argument().empty()) {
                        flag.enabled(true);
-               else
+                       flag.setOnOff(status_ == Open);
+               } else
                        flag.enabled(false);
                return true;
 
        case LFUN_LANGUAGE:
-               flag.enabled(!layout_->forceltr);
+               flag.enabled(!layout_->isForceLtr());
                return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_BREAK_PARAGRAPH:
        case LFUN_BREAK_PARAGRAPH_SKIP:
-               flag.enabled(layout_->multipar);
+               flag.enabled(layout_->isMultiPar());
                return true;
 
        default:
@@ -761,36 +755,43 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 {
        status_ = status;
        setButtonLabel();
-       if (status_ == Collapsed)
+       if (status_ == Collapsed) {
                cur.leaveInset(*this);
+               mouse_hover_ = false;
+       }
 }
 
 
-docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
+docstring InsetCollapsable::floatName(
+               string const & type, BufferParams const & bp) const
 {
-       FloatList const & floats = bp.getTextClass().floats();
+       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());
 }
 
 
-InsetCollapsable::Decoration InsetCollapsable::decoration() const
+InsetLayout::InsetDecoration InsetCollapsable::decoration() const
 {
-       if (!layout_ || layout_->decoration == "classic")
-               return Classic;
-       if (layout_->decoration == "minimalistic")
-               return Minimalistic;
-       if (layout_->decoration == "conglomerate")
-               return Conglomerate;
+       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)
-               // FIXME: Is this really necessary?
-               return Conglomerate;
-       return Classic;
+               return InsetLayout::Conglomerate;
+       return InsetLayout::Classic;
 }
 
 
-int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
+int InsetCollapsable::latex(odocstream & os,
                          OutputParams const & runparams) const
 {
        // FIXME: What should we do layout_ is 0?
@@ -803,32 +804,32 @@ int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
        // 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 == "command") {
+       if (!layout_->latexname().empty()) {
+               if (layout_->latextype() == "command") {
                        // FIXME UNICODE
                        if (runparams.moving_arg)
                                os << "\\protect";
-                       os << '\\' << from_utf8(layout_->latexname);
-                       if (!layout_->latexparam.empty())
-                               os << from_utf8(layout_->latexparam);
+                       os << '\\' << from_utf8(layout_->latexname());
+                       if (!layout_->latexparam().empty())
+                               os << from_utf8(layout_->latexparam());
                        os << '{';
-               } else if (layout_->latextype == "environment") {
-                       os << "%\n\\begin{" << from_utf8(layout_->latexname) << "}\n";
-                       if (!layout_->latexparam.empty())
-                               os << from_utf8(layout_->latexparam);
+               } else if (layout_->latextype() == "environment") {
+                       os << "%\n\\begin{" << from_utf8(layout_->latexname()) << "}\n";
+                       if (!layout_->latexparam().empty())
+                               os << from_utf8(layout_->latexparam());
                }
        }
        OutputParams rp = runparams;
-       if (layout_->passthru)
+       if (layout_->isPassThru())
                rp.verbatim = true;
-       if (layout_->needprotect)
+       if (layout_->isNeedProtect())
                rp.moving_arg = true;
-       int i = InsetText::latex(buf, os, rp);
-       if (!layout_->latexname.empty()) {
-               if (layout_->latextype == "command") {
+       int i = InsetText::latex(os, rp);
+       if (!layout_->latexname().empty()) {
+               if (layout_->latextype() == "command") {
                        os << "}";
-               } else if (layout_->latextype == "environment") {
-                       os << "\n\\end{" << from_utf8(layout_->latexname) << "}\n";
+               } else if (layout_->latextype() == "environment") {
+                       os << "\n\\end{" << from_utf8(layout_->latexname()) << "}\n";
                        i += 4;
                }
        }
@@ -842,9 +843,32 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
                return;
 
        // Force inclusion of preamble snippet in layout file
-       features.require(layout_->name);
+       features.require(to_utf8(layout_->name()));
        InsetText::validate(features);
 }
 
 
+bool InsetCollapsable::undefined() const
+{
+       docstring const & n = getLayout().name();
+       return n.empty() || n == DocumentClass::emptyInsetLayout().name();
+}
+
+
+docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+       int y) const
+{
+       if (decoration() == InsetLayout::Conglomerate)
+               return from_ascii("context-conglomerate");
+
+       if (geometry() == NoButton)
+               return from_ascii("context-collapsable");
+
+       Dimension dim = dimensionCollapsed();
+       if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+               return from_ascii("context-collapsable");
+
+       return InsetText::contextMenu(bv, x, y);
+}
+
 } // namespace lyx