X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=386ef5739b3e314a332173a22d0fc2eeb7a2a4c5;hb=a5be70af87123df1af5e2cdd1d713581cd69ba37;hp=4aab4c714d7d5dac5b06c5392000357fc49383a9;hpb=01013c078556843961d843a3ca13314777ec7b41;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 4aab4c714d..386ef5739b 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -109,7 +109,7 @@ public:
 	InsetQuotes::QuoteTimes quotes_times;
 	///
 	std::string fontsize;
-	///Get the LayoutFile this document is using.
+	/// Get the LayoutFile this document is using.
 	LayoutFile const * baseClass() const;
 	///
 	LayoutFileIndex const & baseClassID() const;
@@ -132,10 +132,10 @@ public:
 	/// but it seems to be needed by CutAndPaste::putClipboard().
 	void setDocumentClass(DocumentClass const * const);
 	/// List of modules in use
-	LayoutModuleList const & getModules() const { return layoutModules_; }
+	LayoutModuleList const & getModules() const { return layout_modules_; }
 	/// List of default modules the user has removed
 	std::list<std::string> const & getRemovedModules() const 
-			{ return removedModules_; }
+			{ return removed_modules_; }
 	///
 	/// 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
@@ -147,20 +147,20 @@ public:
 	bool moduleCanBeAdded(std::string const & modName) const;
 	///
 	void addRemovedModule(std::string const & modName) 
-			{ removedModules_.push_back(modName); }
+			{ removed_modules_.push_back(modName); }
 	/// Clear the list
-	void clearLayoutModules() { layoutModules_.clear(); }
+	void clearLayoutModules() { layout_modules_.clear(); }
 	/// Clear the removed module list
-	void clearRemovedModules() { removedModules_.clear(); }
+	void clearRemovedModules() { removed_modules_.clear(); }
 
 	/// List of included children (for includeonly)
 	std::list<std::string> const & getIncludedChildren() const 
-			{ return includedChildren_; }
+			{ return included_children_; }
 	///
 	void addIncludedChildren(std::string const & child) 
-			{ includedChildren_.push_back(child); }
+			{ included_children_.push_back(child); }
 	/// Clear the list of included children
-	void clearIncludedChildren() { includedChildren_.clear(); }
+	void clearIncludedChildren() { included_children_.clear(); }
 
 	/// update aux files of unincluded children (with \includeonly)
 	bool maintain_unincluded_children;
@@ -198,9 +198,9 @@ public:
 
 	/* some LaTeX options */
 	/// The graphics driver
-	std::string graphicsDriver;
+	std::string graphics_driver;
 	/// The default output format
-	std::string defaultOutputFormat;
+	std::string default_output_format;
 	/// customized bibliography processor
 	std::string bibtex_command;
 	/// customized index processor
@@ -208,25 +208,25 @@ public:
 	/// font encoding
 	std::string fontenc;
 	/// the rm font
-	std::string fontsRoman;
+	std::string fonts_roman;
 	/// the sf font
-	std::string fontsSans;
+	std::string fonts_sans;
 	/// the tt font
-	std::string fontsTypewriter;
+	std::string fonts_typewriter;
 	/// the default family (rm, sf, tt)
-	std::string fontsDefaultFamily;
-	/// use the XeTeX processor
-	bool useXetex;
+	std::string fonts_default_family;
+	/// use the fonts of the OS (OpenType, True Type) directly
+	bool useNonTeXFonts;
 	/// use expert Small Caps
-	bool fontsSC;
+	bool fonts_expert_sc;
 	/// use Old Style Figures
-	bool fontsOSF;
+	bool fonts_old_figures;
 	/// the scale factor of the sf font
-	int fontsSansScale;
+	int fonts_sans_scale;
 	/// the scale factor of the tt font
-	int fontsTypewriterScale;
+	int fonts_typewriter_scale;
 	/// the font used by the CJK command
-	std::string fontsCJK;
+	std::string fonts_cjk;
 	///
 	Spacing & spacing();
 	Spacing const & spacing() const;
@@ -236,6 +236,8 @@ public:
 	int tocdepth;
 	///
 	Language const * language;
+	/// language package
+	std::string lang_package;
 	/// BranchList:
 	BranchList & branchlist();
 	BranchList const & branchlist() const;
@@ -340,7 +342,8 @@ public:
 	AuthorList const & authors() const;
 
 	/// map of the file's author IDs to AuthorList indexes
-	std::map<unsigned int, int> author_map;
+	typedef std::map<int, int> AuthorMap;
+	AuthorMap author_map;
 	/// the buffer's font encoding
 	std::string const font_encoding() const;
 	///
@@ -360,7 +363,7 @@ public:
 	///
 	std::string paperSizeName(PapersizePurpose purpose) const;
 	/// set up if and how babel is called
-	std::string babelCall(std::string const & lang_opts) const;
+	std::string babelCall(std::string const & lang_opts, bool const langoptions) const;
 	/// return supported drivers for specific packages
 	docstring getGraphicsDriver(std::string const & package) const;
 	/// handle inputenc etc.
@@ -373,7 +376,8 @@ public:
 				     std::string const & sf, std::string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale,
-				     bool const & xetex) const;
+				     bool const & use_nonlatexfonts,
+				     LaTeXFeatures & features) const;
 
 	/// get the appropriate cite engine (natbib handling)
 	CiteEngine citeEngine() const;
@@ -384,11 +388,12 @@ public:
 	PDFOptions & pdfoptions();
 	PDFOptions const & pdfoptions() const;
 
+	// do not change these values. we rely upon them.
 	enum MathOutput {
-		MathML,
-		HTML,
-		Images,
-		LaTeX
+		MathML = 0,
+		HTML = 1,
+		Images = 2,
+		LaTeX = 3
 	};
 	/// what to use for math output. present choices are above
 	MathOutput html_math_output;
@@ -432,13 +437,13 @@ private:
 	///
 	DocumentClass * doc_class_;
 	/// 
-	LayoutModuleList layoutModules_;
+	LayoutModuleList layout_modules_;
 	/// this is for modules that are required by the document class but that
 	/// the user has chosen not to use
-	std::list<std::string> removedModules_;
+	std::list<std::string> removed_modules_;
 
 	/// the list of included children (for includeonly)
-	std::list<std::string> includedChildren_;
+	std::list<std::string> included_children_;
 
 	/** Use the Pimpl idiom to hide those member variables that would otherwise
 	 *  drag in other header files.