small up/down tweaking

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

diff --git a/src/mathed/math_unknowninset.C b/src/mathed/math_unknowninset.C
index b58588e1fa0cb852391274200344ed414176b51d..c54562514ae2df051c973fe884792d34892a3c9a 100644 (file)
--- a/src/mathed/math_unknowninset.C
+++ b/src/mathed/math_unknowninset.C
@@ -5,17 +5,13 @@
 #endif
 
 #include "math_unknowninset.h"
-#include "frontends/Painter.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 
 
-extern LyXFont WhichFont(short type, int size);
-
-
-MathUnknownInset::MathUnknownInset(string const & nm)
-       : name_(nm)
+MathUnknownInset::MathUnknownInset(string const & nm, bool final, bool black)
+       : name_(nm), final_(final), black_(black)
 {}
 
 
@@ -25,47 +21,55 @@ MathInset * MathUnknownInset::clone() const
 }
 
 
-string const & MathUnknownInset::name() const
+string MathUnknownInset::name() const
 {
        return name_;
 }
 
 
-void MathUnknownInset::setName(string const & n)
+void MathUnknownInset::setName(string const & name)
 {
-       name_ = n;
+       name_ = name;
 }
 
 
-bool MathUnknownInset::match(MathInset * p) const
+bool MathUnknownInset::match(MathAtom const & at) const
 {
-       MathUnknownInset const * q = p->asUnknownInset();
+       MathUnknownInset const * q = at->asUnknownInset();
        return q && name_ == q->name_;
 }
 
 
-void MathUnknownInset::write(WriteStream & os) const
+void MathUnknownInset::normalize(NormalStream & os) const
 {
-       os << "\\" << name_ << ' ';
+       os << "[unknown " << name_ << ']';
 }
 
 
-void MathUnknownInset::normalize(NormalStream & os) const
+void MathUnknownInset::metrics(MathMetricsInfo & mi) const
 {
-       os << "[unknown " << name_ << ']';
+       mathed_string_dim(mi.base.font, name_, dim_);
+}
+
+
+void MathUnknownInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+       if (black_)
+               drawStrBlack(pi, x, y, name_);
+       else
+               drawStrRed(pi, x, y, name_);
 }
 
 
-void MathUnknownInset::metrics(MathMetricsInfo const & mi) const
+void MathUnknownInset::finalize()
 {
-       whichFont(font_, LM_TC_TEX, mi);
-       mathed_string_dim(font_, name_, ascent_, descent_, width_);
+       final_ = true;
 }
 
 
-void MathUnknownInset::draw(Painter & pain, int x, int y) const
+bool MathUnknownInset::final() const
 {
-       drawStr(pain, font_, x, y, name_);
+       return final_;
 }
 
 
@@ -74,6 +78,11 @@ void MathUnknownInset::maplize(MapleStream & os) const
        os << name_;
 }
 
+void MathUnknownInset::mathematicize(MathematicaStream & os) const
+{
+       os << name_;
+}
+
 
 void MathUnknownInset::mathmlize(MathMLStream & os) const
 {