X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=cedbf7a2aea4acb90038f9d627ab4a753c15db8e;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=ff03ab52ff4cc17b6a56a4136344f27ab46f3b91;hpb=00cd9ce4a9fcd354424d6b0c151ecab100f9e2d1;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index ff03ab52ff..cedbf7a2ae 100644 --- 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 #include -// 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,50 +402,89 @@ string Formats::getFormatFromFile(FileName const & filename) const if (filename.empty()) 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 - " << magic_error(magic_cookie)); } else { - string mime = magic_file(magic_cookie, + char const * result = magic_file(magic_cookie, filename.toFilesystemEncoding().c_str()); - mime = token(mime, ';', 0); - // we need our own ps/eps detection - if ((mime != "application/postscript") && (mime != "text/plain")) { + 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 != 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(); } } } 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 - string const format = guessFormatFromContents(filename); 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(); + 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; + } + + // 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); @@ -471,11 +520,13 @@ struct ZippedInfo { /// Mapping absolute pathnames of files to their ZippedInfo metadata. static std::map 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::iterator it = zipped_.find(fname); if (it != zipped_.end() && it->second.timestamp == timestamp) return it->second.zipped; @@ -637,7 +688,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()) { @@ -654,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 @@ -663,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; @@ -722,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; @@ -782,13 +839,14 @@ FlavorTranslator initFlavorTranslator() f.addPair(OutputParams::XML, "docbook-xml"); f.addPair(OutputParams::HTML, "xhtml"); f.addPair(OutputParams::TEXT, "text"); + f.addPair(OutputParams::LYX, "lyx"); return f; } FlavorTranslator const & flavorTranslator() { - static FlavorTranslator translator = initFlavorTranslator(); + static FlavorTranslator const translator = initFlavorTranslator(); return translator; }