X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=47c0f2f2cd40c0dfdb58ea5811c3013ea1f37cca;hb=2420f5ed1e9fe98c6273de3c9d661641aefc011b;hp=fbc5a7b92515ad63ba17637de7d8a4f76ca4c6d2;hpb=163d827729b90f1d4c4155109bd71b8bd86b9055;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index fbc5a7b925..47c0f2f2cd 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -4,10 +4,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,15 +15,16 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
-#include "Font.h"
 #include "Citation.h"
+#include "Font.h"
+#include "LayoutModuleList.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
 
 #include "support/copied_ptr.h"
 
-#include <set>
+#include <list>
 #include <vector>
 
 namespace lyx {
@@ -52,8 +53,6 @@ class VSpace;
  */
 class BufferParams {
 public:
-	///
-	typedef std::vector<std::string> LayoutModuleList;
 	///
 	enum ParagraphSeparation {
 		///
@@ -129,19 +128,20 @@ public:
 	/// List of modules in use
 	LayoutModuleList const & getModules() const { return layoutModules_; }
 	/// List of default modules the user has removed
-	std::set<std::string> const & getRemovedModules() const 
+	std::list<std::string> const & getRemovedModules() const 
 			{ return removedModules_; }
 	///
-	/// Add a module to the list of modules in use.
-	/// Returns true if module was successfully added.
-	/// The makeClass variable signals whether to call makeDocumentClass. This
-	/// need not be done if we know this isn't the final time through, or if
-	/// the BufferParams do not represent the parameters for an actual buffer
-	/// (as in GuiDocument).
+	/// Add a module to the list of modules in use. This checks only that the
+	/// module is not already in the list, so use moduleIsCompatible first if
+	/// you want to check for compatibility.
+	/// \return true if module was successfully added.
 	bool addLayoutModule(std::string const & modName);
+	/// checks to make sure module's requriements are satisfied, that it does
+	/// not conflict with already-present modules, isn't already loaded, etc.
+	bool moduleCanBeAdded(std::string const & modName) const;
 	///
 	void addRemovedModule(std::string const & modName) 
-			{ removedModules_.insert(modName); }
+			{ removedModules_.push_back(modName); }
 	/// Clear the list
 	void clearLayoutModules() { layoutModules_.clear(); }
 	/// Clear the removed module list
@@ -236,6 +236,8 @@ public:
 	std::string local_layout;
 	///
 	std::string options;
+	/// use the class options defined in the layout?
+	bool use_default_options;
 	///
 	std::string master;
 	///
@@ -306,6 +308,8 @@ public:
 	std::string paperSizeName(PapersizePurpose purpose) const;
 	/// set up if and how babel is called
 	std::string babelCall(std::string const & lang_opts) const;
+	/// return supported drivers for specific packages
+	docstring getGraphicsDriver(std::string const & package) const;
 	/// handle inputenc etc.
 	void writeEncodingPreamble(odocstream & os, LaTeXFeatures & features,
 					      TexRow & texrow) const;
@@ -341,7 +345,6 @@ private:
 	void readModules(Lexer &);
 	///
 	void readRemovedModules(Lexer &);
-
 	/// for use with natbib
 	CiteEngine cite_engine_;
 	///
@@ -350,7 +353,7 @@ private:
 	LayoutModuleList layoutModules_;
 	/// this is for modules that are required by the document class but that
 	/// the user has chosen not to use
-	std::set<std::string> removedModules_;
+	std::list<std::string> removedModules_;
 
 	/** Use the Pimpl idiom to hide those member variables that would otherwise
 	 *  drag in other header files.