X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.cpp;h=3055be90935deb7121acf4bb189830dd56771226;hb=9b530e59c2b74828f3a68f3bb7ee3dee0365cdc0;hp=d194cfff1ffa8ece03664247a31c6dfc69fb8808;hpb=4c7a5d00245799695ea81aa0192151eed8f9c5fb;p=lyx.git diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index d194cfff1f..3055be9093 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -102,14 +102,15 @@ namespace { /// Note that \p format may be unknown (i. e. an empty string) string findTargetFormat(string const & format, OutputParams const & runparams) { - // Are we using latex or XeTeX/pdflatex? + // Are we using latex or XeTeX/LuaTeX/pdflatex? if (runparams.flavor == OutputParams::PDFLATEX - || runparams.flavor == OutputParams::XETEX) { + || runparams.flavor == OutputParams::XETEX + || runparams.flavor == OutputParams::LUATEX) { LYXERR(Debug::GRAPHICS, "findTargetFormat: PDF mode"); Format const * const f = formats.getFormat(format); // Convert vector graphics to pdf if (f && f->vectorFormat()) - return "pdf"; + return "pdf6"; // pdflatex can use jpeg, png and pdf directly if (format == "jpg") return format; @@ -192,7 +193,7 @@ InsetGraphics::~InsetGraphics() void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action_) { + switch (cmd.action()) { case LFUN_INSET_EDIT: { InsetGraphicsParams p = params(); if (!cmd.argument().empty()) @@ -202,13 +203,19 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd) } case LFUN_INSET_MODIFY: { + if (cmd.getArg(0) != "graphics") { + Inset::doDispatch(cur, cmd); + break; + } + InsetGraphicsParams p; string2params(to_utf8(cmd.argument()), buffer(), p); if (p.filename.empty()) { - cur.noUpdate(); + cur.noScreenUpdate(); break; } + cur.recordUndo(); setParams(p); // if the inset is part of a graphics group, all the // other members should be updated too. @@ -237,9 +244,12 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - switch (cmd.action_) { - case LFUN_INSET_EDIT: + switch (cmd.action()) { case LFUN_INSET_MODIFY: + if (cmd.getArg(0) != "graphics") + return Inset::getStatus(cur, cmd, flag); + // fall through + case LFUN_INSET_EDIT: case LFUN_INSET_DIALOG_UPDATE: case LFUN_GRAPHICS_RELOAD: flag.setEnabled(true); @@ -393,7 +403,7 @@ docstring InsetGraphics::toDocbookLength(Length const & len) const case Length::PPW: // Percent of PageWidth case Length::PLW: // Percent of LineWidth case Length::PTH: // Percent of TextHeight - case Length::PPH: // Percent of Paper + case Length::PPH: // Percent of PaperHeight // Sigh, this will go wrong. result << len.value() << "%"; break; @@ -471,7 +481,7 @@ copyFileIfNeeded(FileName const & file_in, FileName const & file_out) LYXERR(Debug::GRAPHICS, to_utf8(bformat(_("Could not copy the file\n%1$s\n" "into the temporary directory."), - from_utf8(file_in.absFilename())))); + from_utf8(file_in.absFileName())))); } GraphicsCopyStatus status = success ? SUCCESS : FAILURE; @@ -482,20 +492,20 @@ copyFileIfNeeded(FileName const & file_in, FileName const & file_out) pair const copyToDirIfNeeded(DocFileName const & file, string const & dir) { - string const file_in = file.absFilename(); + string const file_in = file.absFileName(); string const only_path = onlyPath(file_in); if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/")) - return make_pair(IDENTICAL_PATHS, file_in); + return make_pair(IDENTICAL_PATHS, FileName(file_in)); - string mangled = file.mangledFilename(); - if (file.isZipped()) { + string mangled = file.mangledFileName(); + if (formats.isZippedFile(file)) { // We need to change _eps.gz to .eps.gz. The mangled name is - // still unique because of the counter in mangledFilename(). - // We can't just call mangledFilename() with the zip + // still unique because of the counter in mangledFileName(). + // We can't just call mangledFileName() with the zip // extension removed, because base.eps and base.eps.gz may // have different content but would get the same mangled // name in this case. - string const base = removeExtension(file.unzippedFilename()); + string const base = removeExtension(file.unzippedFileName()); string::size_type const ext_len = file_in.length() - base.length(); mangled[mangled.length() - ext_len] = '.'; } @@ -548,9 +558,9 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const if (params().filename.empty()) return string(); - string const orig_file = params().filename.absFilename(); + string const orig_file = params().filename.absFileName(); // this is for dryrun and display purposes, do not use latexFilename - string const rel_file = params().filename.relFilename(buffer().filePath()); + string const rel_file = params().filename.relFileName(buffer().filePath()); // previewing source code, no file copying or file format conversion if (runparams.dryrun) @@ -565,7 +575,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // We are not going to change the extension or using the name of the // temporary file, the code is already complicated enough. if (runparams.inComment || !params().filename.isReadableFile()) - return params().filename.outputFilename(masterBuffer->filePath()); + return params().filename.outputFileName(masterBuffer->filePath()); // We place all temporary files in the master buffer's temp dir. // This is possible because we use mangled file names. @@ -586,24 +596,35 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // "nice" means that the buffer is exported to LaTeX format but not // run through the LaTeX compiler. string output_file = runparams.nice ? - params().filename.outputFilename(masterBuffer->filePath()) : - onlyFilename(temp_file.absFilename()); - - if (runparams.nice && !isValidLaTeXFilename(output_file)) { - frontend::Alert::warning(_("Invalid filename"), - _("The following filename is likely to cause trouble " - "when running the exported file through LaTeX: ") + - from_utf8(output_file)); + params().filename.outputFileName(masterBuffer->filePath()) : + onlyFileName(temp_file.absFileName()); + + if (runparams.nice) { + if (!isValidLaTeXFileName(output_file)) { + frontend::Alert::warning(_("Invalid filename"), + _("The following filename will cause troubles " + "when running the exported file through LaTeX: ") + + from_utf8(output_file)); + } + // only show DVI-specific warning when export format is plain latex + if (!isValidDVIFileName(output_file) + && runparams.flavor == OutputParams::LATEX) { + frontend::Alert::warning(_("Problematic filename for DVI"), + _("The following filename can cause troubles " + "when running the exported file through LaTeX " + "and opening the resulting DVI: ") + + from_utf8(output_file), true); + } } FileName source_file = runparams.nice ? FileName(params().filename) : temp_file; - string const tex_format = (runparams.flavor == OutputParams::LATEX) ? - "latex" : "pdflatex"; + // determine the export format + string const tex_format = flavor2format(runparams.flavor); // If the file is compressed and we have specified that it // should not be uncompressed, then just return its name and // let LaTeX do the rest! - if (params().filename.isZipped()) { + if (formats.isZippedFile(params().filename)) { if (params().noUnzip) { // We don't know whether latex can actually handle // this file, but we can't check, because that would @@ -621,7 +642,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // LaTeX needs the bounding box file in the // tmp dir FileName bb_file = - FileName(changeExtension(temp_file.absFilename(), "bb")); + FileName(changeExtension(temp_file.absFileName(), "bb")); boost::tie(status, bb_file) = copyFileIfNeeded(bb_orig_file, bb_file); if (status == FAILURE) @@ -639,9 +660,9 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const } FileName const unzipped_temp_file = - FileName(unzippedFileName(temp_file.absFilename())); + FileName(unzippedFileName(temp_file.absFileName())); output_file = unzippedFileName(output_file); - source_file = FileName(unzippedFileName(source_file.absFilename())); + source_file = FileName(unzippedFileName(source_file.absFileName())); if (compare_timestamps(unzipped_temp_file, temp_file) > 0) { // temp_file has been unzipped already and // orig_file has not changed in the meantime. @@ -675,12 +696,12 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // the file format from the extension, so we must // change it. FileName const new_file = - FileName(changeExtension(temp_file.absFilename(), ext)); + FileName(changeExtension(temp_file.absFileName(), ext)); if (temp_file.moveTo(new_file)) { temp_file = new_file; output_file = changeExtension(output_file, ext); source_file = - FileName(changeExtension(source_file.absFilename(), ext)); + FileName(changeExtension(source_file.absFileName(), ext)); } else { LYXERR(Debug::GRAPHICS, "Could not rename file `" << temp_file << "' to `" << new_file << "'."); @@ -695,7 +716,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const } // so the source and destination formats are different - FileName const to_file = FileName(changeExtension(temp_file.absFilename(), ext)); + FileName const to_file = FileName(changeExtension(temp_file.absFileName(), ext)); string const output_to_file = changeExtension(output_file, ext); // Do we need to perform the conversion? @@ -732,20 +753,30 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const } -int InsetGraphics::latex(odocstream & os, - OutputParams const & runparams) const +void InsetGraphics::latex(otexstream & os, + OutputParams const & runparams) const { // If there is no file specified or not existing, // just output a message about it in the latex output. LYXERR(Debug::GRAPHICS, "insetgraphics::latex: Filename = " - << params().filename.absFilename()); + << params().filename.absFileName()); bool const file_exists = !params().filename.empty() && params().filename.isReadableFile(); - string const message = file_exists ? - string() : string("bb = 0 0 200 100, draft, type=eps"); - // if !message.empty() then there was no existing file - // "filename" found. In this case LaTeX + string message; + if (!file_exists) { + if (params().bb.empty()) + message = "bb = 0 0 200 100"; + if (!params().draft) { + if (!message.empty()) + message += ", "; + message += "draft"; + } + if (!message.empty()) + message += ", "; + message += "type=eps"; + } + // If no existing file "filename" was found LaTeX // draws only a rectangle with the above bb and the // not found filename in it. LYXERR(Debug::GRAPHICS, "\tMessage = \"" << message << '\"'); @@ -776,18 +807,18 @@ int InsetGraphics::latex(odocstream & os, // 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(runparams); + string file_path = prepareFile(runparams); + latex_str += file_path; latex_str += '}' + after; // FIXME UNICODE os << from_utf8(latex_str); LYXERR(Debug::GRAPHICS, "InsetGraphics::latex outputting:\n" << latex_str); - // Return how many newlines we issued. - return int(count(latex_str.begin(), latex_str.end(),'\n')); } -int InsetGraphics::plaintext(odocstream & os, OutputParams const &) const +int InsetGraphics::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { // No graphics in ascii output. Possible to use gifscii to convert // images to ascii approximation. @@ -798,7 +829,7 @@ int InsetGraphics::plaintext(odocstream & os, OutputParams const &) const // FIXME: We have no idea what the encoding of the filename is docstring const str = bformat(buffer().B_("Graphics file: %1$s"), - from_utf8(params().filename.absFilename())); + from_utf8(params().filename.absFileName())); os << '<' << str << '>'; return 2 + str.size(); @@ -870,7 +901,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const if (params().filename.empty()) return string(); - string const orig_file = params().filename.absFilename(); + string const orig_file = params().filename.absFileName(); // The master buffer. This is useful when there are multiple levels // of include files @@ -894,7 +925,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const if (status == FAILURE) return string(); - string output_file = onlyFilename(temp_file.absFilename()); + string output_file = onlyFileName(temp_file.absFileName()); string const from = formats.getFormatFromFile(temp_file); if (from.empty()) @@ -912,7 +943,7 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const } // so the source and destination formats are different - FileName const to_file = FileName(changeExtension(temp_file.absFilename(), ext)); + FileName const to_file = FileName(changeExtension(temp_file.absFileName(), ext)); string const output_to_file = changeExtension(output_file, ext); // Do we need to perform the conversion? @@ -946,20 +977,29 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const docstring InsetGraphics::xhtml(XHTMLStream & xs, OutputParams const & op) const { string const output_file = prepareHTMLFile(op); + if (output_file.empty()) { LYXERR0("InsetGraphics::xhtml: Unable to prepare file `" << params().filename << "' for output. File missing?"); - string const attr = "src='" + params().filename.absFilename() + string const attr = "src='" + params().filename.absFileName() + "' alt='image: " + output_file + "'"; xs << html::CompTag("img", attr); return docstring(); } // FIXME XHTML - // Do we want to do something with the parameters, other than use them to - // crop, etc, the image? - // Speaking of which: Do the cropping, rotating, etc. - string const attr = "src='" + output_file + "' alt='image: " + // We aren't doing anything with the crop and rotate parameters, and it would + // really be better to do width and height conversion, rather than to output + // these parameters here. + string imgstyle; + if (!params().width.zero()) + imgstyle += "width:" + params().width.asHTMLString() + ";"; + if (!params().height.zero()) + imgstyle += " height:" + params().height.asHTMLString() + ";"; + if (!imgstyle.empty()) + imgstyle = "style='" + imgstyle + "' "; + + string const attr = imgstyle + "src='" + output_file + "' alt='image: " + output_file + "'"; xs << html::CompTag("img", attr); return docstring(); @@ -973,14 +1013,12 @@ void InsetGraphics::validate(LaTeXFeatures & features) const return; features.includeFile(graphic_label, - removeExtension(params().filename.absFilename())); + removeExtension(params().filename.absFileName())); features.require("graphicx"); if (features.runparams().nice) { - Buffer const * masterBuffer = features.buffer().masterBuffer(); - string const rel_file = removeExtension( - params().filename.relFilename(masterBuffer->filePath())); + string const rel_file = params().filename.onlyFileNameWithoutExt(); if (contains(rel_file, ".")) features.require("lyxdot"); } @@ -1017,19 +1055,17 @@ void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const } -void InsetGraphics::addToToc(DocIterator const & cpit) +void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active) const { - TocBackend & backend = buffer().tocBackend(); - //FIXME UNICODE docstring const str = from_utf8(params_.filename.onlyFileName()); - backend.toc("graphics").push_back(TocItem(cpit, 0, str)); + buffer().tocBackend().toc("graphics").push_back(TocItem(cpit, 0, str, output_active)); } -docstring InsetGraphics::contextMenu(BufferView const &, int, int) const +string InsetGraphics::contextMenuName() const { - return from_ascii("context-graphics"); + return "context-graphics"; } @@ -1059,6 +1095,12 @@ string InsetGraphics::params2string(InsetGraphicsParams const & params, return data.str(); } + +docstring InsetGraphics::toolTip(BufferView const &, int, int) const +{ + return from_utf8(params().filename.onlyFileName()); +} + namespace graphics { void getGraphicsGroups(Buffer const & b, set & ids) @@ -1129,7 +1171,7 @@ void unifyGraphicsGroups(Buffer & b, string const & argument) InsetGraphics & ins = static_cast(*it); InsetGraphicsParams inspar = ins.getParams(); if (params.groupId == inspar.groupId) { - b.undo().recordUndo(it); + b.undo().recordUndo(CursorData(it)); params.filename = inspar.filename; ins.setParams(params); }