* add PreBabelPreamble to Language definition (fixes #4786).

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index fd1067d7673081120f67c746bdab0b2e6877bad6..4408b9d0b3f2b0ab53d2311677a9847c8a431737 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -15,7 +15,6 @@
 #include "InsetLayout.h"
 
 #include "ColorSet.h"
-#include "Font.h"
 #include "Lexer.h"
 #include "TextClass.h"
 
@@ -32,13 +31,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_(false), custompars_(true), forceplain_(false), 
-       passthru_(false), needprotect_(false), freespacing_(false), 
-       keepempty_(false), forceltr_(false), intoc_(false)
+       multipar_(true), custompars_(true), forceplain_(false), 
+       passthru_(false), parbreakisnewline_(false), freespacing_(false), 
+       keepempty_(false), forceltr_(false), 
+       needprotect_(false), intoc_(false), spellcheck_(true), 
+       resetsfont_(true)
 { 
        labelfont_.setColor(Color_error);
 }
@@ -75,6 +76,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
 {
        enum {
                IL_BGCOLOR,
+               IL_CONTENTASLABEL,
                IL_COPYSTYLE,
                IL_COUNTER,
                IL_CUSTOMPARS,
@@ -103,14 +105,19 @@ 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[] = {
                { "bgcolor", IL_BGCOLOR },
+               { "contentaslabel", IL_CONTENTASLABEL },
                { "copystyle", IL_COPYSTYLE }, 
                { "counter", IL_COUNTER},
                { "custompars", IL_CUSTOMPARS },
@@ -139,9 +146,13 @@ 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 },
-               { "requires", IL_REQUIRES }
+               { "refprefix", IL_REFPREFIX },
+               { "requires", IL_REQUIRES },
+               { "resetsfont", IL_RESETSFONT },
+               { "spellcheck", IL_SPELLCHECK }
        };
 
        lex.pushTable(elementTags);
@@ -175,6 +186,8 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                        lyxtype_ = translateLyXType(lt);
                        if (lyxtype_  == NOLYXTYPE)
                                LYXERR0("Unknown LyXType `" << lt << "'.");
+                       if (lyxtype_ == CHARSTYLE)
+                               multipar_ = false;
                        break;
                }
                case IL_LATEXTYPE:  {
@@ -227,10 +240,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_;
@@ -241,7 +257,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, '_', ' ');
@@ -282,6 +302,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;
@@ -316,6 +339,12 @@ 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_END:
                        getout = true;
                        break;
@@ -352,64 +381,73 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
 }
 
 
+string const & InsetLayout::htmltag() const
+{
+       if (htmltag_.empty())
+               htmltag_ = multipar_ ? "div" : "span";
+       return htmltag_; 
+}
+
+
+string const & InsetLayout::htmlattr() const
+{
+       if (htmlattr_.empty())
+               htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
+       return htmlattr_; 
+}
+
+
+string const & InsetLayout::htmlinnerattr() const
+{
+       if (htmlinnerattr_.empty())
+               htmlinnerattr_ = "class=\"" + defaultCSSClass() + "_inner\"";
+       return htmlinnerattr_; 
+}
+
+
 string InsetLayout::defaultCSSClass() const
 { 
        if (!defaultcssclass_.empty())
                return defaultcssclass_;
-       docstring d;
-       docstring::const_iterator it = name().begin();
-       docstring::const_iterator en = name().end();
+       string d;
+       string n = to_utf8(name());
+       string::const_iterator it = n.begin();
+       string::const_iterator en = n.end();
        for (; it != en; ++it) {
                if (!isalpha(*it))
-                       continue;
-               if (islower(*it))
+                       d += "_";
+               else if (islower(*it))
                        d += *it;
-               else 
+               else
                        d += support::lowercase(*it);
        }
        // are there other characters we need to remove?
-       defaultcssclass_ = to_utf8(d);
+       defaultcssclass_ = d;
        return defaultcssclass_;
 }
 
 
 void InsetLayout::makeDefaultCSS() const
 {
-#ifdef TEX2LYX
-       // tex2lyx does not have FontInfo::asCSS()
-       return;
-#else
        if (!htmldefaultstyle_.empty()) 
                return;
-       if (!htmltag_.empty()) {
-               docstring const mainfontCSS = font_.asCSS();
-               if (!mainfontCSS.empty())
-                       htmldefaultstyle_ = 
-                                       from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
-                                       mainfontCSS + from_ascii("\n}\n");
-       }
-       /* 
-       At present, we do not have default tags, etc, for the label.
-       if (labelfont_ == font_)
-                       return;
-       docstring const labelfontCSS = labelfont_.asCSS();
-       if (!labelfontCSS.empty())
-               htmldefaultstyle_ +=
-.                              from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
-                               labelfontCSS + from_ascii("\n}\n");
-       */
-#endif
+       docstring const mainfontCSS = font_.asCSS();
+       if (!mainfontCSS.empty())
+               htmldefaultstyle_ = 
+                               from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
+                               mainfontCSS + from_ascii("\n}\n");
 }
 
+
 docstring InsetLayout::htmlstyle() const 
 { 
        if (!htmlstyle_.empty() && !htmlforcecss_)
                return htmlstyle_;
-       if (htmldefaultstyle_.empty()) 
+       if (htmldefaultstyle_.empty())
                makeDefaultCSS();
        docstring retval = htmldefaultstyle_;
        if (!htmlstyle_.empty())
-               retval += '\n' + htmlstyle_;
+               retval += '\n' + htmlstyle_ + '\n';
        return retval;
 }