X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.h;h=578645f3ee4488e4ec92a5588745f7f0a6e7816f;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=d78692733a672a1ec6b66e4cde5a54fa96d91c5e;hpb=54acb900add2a7ba54294e585f64722ead6ac94c;p=lyx.git

diff --git a/src/bufferparams.h b/src/bufferparams.h
index d78692733a..578645f3ee 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -26,6 +26,8 @@
 #include <vector>
 
 
+namespace lyx {
+
 class AuthorList;
 class BranchList;
 class Bullet;
@@ -37,7 +39,6 @@ class VSpace;
 class Language;
 
 
-namespace lyx {
 namespace biblio {
 
 enum CiteEngine {
@@ -55,7 +56,6 @@ public:
 };
 
 } // namespace biblio
-} // namespace lyx
 
 
 /** Buffer parameters.
@@ -86,7 +86,7 @@ public:
 	 *  the BufferParams and a LyXRC variable).
 	 *  This returned value can then be passed to the insets...
 	 */
-	bool writeLaTeX(std::ostream &, LaTeXFeatures &, TexRow &) const;
+	bool writeLaTeX(odocstream &, LaTeXFeatures &, TexRow &) const;
 
 	///
 	void useClassDefaults();
@@ -111,7 +111,7 @@ public:
 	///
 	std::string fontsize;
 	///
-	lyx::textclass_type textclass;
+	textclass_type textclass;
 	///
 	LyXTextClass const & getLyXTextClass() const;
 
@@ -175,7 +175,15 @@ public:
 	/// BranchList:
 	BranchList & branchlist();
 	BranchList const & branchlist() const;
-	///
+	/**
+	 * The input encoding for LaTeX. This can be one of
+	 * - auto: find out the input encoding from the used languages
+	 * - default: Don't load the inputenc package and hope that it will
+	 *   work (unlikely)
+	 * - any encoding supported by the inputenc package
+	 * The encoding of the LyX file is always utf8 and has nothing to
+	 * do with this setting.
+	 */
 	std::string inputenc;
 	///
 	std::string preamble;
@@ -190,11 +198,11 @@ public:
 	///
 	std::string pagestyle;
 	/// \param index should lie in the range 0 <= \c index <= 3.
-	Bullet & temp_bullet(lyx::size_type index);
-	Bullet const & temp_bullet(lyx::size_type index) const;
+	Bullet & temp_bullet(size_type index);
+	Bullet const & temp_bullet(size_type index) const;
 	/// \param index should lie in the range 0 <= \c index <= 3.
-	Bullet & user_defined_bullet(lyx::size_type index);
-	Bullet const & user_defined_bullet(lyx::size_type index) const;
+	Bullet & user_defined_bullet(size_type index);
+	Bullet const & user_defined_bullet(size_type index) const;
 	///
 	void readPreamble(LyXLex &);
 	///
@@ -206,27 +214,35 @@ public:
 	///
 	void readBulletsLaTeX(LyXLex &);
 
-	/// use AMS package, not, or auto
-	enum AMS {
-		AMS_OFF,
-		AMS_AUTO,
-		AMS_ON
+	/// Whether to load a package such as amsmath or esint.
+	/// The enum values must not be changed (file format!)
+	enum Package {
+		/// Don't load the package. For experts only.
+		package_off = 0,
+		/// Load the package if needed (recommended)
+		package_auto = 1,
+		/// Always load the package (e.g. if the document contains
+		/// some ERT that needs the package)
+		package_on = 2
 	};
-	AMS use_amsmath;
+	/// Whether and how to load amsmath
+	Package use_amsmath;
+	/// Whether and how to load esint
+	Package use_esint;
 	///
-	lyx::biblio::CiteEngine cite_engine;
+	biblio::CiteEngine cite_engine;
 	///
 	bool use_bibtopic;
 	/// revision tracking for this buffer ?
-	bool tracking_changes;
+	bool trackChanges;
 	/** This param decides whether change tracking marks should be output
 	 *  (using the dvipost package) or if the current "state" of the
 	 *  document should be output instead. Since dvipost needs dvi
 	 *  specials, it only works with dvi/ps output (the param will be
-	 *  ignored with other output flavors and disabled when dbipost is
+	 *  ignored with other output flavors and disabled when dvipost is
 	 *  not installed).
 	 */
-	bool output_changes;
+	bool outputChanges;
 	/// Time ago we agreed that this was a buffer property [ale990407]
 	std::string parentname;
 	///
@@ -262,7 +278,9 @@ private:
 		static Impl * clone(Impl const *);
 		static void destroy(Impl *);
 	};
-	lyx::support::copied_ptr<Impl, MemoryTraits> pimpl_;
+	support::copied_ptr<Impl, MemoryTraits> pimpl_;
 };
 
+} // namespace lyx
+
 #endif