} // namespace anon
-void init(int argc, char * argv[])
+void init(int argc, char ** argv[])
{
argc_ = argc;
- argv_ = argv;
+ argv_ = *argv;
// Set environment's default locale
setlocale(LC_ALL, "");
{
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);
}
+ QString const win_path =
+ toqstr(convert_path(filename, PathStyle(windows)));
+
// 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,
- win_path.c_str(), NULL, NULL, 1)) > 32;
+ wchar_t const * action = (mode == VIEW) ? L"open" : L"edit";
+ bool success = reinterpret_cast<long>(ShellExecuteW(NULL, action,
+ reinterpret_cast<wchar_t const *>(win_path.utf16()),
+ 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;