Fix layout tests for autotools

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index b9e37510cac60382be41344797165f5a686e42a7..9c558a6f5e2afaa58d15ada0b3fcf79886eaeb45 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -162,6 +162,10 @@ public:
        void clearLayoutModules() { layout_modules_.clear(); }
        /// Clear the removed module list
        void clearRemovedModules() { removed_modules_.clear(); }
+       /// Get the local layouts
+       std::string getLocalLayout(bool) const;
+       /// Set the local layouts
+       void setLocalLayout(std::string const &, bool);
 
        /// returns \c true if the buffer contains a LaTeX document
        bool isLatex() const;
@@ -305,8 +309,6 @@ public:
        ///
        std::string preamble;
        ///
-       std::string local_layout;
-       ///
        std::string options;
        /// use the class options defined in the layout?
        bool use_default_options;
@@ -361,7 +363,7 @@ public:
        /// Set whether to load a package such as amsmath or esint.
        void use_package(std::string const & p, Package u);
        /// All packages that can be switched on or off
-       static std::vector<std::string> const & auto_packages();
+       static std::map<std::string, std::string> const & auto_packages();
        /// Split bibliography?
        bool use_bibtopic;
        /// Split the index?
@@ -483,7 +485,7 @@ private:
        ///
        void readPreamble(Lexer &);
        ///
-       void readLocalLayout(Lexer &);
+       void readLocalLayout(Lexer &, bool);
        ///
        void readLanguage(Lexer &);
        ///
@@ -513,6 +515,10 @@ private:
        /// this is for modules that are required by the document class but that
        /// the user has chosen not to use
        std::list<std::string> removed_modules_;
+       /// The local layouts without the forced ones
+       std::string local_layout_;
+       /// Forced local layouts only for reading (use getLocalLayout() instead)
+       std::string forced_local_layout_;
 
        /// the list of included children (for includeonly)
        std::list<std::string> included_children_;