oh well

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index b1efdb6f8198a49eb79553c49c323ed581207361..7ad73aa37eb89a0e83bcbb048b229cea2093195b 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -27,28 +27,29 @@ MathStringInset::MathStringInset(string const & s, MathTextCodes t)
 
 
 MathInset * MathStringInset::clone() const
-{   
+{
        return new MathStringInset(*this);
 }
 
 
 int MathStringInset::ascent() const
 {
-       return mathed_string_ascent(code_, mi_, str_);
+       return mathed_string_ascent(font_, str_);
 }
 
 
 int MathStringInset::descent() const
 {
-       return mathed_string_descent(code_, mi_, str_);
+       return mathed_string_descent(font_, str_);
 }
 
 
 int MathStringInset::width() const
 {
-       return mathed_string_width(code_, mi_, str_);
+       return mathed_string_width(font_, str_);
 }
 
+
 void MathStringInset::validate(LaTeXFeatures & features) const
 {
        //lyxerr << "stringinset amssymb" << endl;
@@ -56,16 +57,17 @@ void MathStringInset::validate(LaTeXFeatures & features) const
                features.require("amssymb");
 }
 
+
 void MathStringInset::metrics(MathMetricsInfo const & mi) const
 {
-       mi_ = mi;
+       whichFont(font_, code_, mi);
 }
 
 
 void MathStringInset::draw(Painter & pain, int x, int y) const
-{ 
+{
        //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
-       drawStr(pain, code_, mi_, x, y, str_);
+       drawStr(pain, font_, x, y, str_);
 }
 
 
@@ -80,11 +82,11 @@ void MathStringInset::maplize(MapleStream & os) const
        if (code_ != LM_TC_VAR || str_.size() <= 1) {
                os << ' ' << str_ << ' ';
                return;
-       }       
+       }
 
        // insert '*' between adjacent chars if type is LM_TC_VAR
        os << str_[0];
-       for (string::size_type i = 1; i < str_.size(); ++i) 
+       for (string::size_type i = 1; i < str_.size(); ++i)
                os << '*' << str_[i];
 }
 
@@ -94,11 +96,11 @@ void MathStringInset::octavize(OctaveStream & os) const
        if (code_ != LM_TC_VAR || str_.size() <= 1) {
                os << ' ' << str_ << ' ';
                return;
-       }       
+       }
 
        // insert '*' between adjacent chars if type is LM_TC_VAR
        os << str_[0];
-       for (string::size_type i = 1; i < str_.size(); ++i) 
+       for (string::size_type i = 1; i < str_.size(); ++i)
                os << '*' << str_[i];
 }
 
@@ -118,10 +120,8 @@ void MathStringInset::mathmlize(MathMLStream & os) const
 
 void MathStringInset::write(WriteStream & os) const
 {
-       if (math_font_name(code_)) 
+       if (math_font_name(code_))
                os << '\\' << math_font_name(code_) << '{' << str_ << '}';
-       else 
+       else
                os << str_;
 }
-
-