X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=4a33eb07c49e97c80ef4548979b00029500c9dc4;hb=268ae66e3c7df04effc329373dc887715d9c6f06;hp=2bc7ac534b745139e79e6282dbf0bd291c4a12c1;hpb=8097911a9fcfe4a405ff628a3fe1824bfad7b0bc;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index 2bc7ac534b..4a33eb07c4 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -22,6 +22,8 @@ #include "support/filetools.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/mutex.h" +#include "support/docstream.h" #include "support/os.h" #include "support/PathChanger.h" #include "support/Systemcall.h" @@ -32,7 +34,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,16 +106,18 @@ private: bool Format::formatSorter(Format const * lhs, Format const * rhs) { - return _(lhs->prettyname()) < _(rhs->prettyname()); + return compare_locale(translateIfPossible(lhs->prettyname()), + translateIfPossible(rhs->prettyname())) < 0; } bool operator<(Format const & a, Format const & b) { - return _(a.prettyname()) < _(b.prettyname()); + return compare_locale(translateIfPossible(a.prettyname()), + translateIfPossible(b.prettyname())) < 0; } -Format::Format(string const & n, string const & e, string const & p, +Format::Format(string const & n, string const & e, docstring const & p, string const & s, string const & v, string const & ed, string const & m, int flags) : name_(n), prettyname_(p), shortcut_(s), viewer_(v), @@ -168,9 +172,9 @@ void Format::setExtensions(string const & e) Format const * Formats::getFormat(string const & name) const { FormatList::const_iterator cit = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatNamesEqual(name)); - if (cit != formatlist.end()) + if (cit != formatlist_.end()) return &(*cit); else return 0; @@ -233,6 +237,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 +249,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 +281,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 +369,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,11 +405,12 @@ 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 - " @@ -412,38 +426,68 @@ 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(), + find_if(formatlist_.begin(), formatlist_.end(), FormatMimeEqual(mime)); - if (cit != formats.end()) { + if (cit != formatlist_.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 = getFormatFromExtension(ext); + if (!fmt_name.empty()) { + Format const * p_format = 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); @@ -456,9 +500,9 @@ string Formats::getFormatFromExtension(string const & ext) const // this is ambigous if two formats have the same extension, // but better than nothing Formats::const_iterator cit = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatExtensionsEqual(ext)); - if (cit != formats.end()) { + if (cit != formatlist_.end()) { LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: " << ext << " -> " << cit->name()); return cit->name(); @@ -479,14 +523,20 @@ 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; + // FIXME perf: This very expensive function is called on startup on each + // file whic is going to be parsed, and also on svgz icons. Maybe there is a + // quicker way to check whether a file is zipped? I.e. for icons we + // probably just need to check the extension (svgz vs svg). string const & format = getFormatFromFile(filename); bool zipped = (format == "gzip" || format == "zip"); zipped_.insert(make_pair(fname, ZippedInfo(zipped, timestamp))); @@ -527,8 +577,8 @@ static string fixCommand(string const & cmd, string const & ext, void Formats::setAutoOpen() { - FormatList::iterator fit = formatlist.begin(); - FormatList::iterator const fend = formatlist.end(); + FormatList::iterator fit = formatlist_.begin(); + FormatList::iterator const fend = formatlist_.end(); for ( ; fit != fend ; ++fit) { fit->setViewer(fixCommand(fit->viewer(), fit->extension(), os::VIEW)); fit->setEditor(fixCommand(fit->editor(), fit->extension(), os::EDIT)); @@ -539,10 +589,10 @@ void Formats::setAutoOpen() int Formats::getNumber(string const & name) const { FormatList::const_iterator cit = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatNamesEqual(name)); - if (cit != formatlist.end()) - return distance(formatlist.begin(), cit); + if (cit != formatlist_.end()) + return distance(formatlist_.begin(), cit); else return -1; } @@ -551,21 +601,21 @@ int Formats::getNumber(string const & name) const void Formats::add(string const & name) { if (!getFormat(name)) - add(name, name, name, string(), string(), string(), + add(name, name, from_utf8(name), string(), string(), string(), string(), Format::document); } void Formats::add(string const & name, string const & extensions, - string const & prettyname, string const & shortcut, + docstring const & prettyname, string const & shortcut, string const & viewer, string const & editor, string const & mime, int flags) { FormatList::iterator it = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatNamesEqual(name)); - if (it == formatlist.end()) - formatlist.push_back(Format(name, extensions, prettyname, + if (it == formatlist_.end()) + formatlist_.push_back(Format(name, extensions, prettyname, shortcut, viewer, editor, mime, flags)); else *it = Format(name, extensions, prettyname, shortcut, viewer, @@ -576,16 +626,16 @@ void Formats::add(string const & name, string const & extensions, void Formats::erase(string const & name) { FormatList::iterator it = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatNamesEqual(name)); - if (it != formatlist.end()) - formatlist.erase(it); + if (it != formatlist_.end()) + formatlist_.erase(it); } void Formats::sort() { - std::sort(formatlist.begin(), formatlist.end()); + std::sort(formatlist_.begin(), formatlist_.end()); } @@ -593,9 +643,9 @@ void Formats::setViewer(string const & name, string const & command) { add(name); FormatList::iterator it = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatNamesEqual(name)); - if (it != formatlist.end()) + if (it != formatlist_.end()) it->setViewer(command); } @@ -604,9 +654,9 @@ void Formats::setEditor(string const & name, string const & command) { add(name); FormatList::iterator it = - find_if(formatlist.begin(), formatlist.end(), + find_if(formatlist_.begin(), formatlist_.end(), FormatNamesEqual(name)); - if (it != formatlist.end()) + if (it != formatlist_.end()) it->setEditor(command); } @@ -645,7 +695,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()) { @@ -662,8 +712,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 @@ -671,7 +723,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; @@ -730,15 +783,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; @@ -749,7 +805,7 @@ docstring const Formats::prettyName(string const & name) const { Format const * format = getFormat(name); if (format) - return from_utf8(format->prettyname()); + return format->prettyname(); else return from_utf8(name); } @@ -790,13 +846,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; } @@ -815,9 +872,4 @@ OutputParams::FLAVOR format2flavor(std::string fmt) return flavorTranslator().find(fmt); } */ -Formats formats; - -Formats system_formats; - - } // namespace lyx