improve language flag for Objective-C compiler call

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

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 56472058c56e3a0c713785a585ddc39f2a484742..e8839e07f61420104c3ff49826f7dc4997123ce6 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,8 +414,9 @@ void otexstream::put(char_type const & c)
                protectspace_ = false;
        }
        os_.put(c);
+       lastchar_ = c;
        if (c == '\n') {
-               ++lines_;
+               texrow_.newline();
                canbreakline_ = false;
        } else
                canbreakline_ = true;
@@ -427,8 +431,9 @@ otexstream & operator<<(otexstream & ots, BreakLine)
 {
        if (ots.canBreakLine()) {
                ots.os().put('\n');
+               ots.lastChar('\n');
                ots.canBreakLine(false);
-               ots.addLines(1);
+               ots.texrow().newline();
        }
        ots.protectSpace(false);
        return ots;
@@ -439,19 +444,22 @@ otexstream & operator<<(otexstream & ots, SafeBreakLine)
 {
        if (ots.canBreakLine()) {
                ots.os() << "%\n";
+               ots.lastChar('\n');
                ots.canBreakLine(false);
-               ots.addLines(1);
+               ots.texrow().newline();
        }
        ots.protectSpace(false);
        return ots;
 }
 
 
-otexstream & operator<<(otexstream & ots, SetEnc e)
+otexstream & operator<<(otexstream & ots, odocstream_manip pf)
 {
-       ots.os() << e;
-       ots.canBreakLine(true);
-       ots.protectSpace(false);
+       ots.os() << pf;
+       if (pf == static_cast<odocstream_manip>(endl)) {
+               ots.lastChar('\n');
+               ots.texrow().newline();
+       }
        return ots;
 }
 
@@ -469,29 +477,49 @@ otexstream & operator<<(otexstream & ots, docstring const & s)
                        ots.os() << "{}";
                ots.protectSpace(false);
        }
-       ots.os() << s;
-       ots.addLines(count(s.begin(), s.end(), '\n'));
+
+       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;
+
+       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.addLines(count(s, s + len, '\n'));
-       ots.canBreakLine(s[len - 1] != '\n');
+otexstream & operator<<(otexstream & ots, char const * s)
+{
+       ots << from_utf8(s);
        return ots;
 }
 
@@ -504,38 +532,29 @@ otexstream & operator<<(otexstream & ots, char c)
                ots.protectSpace(false);
        }
        ots.os() << c;
+       ots.lastChar(c);
        if (c == '\n')
-               ots.addLines(1);
+               ots.texrow().newline();
        ots.canBreakLine(c != '\n');
        return ots;
 }
 
 
-otexstream & operator<<(otexstream & ots, double d)
-{
-       ots.os() << d;
-       ots.canBreakLine(true);
-       ots.protectSpace(false);
-       return ots;
-}
-
-
-otexstream & operator<<(otexstream & ots, int i)
+template <typename Type>
+otexstream & operator<<(otexstream & ots, Type value)
 {
-       ots.os() << i;
+       ots.os() << value;
+       ots.lastChar(0);
        ots.canBreakLine(true);
        ots.protectSpace(false);
        return ots;
 }
 
-
-otexstream & operator<<(otexstream & ots, unsigned int i)
-{
-       ots.os() << i;
-       ots.canBreakLine(true);
-       ots.protectSpace(false);
-       return ots;
-}
+template otexstream & operator<< <SetEnc>(otexstream & os, SetEnc);
+template otexstream & operator<< <double>(otexstream &, double);
+template otexstream & operator<< <int>(otexstream &, int);
+template otexstream & operator<< <unsigned int>(otexstream &, unsigned int);
+template otexstream & operator<< <unsigned long>(otexstream &, unsigned long);
 
 }