LaTeXFeatures.cpp (useBabel, usePolyglossia):

- thinko (bug #7074)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36477 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2010-11-25 10:25:29 +00:00
parent f69929850d
commit f2e38b021a

View File

@ -285,22 +285,20 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
bool LaTeXFeatures::useBabel() const
{
return (lyxrc.language_package_selection != LyXRC::LP_NONE)
&& !usePolyglossia()
&& ((bufferParams().language->lang() != lyxrc.default_language
if (usePolyglossia())
return false;
return lyxrc.language_package_selection != LyXRC::LP_NONE
|| (bufferParams().language->lang() != lyxrc.default_language
&& !bufferParams().language->babel().empty())
|| this->hasLanguages());
|| this->hasLanguages();
}
bool LaTeXFeatures::usePolyglossia() const
{
return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
return lyxrc.language_package_selection == LyXRC::LP_AUTO
&& isRequired("polyglossia")
&& isAvailable("polyglossia")
&& ((bufferParams().language->lang() != lyxrc.default_language
&& !bufferParams().language->polyglossia().empty())
|| this->hasLanguages())
&& this->hasPolyglossiaLanguages();
}