fix crash when collapsing ert with cursor inside

[lyx.git] / src / lyxtextclass.h

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 9a526ae281bde6e81b84b3bd489765d140796e86..a52cd7ab5973d744492793b8b1eaf492dee658fa 100644 (file)
--- a/src/lyxtextclass.h
+++ b/src/lyxtextclass.h
@@ -23,10 +23,12 @@ class FloatList;
 
 
 ///
-struct CharStyle {
+class CharStyle {
+public:
        std::string name;
        std::string latextype;
        std::string latexname;
+       std::string latexparam;
        LyXFont font;
        LyXFont labelfont;
        std::string preamble;
@@ -83,6 +85,8 @@ public:
 
        /// Sees to that the textclass structure has been loaded
        bool load() const;
+       /// Has this layout file been loaded yet?
+       bool loaded() const { return loaded_; }
 
        /// the list of floats defined in the document class
        FloatList & floats();
@@ -111,6 +115,8 @@ public:
        ///
        std::string const & options() const;
        ///
+       std::string const & class_header() const;
+       ///
        std::string const & pagestyle() const;
        ///
        std::string const & preamble() const;
@@ -186,6 +192,8 @@ private:
        ///
        std::string pagestyle_;
        ///
+       std::string class_header_;
+       ///
        std::string defaultlayout_;
        /// preamble text to support layout styles
        std::string preamble_;
@@ -222,7 +230,7 @@ private:
        LayoutList layoutlist_;
        /// CharStyles available to this layout
        mutable CharStyles charstylelist_;
-       
+
        /// available types of float, eg. figure, algorithm.
        boost::shared_ptr<FloatList> floatlist_;
 
@@ -230,7 +238,7 @@ private:
        boost::shared_ptr<Counters> ctrs_;
 
        /// Has this layout file been loaded yet?
-       mutable bool loaded;
+       mutable bool loaded_;
 
        /// Is the TeX class available?
        bool texClassAvail_;