#include "Language.h"
-#include "debug.h"
#include "Encoding.h"
#include "Lexer.h"
#include "LyXRC.h"
+#include "support/debug.h"
#include "support/FileName.h"
#include <ostream>
-using std::endl;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
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", false, "iso8859-1",
- encodings.getFromLyXName("iso8859-1"),
+ encodings.fromLyXName("iso8859-1"),
"latex", "");
Lexer lex(0, 0);
if (lex.next())
latex_options = lex.getString();
- Encoding const * encoding = encodings.getFromLyXName(encoding_str);
+ Encoding const * encoding = encodings.fromLyXName(encoding_str);
if (!encoding) {
- encoding = encodings.getFromLyXName("iso8859-1");
+ encoding = encodings.fromLyXName("iso8859-1");
lyxerr << "Unknown encoding " << encoding_str << endl;
}