anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 03:03:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BufferParams.cpp: the long discussed babel call logic cleanup

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18274 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2007-05-12 00:13:35 +00:00
parent ff8f2b3609
commit 40ba4d3630
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BufferParams.cpp
View File

@ -867,7 +867,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
language_options << ',';
language_options << language->babel();
}
if (lyxrc.language_global_options)
if (lyxrc.language_global_options && !language_options.str().empty())
clsoptions << language_options.str() << ',';
}
@ -1409,17 +1409,15 @@ string const BufferParams::dvips_options() const
string const BufferParams::babelCall(string const & lang_opts) const
{
string lang_pack = lyxrc.language_package;
if (lang_pack == "\\usepackage{babel}") {
// 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)
return lang_pack;
}
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 (lang_opts is then empty)
if (lang_opts.empty())
return string();
if (!lyxrc.language_global_options)
return string("\\usepackage[") + lang_opts + "]{babel}";
return lang_pack;
}