X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=5e1dd3d7fcfd18780258026dc386fe9b26e47e6a;hb=9176e60b7bcab3e355521a86ddb4c2778cd9b29e;hp=95e9af74d11a6a3e77c2cf61b27761d89c845bde;hpb=3aba81cf6afb538cb6e1dfcc846bf5a98bc17c57;p=lyx.git diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp index 95e9af74d1..5e1dd3d7fc 100644 --- a/src/insets/InsetFloat.cpp +++ b/src/insets/InsetFloat.cpp @@ -322,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); @@ -435,6 +440,15 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const 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 +459,9 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const InsetText::latex(os, runparams); + if (runparams.inDeletedInset) + os << "}"; + // Force \end{} to appear in a new line. os << breakln << "\\end{" << from_ascii(tmptype) << "}\n"; }