X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flanguage.C;h=bb5d5f1d67d7e22ab49b0e4fe51609ce9d4d5524;hb=98c966c64594611e469313314abd1e59524adb4a;hp=7208e3564a23588db2a4a8721fd3b2c47294402a;hpb=a277759770861167afa68ae6b1ce98df6fbb3015;p=lyx.git diff --git a/src/language.C b/src/language.C index 7208e3564a..bb5d5f1d67 100644 --- a/src/language.C +++ b/src/language.C @@ -1,8 +1,8 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * @@ -18,7 +18,6 @@ #include "gettext.h" #include "encoding.h" #include "lyxrc.h" -#include "lyx_gui_misc.h" #include "lyxlex.h" #include "debug.h" @@ -39,7 +38,7 @@ Language const * inherit_language = &inherit_lang; void Languages::setDefaults() { languagelist["english"] = Language("english", "english", N_("English"), - false, + false, encodings.getEncoding("iso8859-1"), "en", ""); english_language = default_language = &languagelist["english"]; @@ -80,10 +79,10 @@ void Languages::read(string const & filename) Encoding const * encoding = encodings.getEncoding(encoding_str); if (!encoding) { encoding = encodings.getEncoding("iso8859-1"); - lyxerr << "Unknown encoding " << encoding_str << endl; + lyxerr << "Unknown encoding " << encoding_str << endl; } - languagelist[lang] = Language(lang, babel, display, rtl, + languagelist[lang] = Language(lang, babel, display, rtl, encoding, code, latex_options); } @@ -104,7 +103,7 @@ void Languages::read(string const & filename) Language const * Languages::getLanguage(string const & language) const { - const_iterator it = languagelist.find(language); + const_iterator it = languagelist.find(language); if (it != languagelist.end()) return &it->second; else