X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetgraphics.C;h=44a37fd723496af1c9d4f2acaa2690984183e62f;hb=1828d1b3f5053973b776bc0642109163528369fe;hp=3ec93e551c99c80eeb2dca07806fd0a705f84dcc;hpb=ec0c2e5bc05335e2d9eda502f29778fffe242519;p=lyx.git diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C index 3ec93e551c..44a37fd723 100644 --- a/src/insets/insetgraphics.C +++ b/src/insets/insetgraphics.C @@ -61,6 +61,7 @@ TODO #include "exporter.h" #include "format.h" #include "funcrequest.h" +#include "FuncStatus.h" #include "gettext.h" #include "LaTeXFeatures.h" #include "lyx_main.h" @@ -74,6 +75,7 @@ TODO #include "frontends/Alert.h" #include "frontends/LyXView.h" +#include "support/convert.h" #include "support/filetools.h" #include "support/lyxalgo.h" // lyx::count #include "support/lyxlib.h" // lyx::sum @@ -94,12 +96,12 @@ using lyx::support::ChangeExtension; using lyx::support::compare_timestamps; using lyx::support::contains; using lyx::support::FileName; +using lyx::support::float_equal; using lyx::support::GetExtension; using lyx::support::IsFileReadable; -using lyx::support::LibFileSearch; +using lyx::support::latex_path; using lyx::support::OnlyFilename; using lyx::support::rtrim; -using lyx::support::strToDbl; using lyx::support::subst; using lyx::support::Systemcall; using lyx::support::unzipFile; @@ -195,10 +197,10 @@ void InsetGraphics::doDispatch(LCursor & cur, FuncRequest & cmd) Buffer const & buffer = cur.buffer(); InsetGraphicsParams p; InsetGraphicsMailer::string2params(cmd.argument, buffer, p); - if (!p.filename.empty()) { + if (!p.filename.empty()) setParams(p); - cur.bv().update(); - } + else + cur.noUpdate(); break; } @@ -217,6 +219,22 @@ void InsetGraphics::doDispatch(LCursor & cur, FuncRequest & cmd) } +bool InsetGraphics::getStatus(LCursor & cur, FuncRequest const & cmd, + FuncStatus & flag) const +{ + switch (cmd.action) { + case LFUN_GRAPHICS_EDIT: + case LFUN_INSET_MODIFY: + case LFUN_INSET_DIALOG_UPDATE: + flag.enabled(true); + return true; + + default: + return InsetBase::getStatus(cur, cmd, flag); + } +} + + void InsetGraphics::edit(LCursor & cur, bool) { InsetGraphicsMailer(*this).showDialog(&cur.bv()); @@ -294,46 +312,47 @@ string const InsetGraphics::createLatexOptions() const // before writing it to the output stream. ostringstream options; if (!params().bb.empty()) - options << " bb=" << rtrim(params().bb) << ",\n"; + options << "bb=" << rtrim(params().bb) << ','; if (params().draft) - options << " draft,\n"; + options << "draft,"; if (params().clip) - options << " clip,\n"; - if (!params().scale.empty() && params().scale != "0") { - if (params().scale != "100") - options << " scale=" << strToDbl(params().scale) / 100.0 - << ",\n"; + options << "clip,"; + double const scl = convert(params().scale); + if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) { + if (!float_equal(scl, 100.0, 0.05)) + options << "scale=" << scl / 100.0 << ','; } else { if (!params().width.zero()) - options << " width=" << params().width.asLatexString() << ",\n"; + options << "width=" << params().width.asLatexString() << ','; if (!params().height.zero()) - options << " height=" << params().height.asLatexString() << ",\n"; + options << "height=" << params().height.asLatexString() << ','; if (params().keepAspectRatio) - options << " keepaspectratio,\n"; + options << "keepaspectratio,"; } // Make sure rotation angle is not very close to zero; // a float can be effectively zero but not exactly zero. - if (!params().rotateAngle.empty() && params().rotateAngle != "0") { - options << " angle=" << params().rotateAngle << ",\n"; + if (!params().rotateAngle.empty() + && !float_equal(convert(params().rotateAngle), 0.0, 0.001)) { + options << "angle=" << params().rotateAngle << ','; if (!params().rotateOrigin.empty()) { - options << " origin=" << params().rotateOrigin[0]; + options << "origin=" << params().rotateOrigin[0]; if (contains(params().rotateOrigin,"Top")) options << 't'; else if (contains(params().rotateOrigin,"Bottom")) options << 'b'; else if (contains(params().rotateOrigin,"Baseline")) options << 'B'; - options << ",\n"; + options << ','; } } if (!params().special.empty()) - options << params().special << ",\n"; + options << params().special << ','; string opts = options.str(); - // delete last ",\n" - return opts.substr(0, opts.size() - 2); + // delete last ',' + return opts.substr(0, opts.size() - 1); } @@ -403,10 +422,11 @@ string const InsetGraphics::createDocBookAttributes() const // Right now it only works with my version of db2latex :-) ostringstream options; - if (!params().scale.empty() && params().scale != "0") { - if (params().scale != "100") - options << " scale=\"" - << static_cast( (strToDbl(params().scale)) + 0.5 ) + double const scl = convert(params().scale); + if (!params().scale.empty() && !float_equal(scl, 0.0, 0.05)) { + if (!float_equal(scl, 100.0, 0.05)) + options << " scale=\"" + << static_cast( (scl) + 0.5 ) << "\" "; } else { if (!params().width.zero()) { @@ -498,7 +518,7 @@ copyToDirIfNeeded(string const & file_in, string const & dir, bool zipped) } -string const stripExtension(string const & file) +string const stripExtensionIfPossible(string const & file) { // Remove the extension so the LaTeX will use whatever // is appropriate (when there are several versions in @@ -506,7 +526,15 @@ string const stripExtension(string const & file) // This works only if the filename contains no dots besides // the just removed one. We can fool here by replacing all // dots with a macro whose definition is just a dot ;-) - return subst(RemoveExtension(file), ".", "\\lyxdot "); + // The automatic format selection does not work if the file + // name is escaped. + string const latex_name = latex_path(file, + lyx::support::EXCLUDE_EXTENSION); + if (contains(latex_name, '"')) + return latex_name; + return latex_path(RemoveExtension(file), + lyx::support::PROTECT_EXTENSION, + lyx::support::ESCAPE_DOTS); } @@ -520,8 +548,8 @@ string const stripExtensionIfPossible(string const & file, string const & to) if (to_format == file_format || (to_format == "eps" && file_format == "ps") || (to_format == "ps" && file_format == "eps")) - return stripExtension(file); - return file; + return stripExtensionIfPossible(file); + return latex_path(file, lyx::support::EXCLUDE_EXTENSION); } } // namespace anon @@ -530,7 +558,10 @@ string const stripExtensionIfPossible(string const & file, string const & to) string const InsetGraphics::prepareFile(Buffer const & buf, OutputParams const & runparams) const { - // We assume that the file exists (the caller checks this) + // The following code depends on non-empty filenames + if (params().filename.empty()) + return string(); + string const orig_file = params().filename.absFilename(); string const rel_file = params().filename.relFilename(buf.filePath()); @@ -547,6 +578,12 @@ string const InsetGraphics::prepareFile(Buffer const & buf, // of include files Buffer const * m_buffer = buf.getMasterBuffer(); + // Return the output name if the file does not exist. + // We are not going to change the extension or using the name of the + // temporary file, the code is already complicated enough. + if (!IsFileReadable(orig_file)) + return params().filename.outputFilename(m_buffer->filePath()); + // We place all temporary files in the master buffer's temp dir. // This is possible because we use mangled file names. // This is necessary for DVI export. @@ -599,7 +636,8 @@ string const InsetGraphics::prepareFile(Buffer const & buf, source_file, output_file); // We can't strip the extension, because we don't know // the unzipped file format - return output_file; + return latex_path(output_file, + lyx::support::EXCLUDE_EXTENSION); } string const unzipped_temp_file = unzippedFileName(temp_file); @@ -659,7 +697,7 @@ string const InsetGraphics::prepareFile(Buffer const & buf, output_to_file); runparams.exportdata->addExternalFile("dvi", to_file, output_to_file); - return stripExtension(output_file); + return stripExtensionIfPossible(output_file); } lyxerr[Debug::GRAPHICS] @@ -668,32 +706,14 @@ string const InsetGraphics::prepareFile(Buffer const & buf, << "\tfile to convert = " << temp_file << '\n' << "\t from " << from << " to " << to << '\n'; - // if no special converter defined, then we take the default one - // from ImageMagic: convert from:inname.from to:outname.to - if (!converters.convert(&buf, temp_file, temp_file, from, to)) { - string const command = - "sh " + LibFileSearch("scripts", "convertDefault.sh") + - ' ' + formats.extension(from) + ':' + temp_file + - ' ' + ext + ':' + to_file; - lyxerr[Debug::GRAPHICS] - << "No converter defined! I use convertDefault.sh:\n\t" - << command << endl; - Systemcall one; - one.startscript(Systemcall::Wait, command); - if (IsFileReadable(to_file)) { - runparams.exportdata->addExternalFile("latex", - to_file, output_to_file); - runparams.exportdata->addExternalFile("dvi", - to_file, output_to_file); - } else { - string str = bformat(_("No information for converting %1$s " - "format files to %2$s.\n" - "Try defining a convertor in the preferences."), from, to); - Alert::error(_("Could not convert image"), str); - } + if (converters.convert(&buf, temp_file, temp_file, from, to, true)) { + runparams.exportdata->addExternalFile("latex", + to_file, output_to_file); + runparams.exportdata->addExternalFile("dvi", + to_file, output_to_file); } - return stripExtension(output_file); + return stripExtensionIfPossible(output_file); } @@ -737,32 +757,26 @@ int InsetGraphics::latex(Buffer const & buf, ostream & os, lyxerr[Debug::GRAPHICS] << "\tOpts = " << opts << endl; if (!opts.empty() && !message.empty()) - before += ("[%\n" + opts + ',' + message + ']'); + before += ('[' + opts + ',' + message + ']'); else if (!opts.empty() || !message.empty()) - before += ("[%\n" + opts + message + ']'); + before += ('[' + opts + message + ']'); lyxerr[Debug::GRAPHICS] << "\tBefore = " << before << "\n\tafter = " << after << endl; - string latex_str = before + '{'; - if (file_exists) - // Convert the file if necessary. - // Remove the extension so the LaTeX will use whatever - // is appropriate (when there are several versions in - // different formats) - latex_str += prepareFile(buf, runparams); - else - latex_str += relative_file + " not found!"; - + // Convert the file if necessary. + // Remove the extension so LaTeX will use whatever is appropriate + // (when there are several versions in different formats) + latex_str += prepareFile(buf, runparams); latex_str += '}' + after; os << latex_str; lyxerr[Debug::GRAPHICS] << "InsetGraphics::latex outputting:\n" << latex_str << endl; // Return how many newlines we issued. - return int(lyx::count(latex_str.begin(), latex_str.end(),'\n') + 1); + return int(lyx::count(latex_str.begin(), latex_str.end(),'\n')); } @@ -858,7 +872,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const return; features.includeFile(graphic_label, - RemoveExtension(params().filename.absFilename())); + RemoveExtension(params().filename.absFilename())); features.require("graphicx");