X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=be00847f7e80f60b2c5b6755281a588b20d7dea0;hb=2992bb04da2b9f72e595df21ba9e8206af7c1816;hp=3b1cc89d646233a5c202c6d48249b6083aa50df4;hpb=38b9a4530e8eb870e60cf8a15c208010fb292054;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 3b1cc89d64..be00847f7e 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -43,6 +43,13 @@ class Language;
  */
 class LaTeXFeatures {
 public:
+	/// Which Language package do we use?
+	enum LangPackage {
+		LANG_PACK_NONE,
+		LANG_PACK_BABEL,
+		LANG_PACK_POLYGLOSSIA,
+		LANG_PACK_CUSTOM
+	};
 	///
 	LaTeXFeatures(Buffer const &, BufferParams const &,
 		      OutputParams const &);
@@ -94,9 +101,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;
 	///
@@ -106,9 +116,11 @@ public:
 	///
 	bool hasLanguages() const;
 	/// check if all used languages are supported by polyglossia
-	bool hasPolyglossiaLanguages() const;
+	bool hasOnlyPolyglossiaLanguages() const;
+	/// check if a language is supported only by polyglossia
+	bool hasPolyglossiaExclusiveLanguages() const;
 	///
-	std::string getLanguages() const;
+	std::string getBabelLanguages() const;
 	///
 	std::map<std::string, std::string> getPolyglossiaLanguages() const;
 	///
@@ -123,10 +135,14 @@ public:
 	void setBuffer(Buffer const &);
 	///
 	BufferParams const & bufferParams() const;
-	/// the return value is dependent upon both LyXRC and LaTeXFeatures.
-	bool useBabel() const;
-	///
-	bool usePolyglossia() const;
+	/** Which language package do we require? \p englishbabel determines
+	 *  if we require babel even if English is the only language.
+	 */
+	LangPackage langPackage() const;
+	/// Convenience function to test if we use 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?
 	bool inFloat() const { return in_float_; }
 	/// are we in a float?
@@ -141,6 +157,8 @@ public:
 	docstring const & htmlTitle() const { return htmltitle_; }
 
 private:
+	///
+	void useLayout(docstring const &, int);
 	///
 	std::list<docstring> usedLayouts_;
 	///