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 c258e2b0b3f5df2f531fbe90ac2fdfdfb60b71aa..0238540a821183d8212424758035a9b11a644928 100644 (file)
--- a/src/mathed/math_exfuncinset.C
+++ b/src/mathed/math_exfuncinset.C
@@ -5,30 +5,34 @@
 #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 & ar)
+       : MathNestInset(1), name_(name)
+{
+       cell(0) = ar;
+}
+
+
 MathInset * MathExFuncInset::clone() const
 {
        return new MathExFuncInset(*this);
 }
 
 
-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_);
 }
 
 
@@ -60,5 +64,3 @@ void MathExFuncInset::write(WriteStream & os) const
 {
        os << '\\' << name_ << '{' << cell(0) << '}';
 }
-
-