The 'Branches' mega-patch.

[features.git] / src / bufferparams.h

diff --git a/src/bufferparams.h b/src/bufferparams.h
index 02e49186d48ad0a2a2dfa465d300884afe1b4421..e2ab54e75ff6ded0a10056aa06dbc05f317576ca 100644 (file)
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -20,6 +20,8 @@
 #include "LaTeXFeatures.h"
 #include "texrow.h"
 #include "author.h"
+#include "paper.h"
+#include "BranchList.h"
 
 #include "insets/insetquotes.h"
 
@@ -38,61 +40,6 @@ struct Language;
 */
 class BufferParams {
 public:
-       ///
-       enum PAPER_SIZE {
-               ///
-               PAPER_DEFAULT,
-               ///
-               PAPER_USLETTER,
-               ///
-               PAPER_LEGALPAPER,
-               ///
-               PAPER_EXECUTIVEPAPER,
-               ///
-               PAPER_A3PAPER,
-               ///
-               PAPER_A4PAPER,
-               ///
-               PAPER_A5PAPER,
-               ///
-               PAPER_B5PAPER
-       };
-       ///
-       enum PAPER_PACKAGES {
-               ///
-               PACKAGE_NONE,
-               ///
-               PACKAGE_A4,
-               ///
-               PACKAGE_A4WIDE,
-               ///
-               PACKAGE_WIDEMARGINSA4
-       };
-       ///
-       enum VMARGIN_PAPER_TYPE {
-               ///
-               VM_PAPER_DEFAULT,
-               ///
-               VM_PAPER_CUSTOM,
-               ///
-               VM_PAPER_USLETTER,
-               ///
-               VM_PAPER_USLEGAL,
-               ///
-               VM_PAPER_USEXECUTIVE,
-               ///
-               VM_PAPER_A3,
-               ///
-               VM_PAPER_A4,
-               ///
-               VM_PAPER_A5,
-               ///
-               VM_PAPER_B3,
-               ///
-               VM_PAPER_B4,
-               ///
-               VM_PAPER_B5
-       };
        ///
        enum PARSEP {
                ///
@@ -101,13 +48,6 @@ public:
                PARSEP_SKIP
        };
        ///
-       enum PAPER_ORIENTATION {
-               ///
-               ORIENTATION_PORTRAIT,
-               ///
-               ORIENTATION_LANDSCAPE
-       };
-       ///
        BufferParams();
 
        /// read a header token, if unrecognised, return it or an unknown class name
@@ -154,13 +94,13 @@ public:
 
        /* this are for the PaperLayout */
        /// the general papersize (papersize2 or paperpackage
-       char papersize; // add apprip. signedness
+       PAPER_SIZE papersize;
        ///  the selected Geometry papersize
-       char papersize2; // add approp. signedness
+       VMARGIN_PAPER_TYPE papersize2;
        /// a special paperpackage .sty-file
-       char paperpackage; // add approp. signedness
+       PAPER_PACKAGES paperpackage;
        ///
-       PAPER_ORIENTATION orientation; // add approp. signedness
+       PAPER_ORIENTATION orientation;
        ///
        bool use_geometry;
        ///
@@ -195,6 +135,8 @@ public:
        int tocdepth;
        ///
        Language const * language;
+       /// BranchList:
+       BranchList branchlist;
        ///
        string inputenc;
        ///
@@ -235,9 +177,15 @@ public:
        bool tracking_changes;
        /// Time ago we agreed that this was a buffer property [ale990407]
        string parentname;
+       ///
+       bool compressed;
 
        /// map of the file's author IDs to buffer author IDs
        std::vector<int> author_map;
+       ///
+       string const dvips_options() const;
+       ///
+       string const paperSizeName() const;
 
 private:
        /// the author list