X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetGraphics.cpp;h=15c87e4e5e98aab81b2f901f28dfa2ef9b3c99ac;hb=d6a93143ec2146210d79f58cac42f9608da86100;hp=3195b5ca0af4d9e337c82f46f01ed587f01cb94f;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 3195b5ca0a..15c87e4e5e 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -68,11 +68,16 @@ TODO #include "OutputParams.h" #include "output_xhtml.h" #include "sgml.h" +#include "texstream.h" #include "TocBackend.h" #include "frontends/alert.h" #include "frontends/Application.h" +#include "graphics/GraphicsCache.h" +#include "graphics/GraphicsCacheItem.h" +#include "graphics/GraphicsImage.h" + #include "support/convert.h" #include "support/debug.h" #include "support/docstream.h" @@ -82,12 +87,14 @@ TODO #include "support/lyxlib.h" #include "support/lstrings.h" #include "support/os.h" +#include "support/qstring_helpers.h" #include "support/Systemcall.h" -#include +#include #include #include +#include using namespace std; using namespace lyx::support; @@ -107,10 +114,10 @@ string findTargetFormat(string const & format, OutputParams const & runparams) || runparams.flavor == OutputParams::XETEX || runparams.flavor == OutputParams::LUATEX) { LYXERR(Debug::GRAPHICS, "findTargetFormat: PDF mode"); - Format const * const f = formats.getFormat(format); + Format const * const f = theFormats().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 +126,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 = theFormats().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 +146,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 +163,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." @@ -159,7 +172,7 @@ void readInsetGraphics(Lexer & lex, string const & bufpath, } } -} // namespace anon +} // namespace InsetGraphics::InsetGraphics(Buffer * buf) @@ -203,6 +216,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()) { @@ -215,7 +233,7 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd) // if the inset is part of a graphics group, all the // other members should be updated too. if (!params_.groupId.empty()) - graphics::unifyGraphicsGroups(buffer(), + graphics::unifyGraphicsGroups(buffer(), to_utf8(cmd.argument())); break; } @@ -240,8 +258,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); @@ -285,19 +306,86 @@ 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()); } -string InsetGraphics::createLatexOptions() const +void InsetGraphics::outBoundingBox(graphics::BoundingBox & bbox) const +{ + if (bbox.empty()) + return; + + FileName const file(params().filename.absFileName()); + + // No correction is necessary for a postscript image + bool const zipped = theFormats().isZippedFile(file); + FileName const unzipped_file = zipped ? unzipFile(file) : file; + string const format = theFormats().getFormatFromFile(unzipped_file); + if (zipped) + unzipped_file.removeFile(); + if (Formats::isPostScriptFileFormat(format)) + return; + + // Get the actual image dimensions in pixels + int width = 0; + int height = 0; + graphics::Cache & gc = graphics::Cache::get(); + if (gc.inCache(file)) { + graphics::Image const * image = gc.item(file)->image(); + if (image) { + width = image->width(); + height = image->height(); + } + } + if (width == 0 || height == 0) + return; + + // Use extractbb to find the dimensions in the typeset output + QProcess extractbb; + extractbb.start("extractbb", QStringList() << "-O" << toqstr(file.absFileName())); + if (!extractbb.waitForStarted() || !extractbb.waitForFinished()) { + LYXERR0("Cannot read output bounding box of " << file); + return; + } + + string const result = extractbb.readAll().constData(); + size_t i = result.find("%%BoundingBox:"); + if (i == string::npos) { + LYXERR0("Cannot find output bounding box of " << file); + return; + } + + string const bb = result.substr(i); + int out_width = convert(token(bb, ' ', 3)); + int out_height = convert(token(bb, ' ', 4)); + + // Compute the scaling ratio and correct the bounding box + double scalex = out_width / double(width); + double scaley = out_height / double(height); + + bbox.xl.value(scalex * bbox.xl.value()); + bbox.xr.value(scalex * bbox.xr.value()); + bbox.yb.value(scaley * bbox.yb.value()); + bbox.yt.value(scaley * bbox.yt.value()); +} + + +string InsetGraphics::createLatexOptions(bool const ps) const { // Calculate the options part of the command, we must do it to a string // 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()) { + graphics::BoundingBox out_bbox = params().bbox; + outBoundingBox(out_bbox); + string const key = ps ? "bb=" : "viewport="; + options << key << out_bbox.xl.asLatexString() << ' ' + << out_bbox.yb.asLatexString() << ' ' + << out_bbox.xr.asLatexString() << ' ' + << out_bbox.yt.asLatexString() << ','; + } if (params().draft) options << "draft,"; if (params().clip) @@ -396,6 +484,7 @@ docstring InsetGraphics::toDocbookLength(Length const & len) const case Length::PLW: // Percent of LineWidth case Length::PTH: // Percent of TextHeight case Length::PPH: // Percent of PaperHeight + case Length::BLS: // Percent of BaselineSkip // Sigh, this will go wrong. result << len.value() << "%"; break; @@ -421,7 +510,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()) { @@ -466,7 +555,7 @@ copyFileIfNeeded(FileName const & file_in, FileName const & file_out) // Nothing to do... return make_pair(IDENTICAL_CONTENTS, file_out); - Mover const & mover = getMover(formats.getFormatFromFile(file_in)); + Mover const & mover = getMover(theFormats().getFormatFromFile(file_in)); bool const success = mover.copy(file_in, file_out); if (!success) { // FIXME UNICODE @@ -486,11 +575,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 (theFormats().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 @@ -531,7 +620,7 @@ string const stripExtensionIfPossible(string const & file, string const & to, bo { // No conversion is needed. LaTeX can handle the graphic file as is. // This is true even if the orig_file is compressed. - string const to_format = formats.getFormat(to)->extension(); + string const to_format = theFormats().getFormat(to)->extension(); string const file_format = getExtension(file); // for latex .ps == .eps if (to_format == file_format || @@ -541,7 +630,7 @@ string const stripExtensionIfPossible(string const & file, string const & to, bo return latex_path(file, EXCLUDE_EXTENSION); } -} // namespace anon +} // namespace string InsetGraphics::prepareFile(OutputParams const & runparams) const @@ -578,8 +667,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; @@ -611,47 +699,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 (theFormats().isZippedFile(params().filename)) { FileName const unzipped_temp_file = FileName(unzippedFileName(temp_file.absFileName())); output_file = unzippedFileName(output_file); @@ -668,12 +718,12 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const } } - string const from = formats.getFormatFromFile(temp_file); + string const from = theFormats().getFormatFromFile(temp_file); if (from.empty()) LYXERR(Debug::GRAPHICS, "\tCould not get file format."); string const to = findTargetFormat(from, runparams); - string const ext = formats.extension(to); + string const ext = theFormats().extension(to); LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to); // We're going to be running the exported buffer through the LaTeX @@ -688,12 +738,12 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // The LaTeX compiler will not be able to determine // the file format from the extension, so we must // change it. - FileName const new_file = + FileName const new_file = FileName(changeExtension(temp_file.absFileName(), ext)); if (temp_file.moveTo(new_file)) { temp_file = new_file; output_file = changeExtension(output_file, ext); - source_file = + source_file = FileName(changeExtension(source_file.absFileName(), ext)); } else { LYXERR(Debug::GRAPHICS, "Could not rename file `" @@ -733,9 +783,15 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const // FIXME (Abdel 12/08/06): Is there a need to show these errors? ErrorList el; - if (theConverters().convert(&buffer(), temp_file, to_file, params().filename, + Converters::RetVal const rv = + theConverters().convert(&buffer(), temp_file, to_file, params().filename, from, to, el, - Converters::try_default | Converters::try_cache)) { + Converters::try_default | Converters::try_cache); + if (rv == Converters::KILLED) { + LYXERR0("Graphics preparation killed."); + if (buffer().isClone() && buffer().isExporting()) + throw ConversionException(); + } else if (rv == Converters::SUCCESS) { runparams.exportdata->addExternalFile(tex_format, to_file, output_to_file); runparams.exportdata->addExternalFile("dvi", @@ -746,8 +802,8 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const } -int InsetGraphics::latex(otexstream & 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. @@ -756,10 +812,20 @@ int InsetGraphics::latex(otexstream & 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 << '\"'); @@ -776,7 +842,9 @@ int InsetGraphics::latex(otexstream & os, before += "\\includegraphics"; // Write the options if there are any. - string const opts = createLatexOptions(); + bool const ps = runparams.flavor == OutputParams::LATEX + || runparams.flavor == OutputParams::DVILUATEX; + string const opts = createLatexOptions(ps); LYXERR(Debug::GRAPHICS, "\tOpts = " << opts); if (!opts.empty() && !message.empty()) @@ -790,18 +858,18 @@ int InsetGraphics::latex(otexstream & 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. @@ -884,15 +952,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 @@ -902,20 +968,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()) + string const from = theFormats().getFormatFromFile(temp_file); + 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 ext = theFormats().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); @@ -947,10 +1014,15 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const // FIXME (Abdel 12/08/06): Is there a need to show these errors? ErrorList el; - bool const success = + Converters::RetVal const rv = theConverters().convert(&buffer(), temp_file, to_file, params().filename, from, to, el, Converters::try_default | Converters::try_cache); - if (!success) + if (rv == Converters::KILLED) { + if (buffer().isClone() && buffer().isExporting()) + throw ConversionException(); + return string(); + } + if (rv != Converters::SUCCESS) return string(); runparams.exportdata->addExternalFile("xhtml", to_file, output_to_file); return output_to_file; @@ -959,21 +1031,40 @@ 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 `" + string const output_file = op.dryrun ? string() : prepareHTMLFile(op); + + if (output_file.empty() && !op.dryrun) { + 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: " + // FIXME XHTML + // 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(); @@ -992,9 +1083,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"); } @@ -1026,24 +1115,25 @@ InsetGraphicsParams const & InsetGraphics::params() const void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const { - formats.edit(buffer(), p.filename, - formats.getFormatFromFile(p.filename)); + theFormats().edit(buffer(), p.filename, + theFormats().getFormatFromFile(p.filename)); } -void InsetGraphics::addToToc(DocIterator const & cpit) const +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::contextMenuName() const +string InsetGraphics::contextMenuName() const { - return from_ascii("context-graphics"); + return "context-graphics"; } @@ -1059,7 +1149,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); } @@ -1073,6 +1163,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) @@ -1080,13 +1176,14 @@ void getGraphicsGroups(Buffer const & b, set & ids) Inset & inset = b.inset(); InsetIterator it = inset_iterator_begin(inset); InsetIterator const end = inset_iterator_end(inset); - for (; it != end; ++it) - if (it->lyxCode() == GRAPHICS_CODE) { - InsetGraphics & ins = static_cast(*it); - InsetGraphicsParams inspar = ins.getParams(); - if (!inspar.groupId.empty()) - ids.insert(inspar.groupId); - } + for (; it != end; ++it) { + InsetGraphics const * ins = it->asInsetGraphics(); + if (!ins) + continue; + InsetGraphicsParams const & inspar = ins->getParams(); + if (!inspar.groupId.empty()) + ids.insert(inspar.groupId); + } } @@ -1098,12 +1195,13 @@ int countGroupMembers(Buffer const & b, string const & groupId) Inset & inset = b.inset(); InsetIterator it = inset_iterator_begin(inset); InsetIterator const end = inset_iterator_end(inset); - for (; it != end; ++it) - if (it->lyxCode() == GRAPHICS_CODE) { - InsetGraphics & ins = static_cast(*it); - if (ins.getParams().groupId == groupId) - ++n; - } + for (; it != end; ++it) { + InsetGraphics const * ins = it->asInsetGraphics(); + if (!ins) + continue; + if (ins->getParams().groupId == groupId) + ++n; + } return n; } @@ -1115,16 +1213,17 @@ string getGroupParams(Buffer const & b, string const & groupId) Inset & inset = b.inset(); InsetIterator it = inset_iterator_begin(inset); InsetIterator const end = inset_iterator_end(inset); - for (; it != end; ++it) - if (it->lyxCode() == GRAPHICS_CODE) { - InsetGraphics & ins = static_cast(*it); - InsetGraphicsParams inspar = ins.getParams(); - if (inspar.groupId == groupId) { - InsetGraphicsParams tmp = inspar; - tmp.filename.erase(); - return InsetGraphics::params2string(tmp, b); - } + for (; it != end; ++it) { + InsetGraphics const * ins = it->asInsetGraphics(); + if (!ins) + continue; + InsetGraphicsParams const & inspar = ins->getParams(); + if (inspar.groupId == groupId) { + InsetGraphicsParams tmp = inspar; + tmp.filename.erase(); + return InsetGraphics::params2string(tmp, b); } + } return string(); } @@ -1134,34 +1233,34 @@ void unifyGraphicsGroups(Buffer & b, string const & argument) InsetGraphicsParams params; InsetGraphics::string2params(argument, b, params); - b.undo().beginUndoGroup(); + // This handles undo groups automagically + UndoGroupHelper ugh(&b); Inset & inset = b.inset(); InsetIterator it = inset_iterator_begin(inset); InsetIterator const end = inset_iterator_end(inset); for (; it != end; ++it) { - if (it->lyxCode() == GRAPHICS_CODE) { - InsetGraphics & ins = static_cast(*it); - InsetGraphicsParams inspar = ins.getParams(); - if (params.groupId == inspar.groupId) { - b.undo().recordUndo(it); - params.filename = inspar.filename; - ins.setParams(params); - } + InsetGraphics * ins = it->asInsetGraphics(); + if (!ins) + continue; + InsetGraphicsParams const & inspar = ins->getParams(); + if (params.groupId == inspar.groupId) { + CursorData(it).recordUndo(); + params.filename = inspar.filename; + ins->setParams(params); } } - b.undo().endUndoGroup(); } InsetGraphics * getCurrentGraphicsInset(Cursor const & cur) { Inset * instmp = &cur.inset(); - if (instmp->lyxCode() != GRAPHICS_CODE) + if (!instmp->asInsetGraphics()) instmp = cur.nextInset(); - if (!instmp || instmp->lyxCode() != GRAPHICS_CODE) + if (!instmp || !instmp->asInsetGraphics()) return 0; - return static_cast(instmp); + return instmp->asInsetGraphics(); } } // namespace graphics