X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=bcf1ed43b82b618701684c670579ed40e48f4b69;hb=fb12b282f1300123c7f4c7f10525c29cb598e1fe;hp=878b466797505646ba5c9e564c7f544416b8b1fb;hpb=4a53fa6e018c2809a3e829c7d8d90590e420a2e3;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 878b466797..bcf1ed43b8 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -13,7 +13,6 @@
 #ifndef LATEXFEATURES_H
 #define LATEXFEATURES_H
 
-
 #include "OutputParams.h"
 #include "support/docstring.h"
 
@@ -67,8 +66,10 @@ public:
 	void showStruct() const;
 	///
 	void addPreambleSnippet(std::string const &);
-	/// Provide a string name-space to the requirements
+	/// 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 (required) package available?
@@ -81,7 +82,7 @@ public:
 	*/
 	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 *);
 	///
@@ -106,26 +107,28 @@ public:
 private:
 	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<docstring , std::string> FileMap;
+	typedef std::map<docstring, std::string> FileMap;
 	///
 	FileMap IncludedFiles_;
 	/** Buffer of the file being processed.