X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=06d2ee99ad1ddb523a896f245ba3b12207c57474;hb=5940dc53aab9fec6cd02f8be337f0e6c9b2e5fb1;hp=7c3d9e3868af3e0b06b73826d98bd3bb92265552;hpb=6c1326cdeba128486cc46deadf6b1dde50ab9c77;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 7c3d9e3868..06d2ee99ad 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -27,6 +27,7 @@ class Buffer;
 class BufferParams;
 class InsetLayout;
 class Language;
+struct TexString;
 
 /** The packages and commands that a buffer needs. This class
  *  contains a list<string>.  Each of the LaTeX packages that a buffer needs
@@ -55,14 +56,16 @@ 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
-	docstring const getMacros() const;
+	TexString getMacros() const;
 	/// Extra preamble code before babel is called
-	std::string const getBabelPresettings() const;
+	docstring const getBabelPresettings() const;
 	/// Extra preamble code after babel is called
-	std::string const getBabelPostsettings() const;
+	docstring const getBabelPostsettings() const;
 	/// Do we need to pass the languages to babel directly?
 	bool needBabelLangOptions() const;
 	/// Load AMS packages when appropriate
@@ -82,17 +85,19 @@ public:
 	/// Include a file for use with the SGML entities
 	void includeFile(docstring const & key, std::string const & name);
 	/// The float definitions.
-	void getFloatDefinitions(odocstream & os) const;
+	void getFloatDefinitions(otexstream & os) const;
 	/// Print requirements to lyxerr
 	void showStruct() const;
+	/// Add preamble snippet with TexRow information
+	void addPreambleSnippet(TexString snippet, bool allowdupes = false);
+	/// Add preamble snippet without TexRow information
+	void addPreambleSnippet(docstring const & snippet, bool allowdupes = false);
 	///
-	void addPreambleSnippet(std::string const &);
-	///
-	std::string getPreambleSnippets() const;
+	TexString getPreambleSnippets() const;
 	///
 	void addCSSSnippet(std::string const &);
 	///
-	std::string getCSSSnippets() const;
+	docstring getCSSSnippets() const;
 	/// Add a feature name requirements
 	void require(std::string const & name);
 	/// Add a set of feature names requirements
@@ -101,9 +106,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 +124,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,7 +146,9 @@ public:
 	void setBuffer(Buffer const &);
 	///
 	BufferParams const & bufferParams() const;
-	/// Which language package do we need?
+	/** 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; }
@@ -142,16 +158,24 @@ public:
 	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"
 	void resolveAlternatives();
+	/// Expand multiple requirements like "textcomp,lyxmathsym,amstext"
+	void expandMultiples();
 	///
 	void setHTMLTitle(docstring const & t) { htmltitle_ = t; }
 	///
 	docstring const & htmlTitle() const { return htmltitle_; }
 
 private:
+	///
+	void useLayout(docstring const &, int);
 	///
 	std::list<docstring> usedLayouts_;
 	///
@@ -161,7 +185,7 @@ private:
 	///
 	Features features_;
 	/// Static preamble bits, from external templates, or anywhere else
-	typedef std::list<std::string> SnippetList;
+	typedef std::list<TexString> SnippetList;
 	///
 	SnippetList preamble_snippets_;
 	///
@@ -193,6 +217,8 @@ private:
 	///
 	bool in_float_;
 	///
+	bool in_deleted_inset_;
+	///
 	docstring htmltitle_;
 };