Change the interface to a paragraph's layout. We still store a LayoutPtr, but now...

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

diff --git a/src/mathed/MathStream.h b/src/mathed/MathStream.h
index 9088db2991db542f71189694cecdc3f8bbed5760..b107d78abe2e358b11c802827cf5b5bbaa71cf51 100644 (file)
--- a/src/mathed/MathStream.h
+++ b/src/mathed/MathStream.h
@@ -12,19 +12,15 @@
 #ifndef MATH_MATHMLSTREAM_H
 #define MATH_MATHMLSTREAM_H
 
+#include "support/strfwd.h"
 
-// Please keep all four streams in one file until the interface has
-// settled.
-
-
-#include "metricsinfo.h"
-#include "support/docstream.h"
-#include "support/docstring.h"
+// FIXME: Move to individual insets
+#include "MetricsInfo.h"
 
 
 namespace lyx {
 
-class MathArray;
+class MathData;
 class InsetMath;
 class MathAtom;
 
@@ -61,7 +57,7 @@ private:
        odocstream & os_;
        /// do we have to write \\protect sometimes
        bool fragile_;
-       /// are we at the beginning of an MathArray?
+       /// are we at the beginning of an MathData?
        bool firstitem_;
        /// are we writing to .tex?
        int latex_;
@@ -74,7 +70,7 @@ private:
 ///
 WriteStream & operator<<(WriteStream &, MathAtom const &);
 ///
-WriteStream & operator<<(WriteStream &, MathArray const &);
+WriteStream & operator<<(WriteStream &, MathData const &);
 ///
 WriteStream & operator<<(WriteStream &, docstring const &);
 ///
@@ -95,21 +91,17 @@ WriteStream & operator<<(WriteStream &, unsigned int);
 class MTag {
 public:
        ///
-       MTag(docstring const tag) : tag_(tag) {}
+       MTag(char const * const tag) : tag_(tag) {}
        ///
-       MTag(char const * const tag) : tag_(from_ascii(tag)) {}
-       ///
-       docstring const tag_;
+       char const * const tag_;
 };
 
 class ETag {
 public:
        ///
-       ETag(docstring const tag) : tag_(tag) {}
-       ///
-       ETag(char const * const tag) : tag_(from_ascii(tag)) {}
+       ETag(char const * const tag) : tag_(tag) {}
        ///
-       docstring const tag_;
+       char const * const tag_;
 };
 
 class MathStream {
@@ -140,7 +132,7 @@ private:
 ///
 MathStream & operator<<(MathStream &, MathAtom const &);
 ///
-MathStream & operator<<(MathStream &, MathArray const &);
+MathStream & operator<<(MathStream &, MathData const &);
 ///
 MathStream & operator<<(MathStream &, docstring const &);
 ///
@@ -172,7 +164,7 @@ private:
 ///
 NormalStream & operator<<(NormalStream &, MathAtom const &);
 ///
-NormalStream & operator<<(NormalStream &, MathArray const &);
+NormalStream & operator<<(NormalStream &, MathData const &);
 ///
 NormalStream & operator<<(NormalStream &, docstring const &);
 ///
@@ -203,7 +195,7 @@ private:
 ///
 MapleStream & operator<<(MapleStream &, MathAtom const &);
 ///
-MapleStream & operator<<(MapleStream &, MathArray const &);
+MapleStream & operator<<(MapleStream &, MathData const &);
 ///
 MapleStream & operator<<(MapleStream &, docstring const &);
 ///
@@ -236,7 +228,7 @@ private:
 ///
 MaximaStream & operator<<(MaximaStream &, MathAtom const &);
 ///
-MaximaStream & operator<<(MaximaStream &, MathArray const &);
+MaximaStream & operator<<(MaximaStream &, MathData const &);
 ///
 MaximaStream & operator<<(MaximaStream &, docstring const &);
 ///
@@ -269,7 +261,7 @@ private:
 ///
 MathematicaStream & operator<<(MathematicaStream &, MathAtom const &);
 ///
-MathematicaStream & operator<<(MathematicaStream &, MathArray const &);
+MathematicaStream & operator<<(MathematicaStream &, MathData const &);
 ///
 MathematicaStream & operator<<(MathematicaStream &, docstring const &);
 ///
@@ -299,7 +291,7 @@ private:
 ///
 OctaveStream & operator<<(OctaveStream &, MathAtom const &);
 ///
-OctaveStream & operator<<(OctaveStream &, MathArray const &);
+OctaveStream & operator<<(OctaveStream &, MathData const &);
 ///
 OctaveStream & operator<<(OctaveStream &, docstring const &);
 ///