Revert "Fix bug with wrong baseline calculation in last paragraph"

[lyx.git] / src / Format.cpp

diff --git a/src/Format.cpp b/src/Format.cpp
index c9e1381992ffd80cb232ad7b179d5bea7910a232..1637bed5b43e2ceb7a2e19d9f4cbcfbe307ea4b6 100644 (file)
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -22,6 +22,7 @@
 #include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/mutex.h"
 #include "support/os.h"
 #include "support/PathChanger.h"
 #include "support/Systemcall.h"
@@ -32,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
@@ -104,12 +105,12 @@ private:
 
 bool Format::formatSorter(Format const * lhs, Format const * rhs)
 {
-       return _(lhs->prettyname()) < _(rhs->prettyname());
+       return compare_locale(_(lhs->prettyname()), _(rhs->prettyname())) < 0;
 }
 
 bool operator<(Format const & a, Format const & b)
 {
-       return _(a.prettyname()) < _(b.prettyname());
+       return compare_locale(_(a.prettyname()), _(b.prettyname())) < 0;
 }
 
 
@@ -233,6 +234,10 @@ string guessFormatFromContents(FileName const & fn)
        // compress
        static string const compressStamp = "\037\235";
 
+       // DOS binary EPS according to Adobe TN-5002
+       static string const binEPSStamp = "\xC5\xD0\xD3\xC6";
+
+
        // Maximum strings to read
        int const max_count = 50;
        int count = 0;
@@ -241,8 +246,9 @@ string guessFormatFromContents(FileName const & fn)
        string format;
        bool firstLine = true;
        bool backslash = false;
+       bool maybelatex = false;
        int dollars = 0;
-       while ((count++ < max_count) && format.empty()) {
+       while ((count++ < max_count) && format.empty() && !maybelatex) {
                if (ifs.eof())
                        break;
 
@@ -272,6 +278,8 @@ string guessFormatFromContents(FileName const & fn)
 
                        } else if (stamp == "\001\332") {
                                format =  "sgi";
+                       } else if (prefixIs(str, binEPSStamp)) {
+                               format =  "eps";
 
                        // PBM family
                        // Don't need to use str.at(0), str.at(1) because
@@ -358,16 +366,18 @@ string guessFormatFromContents(FileName const & fn)
                         contains(str, "$$") ||
                         contains(str, "\\[") ||
                         contains(str, "\\]"))
-                       format = "latex";
+                       maybelatex = true;
                else {
                        if (contains(str, '\\'))
                                backslash = true;
                        dollars += count_char(str, '$');
+                       if (backslash && dollars > 1)
+                               // inline equation
+                               maybelatex = true;
                }
        }
 
-       if (format.empty() && backslash && dollars > 1)
-               // inline equation
+       if (format.empty() && maybelatex && !isBinaryFile(fn))
                format = "latex";
 
        if (format.empty()) {
@@ -392,6 +402,7 @@ string Formats::getFormatFromFile(FileName const & filename) const
        if (filename.empty())
                return string();
 
+       string psformat;
 #ifdef HAVE_MAGIC_H
        if (filename.exists()) {
                magic_t magic_cookie = magic_open(MAGIC_MIME);
@@ -412,8 +423,9 @@ string Formats::getFormatFromFile(FileName const & filename) const
                                                << "\tCouldn't query magic database - "
                                                << magic_error(magic_cookie));
                                }
-                               // we need our own ps/eps detection
-                               if (!mime.empty() && mime != "application/postscript" &&
+                               // 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(),
@@ -421,7 +433,11 @@ string Formats::getFormatFromFile(FileName const & filename) const
                                        if (cit != formats.end()) {
                                                LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: "
                                                        << mime << " -> " << cit->name());
-                                               format = cit->name();
+                                               // See special eps/ps handling below
+                                               if (mime == "application/postscript")
+                                                       psformat = cit->name();
+                                               else
+                                                       format = cit->name();
                                        }
                                }
                        }
@@ -432,7 +448,18 @@ string Formats::getFormatFromFile(FileName const & filename) const
        }
 #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))
+                       return format;
+               else
+                       return psformat;
+       }
+
        string const ext = getExtension(filename.absFileName());
        if (isZippedFileFormat(format) && !ext.empty()) {
                string const & fmt_name = formats.getFormatFromExtension(ext);
@@ -477,14 +504,15 @@ struct ZippedInfo {
 };
 
 
-// FIXME THREAD
 /// Mapping absolute pathnames of files to their ZippedInfo metadata.
 static std::map<std::string, ZippedInfo> zipped_;
+static Mutex zipped_mutex;
 
 
 bool Formats::isZippedFile(support::FileName const & filename) const {
        string const & fname = filename.absFileName();
        time_t timestamp = filename.lastModified();
+       Mutex::Locker lock(&zipped_mutex);
        map<string, ZippedInfo>::iterator it = zipped_.find(fname);
        if (it != zipped_.end() && it->second.timestamp == timestamp)
                return it->second.zipped;
@@ -646,7 +674,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
                }
        }
 
-       string command = libScriptSearch(format->viewer());
+       string command = format->viewer();
 
        if (format_name == "dvi" &&
            !lyxrc.view_dvi_paper_option.empty()) {