anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug in 'Use non-tex fonts' checkbox auto-toggling (#8717)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-07-20 16:15:47 +02:00
parent 98dd9e9b91
commit 6445cd9df4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontends/qt4/GuiDocument.cpp
View File

@ -149,6 +149,7 @@ RGBColor set_fontcolor;
bool is_fontcolor;
RGBColor set_notefontcolor;
RGBColor set_boxbgcolor;
bool forced_fontspec_activation;
namespace {
// used when sorting the textclass list.
@ -1735,11 +1736,22 @@ void GuiDocument::languageChanged(int i)
Language const * lang = lyx::languages.getLanguage(
fromqstr(langModule->languageCO->itemData(i).toString()));
if (lang->babel().empty() && !lang->polyglossia().empty()) {
// If we force to switch fontspec on, store
// current state (#8717)
if (fontModule->osFontsCB->isEnabled())
forced_fontspec_activation =
!fontModule->osFontsCB->isChecked();
fontModule->osFontsCB->setChecked(true);
fontModule->osFontsCB->setEnabled(false);
}
else
else {
fontModule->osFontsCB->setEnabled(true);
// If we have forced to switch fontspec on,
// restore previous state (#8717)
if (forced_fontspec_activation)
fontModule->osFontsCB->setChecked(false);
forced_fontspec_activation = false;
}
// set appropriate quotation mark style
if (!lang->quoteStyle().empty()) {
@ -1916,7 +1928,7 @@ void GuiDocument::updateFontlist()
fontModule->fontsTypewriterCO->clear();
fontModule->fontsMathCO->clear();
// With XeTeX, we have access to all system fonts, but not the LaTeX fonts
// With fontspec (XeTeX, LuaTeX), we have access to all system fonts, but not the LaTeX fonts
if (fontModule->osFontsCB->isChecked()) {
fontModule->fontsRomanCO->addItem(qt_("Default"), QString("default"));
fontModule->fontsSansCO->addItem(qt_("Default"), QString("default"));