Make script inset much tighter in texted.

[lyx.git] / src / insets / InsetFloat.cpp

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index c3600a111db4ab56ae07214c0820723d7f70ed5b..5e1dd3d7fcfd18780258026dc386fe9b26e47e6a 100644 (file)
--- 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_);
@@ -225,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()) {
@@ -291,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);
@@ -392,17 +428,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 +436,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 +459,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";
 }