Uwe Stöhr schrieb:
Attached is a better patch.
I now also implement Abdel's annotations. Can this one now go in?
regards Uwe
Index: BufferParams.cpp
===================================================================
--- BufferParams.cpp (revision 18237)
+++ BufferParams.cpp (working copy)
@@ -1384,12 +1384,17 @@
// suppress the babel call when there is no babel language defined
// in the lib/languages file
if (lyxrc.language_global_options && tmp == "\\usepackage{babel}" &&
- language->babel().empty() )
- tmp = string("");
+ language->babel().empty() ) {
+ // if the armscii8 or a CJK encoding is used, babel has to be called for
+ // foreign languages
+ if (lang_opts != "")
+ tmp = string("\\usepackage[") + lang_opts + "]{babel}";
+ else
+ tmp.clear();
+ }
return tmp;
}
-
string const BufferParams::loadFonts(string const & rm,
string const & sf, string const & tt,
bool const & sc, bool const & osf,
