InsetInfo: enable inset dissolve

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 27d8029d13eb6a2c91a3592c66fc73059d726b9c..080369f104e935535a2be7e6a548416584717b29 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -328,7 +328,7 @@ void XHTMLStream::writeError(std::string const & s) const
 namespace {
        // an illegal tag for internal use
        static html::StartTag const parsep_tag("&LyX_parsep_tag&");
-}
+} // namespace
 
 
 bool XHTMLStream::closeFontTags()
@@ -1114,23 +1114,13 @@ void makeCommand(Buffer const & buf,
 
        bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
 
-       if (style.labeltype == LABEL_ABOVE)
-               xs << html::StartTag("div")
-                  << pbegin->params().labelString()
-                  << html::EndTag("div");
-       else if (style.labeltype == LABEL_CENTERED)
-               xs << html::StartTag("div", "style = \"text-align: center;\"")
-                  << pbegin->params().labelString()
-                  << html::EndTag("div");
-
        openParTag(xs, style, pbegin->params(),
                   make_parid ? pbegin->magicLabel() : "");
 
        // Label around sectioning number:
        // FIXME Probably need to account for LABEL_MANUAL
-       if (style.labeltype != LABEL_NO_LABEL &&
-           style.labeltype != LABEL_ABOVE &&
-           style.labeltype != LABEL_CENTERED ) {
+       // FIXME Probably also need now to account for labels ABOVE and CENTERED.
+       if (style.labeltype != LABEL_NO_LABEL) {
                openLabelTag(xs, style);
                xs << pbegin->params().labelString();
                closeLabelTag(xs, style);