remove redundant lyxerr.debugging checks; macro LYXERR already checks whether the...

[lyx.git] / src / LaTeXFeatures.h

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 39cba36f5531948d88cfc99905e71521e7fd4688..f18cdd480013c02be9b3173252b65c3b0f1f1870 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -15,6 +15,7 @@
 
 
 #include "outputparams.h"
+#include "support/docstring.h"
 
 #include <set>
 #include <list>
@@ -53,27 +54,27 @@ public:
        ///
        std::string const getBabelOptions() const;
        /// The definitions needed by the document's textclass
-       std::string const getTClassPreamble() const;
+       docstring const getTClassPreamble() const;
        /// The sgml definitions needed by the document (docbook)
-       std::string const getLyXSGMLEntities() const;
+       docstring const getLyXSGMLEntities() const;
        /// The SGML Required to include the files added with includeFile();
-       std::string const getIncludedFiles(std::string const & fname) const;
+       docstring const getIncludedFiles(std::string const & fname) const;
        /// Include a file for use with the SGML entities
-       void includeFile(std::string const & key, std::string const & name);
+       void includeFile(docstring const & key, std::string const & name);
        /// The float definitions.
        void getFloatDefinitions(std::ostream & os) const;
        /// Print requirements to lyxerr
        void showStruct() const;
        ///
-       void addExternalPreamble(std::string const &);
+       void addPreambleSnippet(std::string const &);
        /// Provide a string name-space to the requirements
        void require(std::string const & name);
        /// Which of the required packages are installed?
        static void getAvailable();
+       /// Is the (required) package available?
+       static bool isAvailable(std::string const & name);
        /// Is the package required?
        bool isRequired(std::string const & name) const;
-       /// Is the (required) package available?
-       bool isAvailable(std::string const & name) const;
        ///
        void useFloat(std::string const & name);
        ///
@@ -119,7 +120,7 @@ private:
        ///
        UsedFloats usedFloats_;
        ///
-       typedef std::map<std::string , std::string> FileMap;
+       typedef std::map<docstring , std::string> FileMap;
        ///
        FileMap IncludedFiles_;
        /** Buffer of the file being processed.