InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp
index bf63d945343241bc9713ed55ea091aa3d010260d..31b6c181f314ed416e92c72d3c671d406f898444 100644 (file)
--- a/src/insets/InsetGraphics.cpp
+++ b/src/insets/InsetGraphics.cpp
@@ -205,7 +205,7 @@ void InsetGraphics::doDispatch(Cursor & cur, FuncRequest & cmd)
                InsetGraphicsParams p;
                string2params(to_utf8(cmd.argument()), buffer(), p);
                if (p.filename.empty()) {
-                       cur.noUpdate();
+                       cur.noScreenUpdate();
                        break;
                }
 
@@ -393,7 +393,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;
@@ -487,15 +487,15 @@ copyToDirIfNeeded(DocFileName const & file, string const & dir)
        if (rtrim(onlyPath(file_in) , "/") == rtrim(dir, "/"))
                return make_pair(IDENTICAL_PATHS, file_in);
 
-       string mangled = file.mangledFilename();
+       string mangled = file.mangledFileName();
        if (file.isZipped()) {
                // 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] = '.';
        }
@@ -550,7 +550,7 @@ string InsetGraphics::prepareFile(OutputParams const & runparams) const
 
        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 +565,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,17 +586,29 @@ 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;
+       // determine the export format
        string const tex_format = (runparams.flavor == OutputParams::LATEX) ?
                        "latex" : "pdflatex";
 
@@ -894,7 +906,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())
@@ -980,7 +992,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
        if (features.runparams().nice) {
                Buffer const * masterBuffer = features.buffer().masterBuffer();
                string const rel_file = removeExtension(
-                       params().filename.relFilename(masterBuffer->filePath()));
+                       params().filename.relFileName(masterBuffer->filePath()));
                if (contains(rel_file, "."))
                        features.require("lyxdot");
        }