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 b48a0625f51a7846f1e9472b5a07053f5b913a93..f2b701dfb8057f81bb21b03d0242a519b9cc0ec4 100644 (file)
--- a/src/insets/InsetLayout.cpp
+++ b/src/insets/InsetLayout.cpp
@@ -35,7 +35,7 @@ InsetLayout::InsetLayout() :
        latextype_(NOLATEXTYPE), font_(sane_font), 
        labelfont_(sane_font), bgcolor_(Color_error), 
        htmlforcecss_ (false), htmlisblock_(true),
-       multipar_(false), custompars_(true), forceplain_(false), 
+       multipar_(true), custompars_(true), forceplain_(false), 
        passthru_(false), needprotect_(false), freespacing_(false), 
        keepempty_(false), forceltr_(false), intoc_(false)
 { 
@@ -354,7 +354,7 @@ InsetLayout::InsetLyXType translateLyXType(std::string const & str)
 string const & InsetLayout::htmltag() const
 {
        if (htmltag_.empty())
-               htmltag_ = "span";
+               htmltag_ = multipar_ ? "div" : "span";
        return htmltag_; 
 }
 
@@ -406,16 +406,6 @@ void InsetLayout::makeDefaultCSS() const
                htmldefaultstyle_ = 
                                from_ascii(htmltag() + "." + defaultCSSClass() + " {\n") +
                                mainfontCSS + from_ascii("\n}\n");
-       /* 
-       At present, we do not have default tags, etc, for the label.
-       if (labelfont_ == font_)
-                       return;
-       docstring const labelfontCSS = labelfont_.asCSS();
-       if (!labelfontCSS.empty())
-               htmldefaultstyle_ +=
-                       from_ascii(htmllabeltag() + "." + defaultCSSLabelClass() + " {\n") +
-                       labelfontCSS + from_ascii("\n}\n");
-       */
 }