X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.h;h=4ac50dcd0531116605fb8aab0b169ddaf577be6e;hb=06254d11dfdf670fab3548dc2a2674e7a261262c;hp=2a42bbed2b0286647ba750be7df143d84ba97c9f;hpb=12e1d4bc8d0fc7daa015e74028be2d7b2860d69f;p=lyx.git

diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h
index 2a42bbed2b..4ac50dcd05 100644
--- a/src/insets/InsetFlex.h
+++ b/src/insets/InsetFlex.h
@@ -14,52 +14,33 @@
 #define INSETFLEX_H
 
 #include "InsetCollapsable.h"
-#include "TextClass.h"
 
 
 namespace lyx {
 
 
-class InsetFlexParams {
-public:
-	///
-	void write(std::ostream & os) const;
-	///
-	void read(Lexer & lex);
-	///
-	std::string name;
-};
-
-
 /** The Flex inset, e.g., CharStyle, Custom inset or XML short element
 
 */
 class InsetFlex : public InsetCollapsable {
 public:
 	///
-	InsetFlex(BufferParams const &, InsetLayout);
+	InsetFlex(BufferParams const &, InsetLayout const &);
 	///
-	docstring name() const { return from_ascii("Flex"); }
+	docstring name() const { return from_utf8(name_); }
+
 	/// Is this character style defined in the document's textclass?
 	/// May be wrong after textclass change or paste from another document
 	bool undefined() const;
-	/// (Re-)set the character style parameters from \p il
-	void setLayout(InsetLayout il);
 	///
 	virtual docstring const editMessage() const;
 	///
-	Inset::Code lyxCode() const { return Inset::FLEX_CODE; }
+	InsetCode lyxCode() const { return FLEX_CODE; }
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
 	void read(Buffer const & buf, Lexer & lex);
 	///
-	bool metrics(MetricsInfo &, Dimension &) const;
-	///
-	void draw(PainterInfo &, int, int) const;
-	///
-	void getDrawFont(Font &) const;
-	///
 	bool forceDefaultParagraphs(idx_type) const { return true; }
 
 	///
@@ -70,26 +51,24 @@ public:
 		    OutputParams const &) const;
 	/// the string that is passed to the TOC
 	virtual void textString(Buffer const &, odocstream &) const;
-
 	///
-	InsetFlexParams const & params() const { return params_; }
+	void validate(LaTeXFeatures &) const;
 
 	/// should paragraph indendation be ommitted in any case?
 	bool neverIndent(Buffer const &) const { return true; }
 
 protected:
 	InsetFlex(InsetFlex const &);
-	virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
-	///
-	bool getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 
 private:
-	friend class InsetFlexParams;
-
 	virtual Inset * clone() const;
 
 	///
-	InsetFlexParams params_;
+	std::string name_;
+	///
+	std::vector<std::string> packages_;
+	///
+	std::string preamble_;
 };