X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.h;h=fa64d8f7fbcd6ac79cc6c9f1c865f5ad75359f96;hb=1acedf11da79f509da706bc8d6d2f491c9676087;hp=a21d7f65ba3f427925d3d6baf8ae210e551aa728;hpb=b3bed8d879e40fef62c5c0f8d3ef08d1e52fa6aa;p=lyx.git

diff --git a/src/LaTeXFeatures.h b/src/LaTeXFeatures.h
index a21d7f65ba..fa64d8f7fb 100644
--- a/src/LaTeXFeatures.h
+++ b/src/LaTeXFeatures.h
@@ -13,33 +13,39 @@
 #ifndef LATEXFEATURES_H
 #define LATEXFEATURES_H
 
+#include "OutputParams.h"
+#include "support/docstring.h"
 
 #include <set>
 #include <list>
 #include <map>
 #include <string>
 
+
+namespace lyx {
+
 class Buffer;
 class BufferParams;
-struct Language;
+class Language;
 
 /** The packages and commands that a buffer needs. This class
-    contains a list<string>.  Each of the LaTeX packages that a buffer needs
-    should be added with void require(string const & name).
-
-    i.e require("amssymb")
-
-    To add support you should only need to require() the package name as
-    packages which don't have special requirements are handled automatically.
-    If your new package does need special consideration you'll need to alter
-    string const getPackages() const;
-    Remember to update the validate function in buffer.C and paragraph.C
-    when you do so.
-*/
+ *  contains a list<string>.  Each of the LaTeX packages that a buffer needs
+ *  should be added with void require(string const & name).
+ *
+ *  i.e require("amssymb")
+ *
+ *  To add support you should only need to require() the package name as
+ *  packages which don't have special requirements are handled automatically.
+ *  If your new package does need special consideration you'll need to alter
+ *  string const getPackages() const;
+ *  Remember to update the validate function in Buffer.cpp and Paragraph.cpp
+ *  when you do so.
+ */
 class LaTeXFeatures {
 public:
 	///
-	LaTeXFeatures(Buffer const &, BufferParams const &, bool);
+	LaTeXFeatures(Buffer const &, BufferParams const &,
+		      OutputParams const &);
 	/// The packages needed by the document
 	std::string const getPackages() const;
 	/// The macros definitions needed by the document
@@ -47,23 +53,32 @@ public:
 	///
 	std::string const getBabelOptions() const;
 	/// The definitions needed by the document's textclass
-	std::string const getTClassPreamble() const;
-	/// The sgml definitions needed by the document (dobook/linuxdoc)
-	std::string const getLyXSGMLEntities() const;
+	docstring const getTClassPreamble() const;
+	/// The sgml definitions needed by the document (docbook)
+	docstring const getLyXSGMLEntities() const;
 	/// The SGML Required to include the files added with includeFile();
-	std::string const getIncludedFiles(std::string const & fname) const;
+	docstring const getIncludedFiles(std::string const & fname) const;
 	/// Include a file for use with the SGML entities
-	void includeFile(std::string const & key, std::string const & name);
+	void includeFile(docstring const & key, std::string const & name);
 	/// The float definitions.
 	void getFloatDefinitions(std::ostream & os) const;
 	/// Print requirements to lyxerr
 	void showStruct() const;
 	///
-	void addExternalPreamble(std::string const &);
+	void addPreambleSnippet(std::string const &);
 	/// Provide a string name-space to the requirements
 	void require(std::string const & name);
-	/// Is the package required?
+	/// 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.
+	*/
+	bool mustProvide(std::string const & name) const;
 	///
 	void useFloat(std::string const & name);
 	///
@@ -75,7 +90,7 @@ public:
 	///
 	std::set<std::string> getEncodingSet(std::string const & doc_encoding) const;
 	///
-	void useLayout(std::string const & lyt);
+	void useLayout(docstring const & lyt);
 	///
 	Buffer const & buffer() const;
 	///
@@ -84,11 +99,11 @@ public:
 	BufferParams const & bufferParams() const;
 	/// the return value is dependent upon both LyXRC and LaTeXFeatures.
 	bool useBabel() const;
-	///
-	bool nice() const { return nice_; };
+	/// Runparams that will be used for exporting this file.
+	OutputParams const & runparams() const { return runparams_; }
 
 private:
-	std::list<std::string> usedLayouts_;
+	std::list<docstring> usedLayouts_;
 
 	/// Static preamble bits from the external material insets
 	typedef std::list<std::string> FeaturesList;
@@ -96,16 +111,20 @@ private:
 	FeaturesList features_;
 	///
 	FeaturesList preamble_snippets_;
+	/// The available (required) packages
+	typedef std::list<std::string> PackagesList;
 	///
-	typedef std::set<Language const *> LanguageList;
+	static PackagesList packages_;
 	///
+	typedef std::set<Language const *> LanguageList;
+	/// used languages (only those that are supported by babel)
 	LanguageList UsedLanguages_;
 	///
 	typedef std::set<std::string> UsedFloats;
 	///
 	UsedFloats usedFloats_;
 	///
-	typedef std::map<std::string , std::string> FileMap;
+	typedef std::map<docstring, std::string> FileMap;
 	///
 	FileMap IncludedFiles_;
 	/** Buffer of the file being processed.
@@ -116,10 +135,13 @@ private:
 	Buffer const * buffer_;
 	///
 	BufferParams const & params_;
-	/** If we are writing a nice LaTeX file or not.
-	 *  Only needed by InsetInclude::validate().
+	/** Some insets need to know details about the to-be-produced file
+	 *  in validate().
 	 */
-	bool nice_;
+	OutputParams const & runparams_;
 };
 
+
+} // namespace lyx
+
 #endif