enable direct input of #1...#9; some whitespace changes

[lyx.git] / src / mathed / math_spaceinset.C

diff --git a/src/mathed/math_spaceinset.C b/src/mathed/math_spaceinset.C
index 8f9d99982554dbd9e4599fe35f0400405b293f8f..d348218c2b857bc78b2bf0bc7fbdd9790854ca9f 100644 (file)
--- a/src/mathed/math_spaceinset.C
+++ b/src/mathed/math_spaceinset.C
@@ -3,9 +3,11 @@
 #endif
 
 #include "math_spaceinset.h"
+#include "math_support.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+
 
 
 MathSpaceInset::MathSpaceInset(int sp)
@@ -19,7 +21,20 @@ MathInset * MathSpaceInset::clone() const
 }
 
 
-void MathSpaceInset::draw(Painter & pain, int x, int y)
+void MathSpaceInset::metrics(MathMetricsInfo const &) const
+{
+       width_ = space_ ? space_ * 2 : 2;
+       if (space_ > 3)
+               width_ *= 2;
+       if (space_ == 5)
+               width_ *= 2;
+       width_  += 4;
+       ascent_  = 4;
+       descent_ = 0;
+}
+
+
+void MathSpaceInset::draw(Painter & pain, int x, int y) const
 { 
        
 // XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
@@ -38,34 +53,34 @@ void MathSpaceInset::draw(Painter & pain, int x, int y)
 }
 
 
-void MathSpaceInset::Write(std::ostream & os, bool /* fragile */) const
+void MathSpaceInset::incSpace()
 {
-       if (space_ >= 0 && space_ < 6)
-               os << '\\' << latex_mathspace[space_] << ' ';
+       space_ = (space_ + 1) % 6;
 }
 
 
-void MathSpaceInset::WriteNormal(std::ostream & os) const
+void MathSpaceInset::maplize(MapleStream & os) const
 {
-       os << "[space " << space_ << "] ";
+       os << ' ';
 }
 
 
-void MathSpaceInset::Metrics(MathStyles st, int, int)
+void MathSpaceInset::octavize(OctaveStream & os) const
 {
-       size_  = st;
-       width_ = space_ ? space_ * 2 : 2;
-       if (space_ > 3)
-               width_ *= 2;
-       if (space_ == 5)
-               width_ *= 2;
-       width_  += 4;
-       ascent_  = 4;
-       descent_ = 0;
+       os << ' ';
 }
 
 
-void MathSpaceInset::incSpace()
+void MathSpaceInset::normalize(NormalStream & os) const
 {
-       space_ = (space_ + 1) % 6;
+       os << "[space " << space_ << "] ";
 }
+
+
+void MathSpaceInset::write(WriteStream & os) const
+{
+       if (space_ >= 0 && space_ < 6)
+               os << '\\' << latex_mathspace[space_] << ' ';
+}
+
+