fix #1073

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 078ec542cb7bb9482b5521314b2f375a70974cc6..d8a37291bbbfb8ee28c0db9ff93e0783477883b9 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -1,16 +1,10 @@
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_stringinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "LColor.h"
 #include "math_support.h"
-#include "math_parser.h"
-#include "LaTeXFeatures.h"
 #include "debug.h"
 
 
@@ -25,13 +19,13 @@ MathInset * MathStringInset::clone() const
 }
 
 
-void MathStringInset::metrics(MathMetricsInfo & mi) const
+void MathStringInset::metrics(MetricsInfo & mi) const
 {
-       mathed_string_dim(mi.base.font, str_, ascent_, descent_, width_);
+       mathed_string_dim(mi.base.font, str_, dim_);
 }
 
 
-void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathStringInset::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
        drawStr(pi, pi.base.font, x, y, str_);
@@ -40,11 +34,11 @@ void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
 
 void MathStringInset::normalize(NormalStream & os) const
 {
-       os << "[string " << str_ << ' ' << "mathalpha" << "]";
+       os << "[string " << str_ << ' ' << "mathalpha" << ']';
 }
 
 
-void MathStringInset::maplize(MapleStream & os) const
+void MathStringInset::maple(MapleStream & os) const
 {
        if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
                os << ' ' << str_ << ' ';
@@ -58,13 +52,13 @@ void MathStringInset::maplize(MapleStream & os) const
 }
 
 
-void MathStringInset::mathematicize(MathematicaStream & os) const
+void MathStringInset::mathematica(MathematicaStream & os) const
 {
        os << ' ' << str_ << ' ';
 }
 
 
-void MathStringInset::octavize(OctaveStream & os) const
+void MathStringInset::octave(OctaveStream & os) const
 {
        if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
                os << ' ' << str_ << ' ';