X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_cygwin.cpp;h=c2bdb387a699bd0979511d314f68a05dc2f3e208;hb=522f3517e1d7f61ed2bbcafe0632f50cb3e8ae2f;hp=e0c0bd17a04a0e45217d8e45f1f56b9b7729da65;hpb=b60b505fd82866dc57d4522b3ff73ae5bd337612;p=lyx.git

diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index e0c0bd17a0..c2bdb387a6 100644
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -438,22 +438,43 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode,
 {
 	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 oldval = getEnv("TEXINPUTS");
-	string const newval = "." + sep + texinputs + sep + oldval;
+	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", newval);
+		setEnv("TEXINPUTS", newtexinputs);
+		setEnv("BIBINPUTS", newbibinputs);
+		setEnv("BSTINPUTS", newbstinputs);
+		setEnv("TEXFONTS", newtexfonts);
 		cygwin_internal(CW_SYNC_WINENV);
 	}
 
+	string win_path;
+	try {
+		win_path = to_local8bit(from_utf8(convert_path(filename, PathStyle(windows))));
+	} catch (...) {
+		LYXERR0("Cannot encode file name `" << filename << "' to local 8 bit encoding");
+		return false;
+	}
+
+
 	// 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";
-	bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
+	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", oldval);
+		setEnv("TEXINPUTS", oldtexinputs);
+		setEnv("BIBINPUTS", oldbibinputs);
+		setEnv("BSTINPUTS", oldbstinputs);
+		setEnv("TEXFONTS", oldtexfonts);
 		cygwin_internal(CW_SYNC_WINENV);
 	}
 	return success;