if (lang_package != "auto" && lang_package != "babel"
&& lang_package != "default" && lang_package != "none")
return lang_package;
- if (lyxrc.language_package_selection == LyXRC::LP_CUSTOM)
+ if (lang_package == "default"
+ && lyxrc.language_package_selection == LyXRC::LP_CUSTOM)
return lyxrc.language_custom_package;
// suppress the babel call if there is no BabelName defined
// for the document language in the lib/languages file and if no
bool LaTeXFeatures::useBabel() const
{
- if (usePolyglossia())
+ if (usePolyglossia()
+ || bufferParams().lang_package == "none"
+ || (bufferParams().lang_package == "default"
+ && lyxrc.language_package_selection == LyXRC::LP_NONE))
return false;
- if (bufferParams().lang_package == "default")
- return (lyxrc.language_package_selection != LyXRC::LP_NONE)
- || (bufferParams().language->lang() != lyxrc.default_language
- && !bufferParams().language->babel().empty())
- || this->hasLanguages();
- return (bufferParams().lang_package != "none")
- || (bufferParams().language->lang() != lyxrc.default_language
- && !bufferParams().language->babel().empty())
+
+ return (bufferParams().language->lang() != lyxrc.default_language
+ && !bufferParams().language->babel().empty())
|| this->hasLanguages();
}