X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.h;h=036a8efbca8b1ac0e6b62fc31cb466cfb0c89091;hb=e5b8f6956160631022fede155f55bad7951eecb8;hp=4be55bdf4c3bfb9953ab6df9dd5ee2bd69a6de22;hpb=9245b426b3cd59d9a5745654d8c2a0c5b2cb22a2;p=lyx.git

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 4be55bdf4c..036a8efbca 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -26,9 +26,12 @@
 #include <vector>
 
 
+namespace lyx {
+
 class AuthorList;
 class BranchList;
 class Bullet;
+class Encoding;
 class LyXLex;
 class LatexFeatures;
 class Spacing;
@@ -37,7 +40,6 @@ class VSpace;
 class Language;
 
 
-namespace lyx {
 namespace biblio {
 
 enum CiteEngine {
@@ -55,7 +57,6 @@ public:
 };
 
 } // namespace biblio
-} // namespace lyx
 
 
 /** Buffer parameters.
@@ -86,7 +87,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 +112,7 @@ public:
 	///
 	std::string fontsize;
 	///
-	lyx::textclass_type textclass;
+	textclass_type textclass;
 	///
 	LyXTextClass const & getLyXTextClass() const;
 
@@ -185,6 +186,9 @@ public:
 	 * do with this setting.
 	 */
 	std::string inputenc;
+	/// The main encoding used by this buffer for LaTeX output.
+	/// Individual pieces of text can use different encodings.
+	Encoding const & encoding() const;
 	///
 	std::string preamble;
 	///
@@ -198,11 +202,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 &);
 	///
@@ -214,27 +218,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;
 	///
@@ -270,7 +282,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