apply the ostream changes to mathed, some other small related things

[features.git] / src / mathed / math_inset.h

diff --git a/src/mathed/math_inset.h b/src/mathed/math_inset.h
index c128fca9cbdca191b59a9053ffb45fd472cd02ef..1deccae3228ad4873bc4d1175be7fa620c5c234a 100644 (file)
--- a/src/mathed/math_inset.h
+++ b/src/mathed/math_inset.h
@@ -43,17 +43,14 @@ public:
        ~MathFuncInset();
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
        ///
@@ -79,17 +76,14 @@ public:
        ~MathAccentInset();
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
        ///
@@ -116,17 +110,14 @@ public:
        MathDotsInset(char const *, int, short st = LM_ST_TEXT);
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
 protected:
@@ -142,17 +133,14 @@ public:
        MathSpaceInset(int sp, short ot = LM_OT_SPACE, short st = LM_ST_TEXT);
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        inline void Metrics();
        ///
@@ -172,17 +160,14 @@ public:
        MathBigopInset(char const *, int, short st = LM_ST_TEXT);
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
        ///
@@ -206,16 +191,14 @@ public:
        MathSqrtInset(short st = LM_ST_TEXT);
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
-       void draw(Painter &, int x, int baseline);
-#else
        ///
-       void Draw(int x, int baseline);
-#endif
+       void draw(Painter &, int x, int baseline);
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
        ///
@@ -235,17 +218,14 @@ public:
        ~MathFracInset();
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int x, int baseline);
-#else
-       ///
-       void Draw(int x, int baseline);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
        
@@ -288,17 +268,14 @@ public:
        MathDelimInset(int, int, short st = LM_ST_TEXT);
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
 protected:
@@ -316,17 +293,14 @@ public:
        MathDecorationInset(int, short st = LM_ST_TEXT);
        ///
        MathedInset * Clone();
-#ifdef USE_PAINTER
        ///
        void draw(Painter &, int, int);
-#else
-       ///
-       void Draw(int, int);
-#endif
        ///
        void Write(ostream &);
+#ifndef USE_OSTREAM_ONLY
        ///
        void Write(string & file);
+#endif
        ///
        void Metrics();
        ///
@@ -361,10 +335,11 @@ bool MathFuncInset::GetLimits() const
 inline
 void MathFuncInset::Write(ostream & os)
 {
-       os << "\\" << name;
+       os << "\\" << name << ' ';
 }
 
 
+#ifndef USE_OSTREAM_ONLY
 inline
 void MathFuncInset::Write(string & file)
 {
@@ -372,6 +347,7 @@ void MathFuncInset::Write(string & file)
    file += name;
    file += ' ';
 }
+#endif
 
 
 inline