Andre's s/getTextClass/textClass/ cleanup.

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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 2019af14f90d3e26137065bc7ca87a925099049c..279f9940542a2327f2fd1d300e5cf3b1bb4bf3b7 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -21,7 +21,8 @@
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "Cursor.h"
-#include "gettext.h"
+#include "support/gettext.h"
+#include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "Text.h"
 #include "MetricsInfo.h"
@@ -29,30 +30,28 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
 #include "support/convert.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::ostream;
-
 
 InsetFlex::InsetFlex(BufferParams const & bp,
-                               InsetLayout const & il)
-       : InsetCollapsable(bp, Collapsed, &il)
+       TextClassPtr tc, string const & layoutName)
+       : InsetCollapsable(bp, Collapsed, tc),
+       name_(layoutName)
 {
-       params_.name = il.name;
+       setLayout(tc); // again, because now the name is initialized
+       packages_ = getLayout().requires();
+       preamble_ = getLayout().preamble();
 }
 
 
 InsetFlex::InsetFlex(InsetFlex const & in)
-       : InsetCollapsable(in), params_(in.params_)
+       : InsetCollapsable(in), name_(in.name_)
 {}
 
 
@@ -62,12 +61,6 @@ Inset * InsetFlex::clone() const
 }
 
 
-bool InsetFlex::undefined() const
-{
-       return layout_->labelstring == from_utf8("UNDEFINED");
-}
-
-
 docstring const InsetFlex::editMessage() const
 {
        return _("Opened Flex Inset");
@@ -76,14 +69,29 @@ docstring const InsetFlex::editMessage() const
 
 void InsetFlex::write(Buffer const & buf, ostream & os) const
 {
-       params_.write(os);
+       os << "Flex " <<
+               (name_.empty() ? "undefined" : name_) << "\n";
        InsetCollapsable::write(buf, os);
 }
 
 
 void InsetFlex::read(Buffer const & buf, Lexer & lex)
 {
-       params_.read(lex);
+       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;
+               }
+       }
        InsetCollapsable::read(buf, lex);
 }
 
@@ -103,18 +111,17 @@ int InsetFlex::docbook(Buffer const & buf, odocstream & os,
        ParagraphList::const_iterator end = paragraphs().end();
 
        if (!undefined())
-               // FIXME UNICODE
-               sgml::openTag(os, layout_->latexname,
-                             par->getID(buf, runparams) + layout_->latexparam);
+               sgml::openTag(os, getLayout().latexname(),
+                             par->getID(buf, runparams) + getLayout().latexparam());
 
        for (; par != end; ++par) {
                par->simpleDocBookOnePar(buf, os, runparams,
-                                        outerFont(std::distance(beg, par),
+                                        outerFont(distance(beg, par),
                                                   paragraphs()));
        }
 
        if (!undefined())
-               sgml::closeTag(os, layout_->latexname);
+               sgml::closeTag(os, getLayout().latexname());
 
        return 0;
 }
@@ -126,30 +133,11 @@ void InsetFlex::textString(Buffer const & buf, odocstream & os) const
 }
 
 
-void InsetFlexParams::write(ostream & os) const
+void InsetFlex::validate(LaTeXFeatures & features) const
 {
-       os << "Flex " << name << "\n";
+       if (!preamble_.empty())
+               features.addPreambleSnippet(preamble_);
+       features.require(packages_);
 }
 
-
-void InsetFlexParams::read(Lexer & lex)
-{
-       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;
-               }
-       }
-}
-
-
 } // namespace lyx