From 566a5f2b7513ffbd75cc92f713dccccc2636f37e Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Mon, 23 Jul 2012 11:36:55 +0200 Subject: [PATCH] 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. --- src/BufferParams.cpp | 3 ++- src/LaTeXFeatures.cpp | 16 +++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 128b9ecc49..872fd30e07 100644 --- 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 6de5db6641..489d7a4627 100644 --- 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(); } -- 2.39.2