X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFlex.h;h=4ac50dcd0531116605fb8aab0b169ddaf577be6e;hb=06254d11dfdf670fab3548dc2a2674e7a261262c;hp=9cdc7c7a6d1a5fb427e8a4387bf2ca1d512926b3;hpb=dc2a6f95ff6c2dc721125a565cb418fc8c333d9a;p=lyx.git diff --git a/src/insets/InsetFlex.h b/src/insets/InsetFlex.h index 9cdc7c7a6d..4ac50dcd05 100644 --- a/src/insets/InsetFlex.h +++ b/src/insets/InsetFlex.h @@ -14,23 +14,11 @@ #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 */ @@ -39,7 +27,7 @@ public: /// InsetFlex(BufferParams const &, InsetLayout const &); /// - docstring name() const { return from_utf8(params_.name); } + 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 @@ -63,9 +51,8 @@ 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; } @@ -74,12 +61,14 @@ protected: InsetFlex(InsetFlex const &); private: - friend class InsetFlexParams; - virtual Inset * clone() const; /// - InsetFlexParams params_; + std::string name_; + /// + std::vector packages_; + /// + std::string preamble_; };