* ANNOUNCE

[lyx.git] / src / insets / InsetFlex.cpp

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 717fb2b100097482ad52264fbc98a4168fcc7bae..6d64c3f8ead6a4f839e1a93f26e2a67b9e0d2b70 100644 (file)
--- 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,14 +16,13 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/gettext.h"
-#include "LaTeXFeatures.h"
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "Lexer.h"
-#include "Text.h"
-#include "MetricsInfo.h"
-#include "Paragraph.h"
-#include "paragraph_funcs.h"
-#include "sgml.h"
+#include "TextClass.h"
+
+#include "support/gettext.h"
 
 #include <ostream>
 
@@ -32,13 +31,10 @@ using namespace std;
 namespace lyx {
 
 
-InsetFlex::InsetFlex(Buffer const & buf, string const & layoutName)
-       : InsetCollapsable(buf, Collapsed), name_(layoutName)
+InsetFlex::InsetFlex(Buffer * buf, string const & layoutName)
+       : InsetCollapsable(buf), name_(layoutName)
 {
-       // again, because now the name is initialized
-       setLayout(buf.params().documentClassPtr());
-       packages_ = getLayout().requires();
-       preamble_ = getLayout().preamble();
+       status_= Collapsed;
 }
 
 
@@ -47,9 +43,20 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
-docstring InsetFlex::editMessage() const
+InsetLayout const & InsetFlex::getLayout() const
+{
+       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_));
+}
+
+
+InsetLayout::InsetDecoration InsetFlex::decoration() const
 {
-       return _("Opened Flex Inset");
+       InsetLayout::InsetDecoration const dec = getLayout().decoration();
+       return dec == InsetLayout::DEFAULT ? InsetLayout::CONGLOMERATE : dec;
 }
 
 
@@ -61,64 +68,50 @@ void InsetFlex::write(ostream & os) const
 }
 
 
-void InsetFlex::read(Lexer & lex)
+bool InsetFlex::getStatus(Cursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
 {
-       string token;
-       while (lex.isOK()) {
-               lex >> token;
-               if (token == "Flex") {
-                       lex.next();
-                       name_ = lex.getString();
-               } else if (token == "status") {
-                       // This is handled in Collapsable
-                       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(lex);
-}
-
-
-int InsetFlex::plaintext(odocstream & os, OutputParams const & runparams) const
-{
-       return InsetText::plaintext(os, runparams);
 }
 
 
-int InsetFlex::docbook(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, 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);
+                               InsetCollapsable::doDispatch(cur, temp_cmd);
+                       } else
+                               cur.undispatched();
+                       break;
+               }
+               // fall-through
+       default:
+               InsetCollapsable::doDispatch(cur, cmd);
+               break;
        }
-
-       if (!undefined())
-               sgml::closeTag(os, getLayout().latexname());
-
-       return 0;
 }
 
 
-void InsetFlex::textString(odocstream & os) const
-{
-       os << paragraphs().begin()->asString(AS_STR_LABEL | AS_STR_INSETS);
-}
-
-
-void InsetFlex::validate(LaTeXFeatures & features) const
-{
-       if (!preamble_.empty())
-               features.addPreambleSnippet(preamble_);
-       features.require(packages_);
-}
-
 } // namespace lyx