MathML for InsetMathBig.

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 1eaffdc1bc85e2cd25a3451f3f57be8be2bf7016..85fe11a8abebe336c26f44a022d08418ece50c29 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -16,7 +16,7 @@
 #include "Language.h"
 #include "TextClass.h"
 #include "Lexer.h"
-#include "Font.h"
+#include "FontInfo.h"
 
 #include "support/Messages.h"
 #include "support/debug.h"
@@ -101,7 +101,8 @@ enum LayoutTags {
        LT_HTMLLABELFIRST,
        LT_HTMLPREAMBLE,
        LT_HTMLSTYLE,
-       LT_HTMLFORCEDEFAULT,
+       LT_HTMLFORCECSS,
+       LT_INPREAMBLE,
        LT_INTITLE // keep this last!
 };
 
@@ -113,6 +114,7 @@ Layout::Layout()
        margintype = MARGIN_STATIC;
        latextype = LATEX_PARAGRAPH;
        intitle = false;
+       inpreamble = false;
        optionalargs = 0;
        needprotect = false;
        keepempty = false;
@@ -141,7 +143,7 @@ Layout::Layout()
        toclevel = NOT_IN_TOC;
        commanddepth = 0;
        htmllabelfirst_ = false;
-       htmlforcedefault_ = false;
+       htmlforcecss_ = false;
 }
 
 
@@ -165,7 +167,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "font",           LT_FONT },
                { "freespacing",    LT_FREE_SPACING },
                { "htmlattr",       LT_HTMLATTR },
-               { "htmlforcedefault", LT_HTMLFORCEDEFAULT },
+               { "htmlforcecss",   LT_HTMLFORCECSS },
                { "htmlitem",       LT_HTMLITEM },
                { "htmlitemattr",   LT_HTMLITEMATTR },
                { "htmllabel",      LT_HTMLLABEL },
@@ -175,6 +177,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "htmlstyle",      LT_HTMLSTYLE },
                { "htmltag",        LT_HTMLTAG },
                { "innertag",       LT_INNERTAG },
+               { "inpreamble",     LT_INPREAMBLE },
                { "intitle",        LT_INTITLE },
                { "itemsep",        LT_ITEMSEP },
                { "itemtag",        LT_ITEMTAG },
@@ -300,6 +303,10 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                        lex >> intitle;
                        break;
 
+               case LT_INPREAMBLE:
+                       lex >> inpreamble;
+                       break;
+
                case LT_TOCLEVEL:
                        lex >> toclevel;
                        break;
@@ -494,7 +501,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                        break;
 
                case LT_HTMLITEM:
-                       lex >> htmlitem_;
+                       lex >> htmlitemtag_;
                        break;
        
                case LT_HTMLITEMATTR:
@@ -502,7 +509,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                        break;
        
                case LT_HTMLLABEL:
-                       lex >> htmllabel_;
+                       lex >> htmllabeltag_;
                        break;
 
                case LT_HTMLLABELATTR: 
@@ -517,8 +524,8 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                        htmlstyle_ = from_utf8(lex.getLongString("EndHTMLStyle"));
                        break;
 
-               case LT_HTMLFORCEDEFAULT:
-                       lex >> htmlforcedefault_;
+               case LT_HTMLFORCECSS:
+                       lex >> htmlforcecss_;
 
                case LT_HTMLPREAMBLE:
                        htmlpreamble_ = from_utf8(lex.getLongString("EndPreamble"));
@@ -869,10 +876,10 @@ docstring const Layout::babelpreamble(Language const * lang) const
 }
 
 
-string const Layout::htmltag() const 
+string const & Layout::htmltag() const 
 { 
        if (htmltag_.empty())
-               htmltag_ = "div";
+               htmltag_ =  "div";
        return htmltag_;
 }
 
@@ -880,45 +887,45 @@ string const Layout::htmltag() const
 string const & Layout::htmlattr() const 
 { 
        if (htmlattr_.empty())
-               htmlattr_ = "class=\"" + to_utf8(name()) + "\"";
+               htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
        return htmlattr_; 
 }
 
 
-string const & Layout::htmlitem() const 
+string const & Layout::htmlitemtag() const 
 { 
-       if (htmlitem_.empty())
-               htmlitem_ = "div";
-       return htmlitem_; 
+       if (htmlitemtag_.empty())
+               htmlitemtag_ = "div";
+       return htmlitemtag_; 
 }
 
 
 string const & Layout::htmlitemattr() const 
 { 
        if (htmlitemattr_.empty())
-               htmlitemattr_ = "class=\"" + to_utf8(name()) + "item\"";
+               htmlitemattr_ = "class=\"" + defaultCSSItemClass() + "\"";
        return htmlitemattr_; 
 }
 
 
-string const & Layout::htmllabel() const 
+string const & Layout::htmllabeltag() const 
 { 
-       if (htmllabel_.empty())
-               htmllabel_ = "span";
-       return htmllabel_; 
+       if (htmllabeltag_.empty())
+               htmllabeltag_ = "span";
+       return htmllabeltag_; 
 }
 
 
 string const & Layout::htmllabelattr() const 
 { 
        if (htmllabelattr_.empty())
-               htmllabelattr_ = "class=\"" + to_utf8(name()) + "label\"";
+               htmllabelattr_ = "class=\"" + defaultCSSLabelClass() + "\"";
        return htmllabelattr_; 
 }
 
 
 docstring Layout::htmlstyle() const {
-       if (!htmlstyle_.empty() && !htmlforcedefault_)
+       if (!htmlstyle_.empty() && !htmlforcecss_)
                return htmlstyle_;
        if (htmldefaultstyle_.empty()) 
                makeDefaultCSS();
@@ -929,9 +936,48 @@ docstring Layout::htmlstyle() const {
 }
 
 
+string Layout::defaultCSSClass() const
+{ 
+       if (!defaultcssclass_.empty())
+               return defaultcssclass_;
+       docstring d;
+       docstring::const_iterator it = name().begin();
+       docstring::const_iterator en = name().end();
+       for (; it != en; ++it) {
+               if (!isalpha(*it))
+                       continue;
+               if (islower(*it))
+                       d += *it;
+               else 
+                       d += lowercase(*it);
+       }
+       // are there other characters we need to remove?
+       defaultcssclass_ = to_utf8(d);
+       return defaultcssclass_;
+}
+
+
+// NOTE There is a whole ton of stuff that could go into this.
+// Things like bottomsep, topsep, and parsep could become various
+// sorts of margins or padding, for example. But for now we are
+// going to keep it simple.
 void Layout::makeDefaultCSS() const {
-// FIXME just an empty hook for now. 
-// i'll get to this shortly.
+       // this never needs to be redone, since reloading layouts will
+       // wipe out what we did before.
+       if (!htmldefaultstyle_.empty()) 
+               return;
+       docstring const mainfontCSS = font.asCSS();
+       if (!mainfontCSS.empty())
+               htmldefaultstyle_ = 
+                       from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
+                       mainfontCSS + from_ascii("\n}\n");
+       if (labelfont == font || htmllabeltag() == "NONE")
+               return;
+       docstring const labelfontCSS = labelfont.asCSS();
+       if (!labelfontCSS.empty())
+               htmldefaultstyle_ +=
+                       from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
+                       labelfontCSS + from_ascii("\n}\n");
 }