X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.cpp;h=cedbf7a2aea4acb90038f9d627ab4a753c15db8e;hb=5a8e91d1c5381d8c152b12269707b547d5241624;hp=e29cdee2ee5661390290a515b6bc1ac15a09a1a3;hpb=90b6920083acf8d271106fea81221ec8de39b4c1;p=lyx.git

diff --git a/src/Format.cpp b/src/Format.cpp
index e29cdee2ee..cedbf7a2ae 100644
--- a/src/Format.cpp
+++ b/src/Format.cpp
@@ -705,8 +705,10 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 	if (!contains(command, token_from_format))
 		command += ' ' + token_from_format;
 
-	command = subst(command, token_from_format, quoteName(onlyFileName(filename.toFilesystemEncoding())));
-	command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+	command = subst(command, token_from_format,
+	                quoteName(onlyFileName(filename.toFilesystemEncoding()), quote_shell_filename));
+	command = subst(command, token_path_format,
+	                quoteName(onlyPath(filename.toFilesystemEncoding()), quote_shell_filename));
 	command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
 	LYXERR(Debug::FILES, "Executing command: " << command);
 	// FIXME UNICODE utf8 can be wrong for files
@@ -714,7 +716,8 @@ bool Formats::view(Buffer const & buffer, FileName const & filename,
 
 	PathChanger p(filename.onlyPath());
 	Systemcall one;
-	one.startscript(Systemcall::DontWait, command, buffer.filePath());
+	one.startscript(Systemcall::DontWait, command,
+	                buffer.filePath(), buffer.layoutPos());
 
 	// we can't report any sort of error, since we aren't waiting
 	return true;
@@ -773,15 +776,18 @@ bool Formats::edit(Buffer const & buffer, FileName const & filename,
 	if (!contains(command, token_from_format))
 		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_from_format,
+	                quoteName(filename.toFilesystemEncoding(), quote_shell_filename));
+	command = subst(command, token_path_format,
+	                quoteName(onlyPath(filename.toFilesystemEncoding()), quote_shell_filename));
 	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));
 
 	Systemcall one;
-	one.startscript(Systemcall::DontWait, command, buffer.filePath());
+	one.startscript(Systemcall::DontWait, command,
+	                buffer.filePath(), buffer.layoutPos());
 
 	// we can't report any sort of error, since we aren't waiting
 	return true;
@@ -833,6 +839,7 @@ FlavorTranslator initFlavorTranslator()
 	f.addPair(OutputParams::XML, "docbook-xml");
 	f.addPair(OutputParams::HTML, "xhtml");
 	f.addPair(OutputParams::TEXT, "text");
+	f.addPair(OutputParams::LYX, "lyx");
 	return f;
 }