X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fdocstream.cpp;h=e8839e07f61420104c3ff49826f7dc4997123ce6;hb=faa87bf9f30b943397429a04254d96963bbf38bc;hp=8f3e62d94ede28e7affaa6ab877782e50ae98113;hpb=d703d9057432ebce6f7cd73cbe6c0e71b241c0f1;p=lyx.git

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 8f3e62d94e..e8839e07f6 100644
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -512,28 +512,14 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
 
 otexstream & operator<<(otexstream & ots, string const & s)
 {
-	ots << s.c_str();
+	ots << from_utf8(s);
 	return ots;
 }
 
 
 otexstream & operator<<(otexstream & ots, char const * s)
 {
-	size_t const len = strlen(s);
-
-	// Check whether there's something to output
-	if (len == 0)
-		return ots;
-
-	if (ots.protectSpace()) {
-		if (!ots.canBreakLine() && s[0] == ' ')
-			ots.os() << "{}";
-		ots.protectSpace(false);
-	}
-	ots.os() << s;
-	ots.lastChar(s[len - 1]);
-	ots.texrow().newlines(count(s, s + len, '\n'));
-	ots.canBreakLine(s[len - 1] != '\n');
+	ots << from_utf8(s);
 	return ots;
 }