X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_cygwin.cpp;h=3464c04d785142fd4a4db3e10f686747addceef8;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=31416c0f711190a8cc18c50d91a2b478035aee95;hpb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;p=lyx.git

diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index 31416c0f71..3464c04d78 100644
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -15,12 +15,16 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/os.h"
 
+#include "support/debug.h"
+#include "support/environment.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
 #include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/debug.h"
 
 #include <windows.h>
 #include <io.h>
@@ -211,6 +215,10 @@ void init(int argc, char * argv[])
 	argc_ = argc;
 	argv_ = argv;
 
+	// Set environment's default locale
+	setlocale(LC_ALL, "");
+	setlocale(LC_NUMERIC, "C");
+
 	// Make sure that the TEMP variable is set
 	// and sync the Windows environment.
 	setenv("TEMP", "/tmp", false);
@@ -223,7 +231,7 @@ void init(int argc, char * argv[])
 
 string utf8_argv(int i)
 {
-	LASSERT(i < argc_, /**/);
+	LASSERT(i < argc_, return "");
 	return to_utf8(from_local8bit(argv_[i]));
 }
 
@@ -343,6 +351,19 @@ string latex_path(string const & p)
 }
 
 
+string latex_path_list(string const & 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_)
+		return convert_path_list(p, PathStyle(windows));
+
+	return convert_path_list(p, PathStyle(posix));
+}
+
+
 bool is_valid_strftime(string const & p)
 {
 	string::size_type pos = p.find_first_of('%');
@@ -375,20 +396,17 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-	return isatty(channel);
-}
-
-
 shell_type shell()
 {
 	return UNIX;
 }
 
 
-char path_separator()
+char path_separator(path_type type)
 {
+	if (type == TEXENGINE)
+		return windows_style_tex_paths_ ? ';' : ':';
+
 	return ':';
 }
 
@@ -415,13 +433,43 @@ 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 otherinputs = os::latex_path_list(path);
+	string const sep = windows_style_tex_paths_ ? ";" : ":";
+	string const oldtexinputs = getEnv("TEXINPUTS");
+	string const newtexinputs = "." + sep + texinputs + sep + oldtexinputs;
+	string const oldbibinputs = getEnv("BIBINPUTS");
+	string const newbibinputs = "." + sep + otherinputs + sep + oldbibinputs;
+	string const oldbstinputs = getEnv("BSTINPUTS");
+	string const newbstinputs = "." + sep + otherinputs + sep + oldbstinputs;
+	string const oldtexfonts = getEnv("TEXFONTS");
+	string const newtexfonts = "." + sep + otherinputs + sep + oldtexfonts;
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", newtexinputs);
+		setEnv("BIBINPUTS", newbibinputs);
+		setEnv("BSTINPUTS", newbstinputs);
+		setEnv("TEXFONTS", newtexfonts);
+		cygwin_internal(CW_SYNC_WINENV);
+	}
+
 	// reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
 	string const win_path = to_local8bit(from_utf8(convert_path(filename, PathStyle(windows))));
 	char const * action = (mode == VIEW) ? "open" : "edit";
-	return reinterpret_cast<int>(ShellExecute(NULL, action,
-		win_path.c_str(), NULL, NULL, 1)) > 32;
+	bool success = reinterpret_cast<long>(ShellExecute(NULL, action,
+					win_path.c_str(), NULL, NULL, 1)) > 32;
+
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", oldtexinputs);
+		setEnv("BIBINPUTS", oldbibinputs);
+		setEnv("BSTINPUTS", oldbstinputs);
+		setEnv("TEXFONTS", oldtexfonts);
+		cygwin_internal(CW_SYNC_WINENV);
+	}
+	return success;
 }