X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=79dd8065bf25a305ff56a86925728ea6fbe7eae3;hb=dbb1ac30e9a87007af7c53f0f93ec9e21826f90b;hp=df10956dfd4bdbf3db8ef98689d8ab7acea923c4;hpb=5ba54be0434b421b542dc573b17de6acacd27636;p=lyx.git

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index df10956dfd..79dd8065bf 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"
@@ -39,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";
@@ -57,7 +58,7 @@ InsetWrap::~InsetWrap()
 }
 
 
-docstring InsetWrap::name() const
+docstring InsetWrap::layoutName() const
 {
 	return "Wrap:" + from_utf8(params_.type);
 }
@@ -65,19 +66,21 @@ docstring InsetWrap::name() const
 
 docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const
 {
+	if (isOpen(bv))
+		return InsetCollapsable::toolTip(bv, x, y);
 	OutputParams rp(&buffer().params().encoding());
-	docstring default_tip = InsetCollapsable::toolTip(bv, x, y);
 	docstring caption_tip = getCaptionText(rp);
-	if (!isOpen(bv) && !caption_tip.empty())
-		return caption_tip + '\n' + default_tip;
-	return default_tip;
+	if (!caption_tip.empty())
+		caption_tip += from_ascii("\n");
+	return toolTipText(caption_tip);
 }
 
 
 void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY: {
+		cur.recordUndoInset(ATOMIC_UNDO, this);
 		InsetWrapParams params;
 		InsetWrap::string2params(to_utf8(cmd.argument()), params);
 		params_.lines = params.lines;
@@ -101,7 +104,7 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY:
 	case LFUN_INSET_DIALOG_UPDATE:
 		flag.setEnabled(true);
@@ -113,20 +116,26 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetWrap::updateLabels(ParIterator const & it)
+void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-	setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
+	setLabel(_("wrap: ") + floatName(params_.type));
 	Counters & cnts =
 		buffer().masterBuffer()->params().documentClass().counters();
+	if (utype == OutputUpdate) {
+		// counters are local to the wrap
+		cnts.saveLastCounter();
+	}
 	string const saveflt = cnts.current_float();
 
 	// Tell to captions what the current float is
 	cnts.current_float(params().type);
 
-	InsetCollapsable::updateLabels(it);
+	InsetCollapsable::updateBuffer(it, utype);
 
 	// reset afterwards
 	cnts.current_float(saveflt);
+	if (utype == OutputUpdate)
+		cnts.restoreLastCounter();
 }
 
 
@@ -173,13 +182,7 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetWrap::editMessage() const
-{
-	return _("Opened Wrap Inset");
-}
-
-
-int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetWrap::latex(otexstream & os, OutputParams const & runparams_in) const
 {
 	OutputParams runparams(runparams_in);
 	runparams.inFloat = OutputParams::MAINFLOAT;
@@ -193,16 +196,15 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 	if (over.value() != 0)
 		os << '[' << from_ascii(params_.overhang.asLatexString()) << ']';
 	os << '{' << from_ascii(params_.width.asLatexString()) << "}%\n";
-	int const i = InsetText::latex(os, runparams);
+	InsetText::latex(os, runparams);
 	os << "\\end{wrap" << from_ascii(params_.type) << "}%\n";
-	return i + 2;
 }
 
 
 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]";
 
@@ -220,18 +222,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: " + width + ";'";
+	xs << html::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 << html::EndTag("div");
+	return deferred;
 }