X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=5e1dd3d7fcfd18780258026dc386fe9b26e47e6a;hb=9176e60b7bcab3e355521a86ddb4c2778cd9b29e;hp=e0586cc6d5b9b76c6090e1cb820f7653f8f7e671;hpb=58e6c6c87649cc12b0a3d077f4500ab68ad10e99;p=lyx.git

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index e0586cc6d5..5e1dd3d7fc 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -114,7 +114,7 @@ namespace lyx {
 // Lgb
 
 //FIXME: why do we set in stone the type here?
-InsetFloat::InsetFloat(Buffer * buf, string params_str)
+InsetFloat::InsetFloat(Buffer * buf, string const & params_str)
 	: InsetCaptionable(buf)
 {
 	string2params(params_str, params_);
@@ -125,7 +125,7 @@ InsetFloat::InsetFloat(Buffer * buf, string params_str)
 // Enforce equality of float type and caption type.
 void InsetFloat::setCaptionType(std::string const & type)
 {
-	InsetCaptionable::setCaptionType(type);	
+	InsetCaptionable::setCaptionType(type);
 	params_.type = captionType();
 	// check if the float type exists
 	if (buffer().params().documentClass().floats().typeExist(params_.type))
@@ -136,7 +136,7 @@ void InsetFloat::setCaptionType(std::string const & type)
 
 
 docstring InsetFloat::layoutName() const
-{ 
+{
 	return "Float:" + from_utf8(params_.type);
 }
 
@@ -166,6 +166,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd)
 			params_.wide      = params.wide;
 			params_.sideways  = params.sideways;
 		}
+		params_.alignment  = params.alignment;
 		setNewLabel();
 		if (params_.type != params.type)
 			setCaptionType(params.type);
@@ -203,12 +204,14 @@ 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;
 		}
+		// no subfloat:
+		// fall through
 
 	default:
 		return InsetCaptionable::getStatus(cur, cmd, flag);
@@ -222,6 +225,37 @@ bool InsetFloat::hasSubCaptions(ParIterator const & it) const
 }
 
 
+string InsetFloat::getAlignment() const
+{
+	string alignment;
+	string const buf_alignment = buffer().params().float_alignment;
+	if (params_.alignment == "document"
+	    && !buf_alignment.empty()) {
+		alignment = buf_alignment;
+	} else if (!params_.alignment.empty()
+		   && params_.alignment != "class"
+		   && params_.alignment != "document") {
+		alignment = params_.alignment;
+	}
+	return alignment;
+}
+
+
+LyXAlignment InsetFloat::contentAlignment() const
+{
+	LyXAlignment align = LYX_ALIGN_NONE;
+	string alignment = getAlignment();
+	if (alignment == "left")
+		align = LYX_ALIGN_LEFT;
+	else if (alignment == "center")
+		align = LYX_ALIGN_CENTER;
+	else if (alignment == "right")
+		align = LYX_ALIGN_RIGHT;
+
+	return align;
+}
+
+
 void InsetFloatParams::write(ostream & os) const
 {
 	if (type.empty()) {
@@ -233,6 +267,8 @@ void InsetFloatParams::write(ostream & os) const
 
 	if (!placement.empty())
 		os << "placement " << placement << "\n";
+	if (!alignment.empty())
+		os << "alignment " << alignment << "\n";
 
 	if (wide)
 		os << "wide true\n";
@@ -252,6 +288,8 @@ void InsetFloatParams::read(Lexer & lex)
 	lex >> type;
 	if (lex.checkFor("placement"))
 		lex >> placement;
+	if (lex.checkFor("alignment"))
+		lex >> alignment;
 	lex >> "wide" >> wide;
 	lex >> "sideways" >> sideways;
 }
@@ -284,6 +322,11 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 	if (features.inFloat())
 		features.require("subfig");
 
+	if (features.inDeletedInset()) {
+		features.require("tikz");
+		features.require("ct-tikz-object-sout");
+	}
+
 	features.useFloat(params_.type, features.inFloat());
 	features.inFloat(true);
 	InsetCaptionable::validate(features);
@@ -301,7 +344,7 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	odocstringstream ods;
 	XHTMLStream newxs(ods);
 	newxs << html::StartTag(htmltype, attr);
-	InsetText::XHTMLOptions const opts = 
+	InsetText::XHTMLOptions const opts =
 		InsetText::WriteLabel | InsetText::WriteInnerTag;
 	docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
 	newxs << html::EndTag(htmltype);
@@ -313,7 +356,7 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	} else {
 		// In this case, the whole thing is already being deferred, so
 		// we can write to the stream.
-		// Note that things will already have been escaped, so we do not 
+		// Note that things will already have been escaped, so we do not
 		// want to escape them again.
 		xs << XHTMLStream::ESCAPE_NONE << ods.str();
 	}
@@ -364,13 +407,14 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 	string tmpplacement;
 	string const buf_placement = buffer().params().float_placement;
 	string const def_placement = floats.defaultPlacement(params_.type);
-	if (!params_.placement.empty()
-	    && params_.placement != def_placement) {
-		tmpplacement = params_.placement;
-	} else if (params_.placement.empty()
-		   && !buf_placement.empty()
-		   && buf_placement != def_placement) {
+	if (params_.placement == "document"
+	    && !buf_placement.empty()
+	    && buf_placement != def_placement) {
 		tmpplacement = buf_placement;
+	} else if (!params_.placement.empty()
+		   && params_.placement != "document"
+		   && params_.placement != def_placement) {
+		tmpplacement = params_.placement;
 	}
 
 	// Check if placement is allowed by this float
@@ -392,12 +436,32 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 	// sidewaysfloats always use their own page,
 	// therefore don't output the p option that is always set
 	if (!placement.empty()
-	    && (!params_.sideways || (params_.sideways && from_ascii(placement) != "p")))
+	    && (!params_.sideways || from_ascii(placement) != "p"))
 		os << '[' << from_ascii(placement) << ']';
 	os << '\n';
 
+	if (runparams.inDeletedInset) {
+		// This has to be done manually since we need it inside the float
+		OutputParams::CtObject ctobject = runparams.ctObject;
+		runparams.ctObject = OutputParams::CT_DISPLAYOBJECT;
+		Changes::latexMarkChange(os, buffer().params(), Change(Change::UNCHANGED),
+					 Change(Change::DELETED), runparams);
+		runparams.ctObject = ctobject;
+	}
+
+	string alignment = getAlignment();
+	if (alignment == "left")
+		os << "\\raggedright" << breakln;
+	else if (alignment == "center")
+		os << "\\centering" << breakln;
+	else if (alignment == "right")
+		os << "\\raggedleft" << breakln;
+
 	InsetText::latex(os, runparams);
 
+	if (runparams.inDeletedInset)
+		os << "}";
+
 	// Force \end{<floatname>} to appear in a new line.
 	os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
 }
@@ -428,7 +492,7 @@ int InsetFloat::docbook(odocstream & os, OutputParams const & runparams) const
 
 bool InsetFloat::insetAllowed(InsetCode code) const
 {
-	// The case that code == FLOAT_CODE is handled in Text3.cpp, 
+	// The case that code == FLOAT_CODE is handled in Text3.cpp,
 	// because we need to know what type of float is meant.
 	switch(code) {
 	case WRAP_CODE: