fix compiler warnings in pedantic mode: remove trailing comma after last enum member

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 6a59fe695c7240bceaaa889261f9577bae961628..7900aed06f631fd85cf572c2857b5d29ef6cdbc8 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -344,7 +344,7 @@ void Encoding::init() const
 }
 
 
-docstring Encoding::latexChar(char_type c, bool for_mathed) const
+docstring Encoding::latexChar(char_type c, bool no_commands) const
 {
        // assure the used encoding is properly initialized
        init();
@@ -355,7 +355,7 @@ docstring Encoding::latexChar(char_type c, bool for_mathed) const
                return docstring(1, c);
        if (encodable_.find(c) != encodable_.end())
                return docstring(1, c);
-       if (for_mathed)
+       if (no_commands)
                return docstring();
 
        // c cannot (or should not) be encoded in this encoding
@@ -696,8 +696,14 @@ Encoding const * Encodings::fromLyXName(string const & name) const
 }
 
 
-Encoding const * Encodings::fromLaTeXName(string const & name) const
+Encoding const * Encodings::fromLaTeXName(string const & n) const
 {
+       string name = n;
+       // FIXME: if we have to test for too many of these synonyms,
+       // we should instead extend the format of lib/encodings
+       if (n == "ansinew")
+               name = "cp1252";
+
        // We don't use find_if because it makes copies of the pairs in
        // the map.
        // This linear search is OK since we don't have many encodings.
@@ -819,7 +825,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
        // Now read the encodings
        enum {
                et_encoding = 1,
-               et_end,
+               et_end
        };
 
        LexerKeyword encodingtags[] = {