Correctly set language after intitle paragraphs

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index 4a33eb07c49e97c80ef4548979b00029500c9dc4..a6727a2d8128a8c67e670912ad559b0d66b901f8 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -19,11 +19,12 @@
 #include "frontends/alert.h" //to be removed?
 
 #include "support/debug.h"
+#include "support/docstream.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/lyxmagic.h"
 #include "support/mutex.h"
-#include "support/docstream.h"
 #include "support/os.h"
 #include "support/PathChanger.h"
 #include "support/Systemcall.h"
@@ -39,10 +40,6 @@
 #include "support/linkback/LinkBackProxy.h"
 #endif
 
-#ifdef HAVE_MAGIC_H
-#include <magic.h>
-#endif
-
 using namespace std;
 using namespace lyx::support;
 
@@ -102,7 +99,7 @@ private:
 };
 
 
-} //namespace anon
+} // namespace
 
 bool Format::formatSorter(Format const * lhs, Format const * rhs)
 {
@@ -232,7 +229,7 @@ string guessFormatFromContents(FileName const & fn)
        static string const zipStamp = "PK";
 
        // ZIP containers (koffice, openoffice.org etc).
-       static string const nonzipStamp = "\008\0\0\0mimetypeapplication/";
+       static string const nonzipStamp = "\010\0\0\0mimetypeapplication/";
 
        // compress
        static string const compressStamp = "\037\235";
@@ -340,6 +337,9 @@ string guessFormatFromContents(FileName const & fn)
                        // autodetect pdf format for graphics inclusion
                        format = "pdf6";
 
+               else if (contains(str, " EMF"))
+                       format = "emf";
+
                else if (contains(str, "PNG"))
                        format = "png";
 
@@ -397,7 +397,7 @@ string guessFormatFromContents(FileName const & fn)
        return string();
 }
 
-}
+} // namespace
 
 
 string Formats::getFormatFromFile(FileName const & filename) const
@@ -407,52 +407,37 @@ string Formats::getFormatFromFile(FileName const & filename) const
 
        string psformat;
        string format;
-#ifdef HAVE_MAGIC_H
        if (filename.exists()) {
-               magic_t magic_cookie = magic_open(MAGIC_MIME);
-               if (magic_cookie) {
-                       if (magic_load(magic_cookie, NULL) != 0) {
-                               LYXERR(Debug::GRAPHICS, "Formats::getFormatFromFile\n"
-                                       << "\tCouldn't load magic database - "
-                                       << magic_error(magic_cookie));
-                       } else {
-                               char const * result = magic_file(magic_cookie,
-                                       filename.toFilesystemEncoding().c_str());
-                               string mime;
-                               if (result)
-                                       mime = token(result, ';', 0);
-                               else {
-                                       LYXERR(Debug::GRAPHICS, "Formats::getFormatFromFile\n"
-                                               << "\tCouldn't query magic database - "
-                                               << magic_error(magic_cookie));
-                               }
-                               // our own detection is better for binary files (can be anything)
-                               // and different plain text formats
-                               if (!mime.empty() && mime != "application/octet-stream" &&
-                                   mime != "text/plain") {
-                                       Formats::const_iterator cit =
-                                               find_if(formatlist_.begin(), formatlist_.end(),
-                                                       FormatMimeEqual(mime));
-                                       if (cit != formatlist_.end()) {
-                                               LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: "
-                                                       << mime << " -> " << cit->name());
-                                               // See special eps/ps handling below
-                                               if (mime == "application/postscript")
-                                                       psformat = cit->name();
-                                               else
-                                                       format = cit->name();
-                                       }
-                               }
+               // one instance of Magic that will be reused for next calls
+               // This avoids to read the magic file everytime
+               // If libmagic is not available, Magic::file returns an empty string.
+               static Magic magic;
+               string const result = magic.file(filename.toFilesystemEncoding());
+               string const mime = token(result, ';', 0);
+               // our own detection is better for binary files (can be anything)
+               // and different plain text formats
+               if (!mime.empty() && mime != "application/octet-stream" &&
+                       mime != "text/plain") {
+                       Formats::const_iterator cit =
+                               find_if(formatlist_.begin(), formatlist_.end(),
+                                               FormatMimeEqual(mime));
+                       if (cit != formatlist_.end()) {
+                               LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: "
+                                          << mime << " -> " << cit->name());
+                               // See special eps/ps handling below
+                               if (mime == "application/postscript")
+                                       psformat = cit->name();
+                               else
+                                       format = cit->name();
                        }
-                       magic_close(magic_cookie);
-                       // 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;
                }
+
+               // 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
 
        string const ext = getExtension(filename.absFileName());
        if (format.empty()) {
@@ -697,6 +682,28 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 
        string command = format->viewer();
 
+       // Escape backslashes if not already in double or single quotes.
+       // We cannot simply quote the whole command as there may be arguments.
+       if (contains(command, '\\')) {
+               bool inquote1 = false;
+               bool inquote2 = false;
+               string::iterator cit = command.begin();
+               for (; cit != command.end(); ++cit) {
+                       switch (*cit) {
+                       case '"':
+                               inquote1 = !inquote1;
+                               break;
+                       case '\'':
+                               inquote2 = !inquote2;
+                               break;
+                       case '\\':
+                               if (!inquote1 && !inquote2)
+                                       cit = ++command.insert(cit, '\\');
+                               break;
+                       }
+               }
+       }
+
        if (format_name == "dvi" &&
            !lyxrc.view_dvi_paper_option.empty()) {
                string paper_size = buffer.params().paperSizeName(BufferParams::XDVI);
@@ -857,7 +864,7 @@ FlavorTranslator const & flavorTranslator()
        return translator;
 }
 
-}
+} // namespace
 
 
 std::string flavor2format(OutputParams::FLAVOR flavor)