fix merged build

[lyx.git] / src / BufferParams.h

diff --git a/src/BufferParams.h b/src/BufferParams.h
index d0888406f80f3a95f62ad92d821798d288dce0a9..0be946c37f42ee1a0c6d4eec607256b06e0e983d 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -25,6 +25,7 @@
 #include "support/copied_ptr.h"
 
 #include <list>
+#include <map>
 #include <vector>
 
 namespace lyx {
@@ -36,6 +37,7 @@ class BranchList;
 class Bullet;
 class DocumentClass;
 class Encoding;
+class HSpace;
 class IndicesList;
 class Language;
 class LatexFeatures;
@@ -89,6 +91,10 @@ public:
        ///
        bool hasClassDefaults() const;
 
+       ///
+       HSpace const & getIndentation() const;
+       ///
+       void setIndentation(HSpace const & indent);
        ///
        VSpace const & getDefSkip() const;
        ///
@@ -253,6 +259,8 @@ public:
        ///
        std::string master;
        ///
+       bool suppress_date;
+       ///
        std::string float_placement;
        ///
        unsigned int columns;
@@ -304,8 +312,8 @@ public:
        AuthorList & authors();
        AuthorList const & authors() const;
 
-       /// map of the file's author IDs to buffer author IDs
-       std::vector<unsigned int> author_map;
+       /// map of the file's author IDs to AuthorList indexes
+       std::map<unsigned int, int> author_map;
        ///
        std::string const dvips_options() const;
        /** The return value of paperSizeName() depends on the