X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FLayout.h;h=1db9a23a386896ac0248fb08df98c33a34506154;hb=612109bb6e5e61ba3c3693696f329eac3a288b5b;hp=5b22f90cc3d291da37404f7582da0b6dd23974d1;hpb=089927dd6f99aa823c4da86a6449f701d1608252;p=lyx.git

diff --git a/src/Layout.h b/src/Layout.h
index 5b22f90cc3..1db9a23a38 100644
--- 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;