X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.cpp;h=6d64c3f8ead6a4f839e1a93f26e2a67b9e0d2b70;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=3b34be760a9769675bfdcccc2cb89fdf8f5b8126;hpb=0439d04f9bacb170cc8d485659b80930892d0498;p=lyx.git

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 3b34be760a..6d64c3f8ea 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -16,13 +16,11 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "LaTeXFeatures.h"
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "Lexer.h"
-#include "MetricsInfo.h"
-#include "Paragraph.h"
-#include "paragraph_funcs.h"
-#include "sgml.h"
-#include "Text.h"
+#include "TextClass.h"
 
 #include "support/gettext.h"
 
@@ -33,11 +31,9 @@ using namespace std;
 namespace lyx {
 
 
-InsetFlex::InsetFlex(Buffer const & buf, string const & layoutName)
+InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
 	: InsetCollapsable(buf), name_(layoutName)
 {
-	// again, because now the name is initialized
-	setLayout(buf.params().documentClassPtr());
 	status_= Collapsed;
 }
 
@@ -47,52 +43,74 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
-docstring InsetFlex::editMessage() const
+InsetLayout const & InsetFlex::getLayout() const
 {
-	return _("Opened Flex Inset");
+	DocumentClass const & dc = buffer().params().documentClass();
+	docstring const dname = from_utf8(name_); 
+	if (dc.hasInsetLayout(dname))
+		return dc.insetLayout(dname);
+	return dc.insetLayout(from_utf8("Flex:" + name_));
 }
 
 
-void InsetFlex::write(ostream & os) const
+InsetLayout::InsetDecoration InsetFlex::decoration() const
 {
-	os << "Flex " <<
-		(name_.empty() ? "undefined" : name_) << "\n";
-	InsetCollapsable::write(os);
+	InsetLayout::InsetDecoration const dec = getLayout().decoration();
+	return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec;
 }
 
 
-int InsetFlex::plaintext(odocstream & os, OutputParams const & runparams) const
+void InsetFlex::write(ostream & os) const
 {
-	return InsetText::plaintext(os, runparams);
+	os << "Flex " <<
+		(name_.empty() ? "undefined" : name_) << "\n";
+	InsetCollapsable::write(os);
 }
 
 
-int InsetFlex::docbook(odocstream & os, OutputParams const & runparams) const
+bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) 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()));
+	switch (cmd.action()) {
+	case LFUN_INSET_DISSOLVE:
+		if (!cmd.argument().empty()) {
+			InsetLayout const & il = getLayout();
+			InsetLayout::InsetLyXType const type = 
+				translateLyXType(to_utf8(cmd.argument()));
+			if (il.lyxtype() == type) {
+				FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
+				return InsetCollapsable::getStatus(cur, temp_cmd, flag);
+			} else
+				return false;
+		}
+		// fall-through
+	default:
+		return InsetCollapsable::getStatus(cur, cmd, flag);
 	}
-
-	if (!undefined())
-		sgml::closeTag(os, getLayout().latexname());
-
-	return 0;
 }
 
 
-void InsetFlex::tocString(odocstream & os) const
+void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	os << text().asString(0, 1, AS_STR_LABEL | AS_STR_INSETS);
+	switch (cmd.action()) {
+	case LFUN_INSET_DISSOLVE:
+		if (!cmd.argument().empty()) {
+			InsetLayout const & il = getLayout();
+			InsetLayout::InsetLyXType const type = 
+				translateLyXType(to_utf8(cmd.argument()));
+			
+			if (il.lyxtype() == type) {
+				FuncRequest temp_cmd(LFUN_INSET_DISSOLVE);
+				InsetCollapsable::doDispatch(cur, temp_cmd);
+			} else
+				cur.undispatched();
+			break;
+		}
+		// fall-through
+	default:
+		InsetCollapsable::doDispatch(cur, cmd);
+		break;
+	}
 }