Fix bug 5802 (http://bugzilla.lyx.org/show_bug.cgi?id=5802)

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

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 43d618f8ce34d8aa639528247c5b16581e16db74..356eacccf325015f7e4b22c5f0a0378b3742a370 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,7 +12,6 @@
 
 #include "MathStream.h"
 
-#include "InsetMath.h"
 #include "MathData.h"
 #include "MathExtern.h"
 
@@ -20,13 +19,13 @@
 #include "support/docstring.h"
 
 #include <algorithm>
+#include <cstring>
 #include <ostream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::strlen;
-
 
 //////////////////////////////////////////////////////////////////////
 
@@ -52,7 +51,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;
@@ -86,7 +85,12 @@ NormalStream & operator<<(NormalStream & ns, int i)
 
 WriteStream & operator<<(WriteStream & ws, docstring const & s)
 {
-       if (ws.pendingSpace() && s.length() > 0) {
+       if (ws.pendingBrace()) {
+               ws.os() << '}';
+               ws.pendingBrace(false);
+               ws.pendingSpace(false);
+               ws.textMode(true);
+       } else if (ws.pendingSpace() && s.length() > 0) {
                if (isAlphaASCII(s[0]))
                        ws.os() << ' ';
                ws.pendingSpace(false);
@@ -103,21 +107,26 @@ WriteStream & operator<<(WriteStream & ws, docstring const & s)
 }
 
 
-WriteStream::WriteStream(odocstream & os, bool fragile, bool latex)
+WriteStream::WriteStream(odocstream & os, bool fragile, bool latex, bool dryrun,
+                       Encoding const * encoding)
        : os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
-         pendingspace_(false), line_(0)
+         dryrun_(dryrun), pendingspace_(false), pendingbrace_(false),
+         textmode_(false), line_(0), encoding_(encoding)
 {}
 
 
 WriteStream::WriteStream(odocstream & os)
        : os_(os), fragile_(false), firstitem_(false), latex_(false),
-         pendingspace_(false), line_(0)
+         dryrun_(false), pendingspace_(false), pendingbrace_(false),
+         textmode_(false), line_(0), encoding_(0)
 {}
 
 
 WriteStream::~WriteStream()
 {
-       if (pendingspace_)
+       if (pendingbrace_)
+               os_ << '}';
+       else if (pendingspace_)
                os_ << ' ';
 }
 
@@ -134,6 +143,18 @@ void WriteStream::pendingSpace(bool how)
 }
 
 
+void WriteStream::pendingBrace(bool brace)
+{
+       pendingbrace_ = brace;
+}
+
+
+void WriteStream::textMode(bool textmode)
+{
+       textmode_ = textmode;
+}
+
+
 WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
 {
        at->write(ws);
@@ -150,20 +171,30 @@ WriteStream & operator<<(WriteStream & ws, MathData const & ar)
 
 WriteStream & operator<<(WriteStream & ws, char const * s)
 {
-       if (ws.pendingSpace() && strlen(s) > 0) {
+       if (ws.pendingBrace()) {
+               ws.os() << '}';
+               ws.pendingBrace(false);
+               ws.pendingSpace(false);
+               ws.textMode(true);
+       } else if (ws.pendingSpace() && strlen(s) > 0) {
                if (isAlphaASCII(s[0]))
                        ws.os() << ' ';
                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;
 }
 
 
 WriteStream & operator<<(WriteStream & ws, char c)
 {
-       if (ws.pendingSpace()) {
+       if (ws.pendingBrace()) {
+               ws.os() << '}';
+               ws.pendingBrace(false);
+               ws.pendingSpace(false);
+               ws.textMode(true);
+       } else if (ws.pendingSpace()) {
                if (isAlphaASCII(c))
                        ws.os() << ' ';
                ws.pendingSpace(false);
@@ -177,6 +208,11 @@ WriteStream & operator<<(WriteStream & ws, char c)
 
 WriteStream & operator<<(WriteStream & ws, int i)
 {
+       if (ws.pendingBrace()) {
+               ws.os() << '}';
+               ws.pendingBrace(false);
+               ws.textMode(true);
+       }
        ws.os() << i;
        return ws;
 }
@@ -184,6 +220,11 @@ WriteStream & operator<<(WriteStream & ws, int i)
 
 WriteStream & operator<<(WriteStream & ws, unsigned int i)
 {
+       if (ws.pendingBrace()) {
+               ws.os() << '}';
+               ws.pendingBrace(false);
+               ws.textMode(true);
+       }
        ws.os() << i;
        return ws;
 }
@@ -466,7 +507,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;