fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_notinset.C b/src/mathed/math_notinset.C
index da26ba0a3b02c6ecf2eb88a463756425a644159d..ce3db3945cb45fbe7351f3330ae0697e608de386 100644 (file)
--- a/src/mathed/math_notinset.C
+++ b/src/mathed/math_notinset.C
@@ -1,11 +1,9 @@
 #include "math_notinset.h"
 #include "math_parser.h"
-#include "support.h"
-#include "support/LOstream.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
 
 
-using std::ostream;
-
 MathNotInset::MathNotInset()
 {}
 
@@ -16,13 +14,13 @@ MathInset * MathNotInset::clone() const
 }
 
 
-void MathNotInset::write(MathWriteInfo & os) const
+void MathNotInset::write(WriteStream & os) const
 {
        os << "\\not ";
 }
 
 
-void MathNotInset::writeNormal(ostream & os) const
+void MathNotInset::normalize(NormalStream & os) const
 {
        os << "[not] ";
 }
@@ -30,19 +28,22 @@ void MathNotInset::writeNormal(ostream & os) const
 
 void MathNotInset::metrics(MathMetricsInfo const & mi) const
 {
-       mi_ = mi;
-       if (math_font_available(LM_TC_CMSY))
-               mathed_char_dim(LM_TC_CMSY, mi_, 54, ascent_, descent_, width_);
-       else
-               mathed_char_dim(LM_TC_VAR, mi_, '/', ascent_, descent_, width_);
+       if (math_font_available(LM_TC_CMSY)) {
+               whichFont(font_, LM_TC_CMSY, mi);
+               mathed_char_dim(font_, 54, ascent_, descent_, width_);
+       }
+       else {
+               whichFont(font_, LM_TC_VAR, mi);
+               mathed_char_dim(font_, '/', ascent_, descent_, width_);
+       }
        width_ = 0;
 }
 
 
 void MathNotInset::draw(Painter & pain, int x, int y) const
-{  
+{
        if (math_font_available(LM_TC_CMSY))
-               drawChar(pain, LM_TC_CMSY, mi_, x, y, 54);
+               drawChar(pain, font_, x, y, 54);
        else
-               drawChar(pain, LM_TC_VAR, mi_, x, y, '/');
+               drawChar(pain, font_, x, y, '/');
 }