X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=a37b9549479b229078f84e38598b95ea323d5a13;hb=a6b07608d8e9de24;hp=c3600a111db4ab56ae07214c0820723d7f70ed5b;hpb=aa9543fa2bcb1bda0435cee5c1a24a2c3d5008b7;p=lyx.git

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index c3600a111d..a37b954947 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -11,6 +11,7 @@
  */
 
 #include <config.h>
+#include <xml.h>
 
 #include "InsetFloat.h"
 #include "InsetCaption.h"
@@ -32,6 +33,7 @@
 #include "TexRow.h"
 #include "texstream.h"
 #include "TextClass.h"
+#include "InsetList.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -114,7 +116,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_);
@@ -225,6 +227,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()) {
@@ -291,6 +324,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);
@@ -298,7 +336,7 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 }
 
 
-docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetFloat::xhtml(XMLStream & xs, OutputParams const & rp) const
 {
 	FloatList const & floats = buffer().params().documentClass().floats();
 	Floating const & ftype = floats.getType(params_.type);
@@ -306,12 +344,12 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 	string const & attr = ftype.htmlAttrib();
 
 	odocstringstream ods;
-	XHTMLStream newxs(ods);
-	newxs << html::StartTag(htmltype, attr);
+	XMLStream newxs(ods);
+	newxs << xml::StartTag(htmltype, attr);
 	InsetText::XHTMLOptions const opts =
 		InsetText::WriteLabel | InsetText::WriteInnerTag;
 	docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts);
-	newxs << html::EndTag(htmltype);
+	newxs << xml::EndTag(htmltype);
 
 	if (rp.inFloat == OutputParams::NONFLOAT) {
 		// In this case, this float needs to be deferred, but we'll put it
@@ -322,7 +360,7 @@ 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::ESCAPE_NONE << ods.str();
+		xs << XMLStream::ESCAPE_NONE << ods.str();
 	}
 	return deferred;
 }
@@ -392,17 +430,6 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 			placement += *lit;
 	}
 
-	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;
-	}
-
 	// Force \begin{<floatname>} to appear in a new line.
 	os << breakln << "\\begin{" << from_ascii(tmptype) << '}';
 	if (runparams.lastid != -1)
@@ -411,9 +438,20 @@ 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")
@@ -423,6 +461,9 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const
 
 	InsetText::latex(os, runparams);
 
+	if (runparams.inDeletedInset)
+		os << "}";
+
 	// Force \end{<floatname>} to appear in a new line.
 	os << breakln << "\\end{" << from_ascii(tmptype) << "}\n";
 }