Do not break on undefined references that are part of the family.

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 2b55e0ef5ccba36a12bdf6b733d9ed215c168cc8..47e27eb97d9c94e6909e8367618f5c6f41c197e8 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -23,10 +23,9 @@
 #include "support/textutils.h"
 #include "support/unicode.h"
 
-#include <boost/cstdint.hpp>
-
-#include <iterator>
 #include <algorithm>
+#include <cstdint>
+#include <iterator>
 #include <sstream>
 
 using namespace std;
@@ -230,8 +229,8 @@ pair<docstring, docstring> Encoding::latexString(docstring const & input, bool d
        docstring uncodable;
        bool terminate = false;
        for (size_t n = 0; n < input.size(); ++n) {
+               char_type const c = input[n];
                try {
-                       char_type const c = input[n];
                        pair<docstring, bool> latex_char = latexChar(c);
                        docstring const latex = latex_char.first;
                        if (terminate && !prefixIs(latex, '\\')
@@ -248,7 +247,8 @@ pair<docstring, docstring> Encoding::latexString(docstring const & input, bool d
                        result += latex;
                        terminate = latex_char.second;
                } catch (EncodingException & /* e */) {
-                       LYXERR0("Uncodable character in latexString!");
+                       LYXERR0("Uncodable character <" << docstring(1, c) 
+                                       << "> in latexString!");
                        if (dryrun) {
                                result += "<" + _("LyX Warning: ")
                                           + _("uncodable character") + " '";
@@ -274,7 +274,7 @@ vector<char_type> Encoding::symbolsList() const
        // add all encodable characters
        copy(encodable_.begin(), encodable_.end(), back_inserter(symbols));
        // now the ones from the unicodesymbols file that are not already there
-       for (pair<char_type, CharInfo> const & elem : unicodesymbols) {
+       for (auto const & elem : unicodesymbols) {
                if (find(symbols.begin(), symbols.end(), elem.first) == symbols.end())
                        symbols.push_back(elem.first);
        }
@@ -636,9 +636,9 @@ Encodings::fromLyXName(string const & name, bool allowUnsafe) const
 {
        EncodingList::const_iterator const it = encodinglist.find(name);
        if (it == encodinglist.end())
-               return 0;
+               return nullptr;
        if (!allowUnsafe && it->second.unsafe())
-               return 0;
+               return nullptr;
        return &it->second;
 }
 
@@ -662,7 +662,7 @@ Encodings::fromLaTeXName(string const & n, int const & p, bool allowUnsafe) cons
                if ((it->second.latexName() == name) && (it->second.package() & p)
                                && (!it->second.unsafe() || allowUnsafe))
                        return &it->second;
-       return 0;
+       return nullptr;
 }
 
 
@@ -674,7 +674,7 @@ Encodings::fromIconvName(string const & n, int const & p, bool allowUnsafe) cons
                if ((it->second.iconvName() == n) && (it->second.package() & p)
                                && (!it->second.unsafe() || allowUnsafe))
                        return &it->second;
-       return 0;
+       return nullptr;
 }
 
 
@@ -702,7 +702,7 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                istringstream is(symbolslex.getString());
                // reading symbol directly does not work if
                // char_type == wchar_t.
-               boost::uint32_t tmp;
+               uint32_t tmp;
                if(!(is >> hex >> tmp))
                        break;
                symbol = tmp;