X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.cpp;h=b41d72bc70083d132742ee48ef3b851aeb576251;hb=83074c431c97f5447ddbfd8394c97c1118c93693;hp=e28a986b73e47e0d67ed06b7768f6a372d878b44;hpb=2868ff7a522a282ac2d918ca73bceef686ef70ae;p=lyx.git diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index e28a986b73..b41d72bc70 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -68,6 +68,7 @@ TODO #include "OutputParams.h" #include "output_xhtml.h" #include "sgml.h" +#include "texstream.h" #include "TocBackend.h" #include "frontends/alert.h" @@ -84,10 +85,9 @@ TODO #include "support/os.h" #include "support/Systemcall.h" -#include - #include #include +#include using namespace std; using namespace lyx::support; @@ -110,7 +110,7 @@ string findTargetFormat(string const & format, OutputParams const & runparams) 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; @@ -119,8 +119,14 @@ string findTargetFormat(string const & format, OutputParams const & runparams) } // for HTML, we leave the known formats and otherwise convert to png if (runparams.flavor == OutputParams::HTML) { + Format const * const f = formats.getFormat(format); + // Convert vector graphics to svg + if (f && f->vectorFormat() && theConverters().isReachable(format, "svg")) + return "svg"; + // Leave the known formats alone if (format == "jpg" || format == "png" || format == "gif") return format; + // Convert everything else to png return "png"; } // If it's postscript, we always do eps. @@ -133,7 +139,7 @@ string findTargetFormat(string const & format, OutputParams const & runparams) } -void readInsetGraphics(Lexer & lex, string const & bufpath, +void readInsetGraphics(Lexer & lex, Buffer const & buf, bool allowOrigin, InsetGraphicsParams & params) { bool finished = false; @@ -150,7 +156,7 @@ void readInsetGraphics(Lexer & lex, string const & bufpath, if (token == "\\end_inset") { finished = true; } else { - if (!params.Read(lex, token, bufpath)) + if (!params.Read(lex, token, buf, allowOrigin)) lyxerr << "Unknown token, " << token << ", skipping." @@ -203,6 +209,11 @@ 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()) { @@ -210,6 +221,7 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd) break; } + cur.recordUndo(); setParams(p); // if the inset is part of a graphics group, all the // other members should be updated too. @@ -239,8 +251,11 @@ bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { switch (cmd.action()) { - case LFUN_INSET_EDIT: 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); @@ -284,7 +299,7 @@ void InsetGraphics::read(Lexer & lex) { lex.setContext("InsetGraphics::read"); //lex >> "Graphics"; - readInsetGraphics(lex, buffer().filePath(), params_); + readInsetGraphics(lex, buffer(), true, params_); graphic_->update(params().as_grfxParams()); } @@ -295,8 +310,11 @@ string InsetGraphics::createLatexOptions() const // stream since we might have a trailing comma that we would like to remove // before writing it to the output stream. ostringstream options; - if (!params().bb.empty()) - options << "bb=" << rtrim(params().bb) << ','; + if (!params().bbox.empty()) + options << "bb=" << params().bbox.xl.asLatexString() << ' ' + << params().bbox.yb.asLatexString() << ' ' + << params().bbox.xr.asLatexString() << ' ' + << params().bbox.yt.asLatexString() << ','; if (params().draft) options << "draft,"; if (params().clip) @@ -420,7 +438,7 @@ docstring InsetGraphics::createDocBookAttributes() const 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 ) + << support::iround(scl) << "\" "; } else { if (!params().width.zero()) { @@ -485,11 +503,11 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir) { 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); + if (rtrim(only_path, "/") == rtrim(dir, "/")) + return make_pair(IDENTICAL_PATHS, FileName(file_in)); string mangled = file.mangledFileName(); - if (file.isZipped()) { + 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 @@ -577,8 +595,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // we move it to a temp dir or uncompress it. FileName temp_file; GraphicsCopyStatus status; - boost::tie(status, temp_file) = - copyToDirIfNeeded(params().filename, temp_path); + tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path); if (status == FAILURE) return orig_file; @@ -610,47 +627,9 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const FileName source_file = runparams.nice ? FileName(params().filename) : temp_file; // determine the export format - string const tex_format = (runparams.flavor == OutputParams::LATEX) ? - "latex" : "pdflatex"; - - // 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 (params().noUnzip) { - // We don't know whether latex can actually handle - // this file, but we can't check, because that would - // mean to unzip the file and thereby making the - // noUnzip parameter meaningless. - LYXERR(Debug::GRAPHICS, "\tpass zipped file to LaTeX."); - - FileName const bb_orig_file = - FileName(changeExtension(orig_file, "bb")); - if (runparams.nice) { - runparams.exportdata->addExternalFile(tex_format, - bb_orig_file, - changeExtension(output_file, "bb")); - } else { - // LaTeX needs the bounding box file in the - // tmp dir - FileName bb_file = - FileName(changeExtension(temp_file.absFileName(), "bb")); - boost::tie(status, bb_file) = - copyFileIfNeeded(bb_orig_file, bb_file); - if (status == FAILURE) - return orig_file; - runparams.exportdata->addExternalFile(tex_format, - bb_file); - } - runparams.exportdata->addExternalFile(tex_format, - source_file, output_file); - runparams.exportdata->addExternalFile("dvi", - source_file, output_file); - // We can't strip the extension, because we don't know - // the unzipped file format - return latex_path(output_file, EXCLUDE_EXTENSION); - } + string const tex_format = flavor2format(runparams.flavor); + if (formats.isZippedFile(params().filename)) { FileName const unzipped_temp_file = FileName(unzippedFileName(temp_file.absFileName())); output_file = unzippedFileName(output_file); @@ -745,8 +724,8 @@ 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. @@ -755,10 +734,20 @@ int InsetGraphics::latex(odocstream & os, 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().bbox.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 << '\"'); @@ -789,18 +778,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. @@ -883,15 +872,13 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const if (params().filename.empty()) return string(); - string const orig_file = params().filename.absFileName(); + if (!params().filename.isReadableFile()) + return string(); // The master buffer. This is useful when there are multiple levels // of include files Buffer const * masterBuffer = buffer().masterBuffer(); - if (!params().filename.isReadableFile()) - return string(); - // We place all temporary files in the master buffer's temp dir. // This is possible because we use mangled file names. // FIXME We may want to put these files in some special temporary @@ -901,20 +888,21 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const // Copy to temporary directory. FileName temp_file; GraphicsCopyStatus status; - boost::tie(status, temp_file) = - copyToDirIfNeeded(params().filename, temp_path); + tie(status, temp_file) = copyToDirIfNeeded(params().filename, temp_path); if (status == FAILURE) return string(); - string output_file = onlyFileName(temp_file.absFileName()); - string const from = formats.getFormatFromFile(temp_file); - if (from.empty()) + if (from.empty()) { LYXERR(Debug::GRAPHICS, "\tCould not get file format."); + return string(); + } string const to = findTargetFormat(from, runparams); string const ext = formats.extension(to); + string const orig_file = params().filename.absFileName(); + string output_file = onlyFileName(temp_file.absFileName()); LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to); LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file); @@ -959,6 +947,7 @@ 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?"); @@ -969,10 +958,28 @@ docstring InsetGraphics::xhtml(XHTMLStream & xs, OutputParams const & op) const } // 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; + bool const havewidth = !params().width.zero(); + bool const haveheight = !params().height.zero(); + if (havewidth || haveheight) { + if (havewidth) + imgstyle += "width:" + params().width.asHTMLString() + ";"; + if (haveheight) + imgstyle += " height:" + params().height.asHTMLString() + ";"; + } else if (params().scale != "100") { + // Note that this will not have the same effect as in LaTeX export: + // There, the image will be scaled from its original size. Here, the + // percentage will be interpreted by the browser, and the image will + // be scaled to a percentage of the window size. + imgstyle = "width:" + params().scale + "%;"; + } + if (!imgstyle.empty()) + imgstyle = "style='" + imgstyle + "' "; + + string const attr = imgstyle + "src='" + output_file + "' alt='image: " + output_file + "'"; xs << html::CompTag("img", attr); return docstring(); @@ -991,9 +998,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const 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"); } @@ -1030,19 +1035,20 @@ void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const } -void InsetGraphics::addToToc(DocIterator const & cpit) +void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active, + UpdateType, TocBackend & backend) const { - TocBackend & backend = buffer().tocBackend(); - //FIXME UNICODE docstring const str = from_utf8(params_.filename.onlyFileName()); - backend.toc("graphics").push_back(TocItem(cpit, 0, str)); + TocBuilder & b = backend.builder("graphics"); + b.pushItem(cpit, str, output_active); + b.pop(); } -docstring InsetGraphics::contextMenu(BufferView const &, int, int) const +string InsetGraphics::contextMenuName() const { - return from_ascii("context-graphics"); + return "context-graphics"; } @@ -1058,7 +1064,7 @@ void InsetGraphics::string2params(string const & in, Buffer const & buffer, lex.setContext("InsetGraphics::string2params"); lex >> "graphics"; params = InsetGraphicsParams(); - readInsetGraphics(lex, buffer.filePath(), params); + readInsetGraphics(lex, buffer, false, params); } @@ -1072,6 +1078,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) @@ -1142,7 +1154,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); }