Revert part of 21965 which was debugging code.

[lyx.git] / src / Language.cpp

diff --git a/src/Language.cpp b/src/Language.cpp
index 49fd356034f008c67819120a9a5fbf52a8f86c71..39c6efda93d6209ef978c0dac5800ad8cbef9ef2 100644 (file)
--- a/src/Language.cpp
+++ b/src/Language.cpp
@@ -14,33 +14,35 @@
 
 #include "Language.h"
 
-#include "debug.h"
+#include "support/debug.h"
 #include "Encoding.h"
 #include "Lexer.h"
 #include "LyXRC.h"
 
 #include "support/FileName.h"
 
-
-namespace lyx {
+#include <ostream>
 
 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", "");
 
@@ -59,7 +61,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();