X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=06d2ee99ad1ddb523a896f245ba3b12207c57474;hb=c9dde702f070228b625b0674199d07bef1d1887d;hp=6b1febf28bbbf1d26fb959005eff0fb582e52680;hpb=2aa930bbe8f2bf07f665b5cda70842748add271a;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index 6b1febf28b..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
@@ -60,11 +61,11 @@ public:
 	/// 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
@@ -84,18 +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 & snippet, 
-	                        bool allowdupes = false);
-	///
-	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
@@ -122,10 +124,14 @@ 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;
 	///
@@ -152,6 +158,10 @@ 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"
@@ -175,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_;
 	///
@@ -207,6 +217,8 @@ private:
 	///
 	bool in_float_;
 	///
+	bool in_deleted_inset_;
+	///
 	docstring htmltitle_;
 };