From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 23 Oct 2011 02:33:38 +0000 (+0000)
Subject: Revert r39921. This would not work because proper facets for converting
X-Git-Tag: 2.1.0beta1~2534
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=936ae8020f6c0063d42db6142dc7d7adab04f9c1;p=features.git

Revert r39921. This would not work because proper facets for converting
on the fly are only available for ucs4 encoded strings and not for utf8
ones. So, it does only work with docstrings.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39928 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 66ce1c892a..8f3e62d94e 100644
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -517,19 +517,6 @@ otexstream & operator<<(otexstream & ots, string const & s)
 }
 
 
-namespace {
-
-int findToken(char const * s, char const * search_token)
-{
-	char const * token = strstr(s, search_token);
-	if (token)
-		return token - s;
-	return -1;
-}
-
-} // namespace anon
-
-
 otexstream & operator<<(otexstream & ots, char const * s)
 {
 	size_t const len = strlen(s);
@@ -543,42 +530,7 @@ otexstream & operator<<(otexstream & ots, char const * s)
 			ots.os() << "{}";
 		ots.protectSpace(false);
 	}
-
-	char const * start_token = "\xf3\xb0\x80\x80";
-	char const * end_token = "\xf3\xb0\x80\x81";
-
-	int i = findToken(s, start_token);
-
-	if (i >= 0) {
-		// Some encoding changes for the underlying stream are embedded
-		// in the string. The encoding names to be used are enclosed
-		// between the code points 0xF0000 and xF0001 (0xf3b08080 and
-		// 0xf3b08081 in utf8 encoding). These codepoints belong to the
-		// plane 15 Private Use Area and have no associated glyph.
-		string s1(s, i);
-		char const * s2 = s + i + 4;
-		while (true) {
-			if (!s1.empty())
-				ots.os() << s1;
-			if (s2[0] == '\0')
-				break;
-			i = findToken(s2, end_token);
-			if (i >= 0) {
-				ots.os() << setEncoding(string(s2, i));
-				s2 += i + 4;
-			}
-			i = findToken(s2, start_token);
-			if (i >= 0) {
-				s1 = string(s2, i);
-				s2 += i + 4;
-			} else {
-				s1 = s2;
-				s2 += strlen(s2);
-			}
-		}
-	} else
-		ots.os() << s;
-
+	ots.os() << s;
 	ots.lastChar(s[len - 1]);
 	ots.texrow().newlines(count(s, s + len, '\n'));
 	ots.canBreakLine(s[len - 1] != '\n');