X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCollapsable.cpp;h=6135a63545e69494301a66ba7928e58729a98007;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=6e421d31c073dc3a42f8d27666635c0ce6ce1cdc;hpb=2bd998c29eab19692e976a086b02174cc924b376;p=lyx.git

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 6e421d31c0..6135a63545 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -18,70 +18,129 @@
 #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 "Color.h"
+#include "InsetLayout.h"
+#include "Language.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "FuncRequest.h"
 #include "MetricsInfo.h"
+#include "ParagraphParameters.h"
+#include "TextClass.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
+
+using namespace std;
 
 namespace lyx {
 
-using graphics::PreviewLoader;
 
-using std::endl;
-using std::string;
-using std::max;
-using std::min;
-using std::ostream;
+InsetCollapsable::CollapseStatus InsetCollapsable::status() const
+{
+	return autoOpen_ ? Open : status_;
+}
 
 
-InsetCollapsable::CollapseStatus InsetCollapsable::status() const
+InsetCollapsable::Geometry InsetCollapsable::geometry() const
 {
-	return (autoOpen_ && status_ != Inlined) ? Open : status_;
+	switch (decoration()) {
+	case Deco_Classic:
+		if (status() == Open) {
+			if (openinlined_)
+				return LeftButton;
+			else
+				return TopButton;
+		} else
+			return ButtonOnly;
+
+	case Deco_Minimalistic:
+		return status() == Open ? NoButton : ButtonOnly ;
+
+	case Deco_Conglomerate:
+		return status() == Open ? SubLabel : Corners ;
+
+	case Deco_Default:
+		break; // this shouldn't happen
+	}
+
+	// dummy return value to shut down a warning,
+	// this is dead code.
+	return NoButton;
 }
 
 
-InsetCollapsable::InsetCollapsable
-		(BufferParams const & bp, CollapseStatus status)
-	: InsetText(bp), label(from_ascii("Label")), status_(status),
+InsetCollapsable::InsetCollapsable(BufferParams const & bp,
+		CollapseStatus status, TextClassPtr tc)
+	: InsetText(bp), status_(status),
 	  openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
+	setLayout(tc);
 	setAutoBreakRows(true);
 	setDrawFrame(true);
-	setFrameColor(Color::collapsableframe);
-	setButtonLabel();
+	setFrameColor(Color_collapsableframe);
+	paragraphs().back().layout(bp.getTextClass().emptyLayout());
 }
 
 
 InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
 	: InsetText(rhs),
+		textClass_(rhs.textClass_),
 		layout_(rhs.layout_),
+		labelstring_(rhs.labelstring_),
 		button_dim(rhs.button_dim),
-		topx(rhs.topx),
-		topbaseline(rhs.topbaseline),
-		label(rhs.label),
 		status_(rhs.status_),
 		openinlined_(rhs.openinlined_),
 		autoOpen_(rhs.autoOpen_),
-		textdim_(rhs.textdim_),
 		// the sole purpose of this copy constructor
 		mouse_hover_(false)
 {
 }
 
 
-void  InsetCollapsable::setLayout(BufferParams const & bp)
+docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 {
-	setLabelFont(getLayout(bp).labelfont);
-	setLabel(getLayout(bp).labelstring);
+	Dimension dim = dimensionCollapsed();
+	if (geometry() == NoButton)
+		return layout_->labelstring();
+	else if (x > xo(bv) + dim.wid || y > yo(bv) + dim.des)
+		return docstring();
+
+	switch (status_) {
+	case Open:
+		return _("Left-click to collapse the inset");
+	case Collapsed:
+		return _("Left-click to open the inset");
+	}
+	return docstring();
+}
+
+
+void InsetCollapsable::setLayout(BufferParams const & bp)
+{
+	setLayout(bp.getTextClassPtr());
+}
+
+
+void InsetCollapsable::setLayout(TextClassPtr tc)
+{
+	textClass_ = tc;
+	if ( tc.get() != 0 ) {
+		layout_ = &tc->insetlayout(name());
+		labelstring_ = layout_->labelstring();
+	} else {
+		layout_ = &TextClass::emptyInsetLayout();
+		labelstring_ = _("UNDEFINED");
+	}
+
+	setButtonLabel();
 }
 
 
@@ -95,9 +154,6 @@ void InsetCollapsable::write(Buffer const & buf, ostream & os) const
 	case Collapsed:
 		os << "collapsed";
 		break;
-	case Inlined:
-		os << "inlined";
-		break;
 	}
 	os << "\n";
 	text_.write(buf, os);
@@ -114,10 +170,7 @@ void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
 			lex.next();
 			string const tmp_token = lex.getString();
 
-			if (tmp_token == "inlined") {
-				status_ = Inlined;
-				token_found = true;
-			} else if (tmp_token == "collapsed") {
+			if (tmp_token == "collapsed") {
 				status_ = Collapsed;
 				token_found = true;
 			} else if (tmp_token == "open") {
@@ -130,66 +183,96 @@ void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
 				lex.pushToken(token);
 			}
 		} else {
-			lyxerr << "InsetCollapsable::read: Missing 'status'-tag!"
-				   << endl;
+			LYXERR0("InsetCollapsable::read: Missing 'status'-tag!");
 			// take countermeasures
 			lex.pushToken(token);
 		}
 	}
+	//this must be set before we enter InsetText::read()
+	setLayout(buf.params());
+
 	InsetText::read(buf, lex);
 
 	if (!token_found)
 		status_ = isOpen() ? Open : Collapsed;
 
-	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() const
 {
+	BOOST_ASSERT(layout_);
 	Dimension dim;
-	theFontMetrics(layout_.labelfont).buttonText(
-		label, dim.wid, dim.asc, dim.des);
+	theFontMetrics(layout_->labelfont()).buttonText(
+		labelstring_, dim.wid, dim.asc, dim.des);
 	return dim;
 }
 
 
-bool InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetCollapsable::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+	BOOST_ASSERT(layout_);
+
 	autoOpen_ = mi.base.bv->cursor().isInside(this);
-	mi.base.textwidth -= (int) (1.5 * TEXT_TO_INSET_OFFSET);
 
-	if (status() == Inlined) {
+	FontInfo tmpfont = mi.base.font;
+	mi.base.font = layout_->font();
+	mi.base.font.realize(tmpfont);
+
+	switch (geometry()) {
+	case NoButton:
 		InsetText::metrics(mi, dim);
-	} else {
+		break;
+	case Corners:
+		InsetText::metrics(mi, dim);
+		dim.des -= 3;
+		dim.asc -= 1;
+		break;
+	case SubLabel: {
+		InsetText::metrics(mi, dim);
+		// consider width of the inset label
+		FontInfo font(layout_->labelfont());
+		font.realize(sane_font);
+		font.decSize();
+		font.decSize();
+		int w = 0;
+		int a = 0;
+		int d = 0;
+		theFontMetrics(font).rectText(labelstring_, w, a, d);
+		dim.des += a + d;
+		break;
+		}
+	case TopButton:
+	case LeftButton:
+	case ButtonOnly:
 		dim = dimensionCollapsed();
-		if (status() == Open) {
-			InsetText::metrics(mi, textdim_);
-			// This expression should not contain mi.base.texwidth
-			openinlined_ = !hasFixedWidth()
-				&& textdim_.wid < 0.5 * mi.base.bv->workWidth();
+		if (geometry() == TopButton
+		 || geometry() == LeftButton) {
+			Dimension textdim;
+			InsetText::metrics(mi, textdim);
+			openinlined_ = (textdim.wid + dim.wid) < mi.base.textwidth;
 			if (openinlined_) {
-				// Correct for button width, and re-fit
-				mi.base.textwidth -= dim.wid;
-				InsetText::metrics(mi, textdim_);
-				dim.wid += textdim_.wid;
-				dim.des = max(dim.des - textdim_.asc + dim.asc, textdim_.des);
-				dim.asc = textdim_.asc;
+				// Correct for button width.
+				dim.wid += textdim.wid;
+				dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des);
+				dim.asc = textdim.asc;
 			} else {
-				dim.des += textdim_.height() + TEXT_TO_BOTTOM_OFFSET;
-				dim.wid = max(dim.wid, textdim_.wid);
-				if (hasFixedWidth())
-					dim.wid = max(dim.wid, mi.base.textwidth);
+				dim.des += textdim.height() + TEXT_TO_INSET_OFFSET;
+				dim.wid = max(dim.wid, textdim.wid);
 			}
 		}
+		break;
 	}
-	dim.asc += TEXT_TO_INSET_OFFSET;
-	dim.des += TEXT_TO_INSET_OFFSET;
-	dim.wid += (int) (1.5 * TEXT_TO_INSET_OFFSET);
-	mi.base.textwidth += (int) (1.5 * TEXT_TO_INSET_OFFSET);
-	bool const changed = dim_ != dim;
-	dim_ = dim;
-	return changed;
+
+	mi.base.font = tmpfont;
 }
 
 
@@ -202,76 +285,165 @@ bool InsetCollapsable::setMouseHover(bool mouse_hover)
 
 void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 {
-	const int xx = x + TEXT_TO_INSET_OFFSET;
-	if (status() == Inlined) {
-		InsetText::draw(pi, xx, y);
-	} else {
-		Dimension dimc = dimensionCollapsed();
-		int const top  = y - ascent() + TEXT_TO_INSET_OFFSET;
-		button_dim.x1 = xx + 0;
-		button_dim.x2 = xx + dimc.width();
-		button_dim.y1 = top;
-		button_dim.y2 = top + dimc.height();
+	BOOST_ASSERT(layout_);
 
-		pi.pain.buttonText(xx, top + dimc.asc, label, layout_.labelfont, mouse_hover_);
+	autoOpen_ = pi.base.bv->cursor().isInside(this);
+	ColorCode const old_color = pi.background_color;
+	pi.background_color = backgroundColor();
 
-		if (status() == Open) {
-			int textx, texty;
-			if (openinlined_) {
-				textx = xx + dimc.width();
-				texty = top + textdim_.asc;
-			} else {
-				textx = xx;
-				texty = top + dimc.height() + textdim_.asc;
-			}
-			InsetText::draw(pi, textx, texty);
-		}
+	FontInfo tmpfont = pi.base.font;
+	pi.base.font = layout_->font();
+	pi.base.font.realize(tmpfont);
+
+	// Draw button first -- top, left or only
+	Dimension dimc = dimensionCollapsed();
+
+	if (geometry() == TopButton ||
+	    geometry() == LeftButton ||
+	    geometry() == 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, labelstring_, layout_->labelfont(),
+			mouse_hover_);
+	} else {
+		button_dim.x1 = 0;
+		button_dim.y1 = 0;
+		button_dim.x2 = 0;
+		button_dim.y2 = 0;
 	}
-	setPosCache(pi, x, y);
-}
 
+	Dimension const textdim = InsetText::dimension(*pi.base.bv);
+	int const baseline = y;
+	int textx, texty;
+	switch (geometry()) {
+	case LeftButton:
+		textx = x + dimc.width();
+		texty = baseline;
+		InsetText::draw(pi, textx, texty);
+		break;
+	case TopButton:
+		textx = x;
+		texty = baseline + dimc.des + textdim.asc;
+		InsetText::draw(pi, textx, texty);
+		break;
+	case ButtonOnly:
+		break;
+	case NoButton:
+		textx = x;
+		texty = baseline;
+		InsetText::draw(pi, textx, texty);
+		break;
+	case SubLabel:
+	case Corners:
+		textx = x;
+		texty = baseline;
+		const_cast<InsetCollapsable *>(this)->setDrawFrame(false);
+		InsetText::draw(pi, textx, texty);
+		const_cast<InsetCollapsable *>(this)->setDrawFrame(true);
+
+		int desc = textdim.descent();
+		if (geometry() == Corners)
+			desc -= 3;
+
+		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());
+		if (status_ == Open)
+			pi.pain.line(xx1, y + desc, 
+				xx2, y + desc,
+				layout_->labelfont().color());
+		else {
+			// Make status_ value visible:
+			pi.pain.line(xx1, y + desc,
+				xx1 + 4, y + desc,
+				layout_->labelfont().color());
+			pi.pain.line(xx2 - 4, y + desc,
+				xx2, y + desc,
+				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());
+			font.realize(sane_font);
+			font.decSize();
+			font.decSize();
+			int w = 0;
+			int a = 0;
+			int d = 0;
+			theFontMetrics(font).rectText(labelstring_, w, a, d);
+			int const ww = max(textdim.wid, w);
+			pi.pain.rectText(x + (ww - w) / 2, y + desc + a,
+				labelstring_, font, Color_none, Color_none);
+			desc += d;
+		}
 
-void InsetCollapsable::drawSelection(PainterInfo & pi, int x, int y) const
-{
-	x += TEXT_TO_INSET_OFFSET;
-	if (status() == Open) {
-		if (openinlined_)
-			x += dimensionCollapsed().wid;
-		else
-			y += dimensionCollapsed().des + textdim_.asc;
+		// a visual cue when the cursor is inside the inset
+		Cursor & cur = pi.base.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());
+		}
+		break;
 	}
-	if (status() != Collapsed)
-		InsetText::drawSelection(pi, x, y);
+	pi.background_color = old_color;
+
+	pi.base.font = tmpfont;
 }
 
 
 void InsetCollapsable::cursorPos(BufferView const & bv,
 		CursorSlice const & sl, bool boundary, int & x, int & y) const
 {
-	BOOST_ASSERT(status() != Collapsed);
+	if (geometry() == ButtonOnly)
+		status_ = Open;
+	BOOST_ASSERT(geometry() != ButtonOnly);
 
 	InsetText::cursorPos(bv, sl, boundary, x, y);
+	Dimension const textdim = InsetText::dimension(bv);
 
-	if (status() == Open) {
-		if (openinlined_)
-			x += dimensionCollapsed().wid;
-		else
-			y += dimensionCollapsed().height() - ascent()
-				+ TEXT_TO_INSET_OFFSET + textdim_.asc;
+	switch (geometry()) {
+	case LeftButton:
+		x += dimensionCollapsed().wid;
+		break;
+	case TopButton: {
+		y += dimensionCollapsed().des + textdim.asc;
+		break;
+	}
+	case NoButton:
+	case SubLabel:
+	case Corners:
+		// Do nothing
+		break;
+	case ButtonOnly:
+		// Cannot get here
+		break;
 	}
-	x += TEXT_TO_INSET_OFFSET;
 }
 
 
 Inset::EDITABLE InsetCollapsable::editable() const
 {
-	return status() != Collapsed ? HIGHLY_EDITABLE : IS_EDITABLE;
+	return geometry() != ButtonOnly? HIGHLY_EDITABLE : IS_EDITABLE;
 }
 
 
 bool InsetCollapsable::descendable() const
 {
-	return status() != Collapsed;
+	return geometry() != ButtonOnly;
 }
 
 
@@ -302,18 +474,20 @@ 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);
 }
 
 
 Inset * InsetCollapsable::editXY(Cursor & cur, int x, int y)
 {
 	//lyxerr << "InsetCollapsable: edit xy" << endl;
-	if (status() == Collapsed || (button_dim.contains(x, y) && status() != Inlined))
+	if (geometry() == ButtonOnly
+	 || (button_dim.contains(x, y) 
+	  && geometry() != NoButton))
 		return this;
 	cur.push(*this);
 	return InsetText::editXY(cur, x, y);
@@ -327,7 +501,9 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 	switch (cmd.action) {
 	case LFUN_MOUSE_PRESS:
-		if (cmd.button() == mouse_button::button1 && hitButton(cmd) && status() != Inlined) {
+		if (cmd.button() == mouse_button::button1 
+		 && hitButton(cmd) 
+		 && geometry() != NoButton) {
 			// reset selection if necessary (see bug 3060)
 			if (cur.selection())
 				cur.bv().cursor().clearSelection();
@@ -336,9 +512,10 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 			cur.dispatched();
 			break;
 		}
-		if (status() == Inlined)
+		if (geometry() == NoButton)
 			InsetText::doDispatch(cur, cmd);
-		else if (status() == Open && !hitButton(cmd))
+		else if (geometry() != ButtonOnly 
+		     && !hitButton(cmd))
 			InsetText::doDispatch(cur, cmd);
 		else
 			cur.undispatched();
@@ -347,9 +524,10 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_MOUSE_MOTION:
 	case LFUN_MOUSE_DOUBLE:
 	case LFUN_MOUSE_TRIPLE:
-		if (status_ == Inlined)
+		if (geometry() == NoButton)
 			InsetText::doDispatch(cur, cmd);
-		else if (status() && !hitButton(cmd))
+		else if (geometry() != ButtonOnly
+		     && !hitButton(cmd))
 			InsetText::doDispatch(cur, cmd);
 		else
 			cur.undispatched();
@@ -357,12 +535,26 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_MOUSE_RELEASE:
 		if (cmd.button() == mouse_button::button3) {
-			// Open the Inset configuration dialog
-			showInsetDialog(&cur.bv());
-			break;
+			// There is no button to right click:
+			if (decoration() == Deco_Minimalistic ||
+			    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 (status() == Inlined) {
+		if (geometry() == NoButton) {
 			// The mouse click has to be within the inset!
 			InsetText::doDispatch(cur, cmd);
 			break;
@@ -377,7 +569,7 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 			// toggle the inset visual state.
 			cur.dispatched();
 			cur.updateFlags(Update::Force | Update::FitCursor);
-			if (status() == Collapsed) {
+			if (geometry() == ButtonOnly) {
 				setStatus(cur, Open);
 				edit(cur, true);
 			}
@@ -389,7 +581,8 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 		}
 
 		// The mouse click is within the opened inset.
-		if (status() == Open)
+		if (geometry() == TopButton
+		 || geometry() == LeftButton)
 			InsetText::doDispatch(cur, cmd);
 		break;
 
@@ -399,28 +592,167 @@ void InsetCollapsable::doDispatch(Cursor & cur, FuncRequest & cmd)
 		else if (cmd.argument() == "close")
 			setStatus(cur, Collapsed);
 		else if (cmd.argument() == "toggle" || cmd.argument().empty())
-			if (isOpen()) {
+			if (status_ == Open) {
 				setStatus(cur, Collapsed);
-				cur.forwardPosNoDescend();
-			}
-			else
+				if (geometry() == ButtonOnly)
+					cur.top().forwardPos();
+			} else
 				setStatus(cur, Open);
 		else // if assign or anything else
 			cur.undispatched();
 		cur.dispatched();
 		break;
 
+	case LFUN_PASTE:
+	case LFUN_CLIPBOARD_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;
+	font.fontInfo() = inherit_font;
+	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) {
+	// suppress these
+	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_SPECIAL_CARON:
+	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_BIBITEM_INSERT:
+	case LFUN_BOX_INSERT:
+	case LFUN_BRANCH_INSERT:
+	case LFUN_NEW_LINE:
+	case LFUN_CAPTION_INSERT:
+	case LFUN_CLEARPAGE_INSERT:
+	case LFUN_CLEARDOUBLEPAGE_INSERT:
+	case LFUN_DEPTH_DECREMENT:
+	case LFUN_DEPTH_INCREMENT:
+	case LFUN_ENVIRONMENT_INSERT:
+	case LFUN_ERT_INSERT:
+	case LFUN_FILE_INSERT:
+	case LFUN_FLEX_INSERT:
+	case LFUN_FLOAT_INSERT:
+	case LFUN_FLOAT_LIST:
+	case LFUN_FLOAT_WIDE_INSERT:
+	case LFUN_FONT_BOLD:
+	case LFUN_FONT_TYPEWRITER:
+	case LFUN_FONT_DEFAULT:
+	case LFUN_FONT_EMPH:
+	case LFUN_FONT_FREE_APPLY:
+	case LFUN_FONT_FREE_UPDATE:
+	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_FOOTNOTE_INSERT:
+	case LFUN_HFILL_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_LINE_INSERT:
+	case LFUN_NEWPAGE_INSERT:
+	case LFUN_PAGEBREAK_INSERT:
+	case LFUN_LAYOUT:
+	case LFUN_LAYOUT_PARAGRAPH:
+	case LFUN_LAYOUT_TABULAR:
+	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_NOACTION:
+	case LFUN_NOMENCL_INSERT:
+	case LFUN_NOMENCL_PRINT:
+	case LFUN_NOTE_INSERT:
+	case LFUN_NOTE_NEXT:
+	case LFUN_OPTIONAL_INSERT:
+	case LFUN_PARAGRAPH_PARAMS:
+	case LFUN_PARAGRAPH_PARAMS_APPLY:
+	case LFUN_PARAGRAPH_SPACING:
+	case LFUN_PARAGRAPH_UPDATE:
+	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_TOC_INSERT:
+	case LFUN_WRAP_INSERT:
+	if (layout_->isPassThru()) {
+		flag.enabled(false);
+		return true;
+	} else
+		return InsetText::getStatus(cur, cmd, flag);
 
 	case LFUN_INSET_TOGGLE:
 		if (cmd.argument() == "open" || cmd.argument() == "close" ||
@@ -430,6 +762,15 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
 			flag.enabled(false);
 		return true;
 
+	case LFUN_LANGUAGE:
+		flag.enabled(!layout_->isForceLtr());
+		return InsetText::getStatus(cur, cmd, flag);
+
+	case LFUN_BREAK_PARAGRAPH:
+	case LFUN_BREAK_PARAGRAPH_SKIP:
+		flag.enabled(layout_->isMultiPar());
+		return true;
+
 	default:
 		return InsetText::getStatus(cur, cmd, flag);
 	}
@@ -438,7 +779,7 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 void InsetCollapsable::setLabel(docstring const & l)
 {
-	label = l;
+	labelstring_ = l;
 }
 
 
@@ -448,18 +789,9 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 	setButtonLabel();
 	if (status_ == Collapsed)
 		cur.leaveInset(*this);
-	// Because the collapse status is part of the inset and thus an
-	// integral part of the Buffer contents a changed status must be
-	// signaled to all views of current buffer.
-	cur.bv().buffer()->changed();
 }
 
 
-void InsetCollapsable::setLabelFont(Font const & font)
-{
-	layout_.labelfont = font;
-}
-
 docstring InsetCollapsable::floatName(string const & type, BufferParams const & bp) const
 {
 	FloatList const & floats = bp.getTextClass().floats();
@@ -469,4 +801,104 @@ docstring InsetCollapsable::floatName(string const & type, BufferParams const &
 }
 
 
+InsetDecoration InsetCollapsable::decoration() const
+{
+	if (!layout_)
+		return Deco_Classic;
+	InsetDecoration const dec = layout_->decoration();
+	switch (dec) {
+	case Deco_Classic:
+	case Deco_Minimalistic:
+	case Deco_Conglomerate:
+		return dec;
+	case Deco_Default:
+		break;
+	}
+	if (lyxCode() == FLEX_CODE)
+		// FIXME: Is this really necessary?
+		return Deco_Conglomerate;
+	return Deco_Classic;
+}
+
+
+bool InsetCollapsable::isMacroScope(Buffer const &) const
+{
+	// layout_ == 0 leads to no latex output, so ignore 
+	// the macros outside
+	if (!layout_)
+		return true;
+
+	// see InsetCollapsable::latex(...) below. In these case
+	// an environment is opened there
+	if (!layout_->latexname().empty())
+		return true;
+
+	return false;
+}
+
+
+int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
+			  OutputParams const & runparams) const
+{
+	// FIXME: What should we do layout_ is 0?
+	// 1) assert
+	// 2) through 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() == "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() == "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(buf, os, rp);
+	if (!layout_->latexname().empty()) {
+		if (layout_->latextype() == "command") {
+			os << "}";
+		} else if (layout_->latextype() == "environment") {
+			os << "\n\\end{" << from_utf8(layout_->latexname()) << "}\n";
+			i += 4;
+		}
+	}
+	return i;
+}
+
+
+void InsetCollapsable::validate(LaTeXFeatures & features) const
+{
+	if (!layout_)
+		return;
+
+	// Force inclusion of preamble snippet in layout file
+	features.require(to_utf8(layout_->name()));
+	InsetText::validate(features);
+}
+
+
+bool InsetCollapsable::undefined() const
+{
+	docstring const & n = getLayout().name();
+	return n.empty() || n == TextClass::emptyInsetLayout().name();
+}
+
+
 } // namespace lyx