The bug-fix in revision 16531 introduced another bug. This is the right fix. I did...

[lyx.git] / src / bufferparams.h

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 337a87d7751694dbc401a64d4a699edb7b2294c5..28599a93ac10b78bb544a08ee53d2e582676013e 100644 (file)
--- 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;
@@ -179,12 +180,18 @@ public:
         * 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)
+        *   work (unlikely). The encoding is an unspecified 8bit encoding,
+        *   the interpretation is up to the LaTeX compiler. Because we need
+        *   a rule how to create this from our internal UCS4 encoded
+        *   document contents we treat this as latin1 internally.
         * - 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;
+       /// 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 +221,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;
        ///