X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=743467a9a6931a527bfd081321aa2d5c4fb16478;hb=d45ca67d1d3e2d4fdc344cd2a1517725bc91723a;hp=46c02433408bd064f34123f4615c8ab7e5967937;hpb=764b5cf859f6afeb4f866ad4a8f94de759d1afe6;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 46c0243340..743467a9a6 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -23,6 +23,7 @@
 
 #include "support/copied_ptr.h"
 
+#include <set>
 #include <vector>
 
 namespace lyx {
@@ -51,6 +52,8 @@ class VSpace;
  */
 class BufferParams {
 public:
+	///
+	typedef std::vector<std::string> LayoutModuleList;
 	///
 	enum ParagraphSeparation {
 		///
@@ -118,13 +121,17 @@ public:
 	DocumentClass const & documentClass() const;
 	/// \return A pointer to the DocumentClass currently in use: the BaseClass 
 	/// as modified by modules. 
-	DocumentClass * documentClassPtr() const;
+	DocumentClass const * documentClassPtr() const;
 	/// This bypasses the baseClass and sets the textClass directly.
 	/// Should be called with care and would be better not being here,
 	/// but it seems to be needed by CutAndPaste::putClipboard().
 	void setDocumentClass(DocumentClass const * const);
 	/// List of modules in use
-	std::vector<std::string> const & getModules() const;
+	LayoutModuleList const & getModules() const { return layoutModules_; }
+	/// List of default modules the user has removed
+	std::set<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
@@ -132,8 +139,13 @@ public:
 	/// the BufferParams do not represent the parameters for an actual buffer
 	/// (as in GuiDocument).
 	bool addLayoutModule(std::string const & modName);
+	///
+	void addRemovedModule(std::string const & modName) 
+			{ removedModules_.insert(modName); }
 	/// Clear the list
-	void clearLayoutModules();
+	void clearLayoutModules() { layoutModules_.clear(); }
+	/// Clear the removed module list
+	void clearRemovedModules() { removedModules_.clear(); }
 
 	/// returns the main font for the buffer (document)
 	Font const getFont() const;
@@ -185,6 +197,8 @@ public:
 	int fontsSansScale;
 	/// the scale factor of the tt font
 	int fontsTypewriterScale;
+	/// the font used by the CJK command
+	std::string fontsCJK;
 	///
 	Spacing & spacing();
 	Spacing const & spacing() const;
@@ -222,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;
 	///
@@ -290,8 +306,6 @@ public:
 	};
 	///
 	std::string paperSizeName(PapersizePurpose purpose) const;
-	/// set up if and how babel is called
-	std::string babelCall(std::string const & lang_opts) const;
 	/// handle inputenc etc.
 	void writeEncodingPreamble(odocstream & os, LaTeXFeatures & features,
 					      TexRow & texrow) const;
@@ -325,15 +339,18 @@ private:
 	void readBulletsLaTeX(Lexer &);
 	///
 	void readModules(Lexer &);
+	///
+	void readRemovedModules(Lexer &);
 
 	/// for use with natbib
 	CiteEngine cite_engine_;
 	///
 	DocumentClass * doc_class_;
-	///
-	typedef std::vector<std::string> LayoutModuleList;
 	/// 
 	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_;
 
 	/** Use the Pimpl idiom to hide those member variables that would otherwise
 	 *  drag in other header files.