X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstring.cpp;h=c937ba3721a1157bd2acff7d0bc754b74b0e614e;hb=0a9735c5f7bbbaa24ac2e3e4fa745c6dfbc95a18;hp=7f56557899fcc7043303ed780596a08d869e92f7;hpb=2e968d06610325ad5b69cee0e93f99b8435d5542;p=lyx.git

diff --git a/src/support/docstring.cpp b/src/support/docstring.cpp
index 7f56557899..c937ba3721 100644
--- a/src/support/docstring.cpp
+++ b/src/support/docstring.cpp
@@ -25,15 +25,20 @@
 
 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<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;
 }
@@ -99,8 +104,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());
 }
 
@@ -129,7 +133,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 +153,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));
@@ -734,9 +754,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>