X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=0b6ed66fd99e24b3c2a02ffa540e53fb70128ee7;hb=e30db1e44474ee379bedb0d1c752297541156497;hp=ea6f0931f6b0b131bde99811a0edb5fe55afeda4;hpb=4b9153619762d78d938e98734d8f6c140d498c5d;p=lyx.git

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index ea6f0931f6..0b6ed66fd9 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);
 }
@@ -189,6 +189,12 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd,
 			return true;
 		} else
 			return false;
+	
+	case LFUN_NEWLINE_INSERT:
+		if (params_.subfloat) {
+			flag.setEnabled(false);
+			return true;
+		}
 
 	default:
 		return InsetCollapsable::getStatus(cur, cmd, flag);
@@ -325,24 +331,27 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 }
 
 
-int InsetFloat::latex(otexstream & 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)
 			os << "\\protect";
 		os << "\\subfloat";
-	
+
 		OutputParams rp = runparams_in;
+		rp.moving_arg = true;
 		docstring const caption = getCaption(rp);
 		if (!caption.empty()) {
 			os << caption;
 		}
 		os << '{';
+		// The main argument is the contents of the float. This is not a moving argument.
+		rp.moving_arg = false;
 		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;
@@ -372,35 +381,28 @@ int InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 		placement = buf_placement;
 	}
 
-	// clear counter
-	os.countLines();
 	// 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 lines = os.countLines();
 
-	lines += InsetText::latex(os, runparams);
+	InsetText::latex(os, runparams);
 
-	// clear counter
-	os.countLines();
 	// Force \end{<floatname>} to appear in a new line.
 	os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
-	lines += os.countLines();
-
-	return lines;
 }
 
 
-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
@@ -477,6 +479,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())
@@ -486,12 +494,13 @@ docstring InsetFloat::getCaption(OutputParams const & runparams) const
 	if (ins == 0)
 		return docstring();
 
+	TexRow texrow;
 	odocstringstream ods;
-	otexstream os(ods);
-	ins->getOptArg(os, runparams);
+	otexstream os(ods, texrow);
+	ins->getArgs(os, runparams);
 	ods << '[';
 	odocstringstream odss;
-	otexstream oss(odss);
+	otexstream oss(odss, texrow);
 	ins->getArgument(oss, runparams);
 	docstring arg = odss.str();
 	// Protect ']'