Allow LyX format to be written to View>Source window.

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 41180c4a0cc356ad13baab91c8cbe4e70cdbba03..f92a5e6ab7d4020da90156866e08ebf55eb1d986 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -20,6 +20,7 @@
 
 #include "support/debug.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 #include <vector>
 
@@ -31,13 +32,15 @@ namespace lyx {
 
 InsetLayout::InsetLayout() :
        name_(from_ascii("undefined")), lyxtype_(STANDARD),
-       labelstring_(from_ascii("UNDEFINED")), decoration_(DEFAULT),
-       latextype_(NOLATEXTYPE), font_(sane_font), 
+       labelstring_(from_ascii("UNDEFINED")), contentaslabel_(false),
+       decoration_(DEFAULT), latextype_(NOLATEXTYPE), font_(sane_font), 
        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)
+       passthru_(false), parbreakisnewline_(false), freespacing_(false), 
+       keepempty_(false), forceltr_(false), 
+       needprotect_(false), intoc_(false), spellcheck_(true), 
+       resetsfont_(true), display_(true)
 { 
        labelfont_.setColor(Color_error);
 }
@@ -73,11 +76,14 @@ InsetLayout::InsetLaTeXType translateLaTeXType(std::string const & str)
 bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 {
        enum {
+               IL_BABELPREAMBLE,
                IL_BGCOLOR,
+               IL_CONTENTASLABEL,
                IL_COPYSTYLE,
                IL_COUNTER,
                IL_CUSTOMPARS,
                IL_DECORATION,
+               IL_DISPLAY,
                IL_FONT,
                IL_FORCELTR,
                IL_FORCEPLAIN,
@@ -94,6 +100,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_INTOC,
                IL_LABELFONT,
                IL_LABELSTRING,
+               IL_LANGPREAMBLE,
                IL_LATEXNAME,
                IL_LATEXPARAM,
                IL_LATEXTYPE,
@@ -102,18 +109,25 @@ 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
        };
 
 
        LexerKeyword elementTags[] = {
+               { "babelpreamble", IL_BABELPREAMBLE },
                { "bgcolor", IL_BGCOLOR },
+               { "contentaslabel", IL_CONTENTASLABEL },
                { "copystyle", IL_COPYSTYLE }, 
                { "counter", IL_COUNTER},
                { "custompars", IL_CUSTOMPARS },
                { "decoration", IL_DECORATION },
+               { "display", IL_DISPLAY },
                { "end", IL_END },
                { "font", IL_FONT },
                { "forceltr", IL_FORCELTR },
@@ -132,20 +146,24 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "keepempty", IL_KEEPEMPTY },
                { "labelfont", IL_LABELFONT },
                { "labelstring", IL_LABELSTRING },
+               { "langpreamble", IL_LANGPREAMBLE },
                { "latexname", IL_LATEXNAME },
                { "latexparam", IL_LATEXPARAM },
                { "latextype", IL_LATEXTYPE },
                { "lyxtype", IL_LYXTYPE },
                { "multipar", IL_MULTIPAR },
                { "needprotect", IL_NEEDPROTECT },
+               { "parbreakisnewline", IL_PARBREAKISNEWLINE },
                { "passthru", IL_PASSTHRU },
                { "preamble", IL_PREAMBLE },
-               { "requires", IL_REQUIRES }
+               { "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;
@@ -169,11 +187,21 @@ 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);
                        if (lyxtype_  == NOLYXTYPE)
                                LYXERR0("Unknown LyXType `" << lt << "'.");
+                       if (lyxtype_ == CHARSTYLE)
+                               multipar_ = false;
                        break;
                }
                case IL_LATEXTYPE:  {
@@ -226,10 +254,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_;
@@ -240,7 +271,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_NEEDPROTECT:
                        lex >> needprotect_;
                        break;
-               case IL_COPYSTYLE: {     // initialize with a known style
+               case IL_CONTENTASLABEL:
+                       lex >> contentaslabel_;
+                       break;
+               case IL_COPYSTYLE: {
+                       // initialize with a known style
                        docstring style;
                        lex >> style;
                        style = support::subst(style, '_', ' ');
@@ -281,6 +316,15 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_PREAMBLE:
                        preamble_ = from_utf8(lex.getLongString("EndPreamble"));
                        break;
+               case IL_BABELPREAMBLE:
+                       babelpreamble_ = from_utf8(lex.getLongString("EndBabelPreamble"));
+                       break;
+               case IL_LANGPREAMBLE:
+                       langpreamble_ = from_utf8(lex.getLongString("EndLangPreamble"));
+                       break;
+               case IL_REFPREFIX:
+                       lex >> refprefix_;
+                       break;
                case IL_HTMLTAG:
                        lex >> htmltag_;
                        break;
@@ -315,6 +359,15 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        requires_.insert(req.begin(), req.end());
                        break;
                }
+               case IL_SPELLCHECK:
+                       lex >> spellcheck_;
+                       break;
+               case IL_RESETSFONT:
+                       lex >> resetsfont_;
+                       break;
+               case IL_DISPLAY:
+                       lex >> display_;
+                       break;
                case IL_END:
                        getout = true;
                        break;
@@ -354,7 +407,7 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
 string const & InsetLayout::htmltag() const
 {
        if (htmltag_.empty())
-               htmltag_ = "span";
+               htmltag_ = multipar_ ? "div" : "span";
        return htmltag_; 
 }
 
@@ -384,9 +437,9 @@ string InsetLayout::defaultCSSClass() const
        string::const_iterator it = n.begin();
        string::const_iterator en = n.end();
        for (; it != en; ++it) {
-               if (!isalpha(*it))
+               if (!isAlphaASCII(*it))
                        d += "_";
-               else if (islower(*it))
+               else if (isLower(*it))
                        d += *it;
                else
                        d += support::lowercase(*it);