Revert the last few patches. I'll commit a more general fix all at once.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index eee2d69cbb769f49bf1476b5befa968962b95a38..af7333364b3b1aee59131990541d925acf0bc8b4 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -16,13 +16,15 @@
 #define BUFFERPARAMS_H
 
 #include "Font.h"
-#include "BiblioInfo.h"
+#include "Citation.h"
 #include "paper.h"
 
 #include "insets/InsetQuotes.h"
 
 #include "support/copied_ptr.h"
 
+#include <list>
+#include <set>
 #include <vector>
 
 namespace lyx {
@@ -51,6 +53,8 @@ class VSpace;
  */
 class BufferParams {
 public:
+       ///
+       typedef std::list<std::string> LayoutModuleList;
        ///
        enum ParagraphSeparation {
                ///
@@ -118,22 +122,32 @@ public:
        DocumentClass const & documentClass() const;
        /// \return A pointer to the DocumentClass currently in use: the BaseClass 
        /// as modified by modules. 
-       DocumentClass * documentClassPtr() const;
+       DocumentClass const * documentClassPtr() const;
        /// This bypasses the baseClass and sets the textClass directly.
        /// Should be called with care and would be better not being here,
        /// but it seems to be needed by CutAndPaste::putClipboard().
        void setDocumentClass(DocumentClass const * const);
        /// List of modules in use
-       std::vector<std::string> const & getModules() const;
-       /// Add a module to the list of modules in use.
-       /// Returns true if module was successfully added.
-       /// The makeClass variable signals whether to call makeDocumentClass. This
-       /// need not be done if we know this isn't the final time through, or if
-       /// the BufferParams do not represent the parameters for an actual buffer
-       /// (as in GuiDocument).
+       LayoutModuleList const & getModules() const { return layoutModules_; }
+       /// List of default modules the user has removed
+       std::set<std::string> const & getRemovedModules() const 
+                       { return removedModules_; }
+       ///
+       /// Add a module to the list of modules in use. This checks only that the
+       /// module is not already in the list, so use moduleIsCompatible first if
+       /// you want to check for compatibility.
+       /// \return true if module was successfully added.
        bool addLayoutModule(std::string const & modName);
+       /// checks to make sure module's requriements are satisfied, that it does
+       /// not conflict with already-present modules, isn't already loaded, etc.
+       bool moduleCanBeAdded(std::string const & modName) const;
+       ///
+       void addRemovedModule(std::string const & modName) 
+                       { removedModules_.insert(modName); }
        /// Clear the list
-       void clearLayoutModules();
+       void clearLayoutModules() { layoutModules_.clear(); }
+       /// Clear the removed module list
+       void clearRemovedModules() { removedModules_.clear(); }
 
        /// returns the main font for the buffer (document)
        Font const getFont() const;
@@ -185,6 +199,8 @@ public:
        int fontsSansScale;
        /// the scale factor of the tt font
        int fontsTypewriterScale;
+       /// the font used by the CJK command
+       std::string fontsCJK;
        ///
        Spacing & spacing();
        Spacing const & spacing() const;
@@ -222,6 +238,10 @@ public:
        std::string local_layout;
        ///
        std::string options;
+       /// use the class options defined in the layout?
+       bool use_default_options;
+       ///
+       std::string master;
        ///
        std::string float_placement;
        ///
@@ -300,9 +320,9 @@ public:
                                     int const & sfscale, int const & ttscale) const;
 
        /// get the appropriate cite engine (natbib handling)
-       biblio::CiteEngine citeEngine() const;
+       CiteEngine citeEngine() const;
        ///
-       void setCiteEngine(biblio::CiteEngine const);
+       void setCiteEngine(CiteEngine const);
 
        /// options for pdf output
        PDFOptions & pdfoptions();
@@ -323,15 +343,26 @@ private:
        void readBulletsLaTeX(Lexer &);
        ///
        void readModules(Lexer &);
+       ///
+       void readRemovedModules(Lexer &);
+       ///
+       void addDefaultModules();
+       /// checks for consistency among modules: makes sure requirements
+       /// are met, no modules exclude one another, etc, and resolves any
+       /// such conflicts, leaving us with a consistent collection.
+       /// \return true if modules were consistent, false if changes had
+       /// to be made.
+       bool checkModuleConsistency();
 
        /// for use with natbib
-       biblio::CiteEngine cite_engine_;
+       CiteEngine cite_engine_;
        ///
        DocumentClass * doc_class_;
-       ///
-       typedef std::vector<std::string> LayoutModuleList;
        /// 
        LayoutModuleList layoutModules_;
+       /// this is for modules that are required by the document class but that
+       /// the user has chosen not to use
+       std::set<std::string> removedModules_;
 
        /** Use the Pimpl idiom to hide those member variables that would otherwise
         *  drag in other header files.