The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 7d08836de647d2042c7afc4c52838184c8e80cab Author: Juergen Spitzmueller <[email protected]> Date: Mon Jul 23 11:36:55 2012 +0200 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 a224874..6139356 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -2625,7 +2625,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 == "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 diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index 236a7d3..3f7226f 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -291,16 +291,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(); } diff --git a/status.20x b/status.20x index 450591c..e82643d 100644 --- a/status.20x +++ b/status.20x @@ -98,6 +98,8 @@ What's new - Fix babel call with Arabic (arabi). +- Fix suppression of language package. + * USER INTERFACE ----------------------------------------------------------------------- Summary of changes: src/BufferParams.cpp | 3 ++- src/LaTeXFeatures.cpp | 16 +++++++--------- status.20x | 2 ++ 3 files changed, 11 insertions(+), 10 deletions(-) hooks/post-receive -- The LyX Source Repository
