Squash some warnings.

[lyx.git] / src / LaTeXFeatures.h

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 32b03b3d15f9ca4dd001f5c54b9933e6b8093b51..38273e4fa2f85c42b5c57a80decb9ecac7867f3b 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -55,6 +55,8 @@ public:
                      OutputParams const &);
        /// The color packages
        std::string const getColorOptions() const;
+       /// The requested package options
+       std::string const getPackageOptions() const;
        /// The packages needed by the document
        std::string const getPackages() const;
        /// The macros definitions needed by the document
@@ -86,7 +88,8 @@ public:
        /// Print requirements to lyxerr
        void showStruct() const;
        ///
-       void addPreambleSnippet(std::string const &);
+       void addPreambleSnippet(std::string const & snippet, 
+                               bool allowdupes = false);
        ///
        std::string getPreambleSnippets() const;
        ///
@@ -101,9 +104,12 @@ public:
        static bool isAvailable(std::string const & name);
        /// Has the package been required?
        bool isRequired(std::string const & name) const;
-       /* Is it necessary to load the package? This is true if
-          isRequired is true and the feature is not provided by the
-          textclass.
+       /** Is this feature already provided
+        *  e.g. by the document class?
+       */
+       bool isProvided(std::string const & name) const;
+       /** Is it necessary to load the package? This is true if
+           isRequired is true and the feature is not already provided
        */
        bool mustProvide(std::string const & name) const;
        ///
@@ -123,6 +129,8 @@ public:
        ///
        std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
        ///
+       void getFontEncodings(std::vector<std::string> & encodings) const;
+       ///
        void useLayout(docstring const & lyt);
        ///
        void useInsetLayout(InsetLayout const & lay);
@@ -132,12 +140,12 @@ public:
        void setBuffer(Buffer const &);
        ///
        BufferParams const & bufferParams() const;
-       /* Which language package do we require? \p englishbabel determines
-        * if we require babel even if English is the only language.
+       /** Which language package do we require? \p englishbabel determines
+        *  if we require babel even if English is the only language.
         */
-       LangPackage langPackage(bool englishbabel = false) const;
+       LangPackage langPackage() const;
        /// Convenience function to test if we use babel
-       bool useBabel(bool englishbabel = false) const { return langPackage(englishbabel) == LANG_PACK_BABEL; }
+       bool useBabel() const { return langPackage() == LANG_PACK_BABEL; }
        /// Convenience function to test if we use polyglossia
        bool usePolyglossia() const { return langPackage() == LANG_PACK_POLYGLOSSIA; }
        /// are we in a float?
@@ -154,6 +162,8 @@ public:
        docstring const & htmlTitle() const { return htmltitle_; }
 
 private:
+       ///
+       void useLayout(docstring const &, int);
        ///
        std::list<docstring> usedLayouts_;
        ///