InsetArgument: Set ResetsFontEdit to false

[lyx.git] / src / support / docstream.cpp

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index b9b75bf135a1970faa67cc5b50c1c5cc9377514d..e8839e07f61420104c3ff49826f7dc4997123ce6 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -496,7 +496,7 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
                        if (!contains(s2, 0xF0001))
                                s2 = split(enc, s1, 0xF0000);
                        else {
-                               ots.os() << setEncoding(to_utf8(enc));
+                               ots.os() << setEncoding(to_ascii(enc));
                                s2 = split(s3, s1, 0xF0000);
                        }
                }
@@ -510,23 +510,16 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
 }
 
 
-otexstream & operator<<(otexstream & ots, char const * s)
+otexstream & operator<<(otexstream & ots, string const & s)
 {
-       size_t const len = strlen(s);
+       ots << from_utf8(s);
+       return ots;
+}
 
-       // 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');
+otexstream & operator<<(otexstream & ots, char const * s)
+{
+       ots << from_utf8(s);
        return ots;
 }