X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=e6ad5962d523d3850bd8025645c3c15b855d694b;hb=a174f43bc5515291c4d0b28cacd806c9c9ea4de4;hp=bddaf0948e4c4650cbe7b577576205b82bd3049a;hpb=138b23fac84930cdbfada0067c61480989041113;p=lyx.git

diff --git a/src/Format.cpp b/src/Format.cpp
index bddaf0948e..e6ad5962d5 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -14,41 +14,30 @@
 #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 "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>
+#include <algorithm>
 
+// FIXME: Q_WS_MACX is not available, it's in Qt
+#ifdef USE_MACOSX_PACKAGING
+#include "support/linkback/LinkBackProxy.h"
+#endif
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
-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 lyx {
 
 namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
 namespace os = support::os;
 
 namespace {
@@ -58,7 +47,7 @@ string const token_path_format("$$p");
 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) {}
@@ -71,7 +60,7 @@ private:
 };
 
 
-class FormatExtensionsEqual : public std::unary_function<Format, bool> {
+class FormatExtensionsEqual : public unary_function<Format, bool> {
 public:
 	FormatExtensionsEqual(string const & extension)
 		: extension_(extension) {}
@@ -97,7 +86,7 @@ bool operator<(Format const & a, Format const & b)
 
 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)
 {}
@@ -142,12 +131,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
@@ -155,18 +144,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
@@ -185,7 +172,6 @@ string fixCommand(string const & cmd, string const & ext,
 	return cmd;
 }
 
-}
 
 void Formats::setAutoOpen()
 {
@@ -220,15 +206,15 @@ void Formats::add(string const & name)
 
 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);
@@ -262,13 +248,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;
 	}
 
@@ -286,12 +283,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;
 		}
 	}
@@ -300,13 +297,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))
@@ -314,8 +312,8 @@ 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(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));
 
@@ -335,11 +333,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);
@@ -354,14 +364,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;
 		}
 	}
@@ -373,8 +384,8 @@ 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(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));