Get InsetWrap working again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32133 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index fa7ef71e033d10943d92ca979fb7041667a73aed..32e54a62df4a30255c05bf2bbcf16bb1e2350442 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -272,7 +272,6 @@ InsetLayout Wrap
        HTMLStyle
                div.wrap { 
                        float: right;
-                       width: 40%;
                        border: 2px solid black;
                        padding: 1ex;
                        margin: 1ex;

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 2b4e68ab8c067c01dcaa927933d9efd3add139e9..f8e2c5ef981d17b456105b18035289e65084a07d 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -26,6 +26,7 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
 
 #include "support/debug.h"
@@ -214,18 +215,17 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
-docstring InsetWrap::xhtml(odocstream &, OutputParams const & rp) const
+docstring InsetWrap::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
        string const len = params_.width.asHTMLString();
-       docstring retval = from_ascii("<div class='wrap'");
+       string const width = len.empty() ? "50%" : len;
+       string const attr = "class='wrap' style='width: " + len + ";'";
+       xs << StartTag("div", attr);
+       docstring const deferred = 
+               InsetText::insetAsXHTML(xs, rp, InsetText::WriteInnerTag);
        if (!len.empty())
-               retval += from_ascii(" style='width: " + len + ";");
-       retval += from_ascii("'>");
-       odocstringstream os;
-       docstring const deferred = InsetText::xhtml(os, rp);
-       retval += os.str() + from_ascii("</div>");
-       retval += deferred;
-       return retval;
+               xs << EndTag("div");
+       return deferred;
 }
 
 

diff --git a/src/insets/InsetWrap.h b/src/insets/InsetWrap.h
index 6cd08a930b095c586136f88dbf6338509e792b70..cfb80a2ec447591c68d335de13e3c3942f1cc05f 100644 (file)
--- a/src/insets/InsetWrap.h
+++ b/src/insets/InsetWrap.h
@@ -71,7 +71,7 @@ private:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
-       docstring xhtml(odocstream &, OutputParams const &) const;
+       docstring xhtml(XHTMLStream &, OutputParams const &) const;
        ///
        bool insetAllowed(InsetCode) const;
        ///