Rationalize the handling of InsetLayout's preamble and requries. That is,

[features.git] / src / insets / InsetLayout.cpp

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index a46cdb4d1ef7316ff146bc8b21ca95eabe7c58ec..ca1429793b47e46d6cc6b26f5540f86a05ff6bd2 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -14,7 +14,7 @@
 
 #include "InsetLayout.h"
 
-#include "Color.h"
+#include "ColorSet.h"
 #include "Font.h"
 #include "Lexer.h"
 #include "TextClass.h"
@@ -32,11 +32,12 @@ namespace lyx {
 
 InsetLayout::InsetLayout() :
        name_(from_ascii("undefined")), lyxtype_(STANDARD),
-       labelstring_(from_ascii("UNDEFINED")), decoration_(InsetLayout::Default),
-       font_(sane_font), labelfont_(sane_font), bgcolor_(Color_error), 
+       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)
+       keepempty_(false), forceltr_(false), intoc_(false)
 { 
        labelfont_.setColor(Color_error);
 }
@@ -47,25 +48,30 @@ namespace {
 InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
 {
        if (support::compare_ascii_no_case(str, "classic") == 0)
-               return InsetLayout::Classic;
+               return InsetLayout::CLASSIC;
        if (support::compare_ascii_no_case(str, "minimalistic") == 0)
-               return InsetLayout::Minimalistic;
+               return InsetLayout::MINIMALISTIC;
        if (support::compare_ascii_no_case(str, "conglomerate") == 0)
-               return InsetLayout::Conglomerate;
-       return InsetLayout::Default;
+               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;
 }
 
+} // namespace anon
 
-bool InsetLayout::read(Lexer & lex, TextClass & tclass)
-{
-       name_ = support::subst(lex.getDocString(), '_', ' ');
-       // FIXME We need to check for name_.empty() here, and
-       // take the same sort of action as in TextClass::read()
-       // if it is empty. Or, better, we could read name_ there,
-       // take action there, etc.
 
+bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
+{
        enum {
                IL_BGCOLOR,
                IL_COPYSTYLE,
@@ -75,6 +81,7 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
                IL_FORCELTR,
                IL_FORCEPLAIN,
                IL_FREESPACING,
+               IL_INTOC,
                IL_LABELFONT,
                IL_LABELSTRING,
                IL_LATEXNAME,
@@ -101,6 +108,7 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
                { "forceltr", IL_FORCELTR },
                { "forceplain", IL_FORCEPLAIN },
                { "freespacing", IL_FREESPACING },
+               { "intoc", IL_INTOC },
                { "keepempty", IL_KEEPEMPTY },
                { "labelfont", IL_LABELFONT },
                { "labelstring", IL_LABELSTRING },
@@ -136,6 +144,10 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
                        break;
                }
                switch (le) {
+               // FIXME
+               // Perhaps a more 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;
@@ -144,9 +156,14 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
                                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;
@@ -167,6 +184,9 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
                case IL_FORCELTR:
                        lex >> forceltr_;
                        break;
+               case IL_INTOC:
+                       lex >> intoc_;
+                       break;
                case IL_MULTIPAR:
                        lex >> multipar_;
                        // the defaults for these depend upon multipar_
@@ -236,7 +256,7 @@ bool InsetLayout::read(Lexer & lex, TextClass & tclass)
                        bgcolor_ = lcolor.getFromLyXName(tmp);
                        break;
                case IL_PREAMBLE:
-                       preamble_ = lex.getLongString("EndPreamble");
+                       preamble_ = from_utf8(lex.getLongString("EndPreamble"));
                        break;
                case IL_REQUIRES: {
                        lex.eatLine();