Remove the now superseeded SConscript files, and some small missing parts to SConstruct

[lyx.git] / src / lyxtextclass.h

diff --git a/src/lyxtextclass.h b/src/lyxtextclass.h
index 9a526ae281bde6e81b84b3bd489765d140796e86..57345d8353b352615bb15b29688f45cf2faa956c 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;
@@ -60,7 +62,7 @@ public:
        const_iterator end() const { return layoutlist_.end(); }
 
        /// Performs the read of the layout file.
-       bool Read(std::string const & filename, bool merge = false);
+       bool read(std::string const & filename, bool merge = false);
        ///
        void readOutputType(LyXLex &);
        ///
@@ -82,7 +84,9 @@ public:
        LyXLayout_ptr const & operator[](std::string const & vname) const;
 
        /// Sees to that the textclass structure has been loaded
-       bool load() const;
+       bool load(std::string const & path=std::string()) 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;
@@ -166,6 +172,12 @@ public:
 
        ///
        int size() const;
+       /// The minimal TocLevel of sectioning layouts
+       int min_toclevel() const;
+       /// The maximal TocLevel of sectioning layouts
+       int max_toclevel() const;
+       /// returns true if the class has a ToC structure
+       bool hasTocLevels() const;
 private:
        ///
        bool delete_layout(std::string const &);
@@ -186,6 +198,8 @@ private:
        ///
        std::string pagestyle_;
        ///
+       std::string class_header_;
+       ///
        std::string defaultlayout_;
        /// preamble text to support layout styles
        std::string preamble_;
@@ -222,7 +236,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,10 +244,15 @@ 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_;
+
+       /// The minimal TocLevel of sectioning layouts
+       int min_toclevel_;
+       /// The maximal TocLevel of sectioning layouts
+       int max_toclevel_;
 };