X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLanguage.cpp;h=3aee984cf9671af5535fff37ae074afc6913d484;hb=3f7d2a66f522a45583e0a8b0ba734bb71f0ddde0;hp=5820711fc1ae7d2e49b779b86059392039150e30;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git

diff --git a/src/Language.cpp b/src/Language.cpp
index 5820711fc1..3aee984cf9 100644
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -14,18 +14,19 @@
 
 #include "Language.h"
 
-#include "debug.h"
 #include "Encoding.h"
-#include "LyXLex.h"
+#include "Lexer.h"
 #include "LyXRC.h"
 
-#include "support/filename.h"
+#include "support/debug.h"
+#include "support/FileName.h"
 
+#include <ostream>
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
-using std::endl;
-using std::string;
+namespace lyx {
 
 
 Languages languages;
@@ -33,18 +34,18 @@ 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)
+void Languages::read(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;
@@ -59,7 +60,7 @@ void Languages::read(support::FileName const & filename)
 			lang = lex.getString();
 		else
 			break;
-		LYXERR(Debug::INFO) << "Reading language " << lang << endl;
+		LYXERR(Debug::INFO, "Reading language " << lang);
 
 		if (lex.next())
 			babel = lex.getString();