From 4b2fb6a5c089058bd8f7c0fbe7d2f384d623ff33 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Sat, 21 Nov 2009 22:57:40 +0000
Subject: [PATCH] Get InsetWrap working again.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32133 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/layouts/stdinsets.inc |  1 -
 src/insets/InsetWrap.cpp  | 18 +++++++++---------
 src/insets/InsetWrap.h    |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index fa7ef71e03..32e54a62df 100644
--- 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 2b4e68ab8c..f8e2c5ef98 100644
--- 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 6cd08a930b..cfb80a2ec4 100644
--- 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;
 	///
-- 
2.39.2