X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLayout.cpp;h=c4b6e896c6effb05334175422edb1e824ad68e86;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=245a48ea0237c25bbb57ae29eceeb5d2ac10192d;hpb=244cda474ca4181cd76e631191a4c0bcff68a159;p=lyx.git

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 245a48ea02..c4b6e896c6 100644
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -31,9 +31,10 @@ using std::vector;
 namespace lyx {
 
 InsetLayout::InsetLayout() :
-	name_(from_ascii("undefined")), labelstring_(from_ascii("UNDEFINED")),
-	decoration_(InsetLayout::Default),
-	font_(sane_font), labelfont_(sane_font), bgcolor_(Color_error), 
+	name_(from_ascii("undefined")), lyxtype_(STANDARD),
+	labelstring_(from_ascii("UNDEFINED")), decoration_(DEFAULT),
+	latextype_(NOLATEXTYPE), font_(sane_font), 
+	labelfont_(sane_font), bgcolor_(Color_error), 
 	multipar_(false), custompars_(false), forceplain_(true), 
 	passthru_(false), needprotect_(false), freespacing_(false), 
 	keepempty_(false), forceltr_(false)
@@ -46,13 +47,24 @@ namespace {
 
 InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
 {
-	if (str == "classic")
-		return InsetLayout::Classic;
-	if (str == "minimalistic")
-		return InsetLayout::Minimalistic;
-	if (str == "conglomerate")
-		return InsetLayout::Conglomerate;
-	return InsetLayout::Default;
+	if (support::compare_ascii_no_case(str, "classic") == 0)
+		return InsetLayout::CLASSIC;
+	if (support::compare_ascii_no_case(str, "minimalistic") == 0)
+		return InsetLayout::MINIMALISTIC;
+	if (support::compare_ascii_no_case(str, "conglomerate") == 0)
+		return InsetLayout::CONGLOMERATE;
+	return InsetLayout::DEFAULT;
+}
+
+InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
+{
+	if (support::compare_ascii_no_case(str, "command") == 0)
+		return InsetLayout::COMMAND;
+	if (support::compare_ascii_no_case(str, "environment") == 0)
+		return InsetLayout::ENVIRONMENT;
+	if (support::compare_ascii_no_case(str, "none") == 0)
+		return InsetLayout::NOLATEXTYPE;
+	return InsetLayout::ILT_ERROR;
 }
 
 }
@@ -119,7 +131,7 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
 
 	FontInfo font = inherit_font;
 	labelfont_ = inherit_font;
-	bgcolor_ = Color_background;
+	bgcolor_ = Color_none;
 	bool getout = false;
 	// whether we've read the CustomPars or ForcePlain tag
 	// for issuing a warning in case MultiPars comes later
@@ -136,12 +148,26 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
 			break;
 		}
 		switch (le) {
-		case IL_LYXTYPE:
-			lex >> lyxtype_;
+		// FIXME
+		// Perhaps a mroe elegant way to deal with the next two would be the
+		// way this sort of thing is handled in Layout::read(), namely, by
+		// using the Lexer.
+		case IL_LYXTYPE: {
+			string lt;
+			lex >> lt;
+			lyxtype_ = translateLyXType(lt);
+			if (lyxtype_  == NOLYXTYPE)
+				LYXERR0("Unknown LyXType `" << lt << "'.");
 			break;
-		case IL_LATEXTYPE:
-			lex >> latextype_;
+		}
+		case IL_LATEXTYPE:  {
+			string lt;
+			lex >> lt;
+			latextype_ = translateLaTeXType(lt);
+			if (latextype_  == ILT_ERROR)
+				LYXERR0("Unknown LaTeXType `" << lt << "'.");
 			break;
+		}
 		case IL_LABELSTRING:
 			lex >> labelstring_;
 			break;
@@ -258,4 +284,21 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
 	return true;
 }
 
+
+InsetLayout::InsetLyXType translateLyXType(std::string const & str) 
+{
+	
+	if (support::compare_ascii_no_case(str, "charstyle") == 0)
+		return InsetLayout::CHARSTYLE;
+	if (support::compare_ascii_no_case(str, "custom") == 0)
+		return InsetLayout::CUSTOM;
+	if (support::compare_ascii_no_case(str, "element") == 0)
+		return InsetLayout::ELEMENT;
+	if (support::compare_ascii_no_case(str, "end") == 0)
+		return InsetLayout::END;
+	if (support::compare_ascii_no_case(str, "standard") == 0)
+		return InsetLayout::STANDARD;
+	return InsetLayout::NOLYXTYPE;
+}
+
 } //namespace lyx