Check in InsetLabel if LFUN_INSET_MODIFY is intended for us.

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

diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index bb708abd6dce69a904055bdacead6bf7f2fc4e70..aa6f51cbe919a1222a6157df140ee3dec00af6cd 100644 (file)
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -91,7 +91,7 @@ string const doSubstitution(InsetExternalParams const & params,
                params.filename.mangledFileName() :
                params.filename.outputFileName(parentpath);
        string const basename = changeExtension(
-                       onlyFilename(filename), string());
+                       onlyFileName(filename), string());
        string const absname = makeAbsPath(filename, parentpath).absFileName();
 
        string result = s;
@@ -363,11 +363,20 @@ int writeExternal(InsetExternalParams const & params,
        string const absname = makeAbsPath(
                params.filename.outputFileName(buffer.filePath()), buffer.filePath()).absFileName();
 
-       if (!external_in_tmpdir && !isValidLaTeXFilename(absname)) {
-               lyx::frontend::Alert::warning(_("Invalid filename"),
-                                             _("The following filename is likely to cause trouble "
-                                               "when running the exported file through LaTeX: ") +
-                                             from_utf8(absname));
+       if (!dryrun && !external_in_tmpdir) {
+               if (!isValidLaTeXFileName(absname)) {
+                       lyx::frontend::Alert::warning(_("Invalid filename"),
+                                        _("The following filename will cause troubles "
+                                              "when running the exported file through LaTeX: ") +
+                                            from_utf8(absname));
+               }
+               if (!isValidDVIFileName(absname)) {
+                       lyx::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(absname), true);
+               }
        }
 
        str = substituteCommands(params, str, format);