X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=a6727a2d8128a8c67e670912ad559b0d66b901f8;hb=b5722962fb0393299e02df0b146522770e98aef6;hp=1b53d734229a5ae18b42ba430b73acc11d1f5ebe;hpb=dc126bad0441eb8721043e597657d5c18bdf6c90;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index 1b53d73422..a6727a2d81 100644 --- 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 -#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) { @@ -172,9 +169,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; @@ -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()) { @@ -469,9 +454,9 @@ string Formats::getFormatFromFile(FileName const & filename) const } if (isZippedFileFormat(format) && !ext.empty()) { - string const & fmt_name = formats.getFormatFromExtension(ext); + string const & fmt_name = getFormatFromExtension(ext); if (!fmt_name.empty()) { - Format const * p_format = formats.getFormat(fmt_name); + Format const * p_format = getFormat(fmt_name); if (p_format && p_format->zippedNative()) return p_format->name(); } @@ -500,9 +485,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(); @@ -577,8 +562,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)); @@ -589,10 +574,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; } @@ -612,10 +597,10 @@ void Formats::add(string const & name, string const & extensions, 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, @@ -626,16 +611,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()); } @@ -643,9 +628,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); } @@ -654,9 +639,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); } @@ -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) @@ -872,9 +879,4 @@ OutputParams::FLAVOR format2flavor(std::string fmt) return flavorTranslator().find(fmt); } */ -Formats formats; - -Formats system_formats; - - } // namespace lyx