Allow MTag to take attributes.

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index f38d60b0973d27d25668e9a253676b5c9598778d..ae045f130fd3519956085b0c7d9f7e27bb96d81d 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,9 @@ enum LayoutTags {
        LT_HTMLLABELFIRST,
        LT_HTMLPREAMBLE,
        LT_HTMLSTYLE,
-       LT_HTMLFORCEDEFAULT,
+       LT_HTMLFORCECSS,
+       LT_INPREAMBLE,
+       LT_HTMLTITLE,
        LT_INTITLE // keep this last!
 };
 
@@ -113,6 +115,7 @@ Layout::Layout()
        margintype = MARGIN_STATIC;
        latextype = LATEX_PARAGRAPH;
        intitle = false;
+       inpreamble = false;
        optionalargs = 0;
        needprotect = false;
        keepempty = false;
@@ -141,7 +144,8 @@ Layout::Layout()
        toclevel = NOT_IN_TOC;
        commanddepth = 0;
        htmllabelfirst_ = false;
-       htmlforcedefault_ = false;
+       htmlforcecss_ = false;
+       htmltitle_ = false;
 }
 
 
@@ -165,7 +169,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 },
@@ -174,7 +178,9 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                { "htmlpremable",   LT_HTMLPREAMBLE },
                { "htmlstyle",      LT_HTMLSTYLE },
                { "htmltag",        LT_HTMLTAG },
+               { "htmltitle",      LT_HTMLTITLE },
                { "innertag",       LT_INNERTAG },
+               { "inpreamble",     LT_INPREAMBLE },
                { "intitle",        LT_INTITLE },
                { "itemsep",        LT_ITEMSEP },
                { "itemtag",        LT_ITEMTAG },
@@ -300,6 +306,10 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
                        lex >> intitle;
                        break;
 
+               case LT_INPREAMBLE:
+                       lex >> inpreamble;
+                       break;
+
                case LT_TOCLEVEL:
                        lex >> toclevel;
                        break;
@@ -517,13 +527,16 @@ 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"));
                        break;
-
+               
+               case LT_HTMLTITLE:
+                       lex >> htmltitle_;
+                       break;
                }
        }
        lex.popTable();
@@ -918,7 +931,7 @@ string const & Layout::htmllabelattr() const
 
 
 docstring Layout::htmlstyle() const {
-       if (!htmlstyle_.empty() && !htmlforcedefault_)
+       if (!htmlstyle_.empty() && !htmlforcecss_)
                return htmlstyle_;
        if (htmldefaultstyle_.empty()) 
                makeDefaultCSS();
@@ -955,10 +968,6 @@ string Layout::defaultCSSClass() const
 // sorts of margins or padding, for example. But for now we are
 // going to keep it simple.
 void Layout::makeDefaultCSS() const {
-#ifdef TEX2LYX
-       // tex2lyx does not have FontInfo::asCSS()
-       return;
-#else
        // this never needs to be redone, since reloading layouts will
        // wipe out what we did before.
        if (!htmldefaultstyle_.empty()) 
@@ -975,7 +984,6 @@ void Layout::makeDefaultCSS() const {
                htmldefaultstyle_ +=
                        from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
                        labelfontCSS + from_ascii("\n}\n");
-#endif
 }