X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=5121d7263f66c42d5e8634d74a22fda8a694563e;hb=73368ed2d97728ee3ec889383b3803d8e3309e9d;hp=41d0766eed0de2bf13571540f968ea3556231ce5;hpb=6490dd8636b57e178684e507449aa87589fe06e4;p=lyx.git

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 41d0766eed..5121d7263f 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -119,7 +119,7 @@ InsetFloat::InsetFloat(Buffer * buf, string params_str)
 }
 
 
-docstring InsetFloat::name() const 
+docstring InsetFloat::layoutName() const
 { 
 	return "Float:" + from_utf8(params_.type);
 }
@@ -127,8 +127,8 @@ docstring InsetFloat::name() const
 
 docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 {
-	if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen(bv))
-		return docstring();
+	if (isOpen(bv))
+		return InsetCollapsable::toolTip(bv, x, y);
 
 	OutputParams rp(&buffer().params().encoding());
 	return getCaptionText(rp);
@@ -137,11 +137,12 @@ docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const
 
 void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY: {
 		InsetFloatParams params;
 		string2params(to_utf8(cmd.argument()), params);
+		cur.recordUndoInset(ATOMIC_UNDO, this);
 
 		// placement, wide and sideways are not used for subfloats
 		if (!params_.subfloat) {
@@ -152,8 +153,11 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 		setNewLabel();
 		if (params_.type != params.type) {
 			params_.type = params.type;
-			buffer().updateLabels();
+			cur.forceBufferUpdate();
 		}
+		// what we really want here is a TOC update, but that means
+		// a full buffer update
+		cur.forceBufferUpdate();
 		break;
 	}
 
@@ -172,7 +176,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY:
 	case LFUN_INSET_DIALOG_UPDATE:
@@ -192,7 +196,7 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype)
+void InsetFloat::updateBuffer(ParIterator const & it, UpdateType utype)
 {
 	Counters & cnts =
 		buffer().masterBuffer()->params().documentClass().counters();
@@ -214,7 +218,7 @@ void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype)
 	cnts.current_float(params().type);
 	cnts.isSubfloat(subflt);
 
-	InsetCollapsable::updateLabels(it, utype);
+	InsetCollapsable::updateBuffer(it, utype);
 
 	//reset afterwards
 	cnts.current_float(saveflt);
@@ -316,12 +320,12 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 		// we can write to the stream.
 		// Note that things will already have been escaped, so we do not 
 		// want to escape them again.
-		xs << XHTMLStream::NextRaw() << ods.str();
+		xs << XHTMLStream::ESCAPE_NONE << ods.str();
 	return deferred;
 }
 
 
-int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
+void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 {
 	if (runparams_in.inFloat != OutputParams::NONFLOAT) {
 		if (runparams_in.moving_arg)
@@ -335,10 +339,10 @@ int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
 		}
 		os << '{';
 		rp.inFloat = OutputParams::SUBFLOAT;
-		int const i = InsetText::latex(os, rp);
+		InsetText::latex(os, rp);
 		os << "}";
 	
-		return i + 1;
+		return;
 	}
 	OutputParams runparams(runparams_in);
 	runparams.inFloat = OutputParams::MAINFLOAT;
@@ -368,32 +372,28 @@ int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const
 		placement = buf_placement;
 	}
 
-	// The \n is used to force \begin{<floatname>} to appear in a new line.
-	// The % is needed to prevent two consecutive \n chars in the case
-	// when the current output line is empty.
-	os << "%\n\\begin{" << from_ascii(tmptype) << '}';
+	// Force \begin{<floatname>} to appear in a new line.
+	os << breakln << "\\begin{" << from_ascii(tmptype) << '}';
+	if (runparams.lastid != -1)
+		os.texrow().start(runparams.lastid, runparams.lastpos);
 	// We only output placement if different from the def_placement.
 	// sidewaysfloats always use their own page
-	if (!placement.empty() && !params_.sideways) {
+	if (!placement.empty() && !params_.sideways)
 		os << '[' << from_ascii(placement) << ']';
-	}
 	os << '\n';
 
-	int const i = InsetText::latex(os, runparams);
-
-	// The \n is used to force \end{<floatname>} to appear in a new line.
-	// In this case, we do not case if the current output line is empty.
-	os << "\n\\end{" << from_ascii(tmptype) << "}\n";
+	InsetText::latex(os, runparams);
 
-	return i + 4;
+	// Force \end{<floatname>} to appear in a new line.
+	os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
 }
 
 
-int InsetFloat::plaintext(odocstream & os, OutputParams const & runparams) const
+int InsetFloat::plaintext(odocstringstream & os, OutputParams const & runparams, size_t max_length) const
 {
 	os << '[' << buffer().B_("float") << ' '
 		<< floatName(params_.type) << ":\n";
-	InsetText::plaintext(os, runparams);
+	InsetText::plaintext(os, runparams, max_length);
 	os << "\n]";
 
 	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -470,6 +470,12 @@ void InsetFloat::setNewLabel()
 }
 
 
+bool InsetFloat::allowsCaptionVariation(std::string const & newtype) const
+{
+	return !params_.subfloat && newtype != "LongTableNoNumber";
+}
+
+
 docstring InsetFloat::getCaption(OutputParams const & runparams) const
 {
 	if (paragraphs().empty())
@@ -479,10 +485,19 @@ docstring InsetFloat::getCaption(OutputParams const & runparams) const
 	if (ins == 0)
 		return docstring();
 
+	TexRow texrow;
 	odocstringstream ods;
-	ins->getOptArg(ods, runparams);
+	otexstream os(ods, texrow);
+	ins->getArgs(os, runparams);
 	ods << '[';
-	ins->getArgument(ods, runparams);
+	odocstringstream odss;
+	otexstream oss(odss, texrow);
+	ins->getArgument(oss, runparams);
+	docstring arg = odss.str();
+	// Protect ']'
+	if (arg.find(']') != docstring::npos)
+		arg = '{' + arg + '}';
+	ods << arg;
 	ods << ']';
 	return ods.str();
 }