X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=85fe11a8abebe336c26f44a022d08418ece50c29;hb=f37a1b8aeaf8f3a3a66a22bf0b396f7d1ceca2ff;hp=2c48caece9c24b53481493a7695b52176117b5f6;hpb=2e871e1ae3db1dcc387d8d7a072a6f5064d40b6b;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 2c48caece9..85fe11a8ab 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -16,7 +16,7 @@
 #include "Language.h"
 #include "TextClass.h"
 #include "Lexer.h"
-#include "Font.h"
+#include "FontInfo.h"
 
 #include "support/Messages.h"
 #include "support/debug.h"
@@ -102,6 +102,7 @@ enum LayoutTags {
 	LT_HTMLPREAMBLE,
 	LT_HTMLSTYLE,
 	LT_HTMLFORCECSS,
+	LT_INPREAMBLE,
 	LT_INTITLE // keep this last!
 };
 
@@ -113,6 +114,7 @@ Layout::Layout()
 	margintype = MARGIN_STATIC;
 	latextype = LATEX_PARAGRAPH;
 	intitle = false;
+	inpreamble = false;
 	optionalargs = 0;
 	needprotect = false;
 	keepempty = false;
@@ -175,6 +177,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 		{ "htmlstyle",      LT_HTMLSTYLE },
 		{ "htmltag",        LT_HTMLTAG },
 		{ "innertag",       LT_INNERTAG },
+		{ "inpreamble",     LT_INPREAMBLE },
 		{ "intitle",        LT_INTITLE },
 		{ "itemsep",        LT_ITEMSEP },
 		{ "itemtag",        LT_ITEMTAG },
@@ -300,6 +303,10 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
 			lex >> intitle;
 			break;
 
+		case LT_INPREAMBLE:
+			lex >> inpreamble;
+			break;
+
 		case LT_TOCLEVEL:
 			lex >> toclevel;
 			break;
@@ -955,10 +962,6 @@ string Layout::defaultCSSClass() const
 // sorts of margins or padding, for example. But for now we are
 // going to keep it simple.
 void Layout::makeDefaultCSS() const {
-#ifdef TEX2LYX
-	// tex2lyx does not have FontInfo::asCSS()
-	return;
-#else
 	// this never needs to be redone, since reloading layouts will
 	// wipe out what we did before.
 	if (!htmldefaultstyle_.empty()) 
@@ -975,7 +978,6 @@ void Layout::makeDefaultCSS() const {
 		htmldefaultstyle_ +=
 			from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
 			labelfontCSS + from_ascii("\n}\n");
-#endif
 }