X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=38273e4fa2f85c42b5c57a80decb9ecac7867f3b;hb=57b69a5efddf9f3c148007322f00dad6c253a2ed;hp=5b0ff9aaf02104b0a13c6be0122f486e9e8f3e8e;hpb=089927dd6f99aa823c4da86a6449f701d1608252;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 5b0ff9aaf0..38273e4fa2 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -43,11 +43,20 @@ 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 &);
 	/// 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
@@ -56,8 +65,10 @@ public:
 	std::string const getBabelPresettings() const;
 	/// Extra preamble code after babel is called
 	std::string const getBabelPostsettings() const;
-	/// Do we need to pass the languages to babel directly? 
+	/// Do we need to pass the languages to babel directly?
 	bool needBabelLangOptions() const;
+	/// Load AMS packages when appropriate
+	std::string const loadAMSPackages() const;
 	/// The definitions needed by the document's textclass
 	docstring const getTClassPreamble() const;
 	/// The language dependent definitions needed by the document's textclass
@@ -77,22 +88,28 @@ 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;
+	///
+	void addCSSSnippet(std::string const &);
+	///
+	std::string getCSSSnippets() 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 (required) package available?
 	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;
 	///
@@ -102,14 +119,18 @@ 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;
 	///
 	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);
@@ -119,22 +140,30 @@ 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?
 	void inFloat(bool const b) { in_float_ = b; }
 	/// Runparams that will be used for exporting this file.
 	OutputParams const & runparams() const { return runparams_; }
+	/// Resolve alternatives like "esint|amsmath|wasysym"
+	void resolveAlternatives();
 	///
 	void setHTMLTitle(docstring const & t) { htmltitle_ = t; }
 	///
 	docstring const & htmlTitle() const { return htmltitle_; }
 
 private:
+	///
+	void useLayout(docstring const &, int);
 	///
 	std::list<docstring> usedLayouts_;
 	///
@@ -147,10 +176,8 @@ private:
 	typedef std::list<std::string> SnippetList;
 	///
 	SnippetList preamble_snippets_;
-	/// The available (required) packages
-	typedef std::set<std::string> Packages;
 	///
-	static Packages packages_;
+	SnippetList css_snippets_;
 	///
 	typedef std::set<Language const *> LanguageList;
 	/// used languages (only those that are supported by babel)