[LyX/master] Fix viewer file paths on windows (bug #8892)

[Georg Baum]

commit a180414975f45dc3387d6ca71912509fbb03e3e5
Author: Georg Baum <b...@lyx.org>
Date:   Wed Nov 19 22:47:36 2014 +0100

    Fix viewer file paths on windows (bug #8892)
    
    Some applications do not accept forward slashes, so call external viewers
    and editors with backward slashes which is the usual convention under 
windows.

diff --git a/src/Format.cpp b/src/Format.cpp
index e29cdee..bf31026 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
@@ -773,8 +775,10 @@ 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
diff --git a/src/support/filetools.cpp b/src/support/filetools.cpp
index 8e1be90..8efa780 100644
--- a/src/support/filetools.cpp
+++ b/src/support/filetools.cpp
@@ -236,6 +236,8 @@ string const quoteName(string const & name, quote_style 
style)
                // simple parser in Systemcall.cpp do the substitution.
                return '"' + subst(name, "\"", "\\\"") + '"';
 #endif
+       case quote_shell_filename:
+               return quoteName(os::external_path(name), quote_shell);
        case quote_python:
                return "\"" + subst(subst(name, "\\", "\\\\"), "\"", "\\\"")
                     + "\"";
diff --git a/src/support/filetools.h b/src/support/filetools.h
index dc3bdda..cfbec43 100644
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -120,6 +120,9 @@ enum quote_style {
        /** Quote for the (OS dependant) shell. This is needed for command
            line arguments of subprocesses. */
        quote_shell,
+       /** Quote a file name for the (OS dependant) shell. This is needed
+           for file names as command line arguments of subprocesses. */
+       quote_shell_filename,
        /** Quote for python. Use this if you want to store a filename in a
            python script. Example: \code
            os << "infile = " << quoteName(filename) << '\\n';