Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index 82712af0cd25a40dfd2cb75ea29ac55ac6661a2c..eba00b95dfd3190a69eceac619c2d1cb93a9afd3 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -33,7 +33,7 @@
 #include <map>
 #include <ctime>
 
-// FIXME: Q_WS_MACX is not available, it's in Qt
+// FIXME: Q_OS_MAC is not available, it's in Qt
 #ifdef USE_MACOSX_PACKAGING
 #include "support/linkback/LinkBackProxy.h"
 #endif
@@ -403,11 +403,11 @@ string Formats::getFormatFromFile(FileName const & filename) const
                return string();
 
        string psformat;
+       string format;
 #ifdef HAVE_MAGIC_H
        if (filename.exists()) {
                magic_t magic_cookie = magic_open(MAGIC_MIME);
                if (magic_cookie) {
-                       string format;
                        if (magic_load(magic_cookie, NULL) != 0) {
                                LYXERR(Debug::GRAPHICS, "Formats::getFormatFromFile\n"
                                        << "\tCouldn't load magic database - "
@@ -442,35 +442,49 @@ string Formats::getFormatFromFile(FileName const & filename) const
                                }
                        }
                        magic_close(magic_cookie);
-                       if (!format.empty())
+                       // libmagic recognizes as latex also some formats of ours
+                       // such as pstex and pdftex. Therefore we have to perform
+                       // additional checks in this case (bug 9244).
+                       if (!format.empty() && format != "latex")
                                return format;
                }
        }
 #endif
 
-       // libmagic does not distinguish eps and ps.
-       // Therefore we need to use our own detection here, but only if it
-       // recognizes either ps or eps. Otherwise the libmagic guess will
-       // be better (bug 9146).
-       string const format = guessFormatFromContents(filename);
-       if (!psformat.empty()) {
-               if (isPostScriptFileFormat(format))
+       string const ext = getExtension(filename.absFileName());
+       if (format.empty()) {
+               // libmagic does not distinguish eps and ps.
+               // Therefore we need to use our own detection here, but only if it
+               // recognizes either ps or eps. Otherwise the libmagic guess will
+               // be better (bug 9146).
+               format = guessFormatFromContents(filename);
+               if (!psformat.empty()) {
+                       if (isPostScriptFileFormat(format))
+                               return format;
+                       else
+                               return psformat;
+               }
+
+               if (isZippedFileFormat(format) && !ext.empty()) {
+                       string const & fmt_name = formats.getFormatFromExtension(ext);
+                       if (!fmt_name.empty()) {
+                               Format const * p_format = formats.getFormat(fmt_name);
+                               if (p_format && p_format->zippedNative())
+                                       return p_format->name();
+                       }
+               }
+               // Don't simply return latex (bug 9244).
+               if (!format.empty() && format != "latex")
                        return format;
-               else
-                       return psformat;
        }
 
-       string const ext = getExtension(filename.absFileName());
-       if (isZippedFileFormat(format) && !ext.empty()) {
-               string const & fmt_name = formats.getFormatFromExtension(ext);
-               if (!fmt_name.empty()) {
-                       Format const * p_format = formats.getFormat(fmt_name);
-                       if (p_format && p_format->zippedNative())
-                               return p_format->name();
-               }
+       // Both libmagic and our guessing from contents may return as latex
+       // also lyx files and our pstex and pdftex formats. In this case we
+       // give precedence to the format determined by the extension.
+       if (format == "latex") {
+               format = getFormatFromExtension(ext);
+               return format.empty() ? "latex" : format;
        }
-       if (!format.empty())
-               return format;
 
        // try to find a format from the file extension.
        return getFormatFromExtension(ext);
@@ -691,8 +705,10 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
        if (!contains(command, token_from_format))
                command += ' ' + token_from_format;
 
-       command = subst(command, token_from_format, quoteName(onlyFileName(filename.toFilesystemEncoding())));
-       command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+       command = subst(command, token_from_format,
+                       quoteName(onlyFileName(filename.toFilesystemEncoding()), quote_shell_filename));
+       command = subst(command, token_path_format,
+                       quoteName(onlyPath(filename.toFilesystemEncoding()), quote_shell_filename));
        command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
        LYXERR(Debug::FILES, "Executing command: " << command);
        // FIXME UNICODE utf8 can be wrong for files
@@ -700,7 +716,8 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 
        PathChanger p(filename.onlyPath());
        Systemcall one;
-       one.startscript(Systemcall::DontWait, command, buffer.filePath());
+       one.startscript(Systemcall::DontWait, command,
+                       buffer.filePath(), buffer.layoutPos());
 
        // we can't report any sort of error, since we aren't waiting
        return true;
@@ -759,15 +776,18 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
        if (!contains(command, token_from_format))
                command += ' ' + token_from_format;
 
-       command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
-       command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+       command = subst(command, token_from_format,
+                       quoteName(filename.toFilesystemEncoding(), quote_shell_filename));
+       command = subst(command, token_path_format,
+                       quoteName(onlyPath(filename.toFilesystemEncoding()), quote_shell_filename));
        command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
        LYXERR(Debug::FILES, "Executing command: " << command);
        // FIXME UNICODE utf8 can be wrong for files
        buffer.message(_("Executing command: ") + from_utf8(command));
 
        Systemcall one;
-       one.startscript(Systemcall::DontWait, command, buffer.filePath());
+       one.startscript(Systemcall::DontWait, command,
+                       buffer.filePath(), buffer.layoutPos());
 
        // we can't report any sort of error, since we aren't waiting
        return true;