oh well

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

diff --git a/src/mathed/math_exfuncinset.C b/src/mathed/math_exfuncinset.C
index 1cf2588e09af4d3bd7b78c9df927a2f5bd354270..84ab2df48978692dd5f93cb1ae36e16723cc3cef 100644 (file)
--- a/src/mathed/math_exfuncinset.C
+++ b/src/mathed/math_exfuncinset.C
@@ -1,9 +1,9 @@
+#include <config.h>
+
 #include "math_exfuncinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
-
-
-using std::ostream;
+#include "math_streamstr.h"
 
 
 MathExFuncInset::MathExFuncInset(string const & name)
@@ -19,26 +19,26 @@ MathInset * MathExFuncInset::clone() const
 
 void MathExFuncInset::metrics(MathMetricsInfo const & mi) const
 {
-       mi_ = mi;
-       mathed_string_dim(LM_TC_TEXTRM, mi_, name_, ascent_, descent_, width_);
+       whichFont(font_, LM_TC_TEXTRM, mi);
+       mathed_string_dim(font_, name_, ascent_, descent_, width_);
 }
 
 
 void MathExFuncInset::draw(Painter & pain, int x, int y) const
-{  
-       drawStr(pain, LM_TC_TEXTRM, mi_, x, y, name_);
+{
+       drawStr(pain, font_, x, y, name_);
 }
 
 
 void MathExFuncInset::normalize(NormalStream & os) const
 {
-       os << '[' << name_.c_str() << ' ' << cell(0) << ']';
+       os << '[' << name_ << ' ' << cell(0) << ']';
 }
 
 
 void MathExFuncInset::maplize(MapleStream & os) const
 {
-       os << name_.c_str() << '(' << cell(0) << ')';
+       os << name_ << '(' << cell(0) << ')';
 }
 
 
@@ -50,13 +50,11 @@ void MathExFuncInset::mathmlize(MathMLStream & os) const
 
 void MathExFuncInset::octavize(OctaveStream & os) const
 {
-       os << name_.c_str() << '(' << cell(0) << ')';
+       os << name_ << '(' << cell(0) << ')';
 }
 
 
 void MathExFuncInset::write(WriteStream & os) const
 {
-       os << '\\' << name_.c_str() << '{' << cell(0) << '}';
+       os << '\\' << name_ << '{' << cell(0) << '}';
 }
-
-