X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=eb5cb066dca31bfdc868f2b2d12d0eadb1934b43;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=5820711fc1ae7d2e49b779b86059392039150e30;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/Language.cpp b/src/Language.cpp index 5820711fc1..eb5cb066dc 100644 --- a/src/Language.cpp +++ b/src/Language.cpp @@ -16,35 +16,35 @@ #include "debug.h" #include "Encoding.h" -#include "LyXLex.h" +#include "Lexer.h" #include "LyXRC.h" -#include "support/filename.h" - - -namespace lyx { +#include "support/FileName.h" using std::endl; using std::string; +namespace lyx { + + Languages languages; Language const * english_language; Language const * default_language; Language ignore_lang("ignore", "ignore", "Ignore", false, "", 0, "ignore", ""); Language const * ignore_language = &ignore_lang; -Language latex_lang("latex", "latex", "Latex", false, "", 0, "latex", ""); +Language latex_lang("latex", "", "Latex", false, "", 0, "latex", ""); Language const * latex_language = &latex_lang; void Languages::read(support::FileName const & filename) { // We need to set the encoding of latex_lang - latex_lang = Language("latex", "latex", "Latex", false, "iso8859-1", + latex_lang = Language("latex", "", "Latex", false, "iso8859-1", encodings.getFromLyXName("iso8859-1"), "latex", ""); - LyXLex lex(0, 0); + Lexer lex(0, 0); lex.setFile(filename); while (lex.isOK()) { string lang;