Revert 23154.

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 862a07aed2eadf18f660b5d2e2e1f81f54fa6a7e..5fc57aecc81d290cf2e21ebb7cd288057429f5d7 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -133,11 +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);
-       // Add a list of modules.
-       // Returns true if all modules were successfully added.
-       // Currently unused.
-       // bool addLayoutModules(std::vector<std::string>modNames);
+       bool addLayoutModule(std::string const & modName);
        /// Clear the list
        void clearLayoutModules();
 
@@ -169,6 +165,8 @@ public:
        std::string headsep;
        ///
        std::string footskip;
+       ///
+       std::string columnsep;
 
        /* some LaTeX options */
        /// The graphics driver
@@ -278,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.