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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index df23f0c493..fe56091a75 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,27 +26,27 @@
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
-#include "OutputParams.h"
+#include "output_xhtml.h"
+#include "texstream.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"
 
+#include <climits>
+
 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)
+	: InsetCaptionable(buf)
 {
-	setLabel(_("wrap: ") + floatName(type, buf.params()));
-	params_.type = type;
+	setCaptionType(type);
 	params_.lines = 0;
 	params_.placement = "o";
 	params_.overhang = Length(0, Length::PCW);
@@ -59,10 +60,38 @@ InsetWrap::~InsetWrap()
 }
 
 
+// Enforce equality of float type and caption type.
+void InsetWrap::setCaptionType(std::string const & type)
+{
+	InsetCaptionable::setCaptionType(type);
+	params_.type = captionType();
+	setLabel(_("wrap: ") + floatName(type));
+}
+
+
+docstring InsetWrap::layoutName() const
+{
+	return "Wrap:" + from_utf8(params_.type);
+}
+
+
+docstring InsetWrap::toolTip(BufferView const & bv, int x, int y) const
+{
+	if (isOpen(bv))
+		return InsetCaptionable::toolTip(bv, x, y);
+	OutputParams rp(&buffer().params().encoding());
+	docstring caption_tip = getCaptionText(rp);
+	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(this);
 		InsetWrapParams params;
 		InsetWrap::string2params(to_utf8(cmd.argument()), params);
 		params_.lines = params.lines;
@@ -77,7 +106,7 @@ void InsetWrap::doDispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCaptionable::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -86,121 +115,71 @@ 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.enabled(true);
+		flag.setEnabled(true);
 		return true;
 
 	default:
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCaptionable::getStatus(cur, cmd, flag);
 	}
 }
 
 
-void InsetWrap::updateLabels(ParIterator const & it)
+void InsetWrap::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
-	setLabel(_("wrap: ") + floatName(params_.type, buffer().params()));
-	Counters & cnts = buffer().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);
-
-	// reset afterwards
-	cnts.current_float(saveflt);
+	InsetCaptionable::updateBuffer(it, utype, deleted);
 }
 
 
 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;
 }
 
 
 void InsetWrap::write(ostream & os) const
 {
 	params_.write(os);
-	InsetCollapsable::write(os);
+	InsetCaptionable::write(os);
 }
 
 
 void InsetWrap::read(Lexer & lex)
 {
 	params_.read(lex);
-	InsetCollapsable::read(lex);
+	InsetCaptionable::read(lex);
 }
 
 
 void InsetWrap::validate(LaTeXFeatures & features) const
 {
 	features.require("wrapfig");
-	InsetCollapsable::validate(features);
+	features.inFloat(true);
+	InsetCaptionable::validate(features);
+	features.inFloat(false);
 }
 
 
-docstring InsetWrap::editMessage() const
-{
-	return _("Opened Wrap Inset");
-}
-
-
-int InsetWrap::latex(odocstream & os, OutputParams const & runparams) const
+void InsetWrap::latex(otexstream & 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)
@@ -211,17 +190,17 @@ int InsetWrap::latex(odocstream & os, OutputParams const & runparams) 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
+int InsetWrap::plaintext(odocstringstream & os,
+        OutputParams const & runparams, size_t max_length) const
 {
 	os << '[' << buffer().B_("wrap") << ' '
-		<< floatName(params_.type, buffer().params()) << ":\n";
-	InsetText::plaintext(os, runparams);
+		<< floatName(params_.type) << ":\n";
+	InsetText::plaintext(os, runparams, max_length);
 	os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -238,15 +217,30 @@ 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;
+	InsetLayout const & il = getLayout();
+	string const & tag = il.htmltag();
+	string const attr = il.htmlattr() + " style='width:" + width + ";'";
+	xs << html::StartTag(tag, attr);
+	docstring const deferred =
+		InsetText::insetAsXHTML(xs, rp, InsetText::WriteInnerTag);
+	xs << html::EndTag(tag);
+	return deferred;
+}
+
+
 bool InsetWrap::insetAllowed(InsetCode code) const
 {
 	switch(code) {
-	case FLOAT_CODE:
+	case WRAP_CODE:
 	case FOOT_CODE:
 	case MARGIN_CODE:
 		return false;
 	default:
-		return InsetCollapsable::insetAllowed(code);
+		return InsetCaptionable::insetAllowed(code);
 	}
 }
 
@@ -263,31 +257,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("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);
 }