X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=ec61b84387ea2a5c620f8d2e1ddf380ed13a0fd2;hb=dc7c7ca03eca25cf7a6395c155b70dac1594e481;hp=8bd34ad48968d9fb6df3b53ec97eebacfeee22f3;hpb=26f336769af8dd5c48c2c0241cd3fbfc50a3c65e;p=lyx.git diff --git a/src/Format.cpp b/src/Format.cpp index 8bd34ad489..ec61b84387 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -14,42 +14,32 @@ #include "Buffer.h" #include "BufferParams.h" #include "LyXRC.h" -#include "debug.h" -#include "gettext.h" #include "ServerSocket.h" -#include "frontends/Application.h" #include "frontends/alert.h" //to be removed? +#include "support/debug.h" #include "support/filetools.h" +#include "support/gettext.h" #include "support/lstrings.h" #include "support/os.h" #include "support/Systemcall.h" +#include "support/textutils.h" +#include "support/Translator.h" -#include +#include -using std::find_if; -using std::string; -using std::distance; +// FIXME: Q_WS_MACX is not available, it's in Qt +#ifdef USE_MACOSX_PACKAGING +#include "support/linkback/LinkBackProxy.h" +#endif +using namespace std; +using namespace lyx::support; namespace lyx { -using support::absolutePath; -using support::bformat; -using support::compare_ascii_no_case; -using support::contains; -using support::FileName; -using support::libScriptSearch; -using support::makeDisplayPath; -using support::onlyPath; -using support::quoteName; -using support::subst; -using support::Systemcall; -using support::token; - namespace Alert = frontend::Alert; -namespace fs = boost::filesystem; namespace os = support::os; namespace { @@ -59,7 +49,7 @@ string const token_path_format("$$p"); string const token_socket_format("$$a"); -class FormatNamesEqual : public std::unary_function { +class FormatNamesEqual : public unary_function { public: FormatNamesEqual(string const & name) : name_(name) {} @@ -72,7 +62,7 @@ private: }; -class FormatExtensionsEqual : public std::unary_function { +class FormatExtensionsEqual : public unary_function { public: FormatExtensionsEqual(string const & extension) : extension_(extension) {} @@ -114,7 +104,7 @@ bool Format::isChildFormat() const { if (name_.empty()) return false; - return isdigit(name_[name_.length() - 1]); + return isDigitASCII(name_[name_.length() - 1]); } @@ -143,12 +133,12 @@ string Formats::getFormatFromFile(FileName const & filename) const if (filename.empty()) return string(); - string const format = support::getFormatFromContents(filename); + string const format = filename.guessFormatFromContents(); if (!format.empty()) return format; // try to find a format from the file extension. - string const ext(support::getExtension(filename.absFilename())); + string const ext = getExtension(filename.absFileName()); if (!ext.empty()) { // this is ambigous if two formats have the same extension, // but better than nothing @@ -156,18 +146,16 @@ string Formats::getFormatFromFile(FileName const & filename) const find_if(formatlist.begin(), formatlist.end(), FormatExtensionsEqual(ext)); if (cit != formats.end()) { - LYXERR(Debug::GRAPHICS) - << "\twill guess format from file extension: " - << ext << " -> " << cit->name() << std::endl; + LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: " + << ext << " -> " << cit->name()); return cit->name(); } } return string(); } -namespace { -string fixCommand(string const & cmd, string const & ext, +static string fixCommand(string const & cmd, string const & ext, os::auto_open_mode mode) { // configure.py says we do not want a viewer/editor @@ -186,7 +174,6 @@ string fixCommand(string const & cmd, string const & ext, return cmd; } -} void Formats::setAutoOpen() { @@ -263,13 +250,24 @@ void Formats::setViewer(string const & name, string const & command) } +void Formats::setEditor(string const & name, string const & command) +{ + add(name); + FormatList::iterator it = + find_if(formatlist.begin(), formatlist.end(), + FormatNamesEqual(name)); + if (it != formatlist.end()) + it->setEditor(command); +} + + bool Formats::view(Buffer const & buffer, FileName const & filename, string const & format_name) const { - if (filename.empty() || !fs::exists(filename.toFilesystemEncoding())) { + if (filename.empty() || !filename.exists()) { Alert::error(_("Cannot view file"), bformat(_("File does not exist: %1$s"), - from_utf8(filename.absFilename()))); + from_utf8(filename.absFileName()))); return false; } @@ -287,12 +285,12 @@ bool Formats::view(Buffer const & buffer, FileName const & filename, } // viewer is 'auto' if (format->viewer() == "auto") { - if (os::autoOpenFile(filename.absFilename(), os::VIEW)) + if (os::autoOpenFile(filename.absFileName(), os::VIEW)) return true; else { Alert::error(_("Cannot view file"), bformat(_("Auto-view file %1$s failed"), - from_utf8(filename.absFilename()))); + from_utf8(filename.absFileName()))); return false; } } @@ -301,13 +299,14 @@ bool Formats::view(Buffer const & buffer, FileName const & filename, if (format_name == "dvi" && !lyxrc.view_dvi_paper_option.empty()) { - command += ' ' + lyxrc.view_dvi_paper_option; - string paper_size = buffer.params().paperSizeName(); - if (paper_size == "letter") - paper_size = "us"; - command += ' ' + paper_size; - if (buffer.params().orientation == ORIENTATION_LANDSCAPE) - command += 'r'; + string paper_size = buffer.params().paperSizeName(BufferParams::XDVI); + if (!paper_size.empty()) { + command += ' ' + lyxrc.view_dvi_paper_option; + command += ' ' + paper_size; + if (buffer.params().orientation == ORIENTATION_LANDSCAPE && + buffer.params().papersize != PAPER_CUSTOM) + command += 'r'; + } } if (!contains(command, token_from_format)) @@ -316,19 +315,14 @@ bool Formats::view(Buffer const & buffer, FileName const & filename, command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding())); command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding()))); command = subst(command, token_socket_format, quoteName(theServerSocket().address())); - LYXERR(Debug::FILES) << "Executing command: " << command << std::endl; + LYXERR(Debug::FILES, "Executing command: " << command); // FIXME UNICODE utf8 can be wrong for files buffer.message(_("Executing command: ") + from_utf8(command)); Systemcall one; - int const res = one.startscript(Systemcall::DontWait, command); + one.startscript(Systemcall::DontWait, command); - if (res) { - Alert::error(_("Cannot view file"), - bformat(_("An error occurred whilst running %1$s"), - makeDisplayPath(command, 50))); - return false; - } + // we can't report any sort of error, since we aren't waiting return true; } @@ -336,11 +330,23 @@ 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() || !fs::exists(filename.toFilesystemEncoding())) { + if (filename.empty() || !filename.exists()) { Alert::error(_("Cannot edit file"), bformat(_("File does not exist: %1$s"), - from_utf8(filename.absFilename()))); + from_utf8(filename.absFileName()))); + return false; + } + + // LinkBack files look like PDF, but have the .linkback extension + string const ext = getExtension(filename.absFileName()); + if (format_name == "pdf" && ext == "linkback") { +#ifdef USE_MACOSX_PACKAGING + return editLinkBackFile(filename.absFileName().c_str()); +#else + Alert::error(_("Cannot edit file"), + _("LinkBack files can only be edited on Apple Mac OSX.")); return false; +#endif // USE_MACOSX_PACKAGING } Format const * format = getFormat(format_name); @@ -355,14 +361,15 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename, prettyName(format_name))); return false; } + // editor is 'auto' if (format->editor() == "auto") { - if (os::autoOpenFile(filename.absFilename(), os::EDIT)) + if (os::autoOpenFile(filename.absFileName(), os::EDIT)) return true; else { Alert::error(_("Cannot edit file"), bformat(_("Auto-edit file %1$s failed"), - from_utf8(filename.absFilename()))); + from_utf8(filename.absFileName()))); return false; } } @@ -375,19 +382,14 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename, command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding())); command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding()))); command = subst(command, token_socket_format, quoteName(theServerSocket().address())); - LYXERR(Debug::FILES) << "Executing command: " << command << std::endl; + LYXERR(Debug::FILES, "Executing command: " << command); // FIXME UNICODE utf8 can be wrong for files buffer.message(_("Executing command: ") + from_utf8(command)); Systemcall one; - int const res = one.startscript(Systemcall::DontWait, command); + one.startscript(Systemcall::DontWait, command); - if (res) { - Alert::error(_("Cannot edit file"), - bformat(_("An error occurred whilst running %1$s"), - makeDisplayPath(command, 50))); - return false; - } + // we can't report any sort of error, since we aren't waiting return true; } @@ -412,8 +414,42 @@ string const Formats::extension(string const & name) const } +namespace { +typedef Translator FlavorTranslator; + +FlavorTranslator initFlavorTranslator() +{ + FlavorTranslator f(OutputParams::LATEX, "latex"); + 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"); + return f; +} +FlavorTranslator const & flavorTranslator() +{ + static FlavorTranslator translator = initFlavorTranslator(); + return translator; +} +} + + +std::string flavor2format(OutputParams::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) +{ + return flavorTranslator().find(fmt); +} */ + Formats formats; Formats system_formats;