Whitespace.

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

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index 295b1d77d5b9dd4a6a03de31dac9679f75f0d6dc..c9f7ef54a50df772ff4164f936c548ed8a04d765 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"
 
@@ -86,9 +85,16 @@ 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() << ' ';
+               else if (s[0] == ' ' && ws.textMode())
+                       ws.os() << '\\';
                ws.pendingSpace(false);
        }
        ws.os() << s;
@@ -103,21 +109,26 @@ WriteStream & operator<<(WriteStream & ws, docstring const & s)
 }
 
 
-WriteStream::WriteStream(odocstream & os, bool fragile, bool latex)
+WriteStream::WriteStream(odocstream & os, bool fragile, bool latex, OutputType output,
+                       Encoding const * encoding)
        : os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
-         pendingspace_(false), line_(0)
+         output_(output), pendingspace_(false), pendingbrace_(false),
+         textmode_(false), locked_(0), line_(0), encoding_(encoding)
 {}
 
 
 WriteStream::WriteStream(odocstream & os)
        : os_(os), fragile_(false), firstitem_(false), latex_(false),
-         pendingspace_(false), line_(0)
+         output_(wsDefault), pendingspace_(false), pendingbrace_(false),
+         textmode_(false), locked_(0), line_(0), encoding_(0)
 {}
 
 
 WriteStream::~WriteStream()
 {
-       if (pendingspace_)
+       if (pendingbrace_)
+               os_ << '}';
+       else if (pendingspace_)
                os_ << ' ';
 }
 
@@ -134,6 +145,24 @@ void WriteStream::pendingSpace(bool how)
 }
 
 
+void WriteStream::pendingBrace(bool brace)
+{
+       pendingbrace_ = brace;
+}
+
+
+void WriteStream::textMode(bool textmode)
+{
+       textmode_ = textmode;
+}
+
+
+void WriteStream::lockedMode(bool locked)
+{
+       locked_ = locked;
+}
+
+
 WriteStream & operator<<(WriteStream & ws, MathAtom const & at)
 {
        at->write(ws);
@@ -150,9 +179,16 @@ 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() << ' ';
+               else if (s[0] == ' ' && ws.textMode())
+                       ws.os() << '\\';
                ws.pendingSpace(false);
        }
        ws.os() << s;
@@ -163,9 +199,16 @@ WriteStream & operator<<(WriteStream & ws, char const * s)
 
 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() << ' ';
+               else if (c == ' ' && ws.textMode())
+                       ws.os() << '\\';
                ws.pendingSpace(false);
        }
        ws.os() << c;
@@ -177,6 +220,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 +232,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;
 }
@@ -193,10 +246,36 @@ WriteStream & operator<<(WriteStream & ws, unsigned int i)
 
 
 MathStream::MathStream(odocstream & os)
-       : os_(os), tab_(0), line_(0), lastchar_(0)
+       : os_(os), tab_(0), line_(0), lastchar_(0), in_text_(false)
 {}
 
 
+void MathStream::cr()
+{
+       os() << '\n';
+       for (int i = 0; i < tab(); ++i)
+               os() << ' ';
+}
+
+
+void MathStream::defer(docstring const & s)
+{
+       deferred_ << s;
+}
+
+
+void MathStream::defer(string const & s)
+{
+       deferred_ << from_utf8(s);
+}
+
+
+docstring MathStream::deferred() const
+{ 
+       return deferred_.str();
+}
+
+
 MathStream & operator<<(MathStream & ms, MathAtom const & at)
 {
        at->mathmlize(ms);
@@ -225,6 +304,13 @@ MathStream & operator<<(MathStream & ms, char c)
 }
 
 
+MathStream & operator<<(MathStream & ms, char_type c)
+{
+       ms.os() << c;
+       return ms;
+}
+
+
 MathStream & operator<<(MathStream & ms, MTag const & t)
 {
        ++ms.tab();
@@ -244,20 +330,66 @@ MathStream & operator<<(MathStream & ms, ETag const & t)
 }
 
 
-void MathStream::cr()
+MathStream & operator<<(MathStream & ms, docstring const & s)
 {
-       os() << '\n';
-       for (int i = 0; i < tab(); ++i)
-               os() << ' ';
+       ms.os() << s;
+       return ms;
 }
 
 
-MathStream & operator<<(MathStream & ms, docstring const & s)
+SetMode::SetMode(MathStream & os, bool text)
+       : os_(os), opened_(false)
 {
-       ms.os() << s;
-       return ms;
+       init(text, from_ascii(""));
+}
+
+
+SetMode::SetMode(MathStream & os, bool text, docstring attrs)
+       : os_(os), opened_(false)
+{
+       init(text, attrs);
 }
 
+
+void SetMode::init(bool text, docstring attrs)
+{
+       was_text_ = os_.inText();
+       if (was_text_)
+               os_ << "</mtext>";
+       if (text) {
+               os_.setTextMode();
+               os_ << "<mtext";
+               if (!attrs.empty())
+                       os_ << " " << attrs;
+               os_ << ">";
+               opened_ = true;
+       } else {
+               if (!attrs.empty()) {
+                       os_ << "<mstyle " << attrs << ">";
+                       opened_ = true;
+               }
+               os_.setMathMode();
+       }
+}
+
+
+SetMode::~SetMode()
+{
+       if (opened_) {
+               if (os_.inText())
+                       os_ << "</mtext>";
+               else
+                       os_ << "</mstyle>";
+       }
+       if (was_text_) {
+               os_.setTextMode();
+               os_ << "<mtext>";
+       } else {
+               os_.setMathMode();
+       }
+}
+
+
 //////////////////////////////////////////////////////////////////////