X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_cygwin.cpp;h=3464c04d785142fd4a4db3e10f686747addceef8;hb=8d640dc77608bedddb5b00982c23665584f52d21;hp=572273ce2c9c670dc0f5ae7e1ed8965254ccd9e2;hpb=41740ea915ee7a95206d780b6256e660cef39c6e;p=lyx.git diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp index 572273ce2c..3464c04d78 100644 --- a/src/support/os_cygwin.cpp +++ b/src/support/os_cygwin.cpp @@ -438,11 +438,21 @@ 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); } @@ -453,7 +463,10 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode, 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;