X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.h;h=ee2b22a248a91df9f65d4273ca69847ad749de1c;hb=21992716e52ca8c277b2a448f15c8164563b3ff7;hp=5e873b0ac44593f3f816e86a362316aaa914b756;hpb=58978d7bb50361c27fad343796ff4941f8b0d92c;p=lyx.git

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 5e873b0ac4..ee2b22a248 100644
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -82,7 +82,7 @@ public:
 	 *  the BufferParams, a LyXRC variable, and the document class).
 	 *  This returned value can then be passed to the insets...
 	 */
-	bool writeLaTeX(odocstream &, LaTeXFeatures &, TexRow &,
+	bool writeLaTeX(otexstream &, LaTeXFeatures &,
 			support::FileName const &) 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
@@ -210,23 +210,23 @@ public:
 	/// the rm font
 	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;
+	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;
@@ -365,8 +367,7 @@ public:
 	/// 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;
+	void writeEncodingPreamble(otexstream & os, LaTeXFeatures & features) const;
 	///
 	std::string const parseFontName(std::string const & name) const;
 	/// set up the document fonts
@@ -374,7 +375,8 @@ public:
 				     std::string const & sf, std::string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale,
-				     bool const & use_nonlatexfonts) const;
+				     bool const & use_nonlatexfonts,
+				     LaTeXFeatures & features) const;
 
 	/// get the appropriate cite engine (natbib handling)
 	CiteEngine citeEngine() const;
@@ -403,6 +405,8 @@ public:
 	std::string html_latex_start;
 	///
 	std::string html_latex_end;
+	///
+	bool html_css_as_file;
 	/// generate output usable for reverse/forward search
 	bool output_sync;
 	/// custom LaTeX macro from user instead our own
@@ -434,13 +438,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.