X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=754b445d00971b9d842449024e84c2f7ae43dbfc;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=32b03b3d15f9ca4dd001f5c54b9933e6b8093b51;hpb=1db9ff9b1a962005e758706feee541aba4dcfba2;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 32b03b3d15..754b445d00 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -55,6 +55,8 @@ public:
 		      OutputParams const &);
 	/// The color packages
 	std::string const getColorOptions() const;
+	/// The requested package options
+	std::string const getPackageOptions() const;
 	/// The packages needed by the document
 	std::string const getPackages() const;
 	/// The macros definitions needed by the document
@@ -86,7 +88,8 @@ public:
 	/// Print requirements to lyxerr
 	void showStruct() const;
 	///
-	void addPreambleSnippet(std::string const &);
+	void addPreambleSnippet(std::string const & snippet, 
+	                        bool allowdupes = false);
 	///
 	std::string getPreambleSnippets() const;
 	///
@@ -101,9 +104,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;
 	///
@@ -116,13 +122,19 @@ public:
 	bool hasOnlyPolyglossiaLanguages() const;
 	/// check if a language is supported only by polyglossia
 	bool hasPolyglossiaExclusiveLanguages() const;
+	/// A vector of all used languages supported only by polyglossia
+	std::vector<std::string> getPolyglossiaExclusiveLanguages() const;
+	/// A vector of all used languages supported only by babel
+	std::vector<std::string> getBabelExclusiveLanguages() const;
 	///
 	std::string getBabelLanguages() const;
 	///
-	std::map<std::string, std::string> getPolyglossiaLanguages() const;
+	std::set<std::string> getPolyglossiaLanguages() const;
 	///
 	std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
 	///
+	void getFontEncodings(std::vector<std::string> & encodings) const;
+	///
 	void useLayout(docstring const & lyt);
 	///
 	void useInsetLayout(InsetLayout const & lay);
@@ -132,18 +144,22 @@ public:
 	void setBuffer(Buffer const &);
 	///
 	BufferParams const & bufferParams() const;
-	/* Which language package do we require? \p englishbabel determines
-	 * if we require babel even if English is the only language.
+	/** Which language package do we require? \p englishbabel determines
+	 *  if we require babel even if English is the only language.
 	 */
-	LangPackage langPackage(bool englishbabel = false) const;
+	LangPackage langPackage() const;
 	/// Convenience function to test if we use babel
-	bool useBabel(bool englishbabel = false) const { return langPackage(englishbabel) == LANG_PACK_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?
 	void inFloat(bool const b) { in_float_ = b; }
+	/// are we in a deleted inset?
+	bool inDeletedInset() const { return in_deleted_inset_; }
+	/// are we in a deleted inset?
+	void inDeletedInset(bool const b) { in_deleted_inset_ = b; }
 	/// Runparams that will be used for exporting this file.
 	OutputParams const & runparams() const { return runparams_; }
 	/// Resolve alternatives like "esint|amsmath|wasysym"
@@ -154,6 +170,8 @@ public:
 	docstring const & htmlTitle() const { return htmltitle_; }
 
 private:
+	///
+	void useLayout(docstring const &, int);
 	///
 	std::list<docstring> usedLayouts_;
 	///
@@ -195,6 +213,8 @@ private:
 	///
 	bool in_float_;
 	///
+	bool in_deleted_inset_;
+	///
 	docstring htmltitle_;
 };