Some comments.

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 3aa31d0099ab9a771afa860f54b42203706677cf..e9558fd7c4acfa9690da1b83236317f16c284871 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -467,7 +467,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
 {
        // We must read the symbolsfile first, because the Encoding
        // constructor depends on it.
-       Lexer symbolslex(0, 0);
+       Lexer symbolslex;
        symbolslex.setFile(symbolsfile);
        while (symbolslex.isOK()) {
                char_type symbol;
@@ -522,19 +522,19 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
        }
 
        // Now read the encodings
-       enum Encodingtags {
+       enum {
                et_encoding = 1,
                et_end,
-               et_last
        };
 
-       struct keyword_item encodingtags[et_last - 1] = {
+       LexerKeyword encodingtags[] = {
                { "encoding", et_encoding },
                { "end", et_end }
        };
 
-       Lexer lex(encodingtags, et_last - 1);
+       Lexer lex(encodingtags);
        lex.setFile(encfile);
+       lex.setContext("Encodings::read");
        while (lex.isOK()) {
                switch (lex.lex()) {
                case et_encoding:
@@ -553,39 +553,35 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                        else if (width == "variable")
                                fixedwidth = false;
                        else
-                               lex.printError("Encodings::read: "
-                                              "Unknown width: `$$Token'");
+                               lex.printError("Unknown width");
 
                        lex.next();
                        string const p = lex.getString();
                        Encoding::Package package = Encoding::none;
                        if (p == "none")
-                                package = Encoding::none;
+                               package = Encoding::none;
                        else if (p == "inputenc")
                                package = Encoding::inputenc;
                        else if (p == "CJK")
                                package = Encoding::CJK;
                        else
-                               lex.printError("Encodings::read: "
-                                              "Unknown package: `$$Token'");
+                               lex.printError("Unknown package");
 
                        LYXERR(Debug::INFO, "Reading encoding " << name);
                        encodinglist[name] = Encoding(name, latexname,
                                iconvname, fixedwidth, package);
 
                        if (lex.lex() != et_end)
-                               lex.printError("Encodings::read: "
-                                              "missing end");
+                               lex.printError("Missing end");
                        break;
                }
                case et_end:
-                       lex.printError("Encodings::read: Misplaced end");
+                       lex.printError("Misplaced end");
                        break;
                case Lexer::LEX_FEOF:
                        break;
                default:
-                       lex.printError("Encodings::read: "
-                                      "Unknown tag: `$$Token'");
+                       lex.printError("Unknown tag");
                        break;
                }
        }