This patch introduces an optional argument to Buffer::updateLabels(), so

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

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 9534aeb3a74bccf8ebe19a116b7165d9b2f0c0bb..f2b701dfb8057f81bb21b03d0242a519b9cc0ec4 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"
 
@@ -35,7 +34,8 @@ InsetLayout::InsetLayout() :
        labelstring_(from_ascii("UNDEFINED")), decoration_(DEFAULT),
        latextype_(NOLATEXTYPE), font_(sane_font), 
        labelfont_(sane_font), bgcolor_(Color_error), 
-       multipar_(false), custompars_(true), forceplain_(false), 
+       htmlforcecss_ (false), htmlisblock_(true),
+       multipar_(true), custompars_(true), forceplain_(false), 
        passthru_(false), needprotect_(false), freespacing_(false), 
        keepempty_(false), forceltr_(false), intoc_(false)
 { 
@@ -84,6 +84,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                IL_FREESPACING,
                IL_HTMLTAG,
                IL_HTMLATTR,
+               IL_HTMLFORCECSS,
                IL_HTMLINNERTAG,
                IL_HTMLINNERATTR,
                IL_HTMLISBLOCK,
@@ -119,6 +120,7 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                { "forceplain", IL_FORCEPLAIN },
                { "freespacing", IL_FREESPACING },
                { "htmlattr", IL_HTMLATTR },
+               { "htmlforcecss", IL_HTMLFORCECSS },
                { "htmlinnerattr", IL_HTMLINNERATTR},
                { "htmlinnertag", IL_HTMLINNERTAG},
                { "htmlisblock", IL_HTMLISBLOCK},
@@ -285,6 +287,9 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
                case IL_HTMLATTR:
                        lex >> htmlattr_;
                        break;
+               case IL_HTMLFORCECSS:
+                       lex >> htmlforcecss_;
+                       break;
                case IL_HTMLINNERTAG:
                        lex >> htmlinnertag_;
                        break;
@@ -345,4 +350,76 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
        return InsetLayout::NOLYXTYPE;
 }
 
+
+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_;
+       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))
+                       d += "_";
+               else if (islower(*it))
+                       d += *it;
+               else
+                       d += support::lowercase(*it);
+       }
+       // are there other characters we need to remove?
+       defaultcssclass_ = d;
+       return defaultcssclass_;
+}
+
+
+void InsetLayout::makeDefaultCSS() const
+{
+       if (!htmldefaultstyle_.empty()) 
+               return;
+       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())
+               makeDefaultCSS();
+       docstring retval = htmldefaultstyle_;
+       if (!htmlstyle_.empty())
+               retval += '\n' + htmlstyle_ + '\n';
+       return retval;
+}
+
+
 } //namespace lyx