listerrors.lyx : Update a link.

[lyx.git] / src / support / os_win32.cpp

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index dd5f0e594d71cd9fa18fa1adc04dd0710c2d209e..b58397d202640cc5cac395f913e7c4c8c1b421d1 100644 (file)
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -15,10 +15,13 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/os.h"
 #include "support/os_win32.h"
 
 #include "support/debug.h"
+#include "support/environment.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/filetools.h"
@@ -385,6 +388,38 @@ string latex_path(string const & p)
 }
 
 
+string latex_path_list(string const & p)
+{
+       if (p.empty())
+               return p;
+
+       // We may need a posix style path or a windows style path (depending
+       // on windows_style_tex_paths_), but we use always forward slashes,
+       // since this is standard for all tex engines.
+
+       if (!windows_style_tex_paths_) {
+               string pathlist;
+               for (size_t i = 0, k = 0; i != string::npos; k = i) {
+                       i = p.find(';', i);
+                       string path = subst(p.substr(k, i - k), '\\', '/');
+                       if (FileName::isAbsolute(path)) {
+                               string const drive = path.substr(0, 2);
+                               string const cygprefix = cygdrive + "/"
+                                                       + drive.substr(0, 1);
+                               path = subst(path, drive, cygprefix);
+                       }
+                       pathlist += path;
+                       if (i != string::npos) {
+                               pathlist += ':';
+                               ++i;
+                       }
+               }
+               return pathlist;
+       }
+       return subst(p, '\\', '/');
+}
+
+
 bool is_valid_strftime(string const & p)
 {
        string::size_type pos = p.find_first_of('%');
@@ -423,8 +458,11 @@ shell_type shell()
 }
 
 
-char path_separator()
+char path_separator(path_type type)
 {
+       if (type == TEXENGINE)
+               return windows_style_tex_paths_ ? ';' : ':';
+
        return ';';
 }
 
@@ -501,12 +539,25 @@ bool canAutoOpenFile(string const & ext, auto_open_mode const mode)
 }
 
 
-bool autoOpenFile(string const & filename, auto_open_mode const mode)
+bool autoOpenFile(string const & filename, auto_open_mode const mode,
+                 string const & path)
 {
+       string const texinputs = os::latex_path_list(
+                       replaceCurdirPath(path, lyxrc.texinputs_prefix));
+       string const sep = windows_style_tex_paths_ ? ";" : ":";
+       string const oldval = getEnv("TEXINPUTS");
+       string const newval = "." + sep + texinputs + sep + oldval;
+       if (!path.empty() && !lyxrc.texinputs_prefix.empty())
+               setEnv("TEXINPUTS", newval);
+
        // reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
        char const * action = (mode == VIEW) ? "open" : "edit";
-       return reinterpret_cast<int>(ShellExecute(NULL, action,
+       bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
                to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
+
+       if (!path.empty() && !lyxrc.texinputs_prefix.empty())
+               setEnv("TEXINPUTS", oldval);
+       return success;
 }