X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.h;h=c05af76d54b70525635be5d6e8db8ef9bb0404d6;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=337a87d7751694dbc401a64d4a699edb7b2294c5;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 337a87d775..c05af76d54 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -31,6 +31,7 @@ namespace lyx {
 class AuthorList;
 class BranchList;
 class Bullet;
+class Encoding;
 class LyXLex;
 class LatexFeatures;
 class Spacing;
@@ -177,14 +178,23 @@ public:
 	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)
+	 * - \c auto: find out the input encoding from the used languages
+	 * - \c default: ditto
 	 * - any encoding supported by the inputenc package
 	 * The encoding of the LyX file is always utf8 and has nothing to
 	 * do with this setting.
+	 * The difference between \c auto and \c default is that \c auto also
+	 * causes loading of the inputenc package, while \c default does not.
+	 * \c default will not work unless the user takes additional measures
+	 * (such as using special environments like the CJK environment from
+	 * CJK.sty).
+	 * \c default can be seen as an unspecified 8bit encoding, since LyX
+	 * does not interpret it in any way apart from display on screen.
 	 */
 	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;
 	///
@@ -214,13 +224,21 @@ 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;
 	///
 	biblio::CiteEngine cite_engine;
 	///
@@ -253,7 +271,7 @@ public:
 	///
 	std::string const babelCall(std::string const & lang_opts) const;
 	/// set up the document fonts
-	std::string const loadFonts(LaTeXFeatures & features, std::string const & rm,
+	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;