Rename XHTMLStream to XMLStream, move it to another file, and prepare for DocBook...

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 9d92681dd20ccd021d354ee7406c068dfb24dd45..a37b9549479b229078f84e38598b95ea323d5a13 100644 (file)
--- 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_);
@@ -322,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);
@@ -329,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);
@@ -337,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
@@ -353,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;
 }
@@ -431,10 +438,19 @@ 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;
@@ -445,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";
 }