updates to latexfeatures stuff; allow empty \document_path

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

diff --git a/src/mathed/math_notinset.C b/src/mathed/math_notinset.C
index 9ebbb3f1bfb008c3a0bc9f383b33d502e78fe0f2..1929286e129397e7fb6aa4ed854058cd1768dcda 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,36 +14,33 @@ 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] ";
 }
 
 
-void MathNotInset::metrics(MathMetricsInfo const & st) const
+void MathNotInset::metrics(MathMetricsInfo const & mi) const
 {
-       size_ = st;
+       mi_ = mi;
        if (math_font_available(LM_TC_CMSY))
-               mathed_char_dim(LM_TC_CMSY, size(), 54, ascent_, descent_, width_);
+               mathed_char_dim(LM_TC_CMSY, mi_, 54, ascent_, descent_, width_);
        else
-               mathed_char_dim(LM_TC_VAR, size(), '/', ascent_, descent_, width_);
+               mathed_char_dim(LM_TC_VAR, mi_, '/', ascent_, descent_, width_);
        width_ = 0;
 }
 
 
 void MathNotInset::draw(Painter & pain, int x, int y) const
 {  
-       xo(x);
-       yo(y);
-
        if (math_font_available(LM_TC_CMSY))
-               drawChar(pain, LM_TC_CMSY, size(), x, y, 54);
+               drawChar(pain, LM_TC_CMSY, mi_, x, y, 54);
        else
-               drawChar(pain, LM_TC_VAR, size(), x, y, '/');
+               drawChar(pain, LM_TC_VAR, mi_, x, y, '/');
 }