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 021b7f3b17e805d6e05e5e72d1ab9cf5c102f875..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_);
@@ -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);
@@ -224,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()) {
@@ -235,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";
@@ -254,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;
 }
@@ -286,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);
@@ -366,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
@@ -394,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";
 }