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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index cf499e9862..6d64c3f8ea 100644
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -5,7 +5,7 @@
  *
  * \author Angus Leeming
  * \author Martin Vermeer
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,36 +16,25 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "BufferView.h"
-#include "DispatchResult.h"
+#include "Cursor.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "Cursor.h"
-#include "support/gettext.h"
 #include "Lexer.h"
-#include "Text.h"
-#include "MetricsInfo.h"
-#include "Paragraph.h"
-#include "paragraph_funcs.h"
-#include "sgml.h"
+#include "TextClass.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
-#include "support/convert.h"
+#include "support/gettext.h"
 
-#include <sstream>
+#include <ostream>
 
 using namespace std;
 
 namespace lyx {
 
 
-InsetFlex::InsetFlex(BufferParams const & bp,
-				InsetLayout const & il)
-	: InsetCollapsable(bp, Collapsed, &il)
+InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
+	: InsetCollapsable(buf), name_(layoutName)
 {
-	name_ = il.name;
+	status_= Collapsed;
 }
 
 
@@ -54,86 +43,75 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
-Inset * InsetFlex::clone() const
-{
-	return new InsetFlex(*this);
-}
-
-
-bool InsetFlex::undefined() const
+InsetLayout const & InsetFlex::getLayout() const
 {
-	return layout_->labelstring == from_utf8("UNDEFINED");
+	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_));
 }
 
 
-docstring const InsetFlex::editMessage() const
+InsetLayout::InsetDecoration InsetFlex::decoration() const
 {
-	return _("Opened Flex Inset");
+	InsetLayout::InsetDecoration const dec = getLayout().decoration();
+	return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec;
 }
 
 
-void InsetFlex::write(Buffer const & buf, ostream & os) const
+void InsetFlex::write(ostream & os) const
 {
-	os << "Flex " << name_ << "\n";
-	InsetCollapsable::write(buf, os);
+	os << "Flex " <<
+		(name_.empty() ? "undefined" : name_) << "\n";
+	InsetCollapsable::write(os);
 }
 
 
-void InsetFlex::read(Buffer const & buf, Lexer & lex)
+bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
+		FuncStatus & flag) const
 {
-	while (lex.isOK()) {
-		lex.next();
-		string token = lex.getString();
-
-		if (token == "Flex") {
-			lex.next();
-			name_ = lex.getString();
-		}
-
-		// This is handled in Collapsable
-		else if (token == "status") {
-			lex.pushToken(token);
-			break;
+	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);
 	}
-	InsetCollapsable::read(buf, lex);
-}
-
-
-int InsetFlex::plaintext(Buffer const & buf, odocstream & os,
-			      OutputParams const & runparams) const
-{
-	return InsetText::plaintext(buf, os, runparams);
 }
 
 
-int InsetFlex::docbook(Buffer const & buf, odocstream & os,
-			    OutputParams const & runparams) const
+void InsetFlex::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	ParagraphList::const_iterator beg = paragraphs().begin();
-	ParagraphList::const_iterator par = paragraphs().begin();
-	ParagraphList::const_iterator end = paragraphs().end();
-
-	if (!undefined())
-		sgml::openTag(os, layout_->latexname,
-			      par->getID(buf, runparams) + layout_->latexparam);
-
-	for (; par != end; ++par) {
-		par->simpleDocBookOnePar(buf, os, runparams,
-					 outerFont(std::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);
+				InsetCollapsable::doDispatch(cur, temp_cmd);
+			} else
+				cur.undispatched();
+			break;
+		}
+		// fall-through
+	default:
+		InsetCollapsable::doDispatch(cur, cmd);
+		break;
 	}
-
-	if (!undefined())
-		sgml::closeTag(os, layout_->latexname);
-
-	return 0;
 }
 
 
-void InsetFlex::textString(Buffer const & buf, odocstream & os) const
-{
-	os << paragraphs().begin()->asString(buf, true);
-}
-
 } // namespace lyx