Fix some display glitches

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

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 8f3e62d94ede28e7affaa6ab877782e50ae98113..38cabc453c8afaa48d071b241e4004b66ab28239 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -414,12 +414,9 @@ void otexstream::put(char_type const & c)
                protectspace_ = false;
        }
        os_.put(c);
-       lastchar_ = c;
-       if (c == '\n') {
+       lastChar(c);
+       if (c == '\n')
                texrow_.newline();
-               canbreakline_ = false;
-       } else
-               canbreakline_ = true;
 }
 
 
@@ -432,7 +429,6 @@ otexstream & operator<<(otexstream & ots, BreakLine)
        if (ots.canBreakLine()) {
                ots.os().put('\n');
                ots.lastChar('\n');
-               ots.canBreakLine(false);
                ots.texrow().newline();
        }
        ots.protectSpace(false);
@@ -445,7 +441,6 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
        if (ots.canBreakLine()) {
                ots.os() << "%\n";
                ots.lastChar('\n');
-               ots.canBreakLine(false);
                ots.texrow().newline();
        }
        ots.protectSpace(false);
@@ -503,37 +498,24 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
        } else
                ots.os() << s;
 
+       if (len > 1)
+               ots.canBreakLine(s[len - 2] != '\n');
        ots.lastChar(s[len - 1]);
        ots.texrow().newlines(count(s.begin(), s.end(), '\n'));
-       ots.canBreakLine(s[len - 1] != '\n');
        return ots;
 }
 
 
 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;
 }
 
@@ -549,7 +531,6 @@ otexstream & operator<<(otexstream & ots, char c)
        ots.lastChar(c);
        if (c == '\n')
                ots.texrow().newline();
-       ots.canBreakLine(c != '\n');
        return ots;
 }
 
@@ -559,7 +540,6 @@ otexstream & operator<<(otexstream & ots, Type value)
 {
        ots.os() << value;
        ots.lastChar(0);
-       ots.canBreakLine(true);
        ots.protectSpace(false);
        return ots;
 }