small up/down tweaking

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index bb381f340c96d5d8c6379c0b3e6f0e53adb8c283..e28556edbc643f961b614ae68fe5c6e64c455a9d 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -7,17 +7,10 @@
 #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"
 
 
-MathStringInset::MathStringInset()
-       : str_()
-{}
-
 MathStringInset::MathStringInset(string const & s)
        : str_(s)
 {}
@@ -31,7 +24,7 @@ MathInset * MathStringInset::clone() const
 
 void MathStringInset::metrics(MathMetricsInfo & mi) const
 {
-       mathed_string_dim(mi.base.font, str_, ascent_, descent_, width_);
+       mathed_string_dim(mi.base.font, str_, dim_);
 }
 
 
@@ -44,13 +37,13 @@ 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
 {
-       if (/*code_ != LM_TC_VAR || */ str_.size() <= 1) {
+       if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
                os << ' ' << str_ << ' ';
                return;
        }
@@ -58,7 +51,13 @@ void MathStringInset::maplize(MapleStream & os) const
        // insert '*' between adjacent chars if type is LM_TC_VAR
        os << str_[0];
        for (string::size_type i = 1; i < str_.size(); ++i)
-               os << '*' << str_[i];
+               os << str_[i];
+}
+
+
+void MathStringInset::mathematicize(MathematicaStream & os) const
+{
+       os << ' ' << str_ << ' ';
 }
 
 
@@ -72,7 +71,7 @@ void MathStringInset::octavize(OctaveStream & os) const
        // insert '*' between adjacent chars if type is LM_TC_VAR
        os << str_[0];
        for (string::size_type i = 1; i < str_.size(); ++i)
-               os << '*' << str_[i];
+               os << str_[i];
 }