several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/math_exfuncinset.C b/src/mathed/math_exfuncinset.C
index 7882daa993cecbde9a9e483603bb633725ed468d..0238540a821183d8212424758035a9b11a644928 100644 (file)
--- a/src/mathed/math_exfuncinset.C
+++ b/src/mathed/math_exfuncinset.C
@@ -1,15 +1,20 @@
+#include <config.h>
+
 #include "math_exfuncinset.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 
 
-using std::ostream;
+MathExFuncInset::MathExFuncInset(string const & name)
+       : MathNestInset(1), name_(name)
+{}
 
 
-MathExFuncInset::MathExFuncInset(string const & name, MathArray const & arg)
+MathExFuncInset::MathExFuncInset(string const & name, MathArray const & ar)
        : MathNestInset(1), name_(name)
 {
-       cell(0) = arg;
+       cell(0) = ar;
 }
 
 
@@ -19,28 +24,27 @@ MathInset * MathExFuncInset::clone() const
 }
 
 
-void MathExFuncInset::metrics(MathMetricsInfo const & mi) const
+void MathExFuncInset::metrics(MathMetricsInfo & mi) const
 {
-       mi_ = mi;
-       mathed_string_dim(LM_TC_TEXTRM, mi_, name_, ascent_, descent_, width_);
+       mathed_string_dim(mi.base.font, name_, ascent_, descent_, width_);
 }
 
 
-void MathExFuncInset::draw(Painter & pain, int x, int y) const
-{  
-       drawStr(pain, LM_TC_TEXTRM, mi_, x, y, name_);
+void MathExFuncInset::draw(MathPainterInfo & pi, int x, int y) const
+{
+       drawStrBlack(pi, 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) << ')';
 }
 
 
@@ -52,13 +56,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) << '}';
 }
-
-