X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=7128e2a7744692f739ee3759726cbcc4cbadb3df;hb=46c6c40bea6ac75474b712b718b5903a8451bd31;hp=0ec1de2d42074cbfd4a82f4214e91a67c7e549fe;hpb=c506f304bc522ea91ad5a7e97cd4e3c7d54376b0;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index 0ec1de2d42..7128e2a774 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -14,6 +14,7 @@ #include "Buffer.h" #include "BufferParams.h" #include "LyXRC.h" +#include "OutputParams.h" #include "ServerSocket.h" #include "frontends/alert.h" //to be removed? @@ -32,6 +33,7 @@ #include "support/Translator.h" #include +#include #include #include @@ -54,53 +56,9 @@ string const token_from_format("$$i"); string const token_path_format("$$p"); string const token_socket_format("$$a"); - -class FormatNamesEqual : public unary_function { -public: - FormatNamesEqual(string const & name) - : name_(name) - {} - bool operator()(Format const & f) const - { - return f.name() == name_; - } -private: - string name_; -}; - - -class FormatExtensionsEqual : public unary_function { -public: - FormatExtensionsEqual(string const & extension) - : extension_(extension) - {} - bool operator()(Format const & f) const - { - return f.hasExtension(extension_); - } -private: - string extension_; -}; - - -class FormatMimeEqual : public unary_function { -public: - FormatMimeEqual(string const & mime) - : mime_(mime) - {} - bool operator()(Format const & f) const - { - // The test for empty mime strings is needed since we allow - // formats with empty mime types. - return f.mime() == mime_ && !mime_.empty(); - } -private: - string mime_; -}; - - } // namespace + bool Format::formatSorter(Format const * lhs, Format const * rhs) { return compare_locale(translateIfPossible(lhs->prettyname()), @@ -137,9 +95,9 @@ string const Format::extensions() const } -bool Format::hasExtension(string const & e) const +bool Format::hasExtension(string const & ext) const { - return (find(extension_list_.begin(), extension_list_.end(), e) + return (find(extension_list_.begin(), extension_list_.end(), ext) != extension_list_.end()); } @@ -164,13 +122,22 @@ void Format::setExtensions(string const & e) } +namespace { + +std::function FormatNameIs(string const & name) +{ + return [name](Format const & f){ return f.name() == name; }; +} + +} + // This method should return a reference, and throw an exception // if the format named name cannot be found (Lgb) Format const * Formats::getFormat(string const & name) const { FormatList::const_iterator cit = find_if(formatlist_.begin(), formatlist_.end(), - FormatNamesEqual(name)); + FormatNameIs(name)); if (cit != formatlist_.end()) return &(*cit); else @@ -182,7 +149,7 @@ Format * Formats::getFormat(string const & name) { FormatList::iterator it = find_if(formatlist_.begin(), formatlist_.end(), - [name](Format const & f) { return f.name() == name; }); + FormatNameIs(name)); if (it != formatlist_.end()) return &(*it); @@ -289,8 +256,12 @@ string guessFormatFromContents(FileName const & fn) } else if (stamp == "\377\330") { format = "jpg"; + } else if (prefixIs(str, "\x89PNG")) { + format = "png"; + } else if (stamp == "\001\332") { format = "sgi"; + } else if (prefixIs(str, binEPSStamp)) { format = "eps"; @@ -353,9 +324,6 @@ string guessFormatFromContents(FileName const & fn) else if (contains(str, " EMF")) format = "emf"; - else if (contains(str, "PNG")) - format = "png"; - else if (contains(str, "%!PS-Adobe")) { // eps or ps ifs >> str; @@ -433,7 +401,7 @@ string Formats::getFormatFromFile(FileName const & filename) const mime != "text/plain") { Formats::const_iterator cit = find_if(formatlist_.begin(), formatlist_.end(), - FormatMimeEqual(mime)); + [mime](Format const & f){ return f.mime() == mime; }); if (cit != formatlist_.end()) { LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: " << mime << " -> " << cit->name()); @@ -499,7 +467,7 @@ string Formats::getFormatFromExtension(string const & ext) const // but better than nothing Formats::const_iterator cit = find_if(formatlist_.begin(), formatlist_.end(), - FormatExtensionsEqual(ext)); + [ext](Format const & f){ return f.hasExtension(ext); }); if (cit != formatlist_.end()) { LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: " << ext << " -> " << cit->name()); @@ -588,11 +556,11 @@ int Formats::getNumber(string const & name) const { FormatList::const_iterator cit = find_if(formatlist_.begin(), formatlist_.end(), - FormatNamesEqual(name)); - if (cit != formatlist_.end()) - return distance(formatlist_.begin(), cit); - else + FormatNameIs(name)); + if (cit == formatlist_.end()) return -1; + + return distance(formatlist_.begin(), cit); } @@ -623,7 +591,7 @@ void Formats::erase(string const & name) { FormatList::iterator it = find_if(formatlist_.begin(), formatlist_.end(), - FormatNamesEqual(name)); + FormatNameIs(name)); if (it != formatlist_.end()) formatlist_.erase(it); } @@ -676,7 +644,7 @@ bool Formats::view(Buffer const & buffer, FileName const & filename, // by the caller (this should be "utility" code) Alert::error(_("Cannot view file"), bformat(_("No information for viewing %1$s"), - prettyName(format_name))); + translateIfPossible(prettyName(format_name)))); return false; } // viewer is 'auto' @@ -752,10 +720,9 @@ bool Formats::view(Buffer const & buffer, FileName const & filename, bool Formats::edit(Buffer const & buffer, FileName const & filename, string const & format_name) const { - if (filename.empty() || !filename.exists()) { - Alert::error(_("Cannot edit file"), - bformat(_("File does not exist: %1$s"), - from_utf8(filename.absFileName()))); + if (filename.empty()) { + Alert::error(_("No Filename"), + _("No filename was provided!")); return false; } @@ -780,7 +747,7 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename, // be done by the caller (this should be "utility" code) Alert::error(_("Cannot edit file"), bformat(_("No information for editing %1$s"), - prettyName(format_name))); + translateIfPossible(prettyName(format_name)))); return false; } @@ -851,20 +818,20 @@ string const Formats::extensions(string const & name) const namespace { -typedef Translator FlavorTranslator; +typedef Translator FlavorTranslator; FlavorTranslator initFlavorTranslator() { - FlavorTranslator f(OutputParams::LATEX, "latex"); - f.addPair(OutputParams::DVILUATEX, "dviluatex"); - f.addPair(OutputParams::LUATEX, "luatex"); - f.addPair(OutputParams::PDFLATEX, "pdflatex"); - f.addPair(OutputParams::XETEX, "xetex"); - f.addPair(OutputParams::XML, "docbook-xml"); - f.addPair(OutputParams::HTML, "xhtml"); - f.addPair(OutputParams::TEXT, "text"); - f.addPair(OutputParams::LYX, "lyx"); + FlavorTranslator f(Flavor::LaTeX, "latex"); + f.addPair(Flavor::DviLuaTeX, "dviluatex"); + f.addPair(Flavor::LuaTeX, "luatex"); + f.addPair(Flavor::PdfLaTeX, "pdflatex"); + f.addPair(Flavor::XeTeX, "xetex"); + f.addPair(Flavor::DocBook5, "docbook-xml"); + f.addPair(Flavor::Html, "xhtml"); + f.addPair(Flavor::Text, "text"); + f.addPair(Flavor::LyX, "lyx"); return f; } @@ -878,14 +845,14 @@ FlavorTranslator const & flavorTranslator() } // namespace -std::string flavor2format(OutputParams::FLAVOR flavor) +std::string flavor2format(Flavor flavor) { return flavorTranslator().find(flavor); } /* Not currently needed, but I'll leave the code in case it is. -OutputParams::FLAVOR format2flavor(std::string fmt) +Flavor format2flavor(std::string fmt) { return flavorTranslator().find(fmt); } */