Whitespace.

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

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 8dc9c4628da69595636616c9f96a1dd9ffe9fdc0..99900c3c112918fd94c654d276feb7d5e8ac7129 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -263,13 +263,13 @@ public:
        void defer(std::string const &);
        ///
        docstring deferred() const;
+       ///
+       bool inText() const { return in_text_; }
+private:
        ///
        void setTextMode() { in_text_ = true; }
        ///
        void setMathMode() { in_text_ = false; }
-       ///
-       bool inText() const { return in_text_; }
-private:
        ///
        odocstream & os_;
        ///
@@ -282,6 +282,8 @@ private:
        bool in_text_;
        ///
        odocstringstream deferred_;
+       ///
+       friend class SetMode;
 };
 
 ///
@@ -302,31 +304,31 @@ MathStream & operator<<(MathStream &, MTag const &);
 MathStream & operator<<(MathStream &, ETag const &);
 
 
-// A simpler version of ModeSpecifier, for MathML
+/// A simpler version of ModeSpecifier, for MathML
+// FIXME There are still problems here with nesting, at least
+// potentially. The problem is that true nesting of text mode isn't
+// actually possible. I.e., we can't have: 
+//             <mtext><mtext></mtext></mtext>
+// So we have to have:
+//             <mtext></mtext><mtext></mtext><mtext></mtext>
+// instead, where the last is really a continuation of the first.
+// We'll need some kind of stack to remember all that.
 class SetMode {
 public:
        ///
-       explicit SetMode(MathStream & os, bool text)
-               : os_(os)
-       {
-               was_text_ = os.inText();
-               if (text)
-                       os.setTextMode();
-               else
-                       os.setMathMode();
-       }
+       explicit SetMode(MathStream & os, bool text, docstring attrs);
        ///
-       ~SetMode()
-       {
-               if (was_text_)
-                       os_.setTextMode();
-               else
-                       os_.setMathMode();
-       }
+       explicit SetMode(MathStream & os, bool text);
+       ///
+       ~SetMode();
 private:
+       ///
+       void init(bool, docstring);
        ///
        MathStream & os_;
        ///
+       bool opened_;
+       ///
        bool was_text_;
 };