#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;
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;
lang = lex.getString();
else
break;
- LYXERR(Debug::INFO) << "Reading language " << lang << endl;
+ LYXERR(Debug::INFO, "Reading language " << lang);
if (lex.next())
babel = lex.getString();