Fix text frame drawing.

[lyx.git] / src / insets / InsetCharStyle.h

diff --git a/src/insets/InsetCharStyle.h b/src/insets/InsetCharStyle.h
index 0cd25b3a51222f1f2c051669a3add741177bbb4d..7364593c8f677bd24a0a0d28568e9a8e9b9ab4fe 100644 (file)
--- a/src/insets/InsetCharStyle.h
+++ b/src/insets/InsetCharStyle.h
@@ -14,7 +14,7 @@
 #define INSETCHARSTYLE_H
 
 #include "InsetCollapsable.h"
-#include "LyXTextClass.h"
+#include "TextClass.h"
 
 
 namespace lyx {
@@ -27,19 +27,7 @@ public:
        ///
        void read(Lexer & lex);
        ///
-       std::string type;
-       ///
-       std::string latextype;
-       ///
-       std::string latexname;
-       ///
-       std::string latexparam;
-       ///
-       Font font;
-       ///
-       Font labelfont;
-       ///
-       bool show_label;
+       std::string name;
 };
 
 
@@ -51,16 +39,14 @@ public:
        /// Construct an undefined character style
        InsetCharStyle(BufferParams const &, std::string const);
        ///
-       InsetCharStyle(BufferParams const &, CharStyles::iterator);
+       InsetCharStyle(BufferParams const &, InsetLayout);
        ///
-       docstring insetName() const { return from_ascii("CharStyle"); }
+       docstring name() const { return from_ascii("CharStyle"); }
        /// Is this character style defined in the document's textclass?
        /// May be wrong after textclass change or paste from another document
        bool undefined() const;
-       /// Set the character style to "undefined"
-       void setUndefined();
-       /// (Re-)set the character style parameters from \p cs
-       void setDefined(CharStyles::iterator cs);
+       /// (Re-)set the character style parameters from \p il
+       void setLayout(InsetLayout il);
        ///
        virtual docstring const editMessage() const;
        ///
@@ -77,19 +63,15 @@ public:
        void getDrawFont(Font &) const;
        ///
        bool forceDefaultParagraphs(idx_type) const { return true; }
-       ///
-       int latex(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+
        ///
        int plaintext(Buffer const &, odocstream &,
-                     OutputParams const &) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const &) const;
+                   OutputParams const &) const;
        /// the string that is passed to the TOC
        virtual void textString(Buffer const &, odocstream &) const;
-       ///
-       void validate(LaTeXFeatures &) const;
 
        ///
        InsetCharStyleParams const & params() const { return params_; }
@@ -106,10 +88,8 @@ protected:
 private:
        friend class InsetCharStyleParams;
 
-       virtual std::auto_ptr<Inset> doClone() const;
+       virtual Inset * clone() const;
 
-       /// used by the constructors
-       void init();
        ///
        InsetCharStyleParams params_;
 };