Some more cleanup of LyXView:

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index a1beb9d7270cb82a9b5370a0b551ee523dce1a59..6a610c1998465ce815024b450cc5fe43319eaef8 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -23,6 +23,8 @@
 #include "support/lstrings.h"
 #include "support/unicode.h"
 
+#include <boost/cstdint.hpp>
+
 #include <sstream>
 
 #ifndef CXX_GLOBAL_CSTD
@@ -401,20 +403,22 @@ bool Encodings::isCombiningChar(char_type c)
 }
 
 
-bool Encodings::isKnownLangChar(char_type c, string & preamble)
+bool Encodings::isKnownScriptChar(char_type const c, string & preamble)
 {
        CharInfoMap::const_iterator const it = unicodesymbols.find(c);
-       if (it != unicodesymbols.end()) {
-               if (it->second.preamble != "textgreek" &&
-                   it->second.preamble != "textcyr")
-                       return false;
-               if (preamble.empty()) {
-                       preamble = it->second.preamble;
-                       return true;
-               }
-               return it->second.preamble == preamble;
+
+       if (it == unicodesymbols.end())
+               return false;
+
+       if (it->second.preamble != "textgreek" &&
+           it->second.preamble != "textcyr")
+               return false;
+
+       if (preamble.empty()) {
+               preamble = it->second.preamble;
+               return true;
        }
-       return false;
+       return it->second.preamble == preamble;
 }
 
 
@@ -502,11 +506,9 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                if (!info.preamble.empty())
                        info.feature = info.preamble[0] != '\\';
 
-               LYXERR(Debug::INFO)
-                       << "Read unicode symbol " << symbol << " '"
+               LYXERR(Debug::INFO, "Read unicode symbol " << symbol << " '"
                        << to_utf8(info.command) << "' '" << info.preamble
-                       << "' " << info.combining << ' ' << info.feature
-                       << endl;
+                       << "' " << info.combining << ' ' << info.feature);
                unicodesymbols[symbol] = info;
        }
 
@@ -560,7 +562,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                                               "Unknown package: `$$Token'");
                         }
                         
-                       LYXERR(Debug::INFO) << "Reading encoding " << name << endl;
+                       LYXERR(Debug::INFO, "Reading encoding " << name);
                        encodinglist[name] = Encoding(name, latexname,
                                                      iconvname, fixedwidth,
                                                      package);