Fix some display glitches

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

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 3fb0c032951db82adb812f49bc45aa0a2d62b705..38cabc453c8afaa48d071b241e4004b66ab28239 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "support/docstream.h"
+#include "support/lstrings.h"
 #include "support/unicode.h"
 
 #include <algorithm>
@@ -23,6 +24,8 @@
 using namespace std;
 
 using lyx::ucs4_codeset;
+using lyx::support::contains;
+using lyx::support::split;
 
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
@@ -411,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;
 }
 
 
@@ -429,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);
@@ -442,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);
@@ -474,31 +472,50 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
                        ots.os() << "{}";
                ots.protectSpace(false);
        }
-       ots.os() << s;
+
+       if (contains(s, 0xF0000)) {
+               // Some encoding changes for the underlying stream are embedded
+               // in the docstring. The encoding names to be used are enclosed
+               // between the code points 0xF0000 and 0xF0001, the first two
+               // characters of plane 15, which is a Private Use Area whose
+               // codepoints don't have any associated glyph.
+               docstring s1;
+               docstring s2 = split(s, s1, 0xF0000);
+               while (true) {
+                       if (!s1.empty())
+                               ots.os() << s1;
+                       if (s2.empty())
+                               break;
+                       docstring enc;
+                       docstring const s3 = split(s2, enc, 0xF0001);
+                       if (!contains(s2, 0xF0001))
+                               s2 = split(enc, s1, 0xF0000);
+                       else {
+                               ots.os() << setEncoding(to_ascii(enc));
+                               s2 = split(s3, s1, 0xF0000);
+                       }
+               }
+       } 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, 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;
 }
 
@@ -514,7 +531,6 @@ otexstream & operator<<(otexstream & ots, char c)
        ots.lastChar(c);
        if (c == '\n')
                ots.texrow().newline();
-       ots.canBreakLine(c != '\n');
        return ots;
 }
 
@@ -524,7 +540,6 @@ otexstream & operator<<(otexstream & ots, Type value)
 {
        ots.os() << value;
        ots.lastChar(0);
-       ots.canBreakLine(true);
        ots.protectSpace(false);
        return ots;
 }