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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 31e58670a4..e92fdb76cd 100644
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Dekel Tsur
- * \author Uwe Stöhr
+ * \author Uwe Stöhr
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,6 +12,7 @@
 #include <config.h>
 
 #include "InsetWrap.h"
+#include "InsetCaption.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
@@ -25,26 +26,24 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "OutputParams.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
-#include "TocBackend.h"
 
-#include "support/convert.h"
-#include "support/docstream.h"
 #include "support/debug.h"
+#include "support/docstream.h"
 #include "support/gettext.h"
 
 #include "frontends/Application.h"
 
 using namespace std;
 
-namespace lyx {
 
+namespace lyx {
 
-InsetWrap::InsetWrap(Buffer const & buf, string const & type)
-	: InsetCollapsable(buf), name_(from_utf8(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";
@@ -55,7 +54,24 @@ InsetWrap::InsetWrap(Buffer const & buf, string const & type)
 
 InsetWrap::~InsetWrap()
 {
-	hideDialogs("ert", this);
+	hideDialogs("wrap", this);
+}
+
+
+docstring InsetWrap::name() const
+{
+	return "Wrap:" + from_utf8(params_.type);
+}
+
+
+docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const
+{
+	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;
 }
 
 
@@ -89,7 +105,7 @@ bool InsetWrap::getStatus(Cursor & cur, FuncRequest const & cmd,
 	switch (cmd.action) {
 	case LFUN_INSET_MODIFY:
 	case LFUN_INSET_DIALOG_UPDATE:
-		flag.enabled(true);
+		flag.setEnabled(true);
 		return true;
 
 	default:
@@ -98,16 +114,17 @@ 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()));
-	Counters & cnts = buffer().params().documentClass().counters();
+	setLabel(_("wrap: ") + floatName(params_.type));
+	Counters & cnts =
+		buffer().masterBuffer()->params().documentClass().counters();
 	string const saveflt = cnts.current_float();
 
 	// 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);
@@ -117,58 +134,20 @@ void InsetWrap::updateLabels(ParIterator const & it)
 void InsetWrapParams::write(ostream & os) const
 {
 	os << "Wrap " << type << '\n';
-	os << "lines " << lines << "\n";
-	os << "placement " << placement << "\n";
-	os << "overhang " << overhang.asString() << "\n";
+	os << "lines " << lines << '\n';
+	os << "placement " << placement << '\n';
+	os << "overhang " << overhang.asString() << '\n';
 	os << "width \"" << width.asString() << "\"\n";
 }
 
 
 void InsetWrapParams::read(Lexer & lex)
 {
-	string token;
-
-	lex >> token;
-	if (token == "lines")
-		lex >> lines;
-	else {
-		lyxerr << "InsetWrap::Read:: Missing 'lines'-tag!"
-			<< endl;
-		// take countermeasures
-		lex.pushToken(token);
-	}
-	if (!lex)
-		return;
-	lex >> token;
-	if (token == "placement")
-		lex >> placement;
-	else {
-		lyxerr << "InsetWrap::Read:: Missing 'placement'-tag!"
-			<< endl;
-		lex.pushToken(token);
-	}
-	if (!lex)
-		return;
-	lex >> token;
-	if (token == "overhang") {
-		lex.next();
-		overhang = Length(lex.getString());
-	} else {
-		lyxerr << "InsetWrap::Read:: Missing 'overhang'-tag!"
-			<< endl;
-		lex.pushToken(token);
-	}
-	if (!lex)
-		return;
-	lex >> token;
-	if (token == "width") {
-		lex.next();
-		width = Length(lex.getString());
-	} else {
-		lyxerr << "InsetWrap::Read:: Missing 'width'-tag!"
-			<< endl;
-		lex.pushToken(token);
-	}
+	lex.setContext("InsetWrapParams::read");
+	lex >> "lines" >> lines;
+	lex >> "placement" >> placement;
+	lex >> "overhang" >> overhang;
+	lex >> "width" >> width;
 }
 
 
@@ -189,18 +168,16 @@ void InsetWrap::read(Lexer & lex)
 void InsetWrap::validate(LaTeXFeatures & features) const
 {
 	features.require("wrapfig");
+	features.inFloat(true);
 	InsetCollapsable::validate(features);
+	features.inFloat(false);
 }
 
 
-docstring InsetWrap::editMessage() const
-{
-	return _("Opened Wrap Inset");
-}
-
-
-int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const
+int InsetWrap::latex(odocstream & os, OutputParams const & runparams_in) const
 {
+	OutputParams runparams(runparams_in);
+	runparams.inFloat = OutputParams::MAINFLOAT;
 	os << "\\begin{wrap" << from_ascii(params_.type) << '}';
 	// no optional argument when lines are zero
 	if (params_.lines != 0)
@@ -220,7 +197,7 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams) 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]";
 
@@ -238,10 +215,24 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
+docstring InsetWrap::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+{
+	string const len = params_.width.asHTMLString();
+	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())
+		xs << EndTag("div");
+	return deferred;
+}
+
+
 bool InsetWrap::insetAllowed(InsetCode code) const
 {
 	switch(code) {
-	case FLOAT_CODE:
+	case WRAP_CODE:
 	case FOOT_CODE:
 	case MARGIN_CODE:
 		return false;
@@ -263,33 +254,13 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 void InsetWrap::string2params(string const & in, InsetWrapParams & params)
 {
 	params = InsetWrapParams();
-	if (in.empty())
-		return;
-
 	istringstream data(in);
-	Lexer lex(0,0);
+	Lexer lex;
 	lex.setStream(data);
-
-	string name;
-	lex >> name;
-	if (!lex || name != "wrap") {
-		LYXERR0("InsetWrap::string2params(" << in << ")\n"
-					  "Expected arg 1 to be \"wrap\"\n");
-		return;
-	}
-
-	// This is part of the inset proper that is usually swallowed
-	// by Text::readInset
-	string id;
-	lex >> id;
-	if (!lex || id != "Wrap") {
-		LYXERR0("InsetWrap::string2params(" << in << ")\n"
-					  "Expected arg 1 to be \"Wrap\"\n");
-		return;
-	}
-
-	// We have to read the type here!
-	lex >> params.type;
+	lex.setContext("InsetWrap::string2params");
+	lex >> "wrap";
+	lex >> "Wrap";  // Part of the inset proper, swallowed by Text::readInset
+	lex >> params.type; // We have to read the type here!
 	params.read(lex);
 }