X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetWrap.cpp;h=f1b49923e3742b58986f86fd3c43a9f34ec36c32;hb=d6f1915684328c6e3fe61c6eef8846b5cabec334;hp=df23f0c493293d4418da42aa65b3836edd7fadfc;hpb=2012beb58e62d04b9c2fc2bc0bc3d60fa095e03e;p=lyx.git

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index df23f0c493..f1b49923e3 100644
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -12,6 +12,7 @@
 #include <config.h>
 
 #include "InsetWrap.h"
+#include "InsetCaption.h"
 
 #include "Buffer.h"
 #include "BufferParams.h"
@@ -23,26 +24,26 @@
 #include "FloatList.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "InsetList.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "OutputParams.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))
+	: InsetCollapsable(buf)
 {
 	setLabel(_("wrap: ") + floatName(type, buf.params()));
 	params_.type = type;
@@ -59,6 +60,23 @@ InsetWrap::~InsetWrap()
 }
 
 
+docstring InsetWrap::name() const
+{
+	return 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() && !caption_tip.empty())
+		return caption_tip + '\n' + default_tip;
+	return default_tip;
+}
+
+
 void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	switch (cmd.action) {
@@ -89,7 +107,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:
@@ -117,58 +135,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;
 }
 
 
@@ -241,7 +221,7 @@ int InsetWrap::docbook(odocstream & os, OutputParams const & runparams) const
 bool InsetWrap::insetAllowed(InsetCode code) const
 {
 	switch(code) {
-	case FLOAT_CODE:
+	case WRAP_CODE:
 	case FOOT_CODE:
 	case MARGIN_CODE:
 		return false;
@@ -260,34 +240,39 @@ 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();
-	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("Expected arg 1 to be \"wrap\" in " << in);
-		return;
-	}
-
-	// This is part of the inset proper that is usually swallowed
-	// by Text::readInset
-	string id;
-	lex >> id;
-	if (!lex || id != "Wrap") {
-		LYXERR0("Expected arg 2 to be \"Wrap\" in " << in);
-		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);
 }