Customization.lyx: last step of merging/updating

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index dac9a4aef6c4c9d913710cce9aa2b81ec5a7a290..9c558a6f5e2afaa58d15ada0b3fcf79886eaeb45 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -134,7 +134,7 @@ public:
        DocumentClass const & documentClass() const;
        /// \return A pointer to the DocumentClass currently in use: the BaseClass
        /// as modified by modules.
-       DocumentClassConstPtr  documentClassPtr() const;
+       DocumentClassConstPtr documentClassPtr() const;
        /// This bypasses the baseClass and sets the textClass directly.
        /// Should be called with care and would be better not being here,
        /// but it seems to be needed by CutAndPaste::putClipboard().
@@ -146,13 +146,15 @@ public:
                        { return removed_modules_; }
        ///
        /// Add a module to the list of modules in use. This checks only that the
-       /// module is not already in the list, so use moduleIsCompatible first if
-       /// you want to check for compatibility.
+       /// module is not already in the list, so use layoutModuleCanBeAdeed first 
+       /// if you want to check for compatibility.
        /// \return true if module was successfully added.
        bool addLayoutModule(std::string const & modName);
        /// checks to make sure module's requriements are satisfied, that it does
        /// not conflict with already-present modules, isn't already loaded, etc.
-       bool moduleCanBeAdded(std::string const & modName) const;
+       bool layoutModuleCanBeAdded(std::string const & modName) const;
+       /// same, but for citaton modules.
+       bool citationModuleCanBeAdded(std::string const & modName) const;
        ///
        void addRemovedModule(std::string const & modName)
                        { removed_modules_.push_back(modName); }
@@ -160,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;
@@ -200,6 +206,9 @@ public:
        /// returns the main font for the buffer (document)
        Font const getFont() const;
 
+       /// translate quote style string to enum value
+       InsetQuotes::QuoteLanguage getQuoteStyle(std::string const qs) const;
+
        /* these are for the PaperLayout */
        /// the papersize
        PAPER_SIZE papersize;
@@ -245,6 +254,8 @@ public:
        std::string fonts_sans;
        /// the tt font
        std::string fonts_typewriter;
+       /// the math font
+       std::string fonts_math;
        /// the default family (rm, sf, tt)
        std::string fonts_default_family;
        /// use the fonts of the OS (OpenType, True Type) directly
@@ -277,10 +288,10 @@ public:
        IndicesList & indiceslist();
        IndicesList const & indiceslist() const;
        /**
-        * The input encoding for LaTeX. This can be one of
+        * The LyX name of the input encoding for LaTeX. This can be one of
         * - \c auto: find out the input encoding from the used languages
         * - \c default: ditto
-        * - any encoding supported by the inputenc package
+        * - any encoding defined in the file lib/encodings
         * The encoding of the LyX file is always utf8 and has nothing to
         * do with this setting.
         * The difference between \c auto and \c default is that \c auto also
@@ -298,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;
@@ -354,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?
@@ -403,12 +412,7 @@ public:
        ///
        std::string const parseFontName(std::string const & name) const;
        /// set up the document fonts
-       std::string const loadFonts(std::string const & rm,
-                                    std::string const & sf, std::string const & tt,
-                                    bool const & sc, bool const & osf,
-                                    int const & sfscale, int const & ttscale,
-                                    bool const & use_nonlatexfonts,
-                                    LaTeXFeatures & features) const;
+       std::string const loadFonts(LaTeXFeatures & features) const;
 
        /// the cite engine modules
        LayoutModuleList const & citeEngine() const
@@ -481,7 +485,7 @@ private:
        ///
        void readPreamble(Lexer &);
        ///
-       void readLocalLayout(Lexer &);
+       void readLocalLayout(Lexer &, bool);
        ///
        void readLanguage(Lexer &);
        ///
@@ -511,13 +515,17 @@ 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_;
 
        typedef std::map<std::string, Package> PackageMap;
        /** Whether and how to load packages like amsmath, esint, mhchem,
-        *  mathdots and undertilde.
+        *  mathdots, stackrel, stmaryrd and undertilde.
         */
        PackageMap use_packages;