Change to use preffered calling of Boost.Function

[lyx.git] / src / LaTeXFeatures.h

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 261ba90800742711a27a5744d6ac11f653e1dc58..a21d7f65ba3f427925d3d6baf8ae210e551aa728 100644 (file)
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -14,12 +14,12 @@
 #define LATEXFEATURES_H
 
 
-#include "support/std_string.h"
-
 #include <set>
 #include <list>
 #include <map>
+#include <string>
 
+class Buffer;
 class BufferParams;
 struct Language;
 
@@ -39,72 +39,87 @@ struct Language;
 class LaTeXFeatures {
 public:
        ///
-       LaTeXFeatures(BufferParams const &);
+       LaTeXFeatures(Buffer const &, BufferParams const &, bool);
        /// The packages needed by the document
-       string const getPackages() const;
+       std::string const getPackages() const;
        /// The macros definitions needed by the document
-       string const getMacros() const;
+       std::string const getMacros() const;
        ///
-       string const getBabelOptions() const;
+       std::string const getBabelOptions() const;
        /// The definitions needed by the document's textclass
-       string const getTClassPreamble() const;
+       std::string const getTClassPreamble() const;
        /// The sgml definitions needed by the document (dobook/linuxdoc)
-       string const getLyXSGMLEntities() const;
+       std::string const getLyXSGMLEntities() const;
        /// The SGML Required to include the files added with includeFile();
-       string const getIncludedFiles(string const & fname) const;
+       std::string const getIncludedFiles(std::string const & fname) const;
        /// Include a file for use with the SGML entities
-       void includeFile(string const & key, string const & name);
+       void includeFile(std::string const & key, std::string const & name);
        /// The float definitions.
        void getFloatDefinitions(std::ostream & os) const;
        /// Print requirements to lyxerr
        void showStruct() const;
        ///
-       void addExternalPreamble(string const &);
+       void addExternalPreamble(std::string const &);
        /// Provide a string name-space to the requirements
-       void require(string const & name);
+       void require(std::string const & name);
        /// Is the package required?
-       bool isRequired(string const & name) const;
+       bool isRequired(std::string const & name) const;
        ///
-       void useFloat(string const & name);
+       void useFloat(std::string const & name);
        ///
        void useLanguage(Language const *);
        ///
        bool hasLanguages() const;
        ///
-       string getLanguages() const;
+       std::string getLanguages() const;
+       ///
+       std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
+       ///
+       void useLayout(std::string const & lyt);
        ///
-       std::set<string> getEncodingSet(string const & doc_encoding) const;
+       Buffer const & buffer() const;
        ///
-       void useLayout(string const & lyt);
+       void setBuffer(Buffer const &);
        ///
        BufferParams const & bufferParams() const;
        /// the return value is dependent upon both LyXRC and LaTeXFeatures.
        bool useBabel() const;
+       ///
+       bool nice() const { return nice_; };
 
 private:
-       std::list<string> usedLayouts;
+       std::list<std::string> usedLayouts_;
 
        /// Static preamble bits from the external material insets
-       typedef std::list<string> FeaturesList;
+       typedef std::list<std::string> FeaturesList;
        ///
-       FeaturesList features;
+       FeaturesList features_;
        ///
-       FeaturesList preamble_snippets;
+       FeaturesList preamble_snippets_;
        ///
        typedef std::set<Language const *> LanguageList;
        ///
-       LanguageList UsedLanguages;
-       ///
-       typedef std::set<string> UsedFloats;
+       LanguageList UsedLanguages_;
        ///
-       UsedFloats usedFloats;
+       typedef std::set<std::string> UsedFloats;
        ///
-       typedef std::map<string , string> FileMap;
+       UsedFloats usedFloats_;
        ///
-       FileMap IncludedFiles;
+       typedef std::map<std::string , std::string> FileMap;
        ///
+       FileMap IncludedFiles_;
+       /** Buffer of the file being processed.
+        *  This may be a child buffer of the to-be-exported file and
+        *  therefore may not be the buffer that belongs to params_.
+        *  Only needed by InsetInclude::validate().
+        */
+       Buffer const * buffer_;
        ///
-       BufferParams const & params;
+       BufferParams const & params_;
+       /** If we are writing a nice LaTeX file or not.
+        *  Only needed by InsetInclude::validate().
+        */
+       bool nice_;
 };
 
 #endif