Account for old versions of Pygments

[lyx.git] / src / support / docstring.cpp

diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp
index 0f9d43776f7b0de9cb6cb5781b129a0e07a783c2..95c86b3665f2877052e543556e25d382fcaffcba 100644 (file)
--- a/src/support/docstring.cpp
+++ b/src/support/docstring.cpp
@@ -12,29 +12,36 @@
 
 #include "support/docstring.h"
 
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/qstring_helpers.h"
 #include "support/unicode.h"
 
-#include <locale>
-#include <iostream>
-#include <typeinfo>
-
 #include <QFile>
 
-#include <boost/assert.hpp>
+//Needed in Ubuntu
+#include <typeinfo>
+#if ! defined(USE_WCHAR_T) && defined(__GNUC__)
+#include <locale>
+#include <iostream>
+#endif
 
 using namespace std;
 
-namespace lyx {
+using lyx::support::isHexChar;
 
+namespace lyx {
 
 docstring const from_ascii(char const * ascii)
 {
        docstring s;
-       for (char const * c = ascii; *c; ++c) {
-               BOOST_ASSERT(static_cast<unsigned char>(*c) < 0x80);
-               s.push_back(*c);
+       if (int n = strlen(ascii)) {
+               s.resize(n);
+               char_type *d = &s[0];
+               while (--n >= 0) {
+                       d[n] = ascii[n];
+                       LATTEST(static_cast<unsigned char>(ascii[n]) < 0x80);
+               }
        }
        return s;
 }
@@ -44,7 +51,7 @@ docstring const from_ascii(string const & ascii)
 {
        int const len = ascii.length();
        for (int i = 0; i < len; ++i)
-               BOOST_ASSERT(static_cast<unsigned char>(ascii[i]) < 0x80);
+               LATTEST(static_cast<unsigned char>(ascii[i]) < 0x80);
        return docstring(ascii.begin(), ascii.end());
 }
 
@@ -55,21 +62,13 @@ string const to_ascii(docstring const & ucs4)
        string ascii;
        ascii.resize(len);
        for (int i = 0; i < len; ++i) {
-               BOOST_ASSERT(ucs4[i] < 0x80);
+               LATTEST(ucs4[i] < 0x80);
                ascii[i] = static_cast<char>(ucs4[i]);
        }
        return ascii;
 }
 
 
-IconvProcessor & utf8ToUcs4()
-{
-       static IconvProcessor iconv(ucs4_codeset, "UTF-8");
-       return iconv;
-}
-
-
-
 void utf8_to_ucs4(string const & utf8, docstring & ucs4)
 {
        size_t n = utf8.size();
@@ -100,8 +99,7 @@ docstring const from_utf8(string const & utf8)
 
 string const to_utf8(docstring const & ucs4)
 {
-       vector<char> const utf8 =
-               ucs4_to_utf8(ucs4.data(), ucs4.size());
+       vector<char> const utf8 = ucs4_to_utf8(ucs4.data(), ucs4.size());
        return string(utf8.begin(), utf8.end());
 }
 
@@ -130,7 +128,7 @@ string const to_local8bit(docstring const & s)
        if (s.empty())
                return string();
        QByteArray const local = toqstr(s).toLocal8Bit();
-       if (local.size() == 0)
+       if (local.isEmpty())
                throw to_local8bit_failure();
        return string(local.begin(), local.end());
 }
@@ -150,6 +148,22 @@ string const to_filesystem8bit(docstring const & s)
 }
 
 
+string const to_iconv_encoding(docstring const & s, string const & encoding)
+{
+       std::vector<char> const encoded =
+               ucs4_to_eightbit(s.data(), s.length(), encoding);
+       return string(encoded.begin(), encoded.end());
+}
+
+
+docstring const from_iconv_encoding(string const & s, string const & encoding)
+{
+       std::vector<char_type> const ucs4 =
+               eightbit_to_ucs4(s.data(), s.length(), encoding);
+       return docstring(ucs4.begin(), ucs4.end());
+}
+
+
 docstring const normalize_c(docstring const & s)
 {
        return qstring_to_ucs4(toqstr(s).normalized(QString::NormalizationForm_C));
@@ -161,7 +175,7 @@ bool operator==(lyx::docstring const & l, char const * r)
        lyx::docstring::const_iterator it = l.begin();
        lyx::docstring::const_iterator end = l.end();
        for (; it != end; ++it, ++r) {
-               BOOST_ASSERT(static_cast<unsigned char>(*r) < 0x80);
+               LASSERT(static_cast<unsigned char>(*r) < 0x80, return false);
                if (!*r)
                        return false;
                if (*it != static_cast<lyx::docstring::value_type>(*r))
@@ -175,7 +189,7 @@ lyx::docstring operator+(lyx::docstring const & l, char const * r)
 {
        lyx::docstring s(l);
        for (char const * c = r; *c; ++c) {
-               BOOST_ASSERT(static_cast<unsigned char>(*c) < 0x80);
+               LASSERT(static_cast<unsigned char>(*c) < 0x80, return l);
                s.push_back(*c);
        }
        return s;
@@ -186,7 +200,7 @@ lyx::docstring operator+(char const * l, lyx::docstring const & r)
 {
        lyx::docstring s;
        for (char const * c = l; *c; ++c) {
-               BOOST_ASSERT(static_cast<unsigned char>(*c) < 0x80);
+               LASSERT(static_cast<unsigned char>(*c) < 0x80, return r);
                s.push_back(*c);
        }
        s += r;
@@ -196,7 +210,7 @@ lyx::docstring operator+(char const * l, lyx::docstring const & r)
 
 lyx::docstring operator+(lyx::docstring const & l, char r)
 {
-       BOOST_ASSERT(static_cast<unsigned char>(r) < 0x80);
+       LASSERT(static_cast<unsigned char>(r) < 0x80, return l);
        docstring s = l;
        s += docstring::value_type(r);
        return s;
@@ -205,7 +219,7 @@ lyx::docstring operator+(lyx::docstring const & l, char r)
 
 lyx::docstring operator+(char l, lyx::docstring const & r)
 {
-       BOOST_ASSERT(static_cast<unsigned char>(l) < 0x80);
+       LASSERT(static_cast<unsigned char>(l) < 0x80, return r);
        return lyx::docstring::value_type(l) + r;
 }
 
@@ -213,7 +227,7 @@ lyx::docstring operator+(char l, lyx::docstring const & r)
 lyx::docstring & operator+=(lyx::docstring & l, char const * r)
 {
        for (char const * c = r; *c; ++c) {
-               BOOST_ASSERT(static_cast<unsigned char>(*c) < 0x80);
+               LASSERT(static_cast<unsigned char>(*c) < 0x80, return l);
                l.push_back(*c);
        }
        return l;
@@ -222,7 +236,7 @@ lyx::docstring & operator+=(lyx::docstring & l, char const * r)
 
 lyx::docstring & operator+=(lyx::docstring & l, char r)
 {
-       BOOST_ASSERT(static_cast<unsigned char>(r) < 0x80);
+       LASSERT(static_cast<unsigned char>(r) < 0x80, return l);
        l.push_back(r);
        return l;
 }
@@ -500,7 +514,7 @@ protected:
                return do_put_helper(oit, b, fill, v);
        }
 
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
        iter_type
        do_put(iter_type oit, ios_base & b, char_type fill, long long v) const
        {
@@ -661,7 +675,7 @@ protected:
                return do_get_integer(iit, eit, b, err, v);
        }
 
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
        iter_type
        do_get(iter_type iit, iter_type eit, ios_base & b,
                ios_base::iostate & err, long long & v) const
@@ -735,9 +749,9 @@ private:
        bool isNumpunct(lyx::char_type const c) const
        {
                /// Only account for the standard numpunct "C" locale facet.
-               return c < 0x80 && (c == '-' || c == '+' || isdigit(c)
-                       || ('a' <= c && c <= 'f') || ('A' <= c && c <= 'F')
-                       || c == 'x' || c == 'X');
+               return c == '-' || c == '+'
+                       || c == 'x' || c == 'X'
+                       || isHexChar(c);
        }
 
        template <typename ValueType>
@@ -749,7 +763,6 @@ private:
                // [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
                string s;
                s.reserve(64);
-               char c;
                numpunct_facet p;
                char const dot = p.decimal_point();
                char const sep = p.thousands_sep();