Cleanup.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 36ab933e4cc7d41df298376b8f0a592b7b1936dd..9e858275aeaadcf0e0121128f7ad2b930d9e4099 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -18,12 +18,10 @@
 #include "Font.h"
 #include "BiblioInfo.h"
 #include "paper.h"
-#include "TextClassPtr.h"
 
 #include "insets/InsetQuotes.h"
 
 #include "support/copied_ptr.h"
-#include "support/types.h"
 
 #include <vector>
 
@@ -36,13 +34,15 @@ class FileName;
 class AuthorList;
 class BranchList;
 class Bullet;
+class DocumentClass;
 class Encoding;
 class Language;
-class Lexer;
 class LatexFeatures;
+class LayoutFile;
+class LayoutFileIndex;
+class Lexer;
 class PDFOptions;
 class Spacing;
-class TextClass;
 class TexRow;
 class VSpace;
 
@@ -106,30 +106,33 @@ 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;
-       /// 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);
+       ///Get the LayoutFile this document is using.
+       LayoutFile const * baseClass() const;
+       ///
+       LayoutFileIndex const & baseClassID() const;
+       /// Set the LyX layout file this document is using.
+       /// NOTE: This does not call makeDocumentClass() to update the local 
+       /// DocumentClass. That needs to be done manually.
+       /// \param filename the name of the layout file
+       bool setBaseClass(std::string const & classname);
        /// 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
+       /// create our local DocumentClass.
+       void makeDocumentClass();
+       /// Returns the DocumentClass currently in use: the BaseClass as modified
        /// by modules.
-       TextClass const & getTextClass() 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;
+       DocumentClass const & documentClass() const;
+       /// \return A pointer to the DocumentClass currently in use: the BaseClass 
+       /// as modified by modules. 
+       DocumentClass * 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 setTextClass(TextClassPtr);
+       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 makeTextClass. This
+       /// 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).
@@ -165,6 +168,8 @@ public:
        std::string headsep;
        ///
        std::string footskip;
+       ///
+       std::string columnsep;
 
        /* some LaTeX options */
        /// The graphics driver
@@ -274,8 +279,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 +330,8 @@ 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_;
+       ///
+       DocumentClass * doc_class_;
        ///
        typedef std::vector<std::string> LayoutModuleList;
        ///