X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=e92fdb76cd8eab8f1d8fa002334282ed9eb65a44;hb=996505c2ae981187d34580633fca410972c2493d;hp=4e8750137fc2928d76bd47e0f0bf1f91076f959d;hpb=51f9ee61558d1543bf71a370bac91091490f43fa;p=lyx.git

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 4e8750137f..e92fdb76cd 100644
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -24,11 +24,10 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "InsetList.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
-#include "TocBackend.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -41,10 +40,10 @@ using namespace std;
 
 namespace lyx {
 
-InsetWrap::InsetWrap(Buffer const & buf, string const & type)
+InsetWrap::InsetWrap(Buffer * buf, string const & type)
 	: InsetCollapsable(buf)
 {
-	setLabel(_("wrap: ") + floatName(type, buf.params()));
+	setLabel(_("wrap: ") + floatName(type));
 	params_.type = type;
 	params_.lines = 0;
 	params_.placement = "o";
@@ -115,9 +114,9 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetWrap::updateLabels(ParIterator const & it)
+void InsetWrap::updateLabels(ParIterator const & it, bool out)
 {
-	setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
+	setLabel(_("wrap: ") + floatName(params_.type));
 	Counters & cnts =
 		buffer().masterBuffer()->params().documentClass().counters();
 	string const saveflt = cnts.current_float();
@@ -125,7 +124,7 @@ void InsetWrap::updateLabels(ParIterator const & it)
 	// Tell to captions what the current float is
 	cnts.current_float(params().type);
 
-	InsetCollapsable::updateLabels(it);
+	InsetCollapsable::updateLabels(it, out);
 
 	// reset afterwards
 	cnts.current_float(saveflt);
@@ -175,12 +174,6 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetWrap::editMessage() const
-{
-	return _("Opened Wrap Inset");
-}
-
-
 int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 {
 	OutputParams runparams(runparams_in);
@@ -204,7 +197,7 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 int InsetWrap::plaintext(odocstream & os, OutputParams const & runparams) const
 {
 	os << '[' << buffer().B_("wrap") << ' '
-		<< floatName(params_.type, buffer().params()) << ":\n";
+		<< floatName(params_.type) << ":\n";
 	InsetText::plaintext(os, runparams);
 	os << "\n]";
 
@@ -222,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;
 }
 
 
@@ -259,29 +251,6 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-docstring InsetWrap::getCaptionText(OutputParams const & runparams) const
-{
-	if (paragraphs().empty())
-		return docstring();
-
-	ParagraphList::const_iterator pit = paragraphs().begin();
-	for (; pit != paragraphs().end(); ++pit) {
-		InsetList::const_iterator it = pit->insetList().begin();
-		for (; it != pit->insetList().end(); ++it) {
-			Inset & inset = *it->inset;
-			if (inset.lyxCode() == CAPTION_CODE) {
-				odocstringstream ods;
-				InsetCaption * ins =
-					static_cast<InsetCaption *>(it->inset);
-				ins->getCaptionText(ods, runparams);
-				return ods.str();
-			}
-		}
-	}
-	return docstring();
-}
-
-
 void InsetWrap::string2params(string const & in, InsetWrapParams & params)
 {
 	params = InsetWrapParams();