Enhancements and bugfixes to the TOCs

[lyx.git] / src / insets / InsetGraphics.cpp

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index eec663e30bdbcadfa52d88b4af2b5ba9e8310ce6..c20f0314abd27ca559e244a2be56d4960fa32431 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -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.
@@ -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()) {
@@ -240,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);
@@ -285,7 +299,7 @@ void InsetGraphics::read(Lexer & lex)
 {
        lex.setContext("InsetGraphics::read");
        //lex >> "Graphics";
-       readInsetGraphics(lex, buffer().filePath(), params_);
+       readInsetGraphics(lex, buffer().originFilePath(), params_);
        graphic_->update(params().as_grfxParams());
 }
 
@@ -296,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)
@@ -486,7 +503,7 @@ 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, "/"))
+       if (rtrim(only_path, "/") == rtrim(dir, "/"))
                return make_pair(IDENTICAL_PATHS, FileName(file_in));
 
        string mangled = file.mangledFileName();
@@ -613,44 +630,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
        // 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 (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
-                       // 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);
-               }
-
                FileName const unzipped_temp_file =
                        FileName(unzippedFileName(temp_file.absFileName()));
                output_file = unzippedFileName(output_file);
@@ -757,7 +737,7 @@ void InsetGraphics::latex(otexstream & os,
                        && params().filename.isReadableFile();
        string message;
        if (!file_exists) {
-               if (params().bb.empty())
+               if (params().bbox.empty())
                    message = "bb = 0 0 200 100";
                if (!params().draft) {
                        if (!message.empty())
@@ -1047,13 +1027,12 @@ void InsetGraphics::editGraphics(InsetGraphicsParams const & p) const
 }
 
 
-void InsetGraphics::addToToc(DocIterator const & cpit) const
+void InsetGraphics::addToToc(DocIterator const & cpit, bool output_active,
+                                                        UpdateType) 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));
 }