Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 98f79a57fbee105397adff1ff5a28a5a57d3d849..2a669d0ac167b8b8867a318789389363bdb533d6 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -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); }
@@ -282,10 +284,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
@@ -359,7 +361,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?
@@ -517,7 +519,7 @@ private:
 
        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;