>> @@ -1412,15 +1412,15 @@
>>
>> if (lang_pack == "\\usepackage{babel}") {
>
> - if (lang_pack == "\\usepackage{babel}") {
> + if (lang_pack != "\\usepackage{babel}")
> + return lang_pack;
>
>> // suppress the babel call when there is no babel language
>> defined
>> // for the document language in the lib/languages file
and if no
>> - // other languages are used
>> - if (language->babel().empty() && lang_opts.empty())
>> - lang_pack.clear();
>> - if (!lyxrc.language_global_options && !lang_opts.empty())
>> - lang_pack = string("\\usepackage[") + lang_opts +
>> "]{babel}";
>> - if (lyxrc.language_global_options)
>> + // other languages are used (lang_opts is then empty)
>> + if (lang_opts.empty())
>> + return string();
>> + if (!lyxrc.language_global_options)
>> + return string("\\usepackage[") + lang_opts +
"]{babel}";
>
> + if (lyxrc.language_global_options)
> + return lang_pack;
> +
> + return "\\usepackage[" + lang_opts + "]{babel}";
>
> Should work the same in principle.
Yes it does, I applied it with your changes:
http://www.lyx.org/trac/changeset/18274
(http://www.lyx.org/trac/changeset/18275)
Puh, I hope that it is now as smart as possible.
thanks for your patience and best regards
Uwe
