ws changes mostly

[lyx.git] / src / bufferparams.h

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 40e82290ac64b2c0928baeef12947966c0e636e9..0acb1668a09e5d211dfcb2565b6e4c38654dfe1c 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -20,8 +20,6 @@
 
 #include "insets/insetquotes.h"
 
-#include "frontends/controllers/biblio.h"
-
 #include "support/copied_ptr.h"
 #include "support/types.h"
 
@@ -36,7 +34,28 @@ class LatexFeatures;
 class Spacing;
 class TexRow;
 class VSpace;
-struct Language;
+class Language;
+
+
+namespace lyx {
+namespace biblio {
+
+enum CiteEngine {
+       ENGINE_BASIC,
+       ENGINE_NATBIB_AUTHORYEAR,
+       ENGINE_NATBIB_NUMERICAL,
+       ENGINE_JURABIB
+};
+
+class CiteEngine_enum {
+       CiteEngine val_;
+public:
+       CiteEngine_enum(CiteEngine val) : val_(val) {}
+       operator CiteEngine() const{ return val_; }
+};
+
+} // namespace biblio
+} // namespace lyx
 
 
 /** Buffer parameters.
@@ -172,6 +191,10 @@ public:
        void readLanguage(LyXLex &);
        ///
        void readGraphicsDriver(LyXLex &);
+       ///
+       void readBullets(LyXLex &);
+       ///
+       void readBulletsLaTeX(LyXLex &);
 
        /// use AMS package, not, or auto
        enum AMS {
@@ -181,11 +204,19 @@ public:
        };
        AMS use_amsmath;
        ///
-       biblio::CiteEngine cite_engine;
+       lyx::biblio::CiteEngine cite_engine;
        ///
        bool use_bibtopic;
        /// revision tracking for this buffer ?
        bool tracking_changes;
+       /** This param decides if 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 
+        *  not installed).
+        */
+       bool output_changes;
        /// Time ago we agreed that this was a buffer property [ale990407]
        std::string parentname;
        ///
@@ -209,7 +240,8 @@ private:
         *  drag in other header files.
         */
        class Impl;
-       struct MemoryTraits {
+       class MemoryTraits {
+       public:
                static Impl * clone(Impl const *);
                static void destroy(Impl *);
        };