X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstring.cpp;h=95c86b3665f2877052e543556e25d382fcaffcba;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=7f56557899fcc7043303ed780596a08d869e92f7;hpb=2e968d06610325ad5b69cee0e93f99b8435d5542;p=lyx.git diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp index 7f56557899..95c86b3665 100644 --- a/src/support/docstring.cpp +++ b/src/support/docstring.cpp @@ -19,21 +19,29 @@ #include +//Needed in Ubuntu +#include +#if ! defined(USE_WCHAR_T) && defined(__GNUC__) #include #include -#include +#endif using namespace std; +using lyx::support::isHexChar; namespace lyx { docstring const from_ascii(char const * ascii) { docstring s; - for (char const * c = ascii; *c; ++c) { - LASSERT(static_cast(*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(ascii[n]) < 0x80); + } } return s; } @@ -43,7 +51,7 @@ docstring const from_ascii(string const & ascii) { int const len = ascii.length(); for (int i = 0; i < len; ++i) - LASSERT(static_cast(ascii[i]) < 0x80, /**/); + LATTEST(static_cast(ascii[i]) < 0x80); return docstring(ascii.begin(), ascii.end()); } @@ -54,21 +62,13 @@ string const to_ascii(docstring const & ucs4) string ascii; ascii.resize(len); for (int i = 0; i < len; ++i) { - LASSERT(ucs4[i] < 0x80, /**/); + LATTEST(ucs4[i] < 0x80); ascii[i] = static_cast(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(); @@ -99,8 +99,7 @@ docstring const from_utf8(string const & utf8) string const to_utf8(docstring const & ucs4) { - vector const utf8 = - ucs4_to_utf8(ucs4.data(), ucs4.size()); + vector const utf8 = ucs4_to_utf8(ucs4.data(), ucs4.size()); return string(utf8.begin(), utf8.end()); } @@ -129,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()); } @@ -149,6 +148,22 @@ string const to_filesystem8bit(docstring const & s) } +string const to_iconv_encoding(docstring const & s, string const & encoding) +{ + std::vector 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 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)); @@ -160,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) { - LASSERT(static_cast(*r) < 0x80, /**/); + LASSERT(static_cast(*r) < 0x80, return false); if (!*r) return false; if (*it != static_cast(*r)) @@ -174,7 +189,7 @@ lyx::docstring operator+(lyx::docstring const & l, char const * r) { lyx::docstring s(l); for (char const * c = r; *c; ++c) { - LASSERT(static_cast(*c) < 0x80, /**/); + LASSERT(static_cast(*c) < 0x80, return l); s.push_back(*c); } return s; @@ -185,7 +200,7 @@ lyx::docstring operator+(char const * l, lyx::docstring const & r) { lyx::docstring s; for (char const * c = l; *c; ++c) { - LASSERT(static_cast(*c) < 0x80, /**/); + LASSERT(static_cast(*c) < 0x80, return r); s.push_back(*c); } s += r; @@ -195,7 +210,7 @@ lyx::docstring operator+(char const * l, lyx::docstring const & r) lyx::docstring operator+(lyx::docstring const & l, char r) { - LASSERT(static_cast(r) < 0x80, /**/); + LASSERT(static_cast(r) < 0x80, return l); docstring s = l; s += docstring::value_type(r); return s; @@ -204,7 +219,7 @@ lyx::docstring operator+(lyx::docstring const & l, char r) lyx::docstring operator+(char l, lyx::docstring const & r) { - LASSERT(static_cast(l) < 0x80, /**/); + LASSERT(static_cast(l) < 0x80, return r); return lyx::docstring::value_type(l) + r; } @@ -212,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) { - LASSERT(static_cast(*c) < 0x80, /**/); + LASSERT(static_cast(*c) < 0x80, return l); l.push_back(*c); } return l; @@ -221,7 +236,7 @@ lyx::docstring & operator+=(lyx::docstring & l, char const * r) lyx::docstring & operator+=(lyx::docstring & l, char r) { - LASSERT(static_cast(r) < 0x80, /**/); + LASSERT(static_cast(r) < 0x80, return l); l.push_back(r); return l; } @@ -499,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 { @@ -660,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 @@ -734,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 @@ -748,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();