X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=bcf1ed43b82b618701684c670579ed40e48f4b69;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=39cba36f5531948d88cfc99905e71521e7fd4688;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 39cba36f55..bcf1ed43b8 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -13,8 +13,8 @@
 #ifndef LATEXFEATURES_H
 #define LATEXFEATURES_H
 
-
-#include "outputparams.h"
+#include "OutputParams.h"
+#include "support/docstring.h"
 
 #include <set>
 #include <list>
@@ -38,7 +38,7 @@ class Language;
  *  packages which don't have special requirements are handled automatically.
  *  If your new package does need special consideration you'll need to alter
  *  string const getPackages() const;
- *  Remember to update the validate function in buffer.C and paragraph.C
+ *  Remember to update the validate function in Buffer.cpp and Paragraph.cpp
  *  when you do so.
  */
 class LaTeXFeatures {
@@ -53,29 +53,36 @@ 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 &);
-	/// Provide a string name-space to the requirements
+	void addPreambleSnippet(std::string const &);
+	/// Add a feature name requirements
 	void require(std::string const & name);
+	/// Add a set of feature names requirements
+	void require(std::set<std::string> const & names);
 	/// Which of the required packages are installed?
 	static void getAvailable();
-	/// Is the package required?
-	bool isRequired(std::string const & name) const;
 	/// Is the (required) package available?
-	bool isAvailable(std::string const & name) const;
+	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.
+	*/
+	bool mustProvide(std::string const & name) const;
 	///
-	void useFloat(std::string const & name);
+	void useFloat(std::string const & name, bool subfloat = false);
 	///
 	void useLanguage(Language const *);
 	///
@@ -85,7 +92,7 @@ public:
 	///
 	std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
 	///
-	void useLayout(std::string const & lyt);
+	void useLayout(docstring const & lyt);
 	///
 	Buffer const & buffer() const;
 	///
@@ -98,28 +105,30 @@ public:
 	OutputParams const & runparams() const { return runparams_; }
 
 private:
-	std::list<std::string> usedLayouts_;
+	std::list<docstring> usedLayouts_;
 
-	/// Static preamble bits from the external material insets
-	typedef std::list<std::string> FeaturesList;
+	/// The features that are needed by the document
+	typedef std::set<std::string> Features;
 	///
-	FeaturesList features_;
+	Features features_;
+	/// Static preamble bits from the external material insets
+	typedef std::list<std::string> SnippetList;
 	///
-	FeaturesList preamble_snippets_;
+	SnippetList preamble_snippets_;
 	/// The available (required) packages
-	typedef std::list<std::string> PackagesList;
+	typedef std::set<std::string> Packages;
 	///
-	static PackagesList packages_;
+	static Packages packages_;
 	///
 	typedef std::set<Language const *> LanguageList;
-	///
+	/// used languages (only those that are supported by babel)
 	LanguageList UsedLanguages_;
 	///
-	typedef std::set<std::string> UsedFloats;
+	typedef std::map<std::string, bool> UsedFloats;
 	///
 	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.