Fix bug #2213 (part 1): GuiChanges lacks "Previous Change" button.

[lyx.git] / src / TextClass.h

diff --git a/src/TextClass.h b/src/TextClass.h
index 456765eac150476c1ae174b55527e24a8d7edfe7..60cc25a83020f475ef352bf69389fef05465cbd6 100644 (file)
--- a/src/TextClass.h
+++ b/src/TextClass.h
@@ -16,6 +16,7 @@
 #include "FontInfo.h"
 #include "Layout.h"
 #include "LayoutEnums.h"
+#include "LayoutModuleList.h"
 
 #include "insets/InsetLayout.h"
 
@@ -101,7 +102,7 @@ public:
        typedef std::map<docstring, InsetLayout> InsetLayouts;
        ///
        typedef LayoutList::const_iterator const_iterator;
-       
+
        ///////////////////////////////////////////////////////////////////
        // Iterators
        ///////////////////////////////////////////////////////////////////
@@ -134,6 +135,8 @@ public:
        ///
        bool hasLayout(docstring const & name) const;
        ///
+       bool hasInsetLayout(docstring const & name) const;
+       ///
        Layout const & operator[](docstring const & vname) const;
        /// Inset layouts of this doc class
        InsetLayouts const & insetLayouts() const { return insetlayoutlist_; };
@@ -252,11 +255,11 @@ protected:
        /// latex packages requested by document class.
        std::set<std::string> requires_;
        /// default modules wanted by document class
-       std::list<std::string> default_modules_;
+       LayoutModuleList default_modules_;
        /// modules provided by document class
-       std::list<std::string> provided_modules_;
+       LayoutModuleList provided_modules_;
        /// modules excluded by document class
-       std::list<std::string> excluded_modules_;
+       LayoutModuleList excluded_modules_;
        ///
        unsigned int columns_;
        ///
@@ -295,6 +298,8 @@ private:
        bool deleteLayout(docstring const &);
        ///
        bool convertLayoutFormat(support::FileName const &, ReadType);
+       /// Reads the layout file without running layout2layout.
+       ReturnValues readWithoutConv(support::FileName const & filename, ReadType rt);
        /// \return true for success.
        bool readStyle(Lexer &, Layout &) const;
        ///
@@ -427,15 +432,19 @@ private:
 /// DocumentClassBundle::get().
 class DocumentClassBundle : boost::noncopyable {
 public:
-       /// \return Pointer to a new class equal to baseClass
-       DocumentClass & newClass(LayoutFile const & baseClass);
        /// \return The sole instance of this class.
        static DocumentClassBundle & get();
+       /// \return A new DocumentClass based on baseClass, with info added
+       /// from the modules in modlist.
+       DocumentClass & makeDocumentClass(LayoutFile const & baseClass, 
+                       LayoutModuleList const & modlist);
 private:
        /// control instantiation
        DocumentClassBundle() {}
        /// clean up
        ~DocumentClassBundle();
+       /// \return Reference to a new DocumentClass equal to baseClass
+       DocumentClass & newClass(LayoutFile const & baseClass);
        ///
        std::vector<DocumentClass *> documentClasses_;
 };