Update it.po

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index bb9072384807ca52347543b38d22d226862f95bc..7e301af6ee39ee49d2d85f8aa5b6c9c8b270f25d 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,7 @@ enum LayoutTags {
        LT_HTMLLABELFIRST,
        LT_HTMLPREAMBLE,
        LT_HTMLSTYLE,
-       LT_HTMLFORCEDEFAULT,
+       LT_HTMLFORCECSS,
        LT_INTITLE // keep this last!
 };
 
@@ -141,7 +141,7 @@ Layout::Layout()
        toclevel = NOT_IN_TOC;
        commanddepth = 0;
        htmllabelfirst_ = false;
-       htmlforcedefault_ = false;
+       htmlforcecss_ = false;
 }
 
 
@@ -165,7 +165,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 },
@@ -517,8 +517,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"));
@@ -918,7 +918,7 @@ string const & Layout::htmllabelattr() const
 
 
 docstring Layout::htmlstyle() const {
-       if (!htmlstyle_.empty() && !htmlforcedefault_)
+       if (!htmlstyle_.empty() && !htmlforcecss_)
                return htmlstyle_;
        if (htmldefaultstyle_.empty()) 
                makeDefaultCSS();
@@ -929,9 +929,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");
 }