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

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 743467a9a6..d0888406f8 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 {
@@ -35,6 +36,7 @@ class BranchList;
 class Bullet;
 class DocumentClass;
 class Encoding;
+class IndicesList;
 class Language;
 class LatexFeatures;
 class LayoutFile;
@@ -52,8 +54,6 @@ class VSpace;
  */
 class BufferParams {
 public:
-	///
-	typedef std::vector<std::string> LayoutModuleList;
 	///
 	enum ParagraphSeparation {
 		///
@@ -129,19 +129,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
@@ -181,6 +182,12 @@ public:
 	/* some LaTeX options */
 	/// The graphics driver
 	std::string graphicsDriver;
+	/// The default output format
+	std::string defaultOutputFormat;
+	/// customized bibliography processor
+	std::string bibtex_command;
+	/// customized index processor
+	std::string index_command;
 	/// the rm font
 	std::string fontsRoman;
 	/// the sf font
@@ -189,6 +196,8 @@ public:
 	std::string fontsTypewriter;
 	/// the default family (rm, sf, tt)
 	std::string fontsDefaultFamily;
+	/// use the XeTeX processor
+	bool useXetex;
 	/// use expert Small Caps
 	bool fontsSC;
 	/// use Old Style Figures
@@ -211,6 +220,9 @@ public:
 	/// BranchList:
 	BranchList & branchlist();
 	BranchList const & branchlist() const;
+	/// IndicesList:
+	IndicesList & indiceslist();
+	IndicesList const & indiceslist() const;
 	/**
 	 * The input encoding for LaTeX. This can be one of
 	 * - \c auto: find out the input encoding from the used languages
@@ -250,6 +262,8 @@ public:
 	PageSides sides;
 	///
 	std::string pagestyle;
+	///
+	RGBColor backgroundcolor;
 	/// \param index should lie in the range 0 <= \c index <= 3.
 	Bullet & temp_bullet(size_type index);
 	Bullet const & temp_bullet(size_type index) const;
@@ -272,8 +286,10 @@ public:
 	Package use_amsmath;
 	/// Whether and how to load esint
 	Package use_esint;
-	///
+	/// Split bibliography?
 	bool use_bibtopic;
+	/// Split the index?
+	bool use_indices;
 	/// revision tracking for this buffer ?
 	bool trackChanges;
 	/** This param decides whether change tracking marks should be used
@@ -306,14 +322,21 @@ 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;
+	///
+	std::string const parseFontName(std::string const & name) const;
 	/// set up the document fonts
 	std::string const loadFonts(std::string const & rm,
 				     std::string const & sf, std::string const & tt,
 				     bool const & sc, bool const & osf,
-				     int const & sfscale, int const & ttscale) const;
+				     int const & sfscale, int const & ttscale,
+				     bool const & xetex) const;
 
 	/// get the appropriate cite engine (natbib handling)
 	CiteEngine citeEngine() const;
@@ -341,7 +364,6 @@ private:
 	void readModules(Lexer &);
 	///
 	void readRemovedModules(Lexer &);
-
 	/// for use with natbib
 	CiteEngine cite_engine_;
 	///
@@ -350,7 +372,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.