X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=7dc41e4810894989e73a50dd96cf23b97418f240;hb=a5b01f8f96efc95633a8da1cf4748aa473a89f1a;hp=b2d4d2e273edf688fafe62cacc2d6c77488cab9f;hpb=0940cd77d441938c8ea0849a213b869c8e5f9d74;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index b2d4d2e273..7dc41e4810 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -184,7 +184,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		{ "htmllabel",      LT_HTMLLABEL },
 		{ "htmllabelattr",  LT_HTMLLABELATTR },
 		{ "htmllabelfirst", LT_HTMLLABELFIRST },
-		{ "htmlpremable",   LT_HTMLPREAMBLE },
+		{ "htmlpreamble",   LT_HTMLPREAMBLE },
 		{ "htmlstyle",      LT_HTMLSTYLE },
 		{ "htmltag",        LT_HTMLTAG },
 		{ "htmltitle",      LT_HTMLTITLE },
@@ -577,8 +577,8 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 	}
 	lex.popTable();
 	// make sure we only have inpreamble = true for commands
-	if (inpreamble && latextype != LATEX_COMMAND) {
-		LYXERR0("InPreamble not permitted except with Command-type layouts.");
+	if (inpreamble && latextype != LATEX_COMMAND && latextype != LATEX_PARAGRAPH) {
+		LYXERR0("InPreamble not permitted except with command and paragraph layouts.");
 		LYXERR0("Layout name: " << name());
 		inpreamble = false;
 	}
@@ -877,12 +877,14 @@ void Layout::readSpacing(Lexer & lex)
 
 namespace {
 
-docstring const i18npreamble(Language const * lang, docstring const & templ)
+docstring const i18npreamble(Language const * lang, docstring const & templ, bool const polyglossia)
 {
 	if (templ.empty())
 		return templ;
 
-	string preamble = subst(to_utf8(templ), "$$lang", lang->babel());
+	string preamble = polyglossia ?
+		subst(to_utf8(templ), "$$lang", lang->polyglossia()) :
+		subst(to_utf8(templ), "$$lang", lang->babel());
 
 #ifdef TEX2LYX
 	// tex2lyx does not have getMessages()
@@ -912,15 +914,15 @@ docstring const i18npreamble(Language const * lang, docstring const & templ)
 }
 
 
-docstring const Layout::langpreamble(Language const * lang) const
+docstring const Layout::langpreamble(Language const * lang, bool const polyglossia) const
 {
-	return i18npreamble(lang, langpreamble_);
+	return i18npreamble(lang, langpreamble_, polyglossia);
 }
 
 
-docstring const Layout::babelpreamble(Language const * lang) const
+docstring const Layout::babelpreamble(Language const * lang, bool const polyglossia) const
 {
-	return i18npreamble(lang, babelpreamble_);
+	return i18npreamble(lang, babelpreamble_, polyglossia);
 }