Restore the version number position on the splash screen

[lyx.git] / src / encoding.C

diff --git a/src/encoding.C b/src/encoding.C
index f73bbf5833891e0e88b7777b707a1d0f178bdba4..b1a41fd396f5958dc1e7ea5130a83bbdb9bdbf1d 100644 (file)
--- a/src/encoding.C
+++ b/src/encoding.C
@@ -169,7 +169,8 @@ docstring const Encoding::latexChar(char_type c) const
                CharInfoMap::const_iterator const it = unicodesymbols.find(c);
                if (it == unicodesymbols.end())
                        lyxerr << "Could not find LaTeX command for character 0x"
-                              << std::hex << c << ".\nLaTeX export will fail."
+                              << std::hex << c << std::dec
+                              << ".\nLaTeX export will fail."
                               << endl;
                else
                        return it->second.command;
@@ -195,8 +196,8 @@ void Encoding::validate(char_type c, LaTeXFeatures & features) const
 
 bool Encodings::isComposeChar_hebrew(char_type c)
 {
-       return c <= 0xd2 && c >= 0xc0 &&
-               c != 0xce && c != 0xd0;
+       return c <= 0x05c2 && c >= 0x05b0 &&
+              c != 0x05be && c != 0x05c0;
 }
 
 
@@ -322,14 +323,15 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                                info.force = true;
                        else
                                lyxerr << "Ignoring unknown flag `" << flag
-                                      << "' for symbol `0x" << std::hex
-                                      << symbol << "'." << endl;
+                                      << "' for symbol `0x" 
+                                      << std::hex << symbol << std::dec 
+                                      << "'." << endl;
                }
 
                if (!info.preamble.empty())
                        info.feature = info.preamble[0] != '\\';
 
-               lyxerr[Debug::INFO]
+               LYXERR(Debug::INFO)
                        << "Read unicode symbol " << symbol << " '"
                        << to_utf8(info.command) << "' '" << info.preamble
                        << "' " << info.combining << ' ' << info.feature
@@ -361,7 +363,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                        string const latexname = lex.getString();
                        lex.next();
                        string const iconvname = lex.getString();
-                       lyxerr[Debug::INFO] << "Reading encoding " << name << endl;
+                       LYXERR(Debug::INFO) << "Reading encoding " << name << endl;
                        encodinglist[name] = Encoding(name, latexname, iconvname);
                        if (lex.lex() != et_end)
                                lex.printError("Encodings::read: "