#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 <QFile>
-#include <boost/assert.hpp>
+#include <locale>
+#include <iostream>
+#include <typeinfo>
using namespace std;
-namespace lyx {
+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];
+ LASSERT(static_cast<unsigned char>(ascii[n]) < 0x80, /**/);
+ }
}
return s;
}
{
int const len = ascii.length();
for (int i = 0; i < len; ++i)
- BOOST_ASSERT(static_cast<unsigned char>(ascii[i]) < 0x80);
+ LASSERT(static_cast<unsigned char>(ascii[i]) < 0x80, /**/);
return docstring(ascii.begin(), ascii.end());
}
string ascii;
ascii.resize(len);
for (int i = 0; i < len; ++i) {
- BOOST_ASSERT(ucs4[i] < 0x80);
+ LASSERT(ucs4[i] < 0x80, /**/);
ascii[i] = static_cast<char>(ucs4[i]);
}
return ascii;
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());
}
}
+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));
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, /**/);
if (!*r)
return false;
if (*it != static_cast<lyx::docstring::value_type>(*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, /**/);
s.push_back(*c);
}
return s;
{
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, /**/);
s.push_back(*c);
}
s += 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, /**/);
docstring s = l;
s += docstring::value_type(r);
return s;
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 lyx::docstring::value_type(l) + 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, /**/);
l.push_back(*c);
}
return l;
lyx::docstring & operator+=(lyx::docstring & l, char r)
{
- BOOST_ASSERT(static_cast<unsigned char>(r) < 0x80);
+ LASSERT(static_cast<unsigned char>(r) < 0x80, /**/);
l.push_back(r);
return l;
}
for (; iit != eit; ++iit) {
s += *iit;
++n;
- bool true_ok = prefixIs(truename, s);
- bool false_ok = prefixIs(falsename, s);
+ bool true_ok = support::prefixIs(truename, s);
+ bool false_ok = support::prefixIs(falsename, s);
if (!true_ok && !false_ok) {
++iit;
ok = false;