]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetGraphics.cpp
Enhancements and bugfixes to the TOCs
[lyx.git] / src / insets / InsetGraphics.cpp
index 0431b51de2b0ed59a77b73e15f35127730fddc56..c20f0314abd27ca559e244a2be56d4960fa32431 100644 (file)
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Baruch Even
- * \author Herbert Voß
+ * \author Herbert Voß
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -54,22 +54,24 @@ TODO
 #include "Converter.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
-#include "EmbeddedFiles.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "InsetIterator.h"
 #include "LaTeXFeatures.h"
 #include "Length.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "Mover.h"
 #include "OutputParams.h"
+#include "output_xhtml.h"
 #include "sgml.h"
 #include "TocBackend.h"
 
 #include "frontends/alert.h"
+#include "frontends/Application.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -82,7 +84,6 @@ TODO
 #include "support/os.h"
 #include "support/Systemcall.h"
 
-#include <boost/bind.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include <algorithm>
@@ -101,19 +102,33 @@ 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 pdflatex?
-       if (runparams.flavor == OutputParams::PDFLATEX) {
+       // Are we using latex or XeTeX/LuaTeX/pdflatex?
+       if (runparams.flavor == OutputParams::PDFLATEX
+           || 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;
                // Convert everything else to png
                return "png";
        }
+       // 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.
        LYXERR(Debug::GRAPHICS, "findTargetFormat: PostScript mode");
        if (format != "ps")
@@ -142,8 +157,10 @@ void readInsetGraphics(Lexer & lex, string const & bufpath,
                        finished = true;
                } else {
                        if (!params.Read(lex, token, bufpath))
-                               lyxerr << "Unknown token, " << token << ", skipping."
-                                       << endl;
+                               lyxerr << "Unknown token, "
+                                      << token
+                                      << ", skipping."
+                                      << endl;
                }
        }
 }
@@ -151,18 +168,16 @@ void readInsetGraphics(Lexer & lex, string const & bufpath,
 } // namespace anon
 
 
-InsetGraphics::InsetGraphics(Buffer & buf)
-       : graphic_label(sgml::uniqueID(from_ascii("graph"))),
+InsetGraphics::InsetGraphics(Buffer * buf)
+       : Inset(buf), graphic_label(sgml::uniqueID(from_ascii("graph"))),
          graphic_(new RenderGraphic(this))
 {
-       Inset::setBuffer(buf);
 }
 
 
 InsetGraphics::InsetGraphics(InsetGraphics const & ig)
        : Inset(ig),
-         boost::signals::trackable(),
-               graphic_label(sgml::uniqueID(from_ascii("graph"))),
+         graphic_label(sgml::uniqueID(from_ascii("graph"))),
          graphic_(new RenderGraphic(*ig.graphic_, this))
 {
        setParams(ig.params());
@@ -177,55 +192,52 @@ Inset * InsetGraphics::clone() const
 
 InsetGraphics::~InsetGraphics()
 {
-       InsetGraphicsMailer(*this).hideDialog();
-}
-
-
-void InsetGraphics::setBuffer(Buffer & buffer)
-{
-       if (buffer_) {
-               try {
-                       // a file may not be copied successfully when, e.g. buffer_
-                       // has already been closed.
-                       params_.filename = params_.filename.copyTo(&buffer);
-               } catch (ExceptionMessage const & message) {
-                       Alert::error(message.title_, message.details_);
-                       // failed to embed
-                       params_.filename.setEmbed(false);
-               }
-       }
-       Inset::setBuffer(buffer);
+       hideDialogs("graphics", this);
+       delete graphic_;
 }
 
 
 void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-       switch (cmd.action) {
-       case LFUN_GRAPHICS_EDIT: {
+       switch (cmd.action()) {
+       case LFUN_INSET_EDIT: {
                InsetGraphicsParams p = params();
                if (!cmd.argument().empty())
-                       InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buffer(), p);
-               editGraphics(p, buffer());
+                       string2params(to_utf8(cmd.argument()), buffer(), p);
+               editGraphics(p);
                break;
        }
 
        case LFUN_INSET_MODIFY: {
+               if (cmd.getArg(0) != "graphics") {
+                       Inset::doDispatch(cur, cmd);
+                       break;
+               }
+
                InsetGraphicsParams p;
-               InsetGraphicsMailer::string2params(to_utf8(cmd.argument()), buffer(), p);
-               if (!p.filename.empty())
-                       setParams(p);
-               else
-                       cur.noUpdate();
+               string2params(to_utf8(cmd.argument()), buffer(), p);
+               if (p.filename.empty()) {
+                       cur.noScreenUpdate();
+                       break;
+               }
+
+               cur.recordUndo();
+               setParams(p);
+               // if the inset is part of a graphics group, all the
+               // other members should be updated too.
+               if (!params_.groupId.empty())
+                       graphics::unifyGraphicsGroups(buffer(), 
+                                                     to_utf8(cmd.argument()));
                break;
        }
 
        case LFUN_INSET_DIALOG_UPDATE:
-               InsetGraphicsMailer(*this).updateDialog(&cur.bv());
+               cur.bv().updateDialog("graphics", params2string(params(), buffer()));
                break;
 
-       case LFUN_MOUSE_RELEASE:
-               if (!cur.selection() && cmd.button() == mouse_button::button1)
-                       InsetGraphicsMailer(*this).showDialog(&cur.bv());
+       case LFUN_GRAPHICS_RELOAD:
+               params_.filename.refresh();
+               graphic_->reload();
                break;
 
        default:
@@ -238,11 +250,15 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
-       case LFUN_GRAPHICS_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:
-               flag.enabled(true);
+       case LFUN_GRAPHICS_RELOAD:
+               flag.setEnabled(true);
                return true;
 
        default:
@@ -251,24 +267,14 @@ bool InsetGraphics::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-void InsetGraphics::registerEmbeddedFiles(EmbeddedFileList & files) const
-{
-       files.registerFile(params().filename, this, buffer());
-}
-
-
-void InsetGraphics::updateEmbeddedFile(EmbeddedFile const & file)
+bool InsetGraphics::showInsetDialog(BufferView * bv) const
 {
-       // only properties of an embedded file can be changed here.
-       params_.filename = file;
+       bv->showDialog("graphics", params2string(params(), bv->buffer()),
+               const_cast<InsetGraphics *>(this));
+       return true;
 }
 
 
-void InsetGraphics::edit(Cursor & cur, bool, EntryDirection)
-{
-       InsetGraphicsMailer(*this).showDialog(&cur.bv());
-}
-
 
 void InsetGraphics::metrics(MetricsInfo & mi, Dimension & dim) const
 {
@@ -282,12 +288,6 @@ void InsetGraphics::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-Inset::EDITABLE InsetGraphics::editable() const
-{
-       return IS_EDITABLE;
-}
-
-
 void InsetGraphics::write(ostream & os) const
 {
        os << "Graphics\n";
@@ -297,26 +297,24 @@ void InsetGraphics::write(ostream & os) const
 
 void InsetGraphics::read(Lexer & lex)
 {
-       string const token = lex.getString();
-
-       if (token == "Graphics")
-               readInsetGraphics(lex, buffer().filePath(), params_);
-       else
-               LYXERR(Debug::GRAPHICS, "Not a Graphics inset!");
-
-       params_.filename.enable(buffer().embedded(), &buffer(), false);
+       lex.setContext("InsetGraphics::read");
+       //lex >> "Graphics";
+       readInsetGraphics(lex, buffer().originFilePath(), params_);
        graphic_->update(params().as_grfxParams());
 }
 
 
-string const InsetGraphics::createLatexOptions() const
+string InsetGraphics::createLatexOptions() 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())
+               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)
@@ -368,7 +366,7 @@ string const InsetGraphics::createLatexOptions() const
 }
 
 
-docstring const InsetGraphics::toDocbookLength(Length const & len) const
+docstring InsetGraphics::toDocbookLength(Length const & len) const
 {
        odocstringstream result;
        switch (len.unit()) {
@@ -414,7 +412,7 @@ docstring const 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;
@@ -425,7 +423,8 @@ docstring const InsetGraphics::toDocbookLength(Length const & len) const
        return result.str();
 }
 
-docstring const InsetGraphics::createDocBookAttributes() const
+
+docstring InsetGraphics::createDocBookAttributes() const
 {
        // Calculate the options part of the command, we must do it to a string
        // stream since we copied the code from createLatexParams() ;-)
@@ -491,7 +490,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;
@@ -502,20 +501,20 @@ copyFileIfNeeded(FileName const & file_in, FileName const & file_out)
 pair<GraphicsCopyStatus, FileName> 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);
+       if (rtrim(only_path, "/") == rtrim(dir, "/"))
+               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] = '.';
        }
@@ -568,18 +567,14 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
        if (params().filename.empty())
                return string();
 
-       string const orig_file = params().filename.availableFile().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)
                return stripExtensionIfPossible(rel_file, runparams.nice);
 
-       // temp_file will contain the file for LaTeX to act on if, for example,
-       // we move it to a temp dir or uncompress it.
-       FileName temp_file = params().filename.availableFile();
-
        // The master buffer. This is useful when there are multiple levels
        // of include files
        Buffer const * masterBuffer = buffer().masterBuffer();
@@ -589,16 +584,19 @@ 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.
        // This is necessary for DVI export.
        string const temp_path = masterBuffer->temppath();
 
+       // temp_file will contain the file for LaTeX to act on if, for example,
+       // we move it to a temp dir or uncompress it.
+       FileName temp_file;
        GraphicsCopyStatus status;
        boost::tie(status, temp_file) =
-                       copyToDirIfNeeded(params().filename.availableFile(), temp_path);
+                       copyToDirIfNeeded(params().filename, temp_path);
 
        if (status == FAILURE)
                return orig_file;
@@ -607,60 +605,36 @@ 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";
-
-       // 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);
-               }
+       // determine the export format
+       string const tex_format = flavor2format(runparams.flavor);
 
+       if (formats.isZippedFile(params().filename)) {
                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.
@@ -688,15 +662,18 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
        LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
 
        if (from == to) {
-               if (!runparams.nice && getExtension(temp_file.absFilename()) != ext) {
+               // source and destination formats are the same
+               if (!runparams.nice && !FileName(temp_file).hasExtension(ext)) {
                        // 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(changeExtension(temp_file.absFilename(), ext));
+                       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 = FileName(changeExtension(source_file.absFilename(), ext));
+                               source_file = 
+                                       FileName(changeExtension(source_file.absFileName(), ext));
                        } else {
                                LYXERR(Debug::GRAPHICS, "Could not rename file `"
                                        << temp_file << "' to `" << new_file << "'.");
@@ -710,7 +687,8 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
                return stripExtensionIfPossible(output_file, to, runparams.nice);
        }
 
-       FileName const to_file = FileName(changeExtension(temp_file.absFilename(), ext));
+       // so the source and destination formats are different
+       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?
@@ -747,20 +725,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().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 << '\"');
@@ -791,18 +779,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.
@@ -813,7 +801,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();
@@ -879,6 +867,117 @@ int InsetGraphics::docbook(odocstream & os,
 }
 
 
+string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const
+{
+       // The following code depends on non-empty filenames
+       if (params().filename.empty())
+               return string();
+
+       string const orig_file = params().filename.absFileName();
+
+       // 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
+       // directory.
+       string const temp_path = masterBuffer->temppath();
+
+       // Copy to temporary directory.
+       FileName temp_file;
+       GraphicsCopyStatus status;
+       boost::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())
+               LYXERR(Debug::GRAPHICS, "\tCould not get file format.");
+
+       string const to   = findTargetFormat(from, runparams);
+       string const ext  = formats.extension(to);
+       LYXERR(Debug::GRAPHICS, "\t we have: from " << from << " to " << to);
+       LYXERR(Debug::GRAPHICS, "\tthe orig file is: " << orig_file);
+
+       if (from == to) {
+               // source and destination formats are the same
+               runparams.exportdata->addExternalFile("xhtml", temp_file, output_file);
+               return output_file;
+       }
+
+       // so the source and destination formats are different
+       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?
+       // Yes if to_file does not exist or if temp_file is newer than to_file
+       if (compare_timestamps(temp_file, to_file) < 0) {
+               // FIXME UNICODE
+               LYXERR(Debug::GRAPHICS,
+                       to_utf8(bformat(_("No conversion of %1$s is needed after all"),
+                                  from_utf8(orig_file))));
+               runparams.exportdata->addExternalFile("xhtml", to_file, output_to_file);
+               return output_to_file;
+       }
+
+       LYXERR(Debug::GRAPHICS,"\tThe original file is " << orig_file << "\n"
+               << "\tA copy has been made and convert is to be called with:\n"
+               << "\tfile to convert = " << temp_file << '\n'
+               << "\t from " << from << " to " << to);
+
+       // FIXME (Abdel 12/08/06): Is there a need to show these errors?
+       ErrorList el;
+       bool const success = 
+               theConverters().convert(&buffer(), temp_file, to_file, params().filename,
+                       from, to, el, Converters::try_default | Converters::try_cache);
+       if (!success)   
+               return string();
+       runparams.exportdata->addExternalFile("xhtml", to_file, output_to_file);
+       return output_to_file;
+}
+
+
+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() 
+                                   + "' alt='image: " + output_file + "'";
+               xs << html::CompTag("img", attr);
+               return docstring();
+       }
+
+       // 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;
+       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();
+}
+
+
 void InsetGraphics::validate(LaTeXFeatures & features) const
 {
        // If we have no image, we should not require anything.
@@ -886,13 +985,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");
        }
@@ -922,77 +1020,151 @@ InsetGraphicsParams const & InsetGraphics::params() const
 }
 
 
-void InsetGraphics::editGraphics(InsetGraphicsParams const & p,
-                                Buffer const & buffer) const
+void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const
 {
-       formats.edit(buffer, p.filename,
+       formats.edit(buffer(), p.filename,
                     formats.getFormatFromFile(p.filename));
 }
 
 
-void InsetGraphics::addToToc(ParConstIterator const & cpit) const
+void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active,
+                                                        UpdateType) const
 {
-       TocBackend & backend = buffer().tocBackend();
-
-       docstring str = params_.filename.displayName();
-       if (params_.filename.embedded()) {
-               backend.toc("embedded").push_back(TocItem(cpit, 0, str));
-               str += _(" (embedded)");
-       }
-       backend.toc("graphics").push_back(TocItem(cpit, 0, str));
+       //FIXME UNICODE
+       docstring const str = from_utf8(params_.filename.onlyFileName());
+       buffer().tocBackend().toc("graphics")->push_back(TocItem(cpit, 0, str, output_active));
 }
 
 
-docstring InsetGraphics::contextMenu(BufferView const &, int, int) const
-{
-       return from_ascii("context-graphics");
-}
-
-
-string const InsetGraphicsMailer::name_("graphics");
-
-InsetGraphicsMailer::InsetGraphicsMailer(InsetGraphics & inset)
-       : inset_(inset)
-{}
-
-
-string const InsetGraphicsMailer::inset2string(Buffer const & buffer) const
+string InsetGraphics::contextMenuName() const
 {
-       return params2string(inset_.params(), buffer);
+       return "context-graphics";
 }
 
 
-void InsetGraphicsMailer::string2params(string const & in,
-                                       Buffer const & buffer,
-                                       InsetGraphicsParams & params)
+void InsetGraphics::string2params(string const & in, Buffer const & buffer,
+       InsetGraphicsParams & params)
 {
        if (in.empty())
                return;
 
        istringstream data(in);
-       Lexer lex(0,0);
+       Lexer lex;
        lex.setStream(data);
-
-       string name;
-       lex >> name;
-       if (!lex || name != name_)
-               return print_mailer_error("InsetGraphicsMailer", in, 1, name_);
-
+       lex.setContext("InsetGraphics::string2params");
+       lex >> "graphics";
        params = InsetGraphicsParams();
        readInsetGraphics(lex, buffer.filePath(), params);
 }
 
 
-string const
-InsetGraphicsMailer::params2string(InsetGraphicsParams const & params,
-                                  Buffer const & buffer)
+string InsetGraphics::params2string(InsetGraphicsParams const & params,
+       Buffer const & buffer)
 {
        ostringstream data;
-       data << name_ << ' ';
+       data << "graphics" << ' ';
        params.Write(data, buffer);
        data << "\\end_inset\n";
        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<string> & 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<InsetGraphics &>(*it);
+                       InsetGraphicsParams inspar = ins.getParams();
+                       if (!inspar.groupId.empty())
+                               ids.insert(inspar.groupId);
+               }
+}
+
+
+int countGroupMembers(Buffer const & b, string const & groupId)
+{
+       int n = 0;
+       if (groupId.empty())
+               return n;
+       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<InsetGraphics &>(*it);
+                       if (ins.getParams().groupId == groupId)
+                               ++n;
+               }
+       return n;
+}
+
+
+string getGroupParams(Buffer const & b, string const & groupId)
+{
+       if (groupId.empty())
+               return string();
+       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<InsetGraphics &>(*it);
+                       InsetGraphicsParams inspar = ins.getParams();
+                       if (inspar.groupId == groupId) {
+                               InsetGraphicsParams tmp = inspar;
+                               tmp.filename.erase();
+                               return InsetGraphics::params2string(tmp, b);
+                       }
+               }
+       return string();
+}
+
+
+void unifyGraphicsGroups(Buffer & b, string const & argument)
+{
+       InsetGraphicsParams params;
+       InsetGraphics::string2params(argument, b, params);
+
+       b.undo().beginUndoGroup();
+       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<InsetGraphics &>(*it);
+                       InsetGraphicsParams inspar = ins.getParams();
+                       if (params.groupId == inspar.groupId) {
+                               b.undo().recordUndo(CursorData(it));
+                               params.filename = inspar.filename;
+                               ins.setParams(params);
+                       }
+               }
+       }
+       b.undo().endUndoGroup();
+}
+
+
+InsetGraphics * getCurrentGraphicsInset(Cursor const & cur)
+{
+       Inset * instmp = &cur.inset();
+       if (instmp->lyxCode() != GRAPHICS_CODE)
+               instmp = cur.nextInset();
+       if (!instmp || instmp->lyxCode() != GRAPHICS_CODE)
+               return 0;
+
+       return static_cast<InsetGraphics *>(instmp);
+}
+
+} // namespace graphics
+
 } // namespace lyx