* InsetMathHull:

[lyx.git] / src / mathed / MathStream.cpp

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 31f69518de7d4a65e67ccc9b73f830e5d506d8f5..295b1d77d5b9dd4a6a03de31dac9679f75f0d6dc 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -10,18 +10,22 @@
 
 #include <config.h>
 
+#include "MathStream.h"
+
 #include "InsetMath.h"
 #include "MathData.h"
 #include "MathExtern.h"
-#include "MathStream.h"
 
 #include "support/textutils.h"
+#include "support/docstring.h"
 
 #include <algorithm>
+#include <cstring>
+#include <ostream>
 
-namespace lyx {
+using namespace std;
 
-using std::strlen;
+namespace lyx {
 
 
 //////////////////////////////////////////////////////////////////////
@@ -48,7 +52,7 @@ NormalStream & operator<<(NormalStream & ns, docstring const & s)
 }
 
 
-NormalStream & operator<<(NormalStream & ns, const std::string & s)
+NormalStream & operator<<(NormalStream & ns, const string & s)
 {
        ns.os() << from_utf8(s);
        return ns;
@@ -152,7 +156,7 @@ WriteStream & operator<<(WriteStream & ws, char const * s)
                ws.pendingSpace(false);
        }
        ws.os() << s;
-       ws.addlines(int(std::count(s, s + strlen(s), '\n')));
+       ws.addlines(int(count(s, s + strlen(s), '\n')));
        return ws;
 }
 
@@ -225,7 +229,7 @@ MathStream & operator<<(MathStream & ms, MTag const & t)
 {
        ++ms.tab();
        ms.cr();
-       ms.os() << '<' << t.tag_ << '>';
+       ms.os() << '<' << from_ascii(t.tag_) << '>';
        return ms;
 }
 
@@ -235,7 +239,7 @@ MathStream & operator<<(MathStream & ms, ETag const & t)
        ms.cr();
        if (ms.tab() > 0)
                --ms.tab();
-       ms.os() << "</" << t.tag_ << '>';
+       ms.os() << "</" << from_ascii(t.tag_) << '>';
        return ms;
 }
 
@@ -462,7 +466,7 @@ OctaveStream & operator<<(OctaveStream & ns, char_type c)
 }
 
 
-OctaveStream & operator<<(OctaveStream & os, std::string const & s)
+OctaveStream & operator<<(OctaveStream & os, string const & s)
 {
        os.os() << from_utf8(s);
        return os;