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 7ad73aa37eb89a0e83bcbb048b229cea2093195b..e28556edbc643f961b614ae68fe5c6e64c455a9d 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -7,22 +7,12 @@
 #include "math_stringinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "LColor.h"
-#include "Painter.h"
 #include "math_support.h"
-#include "math_parser.h"
-#include "LaTeXFeatures.h"
 #include "debug.h"
 
-#include <cctype>
 
-
-MathStringInset::MathStringInset()
-       : str_(), code_(LM_TC_MIN)
-{}
-
-MathStringInset::MathStringInset(string const & s, MathTextCodes t)
-       : str_(s), code_(t)
+MathStringInset::MathStringInset(string const & s)
+       : str_(s)
 {}
 
 
@@ -32,54 +22,28 @@ MathInset * MathStringInset::clone() const
 }
 
 
-int MathStringInset::ascent() const
-{
-       return mathed_string_ascent(font_, str_);
-}
-
-
-int MathStringInset::descent() const
+void MathStringInset::metrics(MathMetricsInfo & mi) const
 {
-       return mathed_string_descent(font_, str_);
+       mathed_string_dim(mi.base.font, str_, dim_);
 }
 
 
-int MathStringInset::width() const
-{
-       return mathed_string_width(font_, str_);
-}
-
-
-void MathStringInset::validate(LaTeXFeatures & features) const
-{
-       //lyxerr << "stringinset amssymb" << endl;
-       if (code_ == LM_TC_MSA || code_ == LM_TC_MSB)
-               features.require("amssymb");
-}
-
-
-void MathStringInset::metrics(MathMetricsInfo const & mi) const
-{
-       whichFont(font_, code_, mi);
-}
-
-
-void MathStringInset::draw(Painter & pain, int x, int y) const
+void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
 {
        //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
-       drawStr(pain, font_, x, y, str_);
+       drawStr(pi, pi.base.font, x, y, str_);
 }
 
 
 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;
        }
@@ -87,13 +51,19 @@ 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_ << ' ';
 }
 
 
 void MathStringInset::octavize(OctaveStream & os) const
 {
-       if (code_ != LM_TC_VAR || str_.size() <= 1) {
+       if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
                os << ' ' << str_ << ' ';
                return;
        }
@@ -101,12 +71,13 @@ 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];
 }
 
 
 void MathStringInset::mathmlize(MathMLStream & os) const
 {
+/*
        if (code_ == LM_TC_VAR)
                os << "<mi> " << str_ << " </mi>";
        else if (code_ == LM_TC_CONST)
@@ -114,14 +85,12 @@ void MathStringInset::mathmlize(MathMLStream & os) const
        else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
                os << "<mtext> " << str_ <<  " </mtext>";
        else
+*/
                os << str_;
 }
 
 
 void MathStringInset::write(WriteStream & os) const
 {
-       if (math_font_name(code_))
-               os << '\\' << math_font_name(code_) << '{' << str_ << '}';
-       else
-               os << str_;
+       os << str_;
 }