Revert most of dd7863b6.

I did not mean to commit the caption-related stuff.

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 3f6a4a6114e9419733e77a5ec83e722df9124574..a40572f9a8d1c88888fbb19b69c57aa500f4dac3 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -556,14 +556,13 @@ InsetLayout Caption:Standard
        LabelString          standard
        LaTeXType            command
        LatexName            caption
-       NeedProtect          1
+       NeedProtect          1
        MultiPar             false
        Argument 1
                LabelString   "Short Title|S"
                Tooltip       "The caption as it appears in the list of figures/tables"
                InsertCotext  1
        EndArgument
-       HTMLTag               div
        HTMLStyle
                div.float-caption {
                        text-align: center;
@@ -581,7 +580,6 @@ InsetLayout Caption:Unnumbered
        LabelString          unlabelled
        LatexName            caption*
        ResetArgs            1
-       HTMLAttr "class='float-caption float-caption-unnumbered'"
 End
 
 

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 149a40c93b8cb7a5156f27905a078f0abca418cf..613249b6b25c28472c2134cbaf795e6ccc58153d 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -293,7 +293,7 @@ int InsetCaption::docbook(odocstream & os,
 }
 
 
-docstring InsetCaption::xhtml(XHTMLStream &, OutputParams const & rp) const
+docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        if (rp.html_disable_captions)
                return docstring();
@@ -308,14 +308,10 @@ docstring InsetCaption::xhtml(XHTMLStream &, OutputParams const & rp) const
                else
                        attr = attr + " class='" + our_class + "'";
        }
-       odocstringstream ods;
-       XHTMLStream ourxs(ods);
-       ourxs << html::StartTag(tag, attr) << html::CR();
-       docstring def = getCaptionAsHTML(ourxs, rp);
-       ourxs << html::EndTag(tag) << html::CR();
-       if (!def.empty())
-               return ods.str() + "\n" + def;
-       return ods.str();
+       xs << html::StartTag(tag, attr);
+       docstring def = getCaptionAsHTML(xs, rp);
+       xs << html::EndTag(tag);
+       return def;
 }
 
 

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index fa79c5238261405a088f6e3b2166f88477fa993a..e1538e2635f76d9365645ac5541ca25a866cc1a4 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -300,7 +300,7 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 
        odocstringstream ods;
        XHTMLStream newxs(ods);
-       newxs << html::StartTag(htmltype, attr) << html::CR();
+       newxs << html::StartTag(htmltype, attr);
        InsetText::XHTMLOptions const opts = 
                InsetText::WriteLabel | InsetText::WriteInnerTag;
        docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 0bc38a3704419070f149497dd2386feeb9927218..df4f6e219325cd34734ab72cb73e18bd426583f5 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -621,7 +621,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 
        InsetLayout const & il = getLayout();
        if (opts & WriteOuterTag)
-               xs << html::StartTag(il.htmltag(), il.htmlattr()) << html::CR();
+               xs << html::StartTag(il.htmltag(), il.htmlattr());
 
        if ((opts & WriteLabel) && !il.counter().empty()) {
                BufferParams const & bp = buffer().masterBuffer()->params();
@@ -633,9 +633,9 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
                                cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code());
                        // FIXME is this check necessary?
                        if (!lbl.empty()) {
-                               xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr())
-                                  << lbl
-                                  << html::EndTag(il.htmllabeltag());
+                               xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr());
+                               xs << lbl;
+                               xs << html::EndTag(il.htmllabeltag());
                        }
                }
        }