X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstring.cpp;h=5a4ddccd3605d4175f9426093abda475eefb75a4;hb=1b1f8dd235ba8e168348cd23c824063f2595a0c5;hp=b3417f7f26cd6a889a5e7d73f2a566eae4ccaf7b;hpb=5dd5d984738957b5fac80dae7558f433e4ee3e69;p=lyx.git

diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp
index b3417f7f26..5a4ddccd36 100644
--- a/src/support/docstring.cpp
+++ b/src/support/docstring.cpp
@@ -19,12 +19,16 @@
 
 #include <QFile>
 
+//Needed in Ubuntu
+#include <typeinfo>
+#if ! defined(USE_WCHAR_T) && defined(__GNUC__)
 #include <locale>
 #include <iostream>
-#include <typeinfo>
+#endif
 
 using namespace std;
 
+using lyx::support::isHexChar;
 
 namespace lyx {
 
@@ -36,7 +40,7 @@ docstring const from_ascii(char const * ascii)
 		char_type *d = &s[0];
 		while (--n >= 0) {
 			d[n] = ascii[n];
-			LASSERT(static_cast<unsigned char>(ascii[n]) < 0x80, /**/);
+			LATTEST(static_cast<unsigned char>(ascii[n]) < 0x80);
 		}
 	}
 	return s;
@@ -47,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<unsigned char>(ascii[i]) < 0x80, /**/);
+		LATTEST(static_cast<unsigned char>(ascii[i]) < 0x80);
 	return docstring(ascii.begin(), ascii.end());
 }
 
@@ -58,7 +62,7 @@ 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<char>(ucs4[i]);
 	}
 	return ascii;
@@ -132,7 +136,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());
 }
@@ -152,6 +156,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));
@@ -163,7 +183,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<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))
@@ -177,7 +197,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<unsigned char>(*c) < 0x80, /**/);
+		LASSERT(static_cast<unsigned char>(*c) < 0x80, return l);
 		s.push_back(*c);
 	}
 	return s;
@@ -188,7 +208,7 @@ lyx::docstring operator+(char const * l, lyx::docstring const & r)
 {
 	lyx::docstring s;
 	for (char const * c = l; *c; ++c) {
-		LASSERT(static_cast<unsigned char>(*c) < 0x80, /**/);
+		LASSERT(static_cast<unsigned char>(*c) < 0x80, return r);
 		s.push_back(*c);
 	}
 	s += r;
@@ -198,7 +218,7 @@ lyx::docstring operator+(char const * l, lyx::docstring const & r)
 
 lyx::docstring operator+(lyx::docstring const & l, char r)
 {
-	LASSERT(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;
@@ -207,7 +227,7 @@ lyx::docstring operator+(lyx::docstring const & l, char r)
 
 lyx::docstring operator+(char l, lyx::docstring const & r)
 {
-	LASSERT(static_cast<unsigned char>(l) < 0x80, /**/);
+	LASSERT(static_cast<unsigned char>(l) < 0x80, return r);
 	return lyx::docstring::value_type(l) + r;
 }
 
@@ -215,7 +235,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<unsigned char>(*c) < 0x80, /**/);
+		LASSERT(static_cast<unsigned char>(*c) < 0x80, return l);
 		l.push_back(*c);
 	}
 	return l;
@@ -224,7 +244,7 @@ lyx::docstring & operator+=(lyx::docstring & l, char const * r)
 
 lyx::docstring & operator+=(lyx::docstring & l, char r)
 {
-	LASSERT(static_cast<unsigned char>(r) < 0x80, /**/);
+	LASSERT(static_cast<unsigned char>(r) < 0x80, return l);
 	l.push_back(r);
 	return l;
 }
@@ -737,9 +757,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>