X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fformat.C;h=fa327785dadd188a85976ccb42f90777708a94f2;hb=024275f0690b41634e26dabe8758e3dc6cd31ee2;hp=099402c872c040ccae8225bb78cee9411a6e8a16;hpb=d5443737342903de489d527802cd2cdd38987d74;p=lyx.git

diff --git a/src/format.C b/src/format.C
index 099402c872..fa327785da 100644
--- a/src/format.C
+++ b/src/format.C
@@ -18,36 +18,38 @@
 #include "gettext.h"
 #include "lyxsocket.h"
 
+#include "frontends/Application.h"
 #include "frontends/Alert.h" //to be removed?
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
 #include "support/os.h"
-#include "support/path.h"
 #include "support/systemcall.h"
 
 #include <boost/filesystem/operations.hpp>
 
-using lyx::support::bformat;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::contains;
-using lyx::support::libScriptSearch;
-using lyx::support::makeDisplayPath;
-using lyx::support::onlyFilename;
-using lyx::support::onlyPath;
-using lyx::support::Path;
-using lyx::support::quoteName;
-using lyx::support::subst;
-using lyx::support::Systemcall;
-using lyx::support::token;
+
+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 = lyx::support::os;
-
-extern LyXServerSocket * lyxsocket;
+namespace os = support::os;
 
 namespace {
 
@@ -95,9 +97,9 @@ 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,
-               bool d)
+               int flags)
 	: name_(n), extension_(e), prettyname_(p), shortcut_(s), viewer_(v),
-	  editor_(ed), document_(d)
+	  editor_(ed), flags_(flags)
 {}
 
 
@@ -135,17 +137,17 @@ Format const * Formats::getFormat(string const & name) const
 }
 
 
-string Formats::getFormatFromFile(string const & filename) const
+string Formats::getFormatFromFile(FileName const & filename) const
 {
 	if (filename.empty())
 		return string();
 
-	string const format = lyx::support::getFormatFromContents(filename);
+	string const format = support::getFormatFromContents(filename);
 	if (!format.empty())
 		return format;
 
 	// try to find a format from the file extension.
-	string const ext(lyx::support::getExtension(filename));
+	string const ext(support::getExtension(filename.absFilename()));
 	if (!ext.empty()) {
 		// this is ambigous if two formats have the same extension,
 		// but better than nothing
@@ -164,7 +166,7 @@ string Formats::getFormatFromFile(string const & filename) const
 
 namespace {
 
-string fixCommand(string const & cmd, string const & ext, 
+string fixCommand(string const & cmd, string const & ext,
 		  os::auto_open_mode mode)
 {
 	// configure.py says we do not want a viewer/editor
@@ -211,24 +213,25 @@ int Formats::getNumber(string const & name) const
 void Formats::add(string const & name)
 {
 	if (!getFormat(name))
-		add(name, name, name, string(), string(), string(), true);
+		add(name, name, name, string(), string(), string(),
+		    Format::document);
 }
 
 
 void Formats::add(string const & name, string const & extension,
 		  string const & prettyname, string const & shortcut,
-		  string const & viewer, string const & editor, bool document)
+                  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,
-		                            document));
+		                            shortcut, viewer, editor, flags));
 	else
 		*it = Format(name, extension, prettyname, shortcut, viewer,
-		             editor, document);
+			     editor, flags);
 }
 
 
@@ -259,13 +262,13 @@ void Formats::setViewer(string const & name, string const & command)
 }
 
 
-bool Formats::view(Buffer const & buffer, string const & filename,
+bool Formats::view(Buffer const & buffer, FileName const & filename,
 		   string const & format_name) const
 {
-	if (filename.empty() || !fs::exists(filename)) {
+	if (filename.empty() || !fs::exists(filename.toFilesystemEncoding())) {
 		Alert::error(_("Cannot view file"),
 			bformat(_("File does not exist: %1$s"),
-				filename));
+				from_utf8(filename.absFilename())));
 		return false;
 	}
 
@@ -283,12 +286,12 @@ bool Formats::view(Buffer const & buffer, string const & filename,
 	}
 	// viewer is 'auto'
 	if (format->viewer() == "auto") {
-		if (os::autoOpenFile(filename, os::VIEW))
+		if (os::autoOpenFile(filename.absFilename(), os::VIEW))
 			return true;
 		else {
 			Alert::error(_("Cannot view file"),
 				bformat(_("Auto-view file %1$s failed"),
-					filename));
+					from_utf8(filename.absFilename())));
 			return false;
 		}
 	}
@@ -309,14 +312,13 @@ bool Formats::view(Buffer const & buffer, string const & filename,
 	if (!contains(command, token_from))
 		command += ' ' + token_from;
 
-	command = subst(command, token_from,
-			quoteName(onlyFilename(filename)));
-	command = subst(command, token_path, quoteName(onlyPath(filename)));
-	command = subst(command, token_socket, quoteName(lyxsocket->address()));
+	command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
+	command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
+	command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
 	lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-	buffer.message(_("Executing command: ") + command);
+	// FIXME UNICODE utf8 can be wrong for files
+	buffer.message(_("Executing command: ") + from_utf8(command));
 
-	Path p(onlyPath(filename));
 	Systemcall one;
 	int const res = one.startscript(Systemcall::DontWait, command);
 
@@ -330,13 +332,13 @@ bool Formats::view(Buffer const & buffer, string const & filename,
 }
 
 
-bool Formats::edit(Buffer const & buffer, string const & filename,
+bool Formats::edit(Buffer const & buffer, FileName const & filename,
 			 string const & format_name) const
 {
-	if (filename.empty() || !fs::exists(filename)) {
+	if (filename.empty() || !fs::exists(filename.toFilesystemEncoding())) {
 		Alert::error(_("Cannot edit file"),
 			bformat(_("File does not exist: %1$s"),
-				filename));
+				from_utf8(filename.absFilename())));
 		return false;
 	}
 
@@ -354,12 +356,12 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
 	}
 	// editor is 'auto'
 	if (format->editor() == "auto") {
-		if (os::autoOpenFile(filename, os::EDIT))
+		if (os::autoOpenFile(filename.absFilename(), os::EDIT))
 			return true;
 		else {
 			Alert::error(_("Cannot edit file"),
 				bformat(_("Auto-edit file %1$s failed"),
-					filename));
+					from_utf8(filename.absFilename())));
 			return false;
 		}
 	}
@@ -369,14 +371,13 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
 	if (!contains(command, token_from))
 		command += ' ' + token_from;
 
-	command = subst(command, token_from,
-			quoteName(onlyFilename(filename)));
-	command = subst(command, token_path, quoteName(onlyPath(filename)));
-	command = subst(command, token_socket, quoteName(lyxsocket->address()));
+	command = subst(command, token_from, quoteName(filename.toFilesystemEncoding()));
+	command = subst(command, token_path, quoteName(onlyPath(filename.toFilesystemEncoding())));
+	command = subst(command, token_socket, quoteName(theLyXServerSocket().address()));
 	lyxerr[Debug::FILES] << "Executing command: " << command << std::endl;
-	buffer.message(_("Executing command: ") + command);
+	// FIXME UNICODE utf8 can be wrong for files
+	buffer.message(_("Executing command: ") + from_utf8(command));
 
-	Path p(onlyPath(filename));
 	Systemcall one;
 	int const res = one.startscript(Systemcall::DontWait, command);
 
@@ -390,13 +391,13 @@ bool Formats::edit(Buffer const & buffer, string const & filename,
 }
 
 
-string const Formats::prettyName(string const & name) const
+docstring const Formats::prettyName(string const & name) const
 {
 	Format const * format = getFormat(name);
 	if (format)
-		return format->prettyname();
+		return from_utf8(format->prettyname());
 	else
-		return name;
+		return from_utf8(name);
 }
 
 
@@ -415,3 +416,6 @@ string const Formats::extension(string const & name) const
 Formats formats;
 
 Formats system_formats;
+
+
+} // namespace lyx