#include "Buffer.h"
#include "BufferParams.h"
#include "LyXRC.h"
-#include "debug.h"
-#include "gettext.h"
-#include "LyXServerSocket.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 <boost/filesystem/operations.hpp>
+// 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;
-
-using std::string;
-using std::distance;
-
namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
namespace os = support::os;
namespace {
string const token_socket_format("$$a");
-class FormatNamesEqual : public std::unary_function<Format, bool> {
+class FormatNamesEqual : public unary_function<Format, bool> {
public:
FormatNamesEqual(string const & name)
: name_(name) {}
};
-class FormatExtensionsEqual : public std::unary_function<Format, bool> {
+class FormatExtensionsEqual : public unary_function<Format, bool> {
public:
FormatExtensionsEqual(string const & extension)
: extension_(extension) {}
Format::Format(string const & n, string const & e, string const & p,
string const & s, string const & v, string const & ed,
- int flags)
+ int flags)
: name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v),
editor_(ed), flags_(flags)
{}
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
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
return cmd;
}
-}
void Formats::setAutoOpen()
{
void Formats::add(string const & name, string const & extension,
string const & prettyname, string const & shortcut,
- string const & viewer, string const & editor,
- int flags)
+ string const & viewer, string const & editor,
+ int flags)
{
FormatList::iterator it =
find_if(formatlist.begin(), formatlist.end(),
FormatNamesEqual(name));
if (it == formatlist.end())
formatlist.push_back(Format(name, extension, prettyname,
- shortcut, viewer, editor, flags));
+ shortcut, viewer, editor, flags));
else
*it = Format(name, extension, prettyname, shortcut, viewer,
editor, flags);
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())));
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))
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(theLyXServerSocket().address()));
- LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
+ 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));
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())));
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);
if (format && format->editor().empty() &&
format->isChildFormat())
prettyName(format_name)));
return false;
}
+
// editor is 'auto'
if (format->editor() == "auto") {
if (os::autoOpenFile(filename.absFilename(), os::EDIT))
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(theLyXServerSocket().address()));
- LYXERR(Debug::FILES) << "Executing command: " << command << std::endl;
+ 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));
projects / lyx.git / blobdiff