Merge branch 'master' of lyx:lyx

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 5b22f90cc3d291da37404f7582da0b6dd23974d1..1db9a23a386896ac0248fb08df98c33a34506154 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -14,6 +14,7 @@
 #ifndef LAYOUT_H
 #define LAYOUT_H
 
+#include "Encoding.h"
 #include "FontInfo.h"
 #include "LayoutEnums.h"
 #include "Spacing.h"
@@ -95,10 +96,10 @@ public:
        docstring const & preamble() const { return preamble_; }
        /// Get language dependent macro definitions needed for this layout
        /// for language \p lang
-       docstring const langpreamble(Language const * lang, bool const polyglossia) const;
+       docstring const langpreamble(Language const * lang, Encoding const & enc, bool const polyglossia) const;
        /// Get language and babel dependent macro definitions needed for
        /// this layout for language \p lang
-       docstring const babelpreamble(Language const * lang, bool const polyglossia) const;
+       docstring const babelpreamble(Language const * lang, Encoding const & enc, bool const polyglossia) const;
        ///
        std::set<std::string> const & requires() const { return requires_; }
        ///
@@ -214,10 +215,6 @@ public:
        ///
        MarginType margintype;
        ///
-       bool fill_top;
-       ///
-       bool fill_bottom;
-       ///
        bool newline_allowed;
        ///
        bool nextnoindent;