In r35952 we reverted r35933, but InsetParamsWidget.h was forgotten.

[lyx.git] / src / Layout.cpp

diff --git a/src/Layout.cpp b/src/Layout.cpp
index d1dad606709590965b6797d72564087db5d459f2..fd4709e35659bf8927e4974b014f3efc588b5a14 100644 (file)
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -13,10 +13,11 @@
 #include <config.h>
 
 #include "Layout.h"
+#include "FontInfo.h"
 #include "Language.h"
-#include "TextClass.h"
 #include "Lexer.h"
-#include "FontInfo.h"
+#include "output_xhtml.h"
+#include "TextClass.h"
 
 #include "support/debug.h"
 #include "support/lassert.h"
@@ -956,8 +957,13 @@ string const & Layout::htmlitemattr() const
 
 string const & Layout::htmllabeltag() const 
 { 
-       if (htmllabeltag_.empty())
-               htmllabeltag_ = "span";
+       if (htmllabeltag_.empty()) {
+               if (labeltype != LABEL_TOP_ENVIRONMENT &&
+                   labeltype != LABEL_CENTERED_TOP_ENVIRONMENT)
+                       htmllabeltag_ = "span";
+               else
+                       htmllabeltag_ = "div";
+       }
        return htmllabeltag_; 
 }
 
@@ -1004,9 +1010,9 @@ string Layout::defaultCSSClass() const
 
 
 namespace {
-       string makeMarginValue(double d) {
+       string makeMarginValue(char const * side, double d) {
                ostringstream os;
-               os << d << "ex";
+               os << "margin-" << side << ": " << d << "ex;\n";
                return os.str();
        }
 }
@@ -1017,28 +1023,63 @@ void Layout::makeDefaultCSS() const {
        // wipe out what we did before.
        if (!htmldefaultstyle_.empty()) 
                return;
+       
+       // main font
        htmldefaultstyle_ = font.asCSS();
+       
+       // bottom margins
        string tmp;
        if (topsep > 0)
-               tmp += "margin-top: " + makeMarginValue(topsep) + ";\n";
+               tmp += makeMarginValue("top", topsep);
        if (bottomsep > 0)
-               tmp += "margin-bottom: " + makeMarginValue(bottomsep) + ";\n";
+               tmp += makeMarginValue("bottom", bottomsep);
+       if (!leftmargin.empty()) {
+               // we can't really do what LyX does with the margin, so 
+               // we'll just figure out how many characters it is
+               int const len = leftmargin.length();
+               tmp += makeMarginValue("left", len);
+       }
+       if (!rightmargin.empty()) {
+               int const len = rightmargin.length();
+               tmp += makeMarginValue("right", len);
+       }
+               
        if (!tmp.empty()) {
                if (!htmldefaultstyle_.empty())
                        htmldefaultstyle_ += from_ascii("\n");
                htmldefaultstyle_ += from_ascii(tmp);
        }
+
+// tex2lyx does not see output_xhtml.cpp
+#ifndef TEX2LYX
+       // alignment
+       string where = alignmentToCSS(align);
+       if (!where.empty()) {
+               htmldefaultstyle_ += from_ascii("text-align: " + where + ";\n");
+       }
+#endif
+       
+       // wrap up what we have, if anything
        if (!htmldefaultstyle_.empty())
                htmldefaultstyle_ = 
                        from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
                        htmldefaultstyle_ + from_ascii("\n}\n");
-       if (labelfont == font || htmllabeltag() == "NONE")
+       
+       if (labeltype == LABEL_NO_LABEL || htmllabeltag() == "NONE")
                return;
-       docstring const labelfontCSS = labelfont.asCSS();
-       if (!labelfontCSS.empty())
+       
+       docstring labelCSS;
+       
+       // label font
+       if (labelfont != font)
+               labelCSS = labelfont.asCSS() + from_ascii("\n");
+       if (labeltype == LABEL_CENTERED_TOP_ENVIRONMENT)
+               labelCSS += from_ascii("text-align: center;\n");
+       
+       if (!labelCSS.empty())
                htmldefaultstyle_ +=
                        from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
-                       labelfontCSS + from_ascii("\n}\n");
+                       labelCSS + from_ascii("\n}\n");
 }