Fixes to the language package call

* Assure that really no language package is called when none is selected.
* Only call global custom package if global is desired.
This is a candidate for branch as well.

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 128b9ecc49e1b941b96b224df9d2b8a3f41f288c..872fd30e0722c011d9c2e8ea7414c08cfd454a0d 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2648,7 +2648,8 @@ string BufferParams::babelCall(string const & lang_opts, bool const langoptions)
        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 == "auto"
+           && 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

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 6de5db66411f97d662113691ba149eeaa9f5fd44..489d7a4627d1102d1956814467e9b9ffd03c9a48 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -292,16 +292,14 @@ LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
 
 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();
 }