anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-23 16:52:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7557 (TeX engine cannot be switched on Windows)

Browse Source 
As a by-product, make actOnUpdatedPrefs() actually act on updated preferences.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38747 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-05-13 23:39:44 +00:00
parent b3a983c66f
commit e4c2d74d56
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/LyXRC.cpp
View File

@ -1612,8 +1612,9 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
if (tag != RC_LAST)
break;
case RC_TEX_EXPECTS_WINDOWS_PATHS:
if (ignore_system_lyxrc ||
windows_style_tex_paths != system_lyxrc.windows_style_tex_paths) {
// Don't write this setting to the preferences file,
// but allow temporary changes (bug 7557).
if (ignore_system_lyxrc) {
os << "\\tex_expects_windows_paths "
<< convert<string>(windows_style_tex_paths) << '\n';
}
@ -2900,6 +2901,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
// if we forget an element.
LyXRC::LyXRCTags tag = LyXRC::RC_LAST;
switch (tag) {
case LyXRC::RC_LAST:
case LyXRC::RC_ACCEPT_COMPOUND:
case LyXRC::RC_ALT_LANG:
case LyXRC::RC_PLAINTEXT_LINELEN:
@ -2953,9 +2955,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_GROUP_LAYOUTS:
case LyXRC::RC_HUNSPELLDIR_PATH:
case LyXRC::RC_ICON_SET:
if (lyxrc_orig.icon_set != lyxrc_new.icon_set) {
lyxrc.icon_set = lyxrc_new.icon_set;
}
case LyXRC::RC_INDEX_ALTERNATIVES:
case LyXRC::RC_INDEX_COMMAND:
case LyXRC::RC_JBIBTEX_COMMAND:
@ -2984,7 +2983,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_PARAGRAPH_MARKERS:
case LyXRC::RC_PATH_PREFIX:
if (lyxrc_orig.path_prefix != lyxrc_new.path_prefix) {
prependEnvPath("PATH", lyxrc.path_prefix);
prependEnvPath("PATH", lyxrc_new.path_prefix);
}
case LyXRC::RC_PREVIEW:
case LyXRC::RC_PREVIEW_HASHED_LABELS:
@ -3036,9 +3035,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
os::windows_style_tex_paths(lyxrc_new.windows_style_tex_paths);
}
case LyXRC::RC_TEXINPUTS_PREFIX:
if (lyxrc_orig.texinputs_prefix != lyxrc_new.texinputs_prefix) {
lyxrc.texinputs_prefix = lyxrc_new.texinputs_prefix;
}
case LyXRC::RC_THESAURUSDIRPATH:
case LyXRC::RC_UIFILE:
case LyXRC::RC_USER_EMAIL:
@ -3066,7 +3062,6 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
case LyXRC::RC_DEFAULT_DECIMAL_POINT:
case LyXRC::RC_SCROLL_WHEEL_ZOOM:
case LyXRC::RC_CURSOR_WIDTH:
case LyXRC::RC_LAST:
break;
}
}

5
src/frontends/qt4/ui/PrefLatexUi.ui
View File

@ -323,10 +323,7 @@
<bool>true</bool>
</property>
<property name="toolTip">
<string/>
</property>
<property name="whatsThis">
<string>Select if LyX should output Windows-style paths rather than Posix-style paths to LaTeX files. Useful if you're using the native Windows MikTeX rather than the Cygwin teTeX.</string>
<string>Select whether LyX should output Windows or Cygwin style&#x0a;paths to LaTeX files. Don't change the default unless the&#x0a;TeX engine was not correctly detected at configure time.&#x0a;Warning: Your changes here will not be saved.</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>

6
status.20x
View File

@ -42,6 +42,9 @@ What's new
- Updated French, German, Japanese, and Portuguese User Interface Localization.
- Now it is not necessary to restart LyX after changing the default document
directory and/or the PATH prefix in the preferences for them to take effect.
* DOCUMENTATION AND LOCALIZATION
@ -80,6 +83,9 @@ What's new
a document containing aligned and other multi-cell environments
(bug ##7549).
- On Windows, allow to automatically switch TeX engines without the need
of manually saving the preferences after reconfiguring (bug 7557).
* USER INTERFACE