After a hiatus, I'm returning to the rewrite of InsetCommandParams, the purpose of...

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 5dc05b3c38cbd2a58d270b47b6a491cfde429ea4..a1d82104bf255c9065bdac3f04922640d6766aff 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -15,10 +15,9 @@
 #ifndef BUFFERPARAMS_H
 #define BUFFERPARAMS_H
 
-#include "Font.h"
 #include "BiblioInfo.h"
+#include "Font.h"
 #include "paper.h"
-#include "TextClassPtr.h"
 
 #include "insets/InsetQuotes.h"
 
@@ -43,6 +42,7 @@ class LatexFeatures;
 class PDFOptions;
 class Spacing;
 class TextClass;
+class TextClassIndex;
 class TexRow;
 class VSpace;
 
@@ -106,25 +106,25 @@ public:
        InsetQuotes::quote_times quotes_times;
        ///
        std::string fontsize;
-       ///Get the LyX TextClass (that is, the layout file) this document is using.
-       textclass_type getBaseClass() const;
+       /// Get the LyX TextClass (that is, the layout file) this document is using.
+       TextClassIndex baseClass() const;
        /// Set the LyX TextClass (that is, the layout file) this document is using.
        /// NOTE: This does not call makeTextClass() to update the local TextClass.
        /// That needs to be done manually.
-       bool setBaseClass(textclass_type);
+       bool setBaseClass(TextClassIndex const & index);
        /// Adds the module information to the baseClass information to
        /// create our local TextClass.
        void makeTextClass();
        /// Returns the TextClass currently in use: the BaseClass as modified
        /// by modules.
-       TextClass const & getTextClass() const;
+       TextClass const & textClass() const;
        /// Returns a pointer to the TextClass currently in use: the BaseClass 
-       /// as modified by modules. (See \file TextClassPtr.h for the typedef.)
-       TextClassPtr getTextClassPtr() const;
+       /// as modified by modules. (See \file TextClass.h for the definition.)
+       TextClassIndex textClassIndex() 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 setTextClass(TextClassPtr);
+       void setTextClass(TextClassIndex const & index);
        /// List of modules in use
        std::vector<std::string> const & getModules() const;
        /// Add a module to the list of modules in use.
@@ -133,7 +133,7 @@ public:
        /// 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).
-       bool addLayoutModule(std::string modName);
+       bool addLayoutModule(std::string const & modName);
        /// Clear the list
        void clearLayoutModules();
 
@@ -165,6 +165,8 @@ public:
        std::string headsep;
        ///
        std::string footskip;
+       ///
+       std::string columnsep;
 
        /* some LaTeX options */
        /// The graphics driver
@@ -274,8 +276,20 @@ public:
        std::vector<unsigned int> author_map;
        ///
        std::string const dvips_options() const;
+       /** The return value of paperSizeName() depends on the
+        *  purpose for which the paper size is needed, since they
+        *  support different subsets of paper sizes.
+       */
+       enum Papersize_Purpose {
+               ///
+               DVIPS,
+               ///
+               DVIPDFM,
+               ///
+               XDVI
+       };
        ///
-       std::string const paperSizeName() const;
+       std::string const paperSizeName(Papersize_Purpose const & purpose) const;
        /// set up if and how babel is called
        std::string const babelCall(std::string const & lang_opts) const;
        /// handle inputenc etc.
@@ -313,10 +327,6 @@ private:
 
        /// for use with natbib
        biblio::CiteEngine cite_engine_;
-       /// the base TextClass associated with the document
-       textclass_type baseClass_;
-       /// the possibly modular TextClass actually in use
-       TextClassPtr textClass_;
        ///
        typedef std::vector<std::string> LayoutModuleList;
        ///