#include "lyxlex.h"
#include "lyxrc.h"
+#include "support/filename.h"
+
namespace lyx {
Language const * latex_language = &latex_lang;
-void Languages::read(string const & filename)
+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",
- encodings.getEncoding("iso8859-1"),
+ encodings.getFromLyXName("iso8859-1"),
"latex", "");
LyXLex lex(0, 0);
lang = lex.getString();
else
break;
- lyxerr[Debug::INFO] << "Reading language " << lang << endl;
+ LYXERR(Debug::INFO) << "Reading language " << lang << endl;
if (lex.next())
babel = lex.getString();
if (lex.next())
latex_options = lex.getString();
- Encoding const * encoding = encodings.getEncoding(encoding_str);
+ Encoding const * encoding = encodings.getFromLyXName(encoding_str);
if (!encoding) {
- encoding = encodings.getEncoding("iso8859-1");
+ encoding = encodings.getFromLyXName("iso8859-1");
lyxerr << "Unknown encoding " << encoding_str << endl;
}