tex2lyx: support for Spreadsheet and chess external templates

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index ba1bbfb3e507220f647579d5cc9916f88287f49c..dee7e29f7a6083ff0fa4caa306c5a018b85b3353 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -36,8 +36,10 @@ InsetLayout::InsetLayout() :
        labelfont_(sane_font), bgcolor_(Color_error), 
        htmlforcecss_ (false), htmlisblock_(true),
        multipar_(true), custompars_(true), forceplain_(false), 
-       passthru_(false), needprotect_(false), freespacing_(false), 
-       keepempty_(false), forceltr_(false), intoc_(false), spellcheck_(true)
+       passthru_(false), parbreakisnewline_(false), freespacing_(false), 
+       keepempty_(false), forceltr_(false), 
+       needprotect_(false), intoc_(false), spellcheck_(true), 
+       resetsfont_(true), display_(true)
 { 
        labelfont_.setColor(Color_error);
 }
@@ -79,6 +81,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_COUNTER,
                IL_CUSTOMPARS,
                IL_DECORATION,
+               IL_DISPLAY,
                IL_FONT,
                IL_FORCELTR,
                IL_FORCEPLAIN,
@@ -103,9 +106,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_MULTIPAR,
                IL_NEEDPROTECT,
                IL_PASSTHRU,
+               IL_PARBREAKISNEWLINE,
                IL_PREAMBLE,
                IL_REQUIRES,
                IL_SPELLCHECK,
+               IL_REFPREFIX,
+               IL_RESETSFONT,
                IL_END
        };
 
@@ -117,6 +123,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "counter", IL_COUNTER},
                { "custompars", IL_CUSTOMPARS },
                { "decoration", IL_DECORATION },
+               { "display", IL_DISPLAY },
                { "end", IL_END },
                { "font", IL_FONT },
                { "forceltr", IL_FORCELTR },
@@ -141,15 +148,17 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "lyxtype", IL_LYXTYPE },
                { "multipar", IL_MULTIPAR },
                { "needprotect", IL_NEEDPROTECT },
+               { "parbreakisnewline", IL_PARBREAKISNEWLINE },
                { "passthru", IL_PASSTHRU },
                { "preamble", IL_PREAMBLE },
+               { "refprefix", IL_REFPREFIX },
                { "requires", IL_REQUIRES },
+               { "resetsfont", IL_RESETSFONT },
                { "spellcheck", IL_SPELLCHECK }
        };
 
        lex.pushTable(elementTags);
 
-       FontInfo font = inherit_font;
        labelfont_ = inherit_font;
        bgcolor_ = Color_none;
        bool getout = false;
@@ -173,6 +182,14 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                // way this sort of thing is handled in Layout::read(), namely, by
                // using the Lexer.
                case IL_LYXTYPE: {
+                       // make sure that we have the right sort of name.
+                       if (name_ != from_ascii("undefined")
+                           && name_.substr(0,5) != from_ascii("Flex:")) {
+                               LYXERR0("Flex insets must have names of the form `Flex:<name>'.\n"
+                                       "This one has the name `" << to_utf8(name_) << "'\n"
+                                       "Ignoring LyXType declaration.");
+                               break;
+                       }
                        string lt;
                        lex >> lt;
                        lyxtype_ = translateLyXType(lt);
@@ -232,10 +249,13 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        break;
                case IL_FORCEPLAIN:
                        lex >> forceplain_;
+                       readCustomOrPlain = true;
                        break;
                case IL_PASSTHRU:
                        lex >> passthru_;
-                       readCustomOrPlain = true;
+                       break;
+               case IL_PARBREAKISNEWLINE:
+                       lex >> parbreakisnewline_;
                        break;
                case IL_KEEPEMPTY:
                        lex >> keepempty_;
@@ -249,7 +269,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_CONTENTASLABEL:
                        lex >> contentaslabel_;
                        break;
-               case IL_COPYSTYLE: {     // initialize with a known style
+               case IL_COPYSTYLE: {
+                       // initialize with a known style
                        docstring style;
                        lex >> style;
                        style = support::subst(style, '_', ' ');
@@ -290,6 +311,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_PREAMBLE:
                        preamble_ = from_utf8(lex.getLongString("EndPreamble"));
                        break;
+               case IL_REFPREFIX:
+                       lex >> refprefix_;
+                       break;
                case IL_HTMLTAG:
                        lex >> htmltag_;
                        break;
@@ -327,6 +351,12 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_SPELLCHECK:
                        lex >> spellcheck_;
                        break;
+               case IL_RESETSFONT:
+                       lex >> resetsfont_;
+                       break;
+               case IL_DISPLAY:
+                       lex >> display_;
+                       break;
                case IL_END:
                        getout = true;
                        break;