small up/down tweaking

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

diff --git a/src/mathed/math_mathmlstream.h b/src/mathed/math_mathmlstream.h
index 364e5c10778e7e070c7b70db6ba922d9fd995c66..9e75152e08ac56aa9a5dff5ee7f161cc561ac0ed 100644 (file)
--- a/src/mathed/math_mathmlstream.h
+++ b/src/mathed/math_mathmlstream.h
@@ -1,15 +1,78 @@
 #ifndef MATH_MATHMLSTREAM_H
 #define MATH_MATHMLSTREAM_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
 
 // Please keep all four streams in one file until the interface has
 // settled.
 
 
+#include "math_metricsinfo.h"
+
 #include <iosfwd>
 
 class MathArray;
 class MathInset;
+class MathAtom;
+
+//
+// LaTeX/LyX
+//
+
+class WriteStream {
+public:
+       ///
+       WriteStream(std::ostream & os, bool fragile, bool latex);
+       ///
+       explicit WriteStream(std::ostream & os_);
+       ///
+       ~WriteStream();
+       ///
+       int line() const { return line_; }
+       ///
+       bool fragile() const { return fragile_; }
+       ///
+       bool latex() const { return latex_; }
+       ///
+       std::ostream & os() { return os_; }
+       ///
+       bool & firstitem() { return firstitem_; }
+       ///
+       void addlines(unsigned int);
+       /// writes space if next thing is isalpha()
+       void pendingSpace(bool how);
+       /// writes space if next thing is isalpha()
+       bool pendingSpace() const { return pendingspace_; }
+private:
+       ///
+       std::ostream & os_;
+       /// do we have to write \\protect sometimes
+       bool fragile_;
+       /// are we at the beginning of an MathArray?
+       bool firstitem_;
+       /// are we writing to .tex?
+       int latex_;
+       /// do we have a space pending?
+       bool pendingspace_;
+       ///
+       int line_;
+};
+
+///
+WriteStream & operator<<(WriteStream &, MathAtom const &);
+///
+WriteStream & operator<<(WriteStream &, MathArray const &);
+///
+WriteStream & operator<<(WriteStream &, char const *);
+///
+WriteStream & operator<<(WriteStream &, char);
+///
+WriteStream & operator<<(WriteStream &, int);
+///
+WriteStream & operator<<(WriteStream &, unsigned int);
+
 
 
 //
@@ -56,7 +119,7 @@ private:
 };
 
 ///
-MathMLStream & operator<<(MathMLStream &, MathInset const *);
+MathMLStream & operator<<(MathMLStream &, MathAtom const &);
 ///
 MathMLStream & operator<<(MathMLStream &, MathArray const &);
 ///
@@ -86,15 +149,15 @@ private:
 };
 
 ///
-NormalStream & operator<<(NormalStream &, MathInset const *);
+NormalStream & operator<<(NormalStream &, MathAtom const &);
 ///
 NormalStream & operator<<(NormalStream &, MathArray const &);
 ///
 NormalStream & operator<<(NormalStream &, char const *);
 ///
 NormalStream & operator<<(NormalStream &, char);
-
-
+///
+NormalStream & operator<<(NormalStream &, int);
 
 
 //
@@ -115,7 +178,7 @@ private:
 
 
 ///
-MapleStream & operator<<(MapleStream &, MathInset const *);
+MapleStream & operator<<(MapleStream &, MathAtom const &);
 ///
 MapleStream & operator<<(MapleStream &, MathArray const &);
 ///
@@ -127,14 +190,14 @@ MapleStream & operator<<(MapleStream &, int);
 
 
 //
-// Octave
+// Maxima
 //
 
 
-class OctaveStream {
+class MaximaStream {
 public:
        ///
-       explicit OctaveStream(std::ostream & os) : os_(os) {}
+       explicit MaximaStream(std::ostream & os) : os_(os) {}
        ///
        std::ostream & os() { return os_; }
 private:
@@ -142,63 +205,75 @@ private:
        std::ostream & os_;
 };
 
+
 ///
-OctaveStream & operator<<(OctaveStream &, MathInset const *);
+MaximaStream & operator<<(MaximaStream &, MathAtom const &);
 ///
-OctaveStream & operator<<(OctaveStream &, MathArray const &);
+MaximaStream & operator<<(MaximaStream &, MathArray const &);
 ///
-OctaveStream & operator<<(OctaveStream &, char const *);
+MaximaStream & operator<<(MaximaStream &, char const *);
 ///
-OctaveStream & operator<<(OctaveStream &, char);
-
+MaximaStream & operator<<(MaximaStream &, char);
+///
+MaximaStream & operator<<(MaximaStream &, int);
 
 
 //
-// LaTeX/LyX
+// Mathematica
 //
 
-class WriteStream {
+
+class MathematicaStream {
 public:
        ///
-       WriteStream(std::ostream & os, bool fragile, bool latex);
+       explicit MathematicaStream(std::ostream & os) : os_(os) {}
        ///
-       explicit WriteStream(std::ostream & os_);
-       ///
-       int line() const { return line_; }
+       std::ostream & os() { return os_; }
+private:
        ///
-       bool fragile() const { return fragile_; }
+       std::ostream & os_;
+};
+
+
+///
+MathematicaStream & operator<<(MathematicaStream &, MathAtom const &);
+///
+MathematicaStream & operator<<(MathematicaStream &, MathArray const &);
+///
+MathematicaStream & operator<<(MathematicaStream &, char const *);
+///
+MathematicaStream & operator<<(MathematicaStream &, char);
+///
+MathematicaStream & operator<<(MathematicaStream &, int);
+
+
+//
+// Octave
+//
+
+
+class OctaveStream {
+public:
        ///
-       bool latex() const { return latex_; }
+       explicit OctaveStream(std::ostream & os) : os_(os) {}
        ///
        std::ostream & os() { return os_; }
-       ///
-       bool & firstitem() { return firstitem_; }
-       ///
-       void addlines(unsigned int);
 private:
        ///
        std::ostream & os_;
-       ///
-       bool fragile_;
-       /// are we writing to .tex?
-       int latex_;
-       /// are we at the beginning of an MathArray?
-       bool firstitem_;
-       ///
-       int line_;
 };
 
 ///
-WriteStream & operator<<(WriteStream &, MathInset const *);
+OctaveStream & operator<<(OctaveStream &, MathAtom const &);
 ///
-WriteStream & operator<<(WriteStream &, MathArray const &);
-///
-WriteStream & operator<<(WriteStream &, char const *);
+OctaveStream & operator<<(OctaveStream &, MathArray const &);
 ///
-WriteStream & operator<<(WriteStream &, char);
+OctaveStream & operator<<(OctaveStream &, char const *);
 ///
-WriteStream & operator<<(WriteStream &, int);
+OctaveStream & operator<<(OctaveStream &, char);
 ///
-WriteStream & operator<<(WriteStream &, unsigned int);
+OctaveStream & operator<<(OctaveStream &, int);
+
+
 
 #endif