X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_unix.cpp;h=9109fbb58648c0d9cb3e945446718070be939b81;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=81cbb354fe081f23b7dffa01513de5b1602c99e6;hpb=9c55af4a223ce4db29d643251109e245665344bd;p=lyx.git

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index 81cbb354fe..9109fbb586 100644
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -298,14 +298,29 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode,
 
 	string const texinputs = os::latex_path_list(
 		replaceCurdirPath(path, lyxrc.texinputs_prefix));
-	string const oldval = getEnv("TEXINPUTS");
-	string const newval = ".:" + texinputs + ":" + oldval;
-	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
-		setEnv("TEXINPUTS", newval);
+	string const otherinputs = os::latex_path_list(path);
+	string const oldtexinputs = getEnv("TEXINPUTS");
+	string const newtexinputs = ".:" + texinputs + ":" + oldtexinputs;
+	string const oldbibinputs = getEnv("BIBINPUTS");
+	string const newbibinputs = ".:" + otherinputs + ":" + oldbibinputs;
+	string const oldbstinputs = getEnv("BSTINPUTS");
+	string const newbstinputs = ".:" + otherinputs + ":" + oldbstinputs;
+	string const oldtexfonts = getEnv("TEXFONTS");
+	string const newtexfonts = ".:" + otherinputs + ":" + oldtexfonts;
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", newtexinputs);
+		setEnv("BIBINPUTS", newbibinputs);
+		setEnv("BSTINPUTS", newbstinputs);
+		setEnv("TEXFONTS", newtexfonts);
+	}
 	status = LSOpenFromURLSpec (&launchUrlSpec, NULL);
 	CFRelease(launchItems);
-	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
-		setEnv("TEXINPUTS", oldval);
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", oldtexinputs);
+		setEnv("BIBINPUTS", oldbibinputs);
+		setEnv("BSTINPUTS", oldbstinputs);
+		setEnv("TEXFONTS", oldtexfonts);
+	}
 	return status == 0;
 #else
 	// silence compiler warnings